Merge ~mpontillo/maas:add-vlan-info-to-pod-handler--bug-1795759 into maas:master

[Mike Pontillo]

LP: #1795759 - Provide pod host metadata using Pod websocket handler.

[Mike Pontillo (mpontillo)]

A future branch will update the triggers.

[Newell Jensen (newell-jensen)]

+1

review: Approve

diff --git a/src/maasserver/websockets/handlers/pod.py b/src/maasserver/websockets/handlers/pod.py
index 5d3810b..462a053 100644
--- a/src/maasserver/websockets/handlers/pod.py
+++ b/src/maasserver/websockets/handlers/pod.py
@@ -99,7 +99,25 @@ class PodHandler(TimestampedModelHandler):
         data["composed_machines_count"] = obj.node_set.filter(
             node_type=NODE_TYPE.MACHINE).count()
         data["hints"] = self.dehydrate_hints(obj.hints)
+        if obj.host is not None:
+            data["host"] = obj.host.system_id
+        else:
+            data["host"] = None
         if not for_list:
+            if obj.host is not None:
+                data["attached_vlans"] = list(
+                    obj.host.interface_set.all().values_list(
+                        'vlan_id', flat=True))
+                boot_vlans = []
+                query = obj.host.interface_set.all().prefetch_related(
+                    'vlan__relay_vlan')
+                for interface in query:
+                    if interface.has_bootable_vlan():
+                        boot_vlans.append(interface.vlan_id)
+                data["boot_vlans"] = boot_vlans
+            else:
+                data["attached_vlans"] = []
+                data["boot_vlans"] = []
             storage_pools = obj.storage_pools.all()
             if len(storage_pools) > 0:
                 pools_data = []
diff --git a/src/maasserver/websockets/handlers/tests/test_pod.py b/src/maasserver/websockets/handlers/tests/test_pod.py
index 8e46925..ddf3a4c 100644
--- a/src/maasserver/websockets/handlers/tests/test_pod.py
+++ b/src/maasserver/websockets/handlers/tests/test_pod.py
@@ -81,7 +81,7 @@ class TestPodHandler(MAASTransactionServerTestCase):
             failed_rack.system_id: factory.make_exception(),
         }))
 
-    def make_pod_with_hints(self):
+    def make_pod_with_hints(self, ip_address=None):
         architectures = [
             "amd64/generic", "i386/generic", "arm64/generic",
             "armhf/generic"
@@ -89,7 +89,9 @@ class TestPodHandler(MAASTransactionServerTestCase):
         pod = factory.make_Pod(
             architectures=architectures, capabilities=[
                 Capabilities.FIXED_LOCAL_STORAGE, Capabilities.ISCSI_STORAGE,
-                Capabilities.COMPOSABLE, Capabilities.STORAGE_POOLS])
+                Capabilities.COMPOSABLE, Capabilities.STORAGE_POOLS],
+            ip_address=ip_address
+        )
         pod.hints.cores = random.randint(8, 16)
         pod.hints.memory = random.randint(4096, 8192)
         pod.hints.cpu_speed = random.randint(2000, 3000)
@@ -121,6 +123,46 @@ class TestPodHandler(MAASTransactionServerTestCase):
         for key in expected_data:
             self.assertEqual(expected_data[key], result[key], key)
         self.assertThat(result, Equals(expected_data))
+        self.assertThat(result['host'], Equals(None))
+        self.assertThat(result['attached_vlans'], Equals([]))
+        self.assertThat(result['boot_vlans'], Equals([]))
+
+    def test_get_with_pod_host(self):
+        admin = factory.make_admin()
+        handler = PodHandler(admin, {}, None)
+        vlan = factory.make_VLAN(dhcp_on=True)
+        subnet = factory.make_Subnet(vlan=vlan)
+        node = factory.make_Node_with_Interface_on_Subnet(subnet=subnet)
+        ip = factory.make_StaticIPAddress(
+            interface=node.boot_interface, subnet=subnet)
+        pod = self.make_pod_with_hints(ip_address=ip)
+        expected_data = handler.full_dehydrate(pod)
+        result = handler.get({"id": pod.id})
+        self.assertItemsEqual(expected_data.keys(), result.keys())
+        for key in expected_data:
+            self.assertEqual(expected_data[key], result[key], key)
+        self.assertThat(result, Equals(expected_data))
+        self.assertThat(result['host'], Equals(node.system_id))
+        self.assertThat(result['attached_vlans'], Equals([subnet.vlan_id]))
+        self.assertThat(result['boot_vlans'], Equals([subnet.vlan_id]))
+
+    def test_get_with_pod_host_determines_vlan_boot_status(self):
+        admin = factory.make_admin()
+        handler = PodHandler(admin, {}, None)
+        vlan = factory.make_VLAN(dhcp_on=False)
+        subnet = factory.make_Subnet(vlan=vlan)
+        node = factory.make_Node_with_Interface_on_Subnet(subnet=subnet)
+        ip = factory.make_StaticIPAddress(
+            interface=node.boot_interface, subnet=subnet)
+        pod = self.make_pod_with_hints(ip_address=ip)
+        expected_data = handler.full_dehydrate(pod)
+        result = handler.get({"id": pod.id})
+        self.assertItemsEqual(expected_data.keys(), result.keys())
+        for key in expected_data:
+            self.assertEqual(expected_data[key], result[key], key)
+        self.assertThat(result, Equals(expected_data))
+        self.assertThat(result['attached_vlans'], Equals([subnet.vlan_id]))
+        self.assertThat(result['boot_vlans'], Equals([]))
 
     def test_get_as_standard_user(self):
         user = factory.make_User()