Test and cleanup list_storage

Author: cderici

juju/model.py

@@ -940,16 +940,24 @@ async def list_storage(self, filesystem=False, volume=False):
         :param bool volume: List volume storage
         :return:
         """
-        storage_facade = client.StorageFacade.from_connection(self.connection)
+        storage_facade = client.StorageFacade.from_connection(self.connection())
+
         if filesystem and volume:
             raise JujuError("--filesystem and --volume can not be used together")
         if filesystem:
-            res = await storage_facade.ListFilesystems(filters=[])
+            _res = await storage_facade.ListFilesystems(filters=[client.FilesystemFilter()])
         elif volume:
-            res = await storage_facade.ListVolumes(filters=[])
+            _res = await storage_facade.ListVolumes(filters=[client.VolumeFilter()])
         else:
-            res = await storage_facade.ListStorageDetails(filters=[])
-        return res.results
+            _res = await storage_facade.ListStorageDetails(filters=[client.StorageFilter()])
+
+        err = _res.results[0].error
+        res = _res.results[0].result
+
+        if err is not None:
+            raise JujuError(err.message)
+
+        return [details.serialize() for details in res]
 
     async def show_storage_details(self, *storage_ids):
         """Shows storage instance information.

tests/integration/test_model.py

@@ -1062,3 +1062,18 @@ async def test_add_storage(event_loop):
         unit = app.units[0]
         ret = await unit.add_storage("pgdata")
         assert any([tag.storage("pgdata") in s for s in ret])
+
+
+@base.bootstrapped
+@pytest.mark.asyncio
+async def test_list_storage(event_loop):
+    async with base.CleanModel() as model:
+        app = await model.deploy('postgresql')
+        await model.wait_for_idle(status="active")
+        unit = app.units[0]
+        await unit.add_storage("pgdata")
+        storages = await model.list_storage()
+        await model.list_storage(filesystem=True)
+        await model.list_storage(volume=True)
+
+        assert any([tag.storage("pgdata") in s['storage-tag'] for s in storages])