plugins: set MAC addresses based on IP

This will give deterministic MAC addresses for all interfaces CNI
creates and manages the IP for:
* bridge: container veth and host bridge
* macvlan: container veth
* ptp: container veth and host veth

utils/hwaddr/hwaddr.go

@@ -17,13 +17,16 @@ package hwaddr
 import (
 	"fmt"
 	"net"
-	"strconv"
-	"strings"
 )
 
 const (
+	ipRelevantByteLen      = 4
+	PrivateMACPrefixString = "0a:58"
+)
+
+var (
 	// private mac prefix safe to use
-	PrivateMACPrefix = "0a:58"
+	PrivateMACPrefix = []byte{0x0a, 0x58}
 )
 
 type SupportIp4OnlyErr struct{ msg string }
@@ -39,7 +42,7 @@ type InvalidPrefixLengthErr struct{ msg string }
 func (e InvalidPrefixLengthErr) Error() string { return e.msg }
 
 // GenerateHardwareAddr4 generates 48 bit virtual mac addresses based on the IP4 input.
-func GenerateHardwareAddr4(ip net.IP, prefix string) (net.HardwareAddr, error) {
+func GenerateHardwareAddr4(ip net.IP, prefix []byte) (net.HardwareAddr, error) {
 	switch {
 
 	case ip.To4() == nil:
@@ -51,18 +54,10 @@ func GenerateHardwareAddr4(ip net.IP, prefix string) (net.HardwareAddr, error) {
 		}
 	}
 
-	mac := prefix
-	sections := strings.Split(ip.String(), ".")
-	for _, s := range sections {
-		i, _ := strconv.Atoi(s)
-		mac += fmt.Sprintf(":%02x", i)
-	}
-
-	hwAddr, err := net.ParseMAC(mac)
-	if err != nil {
-		return nil, MacParseErr{msg: fmt.Sprintf(
-			"Failed to parse mac address %q generated based on IP %q due to: %v", mac, ip, err),
-		}
-	}
-	return hwAddr, nil
+	ipByteLen := len(ip)
+	return (net.HardwareAddr)(
+		append(
+			prefix,
+			ip[ipByteLen-ipRelevantByteLen:ipByteLen]...),
+	), nil
 }

utils/hwaddr/hwaddr_test.go

@@ -28,26 +28,26 @@ var _ = Describe("Hwaddr", func() {
 		It("generate hardware address based on ipv4 address", func() {
 			testCases := []struct {
 				ip          net.IP
-				expectedMAC string
+				expectedMAC net.HardwareAddr
 			}{
 				{
 					ip:          net.ParseIP("10.0.0.2"),
-					expectedMAC: hwaddr.PrivateMACPrefix + ":0a:00:00:02",
+					expectedMAC: (net.HardwareAddr)(append(hwaddr.PrivateMACPrefix, 0x0a, 0x00, 0x00, 0x02)),
 				},
 				{
 					ip:          net.ParseIP("10.250.0.244"),
-					expectedMAC: hwaddr.PrivateMACPrefix + ":0a:fa:00:f4",
+					expectedMAC: (net.HardwareAddr)(append(hwaddr.PrivateMACPrefix, 0x0a, 0xfa, 0x00, 0xf4)),
 				},
 				{
 					ip:          net.ParseIP("172.17.0.2"),
-					expectedMAC: hwaddr.PrivateMACPrefix + ":ac:11:00:02",
+					expectedMAC: (net.HardwareAddr)(append(hwaddr.PrivateMACPrefix, 0xac, 0x11, 0x00, 0x02)),
 				},
 			}
 
 			for _, tc := range testCases {
 				mac, err := hwaddr.GenerateHardwareAddr4(tc.ip, hwaddr.PrivateMACPrefix)
 				Expect(err).NotTo(HaveOccurred())
-				Expect(mac.String()).To(Equal(tc.expectedMAC))
+				Expect(mac).To(Equal(tc.expectedMAC))
 			}
 		})
 
@@ -63,7 +63,7 @@ var _ = Describe("Hwaddr", func() {
 		})
 
 		It("return error if prefix is invalid", func() {
-			_, err := hwaddr.GenerateHardwareAddr4(net.ParseIP("10.0.0.2"), "")
+			_, err := hwaddr.GenerateHardwareAddr4(net.ParseIP("10.0.0.2"), []byte{0x58})
 			Expect(err).To(BeAssignableToTypeOf(hwaddr.InvalidPrefixLengthErr{}))
 		})
 	})