Merge lp:~danilo/maas/bug-1688060-houdini-pod-nodes into lp:~maas-committers/maas/trunk

[Данило Шеган]

When resyncing/refreshing a pod, ensure machines turned into rack controllers are not recommissioned.

When syncing machines, we instead look at all Nodes in the database with matching interface MAC addresses, and not just all Machine nodes (since rack controllers are not part of those).

As a side-effect, this will also match region-and-rack-controllers, region-controllers and devices: I don't see that as a problem (since it is matched by MAC addresses), and I prefer code that's simpler, but I can easily add extra filtering and tests if needed.

Test instructions:

1. Register a (eg. virsh) pod
2. Compose a few machines
3. Deploy one machine
4. ssh to that machine and install maas-rack-controller
5. Go to Nodes/Controllers page and follow "add rack controller" instructions to add the deployed node

It will disappear from the listing of machines in a pod, but at least refreshing a pod won't cause it to recommission (and mess up your MAAS).

[Andres Rodriguez (andreserl)]

lgtm! I think this would prevent any machine that was part of the pod and became something else to be recommissioned if refreshed.

The one thing in the future is that we will have to show it there with a different status. But that's a future thing.

Since Newell/Blake worked on RSD, I'd like a review from either of them before landing.

review: Approve

[Newell Jensen (newell-jensen)]

Looks good. I tested your branch.

review: Approve

=== modified file 'src/maasserver/models/bmc.py'
--- src/maasserver/models/bmc.py	2017-05-04 22:02:16 +0000
+++ src/maasserver/models/bmc.py	2017-05-17 12:04:11 +0000
@@ -813,7 +813,7 @@
             for interface in machine.interfaces
         ]
         existing_machines = list(
-            Machine.objects.filter(
+            Node.objects.filter(
                 interface__mac_address__in=all_macs)
             .prefetch_related("interface_set")
             .prefetch_related('blockdevice_set__physicalblockdevice')
@@ -821,7 +821,7 @@
             .distinct())
         machines = {
             machine.id: machine
-            for machine in Machine.objects.filter(bmc__id=self.id)
+            for machine in Node.objects.filter(bmc__id=self.id)
         }
         mac_machine_map = {
             interface.mac_address: machine

=== modified file 'src/maasserver/models/tests/test_bmc.py'
--- src/maasserver/models/tests/test_bmc.py	2017-04-24 20:56:23 +0000
+++ src/maasserver/models/tests/test_bmc.py	2017-05-17 12:04:11 +0000
@@ -17,6 +17,7 @@
     INTERFACE_TYPE,
     IPADDRESS_TYPE,
     NODE_CREATION_TYPE,
+    NODE_TYPE,
     POWER_STATE,
 )
 from maasserver.exceptions import PodProblem
@@ -986,6 +987,20 @@
         machine = reload_object(machine)
         self.assertThat(machine.bmc.id, Equals(pod.id))
 
+    def test_sync_keeps_rack_controller_pod_nodes(self):
+        pod = factory.make_Pod()
+        controller = factory.make_RackController(interface=True)
+        discovered_interface = self.make_discovered_interface(
+            mac_address=controller.interface_set.first().mac_address)
+        discovered_machine = self.make_discovered_machine(
+            interfaces=[discovered_interface])
+        discovered_pod = self.make_discovered_pod(
+            machines=[discovered_machine])
+        pod.sync(discovered_pod, factory.make_User())
+        controller = reload_object(controller)
+        self.assertThat(
+            controller.node_type, Equals(NODE_TYPE.RACK_CONTROLLER))
+
     def test_sync_updates_machine_properties_for_dynamic(self):
         pod = factory.make_Pod()
         machine = factory.make_Node(