Merge ~mpontillo/maas:fix-websocket-claim-auto-ips--bug-1804557 into maas:master

[Mike Pontillo]

LP: #1804557 - Fix claiming IP addresses for new interfaces over the WebSocket

[Andres Rodriguez (andreserl)]

Lgtm!

review: Approve

diff --git a/src/maasserver/models/node.py b/src/maasserver/models/node.py
index 18beda4..3e8872e 100644
--- a/src/maasserver/models/node.py
+++ b/src/maasserver/models/node.py
@@ -3275,7 +3275,10 @@ class Node(CleanSave, TimestampedModel):
     def claim_auto_ips(self):
         """Assign IP addresses to all interface links set to AUTO."""
         exclude_addresses = set()
-        for interface in self.interface_set.all():
+        # Query for the interfaces again here; if we use the cached
+        # interface_set, we could skip a newly-created bridge if it was created
+        # at deployment time.
+        for interface in Interface.objects.filter(node=self):
             claimed_ips = interface.claim_auto_ips(
                 exclude_addresses=exclude_addresses)
             for ip in claimed_ips:
diff --git a/src/maasserver/models/tests/test_node.py b/src/maasserver/models/tests/test_node.py
index 91cdef9..1cf5a41 100644
--- a/src/maasserver/models/tests/test_node.py
+++ b/src/maasserver/models/tests/test_node.py
@@ -5681,6 +5681,28 @@ class TestNodeNetworking(MAASTransactionServerTestCase):
         ]
         self.assertItemsEqual(interfaces, observed_interfaces)
 
+    def test_claim_auto_ips_calls_claim_auto_ips_on_new_added_interface(self):
+        node = factory.make_Node()
+        interfaces = [
+            factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
+            for _ in range(2)
+        ]
+        mock_claim_auto_ips = self.patch_autospec(Interface, "claim_auto_ips")
+        node = Node.objects.filter(
+            id=node.id).prefetch_related('interface_set').first()
+        # Add in the third interface after we create the node with the cached
+        # interface_set.
+        new_iface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
+        interfaces.append(new_iface)
+        node.claim_auto_ips()
+        # Since the interfaces are not ordered, which they dont need to be
+        # we extract the passed interface to each call.
+        observed_interfaces = [
+            call[0][0]
+            for call in mock_claim_auto_ips.call_args_list
+        ]
+        self.assertItemsEqual(interfaces, observed_interfaces)
+
     def test_release_interface_config_calls_release_auto_ips_on_all(self):
         node = factory.make_Node()
         interfaces = [