diff --git a/pkg/ip/link_linux.go b/pkg/ip/link_linux.go index f8781cf1..68b2a35b 100644 --- a/pkg/ip/link_linux.go +++ b/pkg/ip/link_linux.go @@ -25,7 +25,6 @@ import ( "github.com/vishvananda/netlink" "github.com/containernetworking/plugins/pkg/ns" - "github.com/containernetworking/plugins/pkg/utils/hwaddr" "github.com/containernetworking/plugins/pkg/utils/sysctl" ) @@ -225,33 +224,6 @@ func DelLinkByNameAddr(ifName string) ([]*net.IPNet, error) { return out, nil } -func SetHWAddrByIP(ifName string, ip4 net.IP, ip6 net.IP) error { - iface, err := netlink.LinkByName(ifName) - if err != nil { - return fmt.Errorf("failed to lookup %q: %v", ifName, err) - } - - switch { - case ip4 == nil && ip6 == nil: - return fmt.Errorf("neither ip4 or ip6 specified") - - case ip4 != nil: - { - hwAddr, err := hwaddr.GenerateHardwareAddr4(ip4, hwaddr.PrivateMACPrefix) - if err != nil { - return fmt.Errorf("failed to generate hardware addr: %v", err) - } - if err = netlink.LinkSetHardwareAddr(iface, hwAddr); err != nil { - return fmt.Errorf("failed to add hardware addr to %q: %v", ifName, err) - } - } - case ip6 != nil: - // TODO: IPv6 - } - - return nil -} - // GetVethPeerIfindex returns the veth link object, the peer ifindex of the // veth, or an error. This peer ifindex will only be valid in the peer's // network namespace. diff --git a/pkg/ip/link_linux_test.go b/pkg/ip/link_linux_test.go index 7249c9ef..3c118e9f 100644 --- a/pkg/ip/link_linux_test.go +++ b/pkg/ip/link_linux_test.go @@ -51,8 +51,6 @@ var _ = Describe("Link", func() { hostVethName string containerVethName string - ip4one = net.ParseIP("1.1.1.1") - ip4two = net.ParseIP("1.1.1.2") originalRandReader = rand.Reader ) @@ -270,41 +268,4 @@ var _ = Describe("Link", func() { return nil }) }) - - It("SetHWAddrByIP must change the interface hwaddr and be predictable", func() { - - _ = containerNetNS.Do(func(ns.NetNS) error { - defer GinkgoRecover() - - var err error - hwaddrBefore := getHwAddr(containerVethName) - - err = ip.SetHWAddrByIP(containerVethName, ip4one, nil) - Expect(err).NotTo(HaveOccurred()) - hwaddrAfter1 := getHwAddr(containerVethName) - - Expect(hwaddrBefore).NotTo(Equal(hwaddrAfter1)) - Expect(hwaddrAfter1).To(Equal(ip4onehwaddr)) - - return nil - }) - }) - - It("SetHWAddrByIP must be injective", func() { - - _ = containerNetNS.Do(func(ns.NetNS) error { - defer GinkgoRecover() - - err := ip.SetHWAddrByIP(containerVethName, ip4one, nil) - Expect(err).NotTo(HaveOccurred()) - hwaddrAfter1 := getHwAddr(containerVethName) - - err = ip.SetHWAddrByIP(containerVethName, ip4two, nil) - Expect(err).NotTo(HaveOccurred()) - hwaddrAfter2 := getHwAddr(containerVethName) - - Expect(hwaddrAfter1).NotTo(Equal(hwaddrAfter2)) - return nil - }) - }) })