Merge lp:~ltrager/maas/lp1552444 into lp:~maas-committers/maas/trunk

[Lee Trager]

Turn dhcp_on on NodeGroup migration and log it. Also refresh rack when converting an existing node type.

[Blake Rouse (blake-rouse)]

Looks good. Thanks for the fixes and fixing refresh as well.

review: Approve

=== modified file 'src/maasserver/rpc/rackcontrollers.py'
--- src/maasserver/rpc/rackcontrollers.py	2016-02-26 16:19:41 +0000
+++ src/maasserver/rpc/rackcontrollers.py	2016-03-04 21:06:01 +0000
@@ -70,7 +70,12 @@
         for nic in rackcontroller.interface_set.all():
             if nic.vlan in vlans:
                 nic.vlan.primary_rack = rackcontroller
+                nic.vlan.dhcp_on = True
                 nic.vlan.save()
+                maaslog.info(
+                    "DHCP setting from NodeGroup(%s) have been migrated to "
+                    "VID %d on fabric_id %d" %
+                    (nodegroup_uuid, nic.vlan.vid, nic.vlan.fabric_id))
         for ng_to_rack in ng_to_racks:
             ng_to_rack.delete()
 
@@ -89,11 +94,23 @@
         Q(interface__mac_address__in=mac_addresses)).first()
     if node is None:
         return None
+    # Refresh whenever an existing node is converted for use as a rack
+    # controller. This is needed for two reasons. First, when the region starts
+    # it creates a node for itself but only gathers networking information.
+    # Second, information about the node may have changed since its last use.
+    needs_refresh = True
     if node.node_type in (
             NODE_TYPE.RACK_CONTROLLER,
             NODE_TYPE.REGION_AND_RACK_CONTROLLER):
         maaslog.info(
             "Registering existing rack controller %s." % node.hostname)
+        # We don't want to refresh existing rack controllers as each time a
+        # rack controller connects to a region it creates four connections.
+        # This means for every region we connect to we would refresh
+        # 4 * regions every time the rack controller restarts. Our information
+        # at this point should be current anyway and the user can always
+        # manually refresh.
+        needs_refresh = False
     elif node.node_type == NODE_TYPE.REGION_CONTROLLER:
         maaslog.info(
             "Converting %s into a region and rack controller." % node.hostname)
@@ -106,7 +123,7 @@
 
     rackcontroller = typecast_node(node, RackController)
     # Tell register RPC call a refresh isn't needed
-    rackcontroller.needs_refresh = False
+    rackcontroller.needs_refresh = needs_refresh
     return rackcontroller
 
 

=== modified file 'src/maasserver/rpc/tests/test_rackcontrollers.py'
--- src/maasserver/rpc/tests/test_rackcontrollers.py	2016-02-27 02:32:00 +0000
+++ src/maasserver/rpc/tests/test_rackcontrollers.py	2016-03-04 21:06:01 +0000
@@ -62,11 +62,25 @@
         rack_registered = register_rackcontroller(interfaces=interfaces)
         self.assertEqual(node.system_id, rack_registered.system_id)
 
-    def test_finds_existing_node_sets_needs_refresh_to_false(self):
-        node = factory.make_Node()
+    def test_finds_existing_controller_sets_needs_refresh_to_false(self):
+        node_type = random.choice([
+            NODE_TYPE.RACK_CONTROLLER,
+            NODE_TYPE.REGION_AND_RACK_CONTROLLER,
+        ])
+        node = factory.make_Node(node_type=node_type)
         rack_registered = register_rackcontroller(system_id=node.system_id)
         self.assertFalse(rack_registered.needs_refresh)
 
+    def test_converts_existing_node_sets_needs_refresh_to_true(self):
+        node_type = random.choice([
+            NODE_TYPE.MACHINE,
+            NODE_TYPE.DEVICE,
+            NODE_TYPE.REGION_CONTROLLER,
+        ])
+        node = factory.make_Node(node_type=node_type)
+        rack_registered = register_rackcontroller(system_id=node.system_id)
+        self.assertTrue(rack_registered.needs_refresh)
+
     def test_find_existing_keeps_type(self):
         node_type = random.choice(
             (NODE_TYPE.RACK_CONTROLLER, NODE_TYPE.REGION_AND_RACK_CONTROLLER))
@@ -181,8 +195,39 @@
             interfaces=interfaces, nodegroup_uuid=ng_uuid)
         vlan = reload_object(vlan)
         self.assertEqual(rack.system_id, vlan.primary_rack.system_id)
+        self.assertTrue(vlan.dhcp_on)
         self.assertItemsEqual([], NodeGroupToRackController.objects.all())
 
+    def test_logs_migration(self):
+        logger = self.useFixture(FakeLogger("maas"))
+        rack = factory.make_RackController()
+        vlan = factory.make_VLAN()
+        subnet = factory.make_Subnet(vlan=vlan)
+        ip = factory.pick_ip_in_Subnet(subnet)
+        interfaces = {
+            factory.make_name("eth0"): {
+                "type": "physical",
+                "mac_address": factory.make_mac_address(),
+                "parents": [],
+                "links": [{
+                    "mode": "static",
+                    "address": "%s/%d" % (
+                        str(ip), subnet.get_ipnetwork().prefixlen),
+                }],
+                "enabled": True,
+            }
+        }
+        ng_uuid = factory.make_UUID()
+        NodeGroupToRackController.objects.create(uuid=ng_uuid, subnet=subnet)
+        register_rackcontroller(
+            system_id=rack.system_id, hostname=rack.hostname,
+            interfaces=interfaces, nodegroup_uuid=ng_uuid)
+        vlan = reload_object(vlan)
+        self.assertEqual(
+            "DHCP setting from NodeGroup(%s) have been migrated to "
+            "VID %d on fabric_id %d" % (ng_uuid, vlan.vid, vlan.fabric_id),
+            logger.output.split('\n')[1].strip())
+
     def test_logs_creating_new_rackcontroller(self):
         logger = self.useFixture(FakeLogger("maas"))
         hostname = factory.make_name("hostname")