MGMT-18993: When installing a node configured with a bond interface comprising of two or more network interfaces, the mac address of the bond and all its slave interfaces is set to match the mac address of the first slave. This can lead to a mismatch with the bootMACAddress field of the corresponding BareMetalHost, preventing the agent from being correctly matched with it. This PR ensures that each interface retains its actual permanent mac address, rather than the visible address set by the bonding configuration. (#1074)

Co-authored-by: omer-vishlitzky <omer.vishlitzky@gmail.com>

Author: openshift-cherrypick-robot

src/inventory/interfaces.go

@@ -8,6 +8,7 @@ import (
 	"github.com/openshift/assisted-installer-agent/src/util"
 	"github.com/openshift/assisted-service/models"
 	"github.com/sirupsen/logrus"
+	"github.com/vishvananda/netlink"
 )
 
 const ipv4LocalLinkCIDR = "169.254.0.0/16"
@@ -82,6 +83,35 @@ func getFlags(flags net.Flags) []string {
 	}
 }
 
+// getPermMacAddress returns the permanent MAC address regardless of network bonding configuration.
+// For bond slaves, it returns the PermHardwareAddr,
+// For non-slave interfaces, the HardwareAddr is the permanent MAC address anyway
+func (i *interfaces) getPermMacAddress(name string) string {
+	link, err := i.dependencies.LinkByName(name)
+	if err != nil {
+		logrus.WithError(err).Warnf("Could not find netlink for interface %s", name)
+		return ""
+	}
+
+	if link.Attrs() == nil {
+		logrus.Warnf("No attributes found for interface %s", name)
+		return ""
+	}
+
+	if link.Attrs().Slave != nil {
+		if bondSlave, ok := link.Attrs().Slave.(*netlink.BondSlave); ok && bondSlave.PermHardwareAddr != nil {
+			return bondSlave.PermHardwareAddr.String()
+		}
+	}
+
+	if link.Attrs().HardwareAddr != nil {
+		return link.Attrs().HardwareAddr.String()
+	}
+
+	logrus.Warnf("No hardware address found for interface %s", name)
+	return ""
+}
+
 func (i *interfaces) getInterfaces() []*models.Interface {
 	ret := make([]*models.Interface, 0)
 	ins, err := i.dependencies.Interfaces()
@@ -95,7 +125,7 @@ func (i *interfaces) getInterfaces() []*models.Interface {
 			HasCarrier:    i.hasCarrier(in.Name()),
 			IPV4Addresses: make([]string, 0),
 			IPV6Addresses: make([]string, 0),
-			MacAddress:    in.HardwareAddr().String(),
+			MacAddress:    i.getPermMacAddress(in.Name()),
 			Name:          in.Name(),
 			Mtu:           int64(in.MTU()),
 			Biosdevname:   i.getBiosDevname(in.Name()),

src/inventory/interfaces_test.go

@@ -45,7 +45,7 @@ var _ = Describe("Interfaces", func() {
 		dependencies.On("ReadFile", "/sys/class/net/eth0/carrier").Return([]byte("1\n"), nil).Once()
 		dependencies.On("ReadFile", "/sys/class/net/eth0/device/device").Return([]byte("my-device"), nil).Once()
 		dependencies.On("ReadFile", "/sys/class/net/eth0/device/vendor").Return([]byte("my-vendor"), nil).Once()
-		dependencies.On("LinkByName", "eth0").Return(&netlink.Dummy{LinkAttrs: netlink.LinkAttrs{Name: "eth0"}}, nil).Once()
+		util.SetupNetlinkMocks(dependencies, []util.Interface{interfaceMock})
 		dependencies.On("RouteList", mock.Anything, mock.Anything).Return([]netlink.Route{
 			{
 				Dst:      &net.IPNet{IP: net.ParseIP("de90::"), Mask: net.CIDRMask(64, 128)},
@@ -105,7 +105,7 @@ var _ = Describe("Interfaces", func() {
 		dependencies.On("ReadFile", "/sys/class/net/eth2.10/carrier").Return(nil, errors.New("Blah")).Once()
 		dependencies.On("ReadFile", "/sys/class/net/eth2.10/device/device").Return(nil, errors.New("Blah")).Once()
 		dependencies.On("ReadFile", "/sys/class/net/eth2.10/device/vendor").Return([]byte("my-vendor2"), nil).Once()
-		dependencies.On("LinkByName", mock.Anything).Return(&netlink.Dummy{LinkAttrs: netlink.LinkAttrs{Name: "eth0"}}, nil)
+		util.SetupNetlinkMocks(dependencies, rets)
 		dependencies.On("RouteList", mock.Anything, mock.Anything).Return([]netlink.Route{
 			{
 				Dst:      &net.IPNet{IP: net.ParseIP("de90::"), Mask: net.CIDRMask(62, 128)},

src/scanners/machine_uuid_scanner_test.go

@@ -116,7 +116,7 @@ var _ = Describe("Machine uuid test", func() {
 			dependencies.On("ReadFile", "/sys/class/net/eth1/carrier").Return(nil, errors.New("Blah")).Once()
 			dependencies.On("ReadFile", "/sys/class/net/eth1/device/device").Return(nil, errors.New("Blah")).Once()
 			dependencies.On("ReadFile", "/sys/class/net/eth1/device/vendor").Return([]byte("my-vendor2"), nil).Once()
-			dependencies.On("LinkByName", mock.Anything).Return(&netlink.Dummy{LinkAttrs: netlink.LinkAttrs{Name: "eth0"}}, nil)
+			agentutils.SetupNetlinkMocks(dependencies, rets)
 			dependencies.On("RouteList", mock.Anything, mock.Anything).Return([]netlink.Route{
 				{
 					Dst:      &net.IPNet{IP: net.ParseIP("de90::"), Mask: net.CIDRMask(64, 128)},

src/util/test_utils.go

@@ -4,6 +4,7 @@ import (
 	"net"
 
 	"github.com/stretchr/testify/mock"
+	"github.com/vishvananda/netlink"
 )
 
 func NewFilledMockInterface(mtu int, name string, macAddr string, flags net.Flags, addrs []string, speedMbps int64, interfaceType string) *MockInterface {
@@ -16,7 +17,7 @@ func FillInterfaceMock(mock *mock.Mock, mtu int, name string, macAddr string, fl
 	mock.On("Name").Return(name)
 	mock.On("MTU").Return(mtu)
 	hwAddr, _ := net.ParseMAC(macAddr)
-	mock.On("HardwareAddr").Return(hwAddr)
+	mock.On("HardwareAddr").Return(hwAddr).Maybe()
 	mock.On("Flags").Return(flags)
 	mock.On("Addrs").Return(parseAddresses(addrs), nil).Once()
 	mock.On("SpeedMbps").Return(speedMbps)
@@ -42,3 +43,18 @@ func parseAddress(addrStr string) net.Addr {
 	}
 	return &net.IPNet{IP: ip, Mask: ipnet.Mask}
 }
+
+func SetupNetlinkMocks(dependencies *MockIDependencies, interfaces []Interface) {
+	for _, iface := range interfaces {
+		name := iface.Name()
+		hwAddr := iface.HardwareAddr()
+
+		link := &netlink.Dummy{
+			LinkAttrs: netlink.LinkAttrs{
+				Name:         name,
+				HardwareAddr: hwAddr,
+			},
+		}
+		dependencies.On("LinkByName", name).Return(link, nil).Maybe()
+	}
+}