Test and fixups for create/list pools

Author: cderici

juju/model.py

@@ -900,7 +900,7 @@ async def create_storage_pool(self, name, provider_type, attributes=""):
         """
         _attrs = [splt.split("=") for splt in attributes.split()]
 
-        storage_facade = client.StorageFacade.from_connection(self.connection)
+        storage_facade = client.StorageFacade.from_connection(self.connection())
         return await storage_facade.CreatePool(pools=[client.StoragePool(
             name=name,
             provider=provider_type,
@@ -913,7 +913,7 @@ async def remove_storage_pool(self, name):
         :param str name:
         :return:
         """
-        storage_facade = client.StorageFacade.from_connection(self.connection)
+        storage_facade = client.StorageFacade.from_connection(self.connection())
         return await storage_facade.RemovePool(pools=[name])
 
     async def update_storage_pool(self, name, attributes=""):
@@ -927,7 +927,7 @@ async def update_storage_pool(self, name, attributes=""):
         if len(_attrs) == 0:
             raise JujuError("Expected at least one attribute to update")
 
-        storage_facade = client.StorageFacade.from_connection(self.connection)
+        storage_facade = client.StorageFacade.from_connection(self.connection())
         return await storage_facade.UpdatePool(pools=[client.StoragePool(
             name=name,
             attrs=_attrs,
@@ -968,7 +968,7 @@ async def show_storage_details(self, *storage_ids):
         if not storage_ids:
             raise JujuError("Expected at least one storage ID")
 
-        storage_facade = client.StorageFacade.from_connection(self.connection)
+        storage_facade = client.StorageFacade.from_connection(self.connection())
         res = await storage_facade.StorageDetails(entities=[client.Entity(tag.storage(s)) for s in storage_ids])
         return res.results
 
@@ -978,9 +978,12 @@ async def list_storage_pools(self):
         :return:
         """
         # TODO (cderici): Filter on pool type, name.
-        storage_facade = client.StorageFacade.from_connection(self.connection)
-        res = await storage_facade.ListPools(filters=[])
-        return res.results
+        storage_facade = client.StorageFacade.from_connection(self.connection())
+        res = await storage_facade.ListPools(filters=[client.StoragePoolFilter()])
+        err = res.results[0].error
+        if err:
+            raise JujuError(err.message)
+        return [p.serialize() for p in res.results[0].storage_pools]
 
     async def remove_storage(self, force=False, destroy_storage=False, *storage_ids):
         """Removes storage from the model.
@@ -993,7 +996,7 @@ async def remove_storage(self, force=False, destroy_storage=False, *storage_ids)
         if not storage_ids:
             raise JujuError("Expected at least one storage ID")
 
-        storage_facade = client.StorageFacade.from_connection(self.connection)
+        storage_facade = client.StorageFacade.from_connection(self.connection())
         return await storage_facade.Remove(storage=[client.RemoveStorageInstance(
             destroy_storage=destroy_storage,
             force=False,

tests/integration/test_model.py

@@ -1077,3 +1077,15 @@ async def test_list_storage(event_loop):
         await model.list_storage(volume=True)
 
         assert any([tag.storage("pgdata") in s['storage-tag'] for s in storages])
+
+
+@base.bootstrapped
+@pytest.mark.asyncio
+async def test_storage_pools(event_loop):
+    async with base.CleanModel() as model:
+        await model.deploy('postgresql')
+        await model.wait_for_idle(status="active")
+
+        await model.create_storage_pool("test-pool", "lxd")
+        pools = await model.list_storage_pools()
+        assert "test-pool" in [p['name'] for p in pools]