Merge pull request #261 from l1b0k/cni2

fix get eni by mac may get incorrect nic in ipvlan mode

pkg/link/interface.go

@@ -20,28 +20,17 @@ func GetDeviceNumber(mac string) (int32, error) {
 	}
 
 	for _, link := range linkList {
+		// ignore virtual nic type. eg. ipvlan veth bridge
+		if _, ok := link.(*netlink.Device); !ok {
+			continue
+		}
 		if link.Attrs().HardwareAddr.String() == mac {
 			return int32(link.Attrs().Index), nil
 		}
 	}
 	return 0, errors.Wrapf(ErrNotFound, "can't found dev by mac %s", mac)
 }
 
-// GetDeviceName get interface device name by mac address
-func GetDeviceName(mac string) (string, error) {
-	linkList, err := netlink.LinkList()
-	if err != nil {
-		return "", errors.Wrapf(err, "error get link list from netlink")
-	}
-
-	for _, link := range linkList {
-		if link.Attrs().HardwareAddr.String() == mac {
-			return link.Attrs().Name, nil
-		}
-	}
-	return "", errors.Wrapf(ErrNotFound, "can't found dev by mac %s", mac)
-}
-
 // DeleteIPRulesByIP delete all ip rule related to the addr
 func DeleteIPRulesByIP(addr *net.IPNet) error {
 	family := netlink.FAMILY_V4