Merge lp:~blake-rouse/maas/fix-1558755 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Add get_boot_rack_controller that returns the booting rack controller for the machine from the set boot_cluster_ip.

[Mike Pontillo (mpontillo)]

Looks good to me.

review: Approve

=== modified file 'src/maasserver/clusterrpc/osystems.py'
--- src/maasserver/clusterrpc/osystems.py	2016-02-02 14:20:45 +0000
+++ src/maasserver/clusterrpc/osystems.py	2016-03-17 20:11:48 +0000
@@ -115,7 +115,7 @@
     :raises TimeoutError: If a response has not been received within 30
         seconds.
     """
-    client = getClientFor(node.get_boot_primary_rack_controller().system_id)
+    client = getClientFor(node.get_boot_rack_controller().system_id)
     call = client(
         GetPreseedData, osystem=node.get_osystem(), preseed_type=preseed_type,
         node_system_id=node.system_id, node_hostname=node.hostname,

=== modified file 'src/maasserver/compose_preseed.py'
--- src/maasserver/compose_preseed.py	2016-02-02 14:20:45 +0000
+++ src/maasserver/compose_preseed.py	2016-03-17 20:11:48 +0000
@@ -33,7 +33,7 @@
             return http_proxy
         else:
             return "http://%s:8000/" % get_maas_facing_server_host(
-                node.get_boot_primary_rack_controller())
+                node.get_boot_rack_controller())
     else:
         return None
 
@@ -224,7 +224,7 @@
     from metadataserver.models import NodeKey
 
     token = NodeKey.objects.get_token_for_node(node)
-    rack_controller = node.get_boot_primary_rack_controller()
+    rack_controller = node.get_boot_rack_controller()
     base_url = rack_controller.url
 
     if preseed_type == PRESEED_TYPE.COMMISSIONING:

=== modified file 'src/maasserver/models/node.py'
--- src/maasserver/models/node.py	2016-03-17 13:35:36 +0000
+++ src/maasserver/models/node.py	2016-03-17 20:11:48 +0000
@@ -2600,6 +2600,22 @@
             return None
         return interfaces[0]
 
+    def get_boot_rack_controller(self):
+        """Return the `RackController` that this node booted from last.
+
+        This uses the `boot_cluster_ip` to determine which rack controller
+        this node booted from last. If empty or not a rack controller
+        then it will fallback to the primary rack controller for the boot
+        interface."""
+        rack_controller = None
+        if self.boot_cluster_ip is not None:
+            rack_controller = RackController.objects.filter(
+                interface__ip_addresses__ip=self.boot_cluster_ip).first()
+        if rack_controller is None:
+            return self.get_boot_primary_rack_controller()
+        else:
+            return rack_controller
+
     def get_boot_primary_rack_controller(self):
         """Return the `RackController` that this node will boot from as its
         primary rack controller ."""

=== modified file 'src/maasserver/models/tests/test_node.py'
--- src/maasserver/models/tests/test_node.py	2016-03-14 18:47:35 +0000
+++ src/maasserver/models/tests/test_node.py	2016-03-17 20:11:48 +0000
@@ -2712,6 +2712,65 @@
         node.boot_interface = interface
         node.save()
 
+    def test_get_boot_rack_controller_returns_rack_from_boot_ip(self):
+        node = factory.make_Node()
+        fabric = factory.make_Fabric()
+        vlan = fabric.get_default_vlan()
+        subnet = factory.make_Subnet(vlan=vlan)
+        boot_interface = factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, node=node, vlan=vlan)
+        primary_rack = factory.make_RackController()
+        primary_rack_interface = factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, node=primary_rack, vlan=vlan)
+        factory.make_StaticIPAddress(
+            alloc_type=IPADDRESS_TYPE.STICKY,
+            ip=factory.pick_ip_in_Subnet(subnet),
+            subnet=subnet, interface=primary_rack_interface)
+        secondary_rack = factory.make_RackController()
+        secondary_rack_interface = factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, node=secondary_rack, vlan=vlan)
+        secondary_rack_ip = factory.make_StaticIPAddress(
+            alloc_type=IPADDRESS_TYPE.STICKY,
+            ip=factory.pick_ip_in_Subnet(subnet),
+            subnet=subnet, interface=secondary_rack_interface)
+        vlan.dhcp_on = True
+        vlan.primary_rack = primary_rack
+        vlan.secondary_rack = secondary_rack
+        vlan.save()
+        node.boot_interface = boot_interface
+        node.boot_cluster_ip = secondary_rack_ip.ip
+        node.save()
+        self.assertEqual(secondary_rack, node.get_boot_rack_controller())
+
+    def test_get_boot_rack_controller_returns_primary_rack(self):
+        node = factory.make_Node()
+        fabric = factory.make_Fabric()
+        vlan = fabric.get_default_vlan()
+        subnet = factory.make_Subnet(vlan=vlan)
+        boot_interface = factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, node=node, vlan=vlan)
+        primary_rack = factory.make_RackController()
+        primary_rack_interface = factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, node=primary_rack, vlan=vlan)
+        factory.make_StaticIPAddress(
+            alloc_type=IPADDRESS_TYPE.STICKY,
+            ip=factory.pick_ip_in_Subnet(subnet),
+            subnet=subnet, interface=primary_rack_interface)
+        secondary_rack = factory.make_RackController()
+        secondary_rack_interface = factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, node=secondary_rack, vlan=vlan)
+        factory.make_StaticIPAddress(
+            alloc_type=IPADDRESS_TYPE.STICKY,
+            ip=factory.pick_ip_in_Subnet(subnet),
+            subnet=subnet, interface=secondary_rack_interface)
+        vlan.dhcp_on = True
+        vlan.primary_rack = primary_rack
+        vlan.secondary_rack = secondary_rack
+        vlan.save()
+        node.boot_interface = boot_interface
+        node.save()
+        self.assertEqual(primary_rack, node.get_boot_rack_controller())
+
     def test__register_request_event_saves_event(self):
         node = factory.make_Node()
         user = factory.make_User()

=== modified file 'src/maasserver/preseed.py'
--- src/maasserver/preseed.py	2016-03-09 06:54:33 +0000
+++ src/maasserver/preseed.py	2016-03-17 20:11:48 +0000
@@ -104,7 +104,7 @@
 
 def curtin_maas_reporter(node, events_support=True):
     token = NodeKey.objects.get_token_for_node(node)
-    rack_controller = node.get_boot_primary_rack_controller()
+    rack_controller = node.get_boot_rack_controller()
     base_url = rack_controller.url
     if events_support:
         return {
@@ -271,7 +271,7 @@
     osystem = node.get_osystem()
     series = node.get_distro_series()
     arch, subarch = node.split_arch()
-    rack_controller = node.get_boot_primary_rack_controller()
+    rack_controller = node.get_boot_rack_controller()
     try:
         images = get_boot_images_for(
             rack_controller, osystem, arch, subarch, series)
@@ -332,7 +332,7 @@
     series = node.get_distro_series()
     template = load_preseed_template(
         node, USERDATA_TYPE.CURTIN, osystem, series)
-    rack_controller = node.get_boot_primary_rack_controller()
+    rack_controller = node.get_boot_rack_controller()
     context = get_preseed_context(
         osystem, series, rack_controller=rack_controller)
     context.update(
@@ -351,7 +351,7 @@
     """
     token = NodeKey.objects.get_token_for_node(node)
     if rack_controller is None:
