Merge ~cgrabowski/maas:provide_pool_id_for_vmhost_resources into maas:master

[Christian Grabowski]

add storage pool's pool_id on pod resources

[Alberto Donato (ack)]

+1

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b provide_pool_id_for_vmhost_resources lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/11463/console
COMMIT: 1319e4f3c0c56acfc799fa594eaa6f2a2a3eb5a7

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b provide_pool_id_for_vmhost_resources lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: c95009d6b3b04156e574c15177c9657bd793ced9

review: Approve

diff --git a/src/maasserver/models/virtualmachine.py b/src/maasserver/models/virtualmachine.py
index 3c12020..fbf4839 100644
--- a/src/maasserver/models/virtualmachine.py
+++ b/src/maasserver/models/virtualmachine.py
@@ -251,6 +251,7 @@ class VMHostVirtualMachineResources:
 class VMHostStoragePool:
     """Storage pool available on a VM host"""
 
+    id: str = ""
     name: str = ""
     path: str = ""
     backend: str = ""
@@ -447,6 +448,7 @@ def _get_global_vm_host_storage(pod, resources):
     total_storage = 0
     for pool in storage_pools:
         resources.storage_pools[pool.name] = VMHostStoragePool(
+            id=pool.pool_id,
             name=pool.name,
             path=pool.path,
             backend=pool.pool_type,
diff --git a/src/maasserver/websockets/handlers/tests/test_pod.py b/src/maasserver/websockets/handlers/tests/test_pod.py
index 67c9ae6..b435859 100644
--- a/src/maasserver/websockets/handlers/tests/test_pod.py
+++ b/src/maasserver/websockets/handlers/tests/test_pod.py
@@ -164,6 +164,38 @@ class TestPodHandler(MAASTransactionServerTestCase):
         )
         self.assertEqual(result["power_parameters"], power_params)
 
+    def test_get_with_storage_pool(self):
+        admin = factory.make_admin()
+        handler = PodHandler(admin, {}, None)
+        power_params = {
+            "power_address": "1.2.3.4",
+            "certificate": SAMPLE_CERTIFICATE.certificate_pem(),
+            "key": SAMPLE_CERTIFICATE.private_key_pem(),
+            "project": "maas",
+        }
+        pod = self.make_pod_with_hints(
+            pod_type="lxd",
+            parameters=power_params,
+        )
+        factory.make_Node()
+        factory.make_Node(bmc=pod)
+        factory.make_Node(bmc=pod, owner=admin)
+        factory.make_Node(bmc=pod, owner=factory.make_User())
+        storage_pool = factory.make_PodStoragePool(pod=pod)
+        expected_data = handler.full_dehydrate(pod)
+        result = handler.get({"id": pod.id})
+        self.assertEqual(expected_data.keys(), result.keys())
+        self.assertEqual(
+            result["storage_pools"], expected_data["storage_pools"]
+        )
+        storage_pool_ids = [pool["id"] for pool in result["storage_pools"]]
+        self.assertIn(storage_pool.pool_id, storage_pool_ids)
+        resource_storage_pool_ids = [
+            pool["id"]
+            for pool in result["resources"]["storage_pools"].values()
+        ]
+        self.assertIn(storage_pool.pool_id, resource_storage_pool_ids)
+
     def test_get_with_pod_host(self):
         admin = factory.make_admin()
         handler = PodHandler(admin, {}, None)