Remove interface name from alt name if exist

This change is similar to SRIOV-CNI [1].

[1] k8snetworkplumbingwg/sriov-cni#292

Signed-off-by: Ivan Kolodyazhny <e0ne@e0ne.info>

Author: e0ne

pkg/sriov/sriov.go

@@ -56,6 +56,11 @@ func (n *MyNetlink) LinkSetVfNodeGUID(link netlink.Link, vf int, nodeGUID net.Ha
 	return netlink.LinkSetVfNodeGUID(link, vf, nodeGUID)
 }
 
+// LinkDelAltName using NetlinkManager
+func (n *MyNetlink) LinkDelAltName(link netlink.Link, altName string) error {
+	return netlink.LinkDelAltName(link, altName)
+}
+
 type pciUtilsImpl struct{}
 
 func (p *pciUtilsImpl) GetSriovNumVfs(ifName string) (int, error) {
@@ -139,18 +144,31 @@ func (s *sriovManager) SetupVF(conf *types.NetConf, podifName, cid string, netns
 		return fmt.Errorf("error setting temp IF name %s for %s", tempName, linkName)
 	}
 
-	// 3. Change netns
+	// 3. Remove alt name from the nic
+	linkObj, err = s.nLink.LinkByName(tempName)
+	if err != nil {
+		return fmt.Errorf("error getting VF netdevice with name %s: %v", tempName, err)
+	}
+	for _, altName := range linkObj.Attrs().AltNames {
+		if altName == linkName {
+			if err := s.nLink.LinkDelAltName(linkObj, linkName); err != nil {
+				return fmt.Errorf("error removing VF altname %s: %v", linkName, err)
+			}
+		}
+	}
+
+	// 4. Change netns
 	if err := s.nLink.LinkSetNsFd(linkObj, int(netns.Fd())); err != nil {
 		return fmt.Errorf("failed to move IF %s to netns: %q", tempName, err)
 	}
 
 	if err := netns.Do(func(_ ns.NetNS) error {
-		// 4. Set Pod IF name
+		// 5. Set Pod IF name
 		if err := s.nLink.LinkSetName(linkObj, podifName); err != nil {
 			return fmt.Errorf("error setting container interface name %s for %s", linkName, tempName)
 		}
 
-		// 5. Bring IF up in Pod netns
+		// 6. Bring IF up in Pod netns
 		if err := s.nLink.LinkSetUp(linkObj); err != nil {
 			return fmt.Errorf("error bringing interface up in container ns: %q", err)
 		}

pkg/sriov/sriov_test.go

@@ -386,6 +386,26 @@ var _ = Describe("Sriov", func() {
 			err := sm.SetupVF(netconf, podifName, contID, targetNetNS)
 			Expect(err).To(HaveOccurred())
 		})
+		It("Remove altName", func() {
+			targetNetNS := newFakeNs()
+			mocked := &mocks.NetlinkManager{}
+
+			fakeLink := &FakeLink{netlink.LinkAttrs{
+				Index:    1000,
+				Name:     "dummylink",
+				AltNames: []string{"enp175s6"},
+			}}
+
+			mocked.On("LinkByName", mock.AnythingOfType("string")).Return(fakeLink, nil)
+			mocked.On("LinkSetDown", fakeLink).Return(nil)
+			mocked.On("LinkSetName", fakeLink, mock.Anything).Return(nil)
+			mocked.On("LinkDelAltName", fakeLink, "enp175s6").Return(nil)
+			mocked.On("LinkSetNsFd", fakeLink, mock.AnythingOfType("int")).Return(nil)
+			mocked.On("LinkSetUp", fakeLink).Return(nil)
+			sm := sriovManager{nLink: mocked}
+			err := sm.SetupVF(netconf, podifName, contID, targetNetNS)
+			Expect(err).NotTo(HaveOccurred())
+		})
 	})
 	Context("Checking ReleaseVF function", func() {
 		var (