-        rack_controller = node.get_boot_primary_rack_controller()
+        rack_controller = node.get_boot_rack_controller()
     base_url = rack_controller.url
     return {
         'curtin_preseed': compose_cloud_init_preseed(node, token, base_url)
@@ -620,7 +620,7 @@
     :rtype: dict.
     """
     if rack_controller is None:
-        rack_controller = node.get_boot_primary_rack_controller()
+        rack_controller = node.get_boot_rack_controller()
     # Create the url and the url-data (POST parameters) used to turn off
     # PXE booting once the install of the node is finished.
     node_disable_pxe_url = absolute_reverse(
@@ -672,7 +672,7 @@
     :rtype: unicode.
     """
     template = load_preseed_template(node, prefix, osystem, release)
-    rack_controller = node.get_boot_primary_rack_controller()
+    rack_controller = node.get_boot_rack_controller()
     context = get_preseed_context(
         osystem, release, rack_controller=rack_controller)
     context.update(

=== modified file 'src/maasserver/preseed_network.py'
--- src/maasserver/preseed_network.py	2016-02-02 14:20:45 +0000
+++ src/maasserver/preseed_network.py	2016-03-17 20:11:48 +0000
@@ -52,7 +52,7 @@
         self.network_config.append({
             "type": "nameserver",
             "address": get_dns_server_address(
-                rack_controller=self.node.get_boot_primary_rack_controller()),
+                rack_controller=self.node.get_boot_rack_controller()),
             "search": sorted(get_dns_search_paths()),
         })
 

=== modified file 'src/metadataserver/user_data/utils.py'
--- src/metadataserver/user_data/utils.py	2016-02-02 14:20:45 +0000
+++ src/metadataserver/user_data/utils.py	2016-03-17 20:11:48 +0000
@@ -54,7 +54,7 @@
     # The preseed context is a dict containing various configs that the
     # templates can use.
     preseed_context = get_preseed_context(
-        rack_controller=node.get_boot_primary_rack_controller())
+        rack_controller=node.get_boot_rack_controller())
     preseed_context['node'] = node
 
     # Render the snippets in the main template.