Merge branch 'master' of /home/edems/PycharmProjects/interface-openstack with conflicts.

controllers/StoragesController.py

+import json
+
+from aiohttp import web
+
+from implementation.storage.OpenstackStorageManager import OpenstackStorageManager
+
+
+class StoragesController:
+
+    storage_manager = None
+
+    @staticmethod
+    def init(app, os):
+        StoragesController.storage_manager = OpenstackStorageManager(os)
+
+        StoragesController.add_routes(app)
+
+    @staticmethod
+    def add_routes(app):
+        app.add_routes([
+            web.get('/storages', StoragesController.list),
+            web.post('/storages/create', StoragesController.create),
+            web.get('/storages/{volume}', StoragesController.show),
+            web.delete('/storages/{storage}/delete', StoragesController.delete)
+        ])
+
+    @staticmethod
+    async def create(request):
+        return web.Response(text='Create')
+
+    @staticmethod
+    async def list(request):
+        volumes = StoragesController.storage_manager.list()
+
+        return web.Response(text=json.dumps(volumes[0]))
+
+    @staticmethod
+    async def show(request):
+        id = request.match_info.get('volume')
+
+        volume = StoragesController.storage_manager.get(id)
+
+        response = json.dumps(volume)
+
+        return web.Response(text=response)
+
+    @staticmethod
+    async def delete(request):
+        return web.Response(text='Delete')

interface/storage/Volume.py

+import json
+
+
+class Volume(object):
+    def __init__(self, id, size, bootable) -> None:
+        super().__init__()
+
+        self.id = id
+        self.size = size
+        self.bootable = bootable
+
+    def default(self, o):
+        return self.toJSON()
+
+    def toJSON(self):
+        return json.dumps(self.__dict__)
+
+    def __repr__(self):
+        return self.toJSON()
+
+    def __str__(self) -> str:
+        return self.toJSON()
+