Merge ~adam-collard/maas:skip-ipoib-at-startup into maas:master

[Adam Collard]

Skip IPoIB in update_interface

[Alberto Donato (ack)]

+1, lgtm

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b skip-ipoib-at-startup lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/12660/console
COMMIT: 7d06d74d5f0a2270142acd819ec497dcd1b86e90

review: Needs Fixing

a729a41... by Adam Collard on 2022-05-25

Add __len__ to fields.MAC

[MAAS Lander (maas-lander)]

UNIT TESTS
-b skip-ipoib-at-startup lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/12661/console
COMMIT: a729a41236e648a1a0841251c200cbe49dc7e8c1

review: Needs Fixing

f0a8340... by Adam Collard on 2022-05-25

Fix tests

[MAAS Lander (maas-lander)]

UNIT TESTS
-b skip-ipoib-at-startup lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/12662/console
COMMIT: f0a8340cbe08da771518133bd169e994a2e67df3

review: Needs Fixing

[Adam Collard (adam-collard)]

jenkins: !test

[MAAS Lander (maas-lander)]

UNIT TESTS
-b skip-ipoib-at-startup lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/12663/console
COMMIT: f0a8340cbe08da771518133bd169e994a2e67df3

review: Needs Fixing

[Adam Collard (adam-collard)]

jenkins: !test

[MAAS Lander (maas-lander)]

UNIT TESTS
-b skip-ipoib-at-startup lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: f0a8340cbe08da771518133bd169e994a2e67df3

review: Approve

diff --git a/src/maasserver/api/tests/test_nodes.py b/src/maasserver/api/tests/test_nodes.py
index 02d9a21..87af027 100644
--- a/src/maasserver/api/tests/test_nodes.py
+++ b/src/maasserver/api/tests/test_nodes.py
@@ -133,7 +133,7 @@ class TestIsRegisteredAnonAPI(APITestCase.ForAnonymousAndUserAndAdmin):
         interface = factory.make_Interface(INTERFACE_TYPE.UNKNOWN)
         response = self.client.get(
             reverse("nodes_handler"),
-            {"op": "is_registered", "mac_address": interface.mac_address},
+            {"op": "is_registered", "mac_address": str(interface.mac_address)},
         )
         self.assertEqual(
             (http.client.OK.value, "false"),
diff --git a/src/maasserver/fields.py b/src/maasserver/fields.py
index c7932bc..c968977 100644
--- a/src/maasserver/fields.py
+++ b/src/maasserver/fields.py
@@ -248,6 +248,10 @@ class MAC:
     def __bytes__(self):
         return self._wrapped.encode("ascii")
 
+    def __len__(self):
+        """Defer to len of the wrapped value."""
+        return len(self._wrapped)
+
     def __eq__(self, other):
         """Two `MAC`s are equal if they wrap the same value.
 
diff --git a/src/maasserver/tests/test_fields.py b/src/maasserver/tests/test_fields.py
index 9d9fdcb..fd85a52 100644
--- a/src/maasserver/tests/test_fields.py
+++ b/src/maasserver/tests/test_fields.py
@@ -111,6 +111,10 @@ class TestMAC(MAASServerTestCase):
         addr = factory.make_mac_address()
         self.assertEqual("'%s'::macaddr" % addr, MAC(MAC(addr)).getquoted())
 
+    def test_mac_is_len_able(self):
+        mac = factory.make_MAC()
+        self.assertEqual(len(mac), len(mac.raw))
+
     def test_mac_equals_self(self):
         mac = factory.make_MAC()
         self.assertTrue(mac == mac)
diff --git a/src/metadataserver/builtin_scripts/network.py b/src/metadataserver/builtin_scripts/network.py
index f08f767..c155168 100644
--- a/src/metadataserver/builtin_scripts/network.py
+++ b/src/metadataserver/builtin_scripts/network.py
@@ -18,6 +18,7 @@ from maasserver.utils.orm import transactional
 from provisioningserver.events import EVENT_TYPES
 from provisioningserver.logger import get_maas_logger
 from provisioningserver.utils import flatten, sorttop
+from provisioningserver.utils.ipaddr import is_ipoib_mac
 from provisioningserver.utils.network import fix_link_addresses
 from provisioningserver.utils.twisted import synchronous
 
@@ -170,6 +171,9 @@ def update_interface(node, name, data, address_extra, hints=None):
         # Ignore OpenBMC interfaces on switches which all share the
         # same, hard-coded OpenBMC MAC address.
         return None
+    # See LP:1939456
+    if is_ipoib_mac(network["hwaddr"]):
+        return None
 
     links = []
     for address in network["addresses"]:
diff --git a/src/metadataserver/builtin_scripts/tests/test_network.py b/src/metadataserver/builtin_scripts/tests/test_network.py
index af89703..a3f5b1e 100644
--- a/src/metadataserver/builtin_scripts/tests/test_network.py
+++ b/src/metadataserver/builtin_scripts/tests/test_network.py
@@ -37,6 +37,7 @@ from metadataserver.builtin_scripts import network as network_module
 from metadataserver.builtin_scripts.network import (
     _hardware_sync_network_device_notify,
     get_interface_dependencies,
+    update_interface,
     update_node_interfaces,
 )
 from provisioningserver.events import EVENT_DETAILS, EVENT_TYPES
@@ -2871,6 +2872,20 @@ class TestGetInterfaceDependencies(MAASTestCase):
         )
 
 
+class TestUpdateInterface(MAASServerTestCase):
+    def test_update_interface_skips_ipoib_mac(self):
+        node = factory.make_Node(with_boot_disk=False, interface=True)
+        data = FakeCommissioningData()
+        data.create_physical_network(
+            "ibp4s0",
+            mac_address="a0:00:02:20:fe:80:00:00:00:00:00:00:e4:1d:2d:03:00:4f:06:e1",
+        )
+        result = update_interface(
+            node, "ibp4s0", data.render(), address_extra={}
+        )
+        self.assertIsNone(result)
+
+
 class TestHardwareSyncNetworkDeviceNotify(MAASServerTestCase):
     def setup(self):
         details = EVENT_DETAILS[EVENT_TYPES.NODE_HARDWARE_SYNC_INTERFACE]