Merge ~ack/maas:1904810-fix-deploy-with-assigned-ip-2.9 into maas:2.9

[Alberto Donato]

LP: #1904810 - don't try to perform IP checks if there's no IP to check

This fixes an issue where the check is attempted for 0 IP addresses for a node
that only has static IPs assigned.

[Alberto Donato (ack)]

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b 1904810-fix-deploy-with-assigned-ip-2.9 lp:~ack/maas/+git/maas into -b 2.9 lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/8723/consoleText

[MAAS Lander (maas-lander)]

UNIT TESTS
-b 1904810-fix-deploy-with-assigned-ip-2.9 lp:~ack/maas/+git/maas into -b 2.9 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: a79ead6b234c795e43b20c552f1f0b62ffdfd1e4

review: Approve

diff --git a/src/maasserver/models/node.py b/src/maasserver/models/node.py
index bdaf5b3..fa05273 100644
--- a/src/maasserver/models/node.py
+++ b/src/maasserver/models/node.py
@@ -4498,6 +4498,9 @@ class Node(CleanSave, TimestampedModel):
                 transactional(self.claim_auto_ips),
                 temp_expires_after=timedelta(minutes=5),
             )
+            if not allocated_ips:
+                # no IPs to test (e.g. all IPs are statically assigned)
+                return
             # skip IPs that have been tested already
             allocated_ips = set(
                 ip for ip in allocated_ips if ip.ip not in attempted_ips
diff --git a/src/maasserver/models/tests/test_node.py b/src/maasserver/models/tests/test_node.py
index c8a1b58..939976f 100644
--- a/src/maasserver/models/tests/test_node.py
+++ b/src/maasserver/models/tests/test_node.py
@@ -8930,6 +8930,29 @@ class TestNode_Start(MAASTransactionServerTestCase):
             with post_commit_hooks:
                 node.start(user)
 
+    def test_claims_auto_ip_ignores_staticly_assigned_addresses(self):
+        user = factory.make_User()
+        node = self.make_acquired_node_with_interface(
+            user, power_type="manual"
+        )
+
+        # set a static IP on the node interface
+        node_interface = node.get_boot_interface()
+        [ip] = node_interface.ip_addresses.filter(
+            alloc_type=IPADDRESS_TYPE.AUTO
+        )
+
+        static_ip = factory.pick_ip_in_Subnet(ip.subnet)
+        ip.alloc_type = IPADDRESS_TYPE.STICKY
+        ip.ip = static_ip
+        ip.save()
+
+        with post_commit_hooks:
+            node.start(user)
+
+        ip = reload_object(ip)
+        self.assertEqual(ip.ip, static_ip)
+
     def test_sets_deploying_before_claiming_auto_ips(self):
         user = factory.make_User()
         node = self.make_acquired_node_with_interface(