Test for detach storage & show_storage_details

Author: cderici

juju/model.py

@@ -970,7 +970,7 @@ async def show_storage_details(self, *storage_ids):
 
         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
+        return [s.result.serialize() for s in res.results]
 
     async def list_storage_pools(self):
         """List storage pools.

juju/unit.py

@@ -165,7 +165,7 @@ async def attach_storage(self, storage_ids=[]):
             unit_tag=self.tag,
         ) for s_id in storage_ids])
 
-    async def detach_storage(self, force=False, *storage_ids):
+    async def detach_storage(self, *storage_ids, force=False):
         """Detaches storage from units.
 
         :param bool force: Forcefully detach storage
@@ -176,13 +176,15 @@ async def detach_storage(self, force=False, *storage_ids):
             raise JujuError("Expected at least one storage ID")
 
         storage_facade = client.StorageFacade.from_connection(self.connection)
-        return await storage_facade.DetachStorage(
+        ret = await storage_facade.DetachStorage(
             force=force,
-            ids=[client.StorageAttachmentIds(ids=[client.StorageAttachmentId(
+            ids=client.StorageAttachmentIds(ids=[client.StorageAttachmentId(
                 storage_tag=tag.storage(s),
                 unit_tag=self.tag,
-            ) for s in storage_ids])]
+            ) for s in storage_ids])
         )
+        if ret.results[0].error:
+            raise JujuError(ret.results[0].error.message)
 
     async def run(self, command, timeout=None):
         """Run command on this unit.

tests/integration/test_model.py

@@ -1064,6 +1064,29 @@ async def test_add_storage(event_loop):
         assert any([tag.storage("pgdata") in s for s in ret])
 
 
+@base.bootstrapped
+@pytest.mark.asyncio
+async def test_detach_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]
+        storage_ids = await unit.add_storage("pgdata")
+        storage_id = storage_ids[0]
+        await jasyncio.sleep(5)
+
+        _storage_details_1 = await model.show_storage_details(storage_id)
+        storage_details_1 = _storage_details_1[0]
+        assert 'unit-postgresql-0' in storage_details_1['attachments']
+
+        await unit.detach_storage(storage_id)
+        await jasyncio.sleep(10)
+
+        _storage_details_2 = await model.show_storage_details(storage_id)
+        storage_details_2 = _storage_details_2[0]
+        assert 'unit-postgresql-0' not in storage_details_2['attachments']
+
+
 @base.bootstrapped
 @pytest.mark.asyncio
 async def test_list_storage(event_loop):