Merge ~ack/maas:1988759-3.2 into maas:3.2

[Alberto Donato]

LP:1988759 allow null config from storage pools (backport 9b23293a6)

This also reverts change to make certificate unrestricted on deployed host

[Alberto Donato (ack)]

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b 1988759-3.2 lp:~ack/maas/+git/maas into -b 3.2 lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas-tester/1070/consoleText

[MAAS Lander (maas-lander)]

UNIT TESTS
-b 1988759-3.2 lp:~ack/maas/+git/maas into -b 3.2 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 81e3543ceb8b046c70557777b996b1b0940e0bc4

review: Approve

diff --git a/src/metadataserver/tests/test_vendor_data.py b/src/metadataserver/tests/test_vendor_data.py
index 54e3fd7..74aed9e 100644
--- a/src/metadataserver/tests/test_vendor_data.py
+++ b/src/metadataserver/tests/test_vendor_data.py
@@ -450,7 +450,7 @@ class TestGenerateKVMPodConfiguration(MAASServerTestCase):
                         "lxd init --auto --network-address=[::]",
                         "lxc project create maas",
                         "sh -c 'lxc project edit maas </root/maas-project.yaml'",
-                        "lxc config trust add /root/lxd.crt",
+                        "lxc config trust add /root/lxd.crt --restricted --projects maas",
                         "rm /root/lxd.crt /root/maas-project.yaml",
                     ],
                 ),
diff --git a/src/metadataserver/vendor_data.py b/src/metadataserver/vendor_data.py
index 60b27f5..1e69157 100644
--- a/src/metadataserver/vendor_data.py
+++ b/src/metadataserver/vendor_data.py
@@ -232,7 +232,7 @@ def generate_kvm_pod_configuration(node):
             "lxd init --auto --network-address=[::]",
             f"lxc project create {maas_project}",
             f"sh -c 'lxc project edit {maas_project} <{project_conf_file}'",
-            f"lxc config trust add {cert_file}",
+            f"lxc config trust add {cert_file} --restricted --projects {maas_project}",
             f"rm {cert_file} {project_conf_file}",
         ]
 
diff --git a/src/provisioningserver/drivers/pod/lxd.py b/src/provisioningserver/drivers/pod/lxd.py
index 4131b8c..1e3f1f8 100644
--- a/src/provisioningserver/drivers/pod/lxd.py
+++ b/src/provisioningserver/drivers/pod/lxd.py
@@ -388,7 +388,7 @@ class LXDPodDriver(PodDriver):
         pools = []
         local_storage = 0
         for storage_pool in storage_pools:
-            discovered_storage_pool = self._get_discovered_pod_storage_pool(
+            discovered_storage_pool = self._get_discovered_storage_pool(
                 storage_pool
             )
             local_storage += discovered_storage_pool.storage
@@ -805,11 +805,12 @@ class LXDPodDriver(PodDriver):
             location=machine.location,
         )
 
-    def _get_discovered_pod_storage_pool(self, storage_pool):
-        """Get the Pod storage pool."""
-        storage_pool_config = storage_pool.config
-        # Sometimes the config is empty, use get() method on the dictionary in case.
-        storage_pool_path = storage_pool_config.get("source")
+    def _get_discovered_storage_pool(self, storage_pool):
+        """Get storage pool info by name."""
+        # Storage configuration can either be empty or None (if credentials are
+        # restricted to a project)
+        storage_pool_config = storage_pool.config or {}
+        storage_pool_path = storage_pool_config.get("source", "")
         storage_pool_resources = storage_pool.resources.get()
         total_storage = storage_pool_resources.space["total"]
 
diff --git a/src/provisioningserver/drivers/pod/tests/test_lxd.py b/src/provisioningserver/drivers/pod/tests/test_lxd.py
index 45f0951..4e1a4af 100644
--- a/src/provisioningserver/drivers/pod/tests/test_lxd.py
+++ b/src/provisioningserver/drivers/pod/tests/test_lxd.py
@@ -737,12 +737,11 @@ class TestLXDPodDriver(MAASTestCase):
             ],
         )
 
-    def test_get_discovered_pod_storage_pool(self):
+    def test_get_discovered_storage_pool(self):
         mock_storage_pool = Mock()
         mock_storage_pool.name = factory.make_name("pool")
         mock_storage_pool.driver = "dir"
         mock_storage_pool.config = {
-            "size": "61203283968",
             "source": "/home/chb/mnt/l2/disks/default.img",
             "volume.size": "0",
             "zfs.pool_name": "default",
@@ -750,8 +749,8 @@ class TestLXDPodDriver(MAASTestCase):
         mock_resources = Mock()
         mock_resources.space = {"used": 207111192576, "total": 306027577344}
         mock_storage_pool.resources.get.return_value = mock_resources
-        discovered_pod_storage_pool = (
-            self.driver._get_discovered_pod_storage_pool(mock_storage_pool)
+        discovered_pod_storage_pool = self.driver._get_discovered_storage_pool(
+            mock_storage_pool
         )
         self.assertEqual(
             mock_storage_pool.name, discovered_pod_storage_pool.id
@@ -770,6 +769,35 @@ class TestLXDPodDriver(MAASTestCase):
             mock_resources.space["total"], discovered_pod_storage_pool.storage
         )
 
+    def test_get_discovered_storage_pool_no_source(self):
+        mock_storage_pool = Mock()
+        mock_storage_pool.name = factory.make_name("pool")
+        mock_storage_pool.driver = "dir"
+        mock_storage_pool.config = {
+            "volume.size": "0",
+            "zfs.pool_name": "default",
+        }
+        mock_resources = Mock()
+        mock_resources.space = {"used": 207111192576, "total": 306027577344}
+        mock_storage_pool.resources.get.return_value = mock_resources
+        discovered_pod_storage_pool = self.driver._get_discovered_storage_pool(
+            mock_storage_pool
+        )
+        self.assertEqual(discovered_pod_storage_pool.path, "")
+
+    def test_get_discovered_storage_pool_no_config(self):
+        mock_storage_pool = Mock()
+        mock_storage_pool.name = factory.make_name("pool")
+        mock_storage_pool.driver = "dir"
+        mock_storage_pool.config = None
+        mock_resources = Mock()
+        mock_resources.space = {"used": 207111192576, "total": 306027577344}
+        mock_storage_pool.resources.get.return_value = mock_resources
+        discovered_pod_storage_pool = self.driver._get_discovered_storage_pool(
+            mock_storage_pool
+        )
+        self.assertEqual(discovered_pod_storage_pool.path, "")
+
     def test_get_discovered_machine(self):
         mock_machine = Mock()
         mock_machine.name = factory.make_name("machine")