improve Storage and IP-address factories

Author: Elias Nygren

upcloud_api/ip_address.py

@@ -73,8 +73,18 @@ def family(self):  # noqa
         return self._family
 
     @staticmethod
-    def _create_ip_address_objs(IP_addrs, cloud_manager):
-        IP_objs = list()
-        for ip_addr in IP_addrs['ip_address']:
-            IP_objs.append(IP_address(cloud_manager=cloud_manager, **ip_addr))
-        return IP_objs
+    def _create_ip_address_objs(ip_addresses, cloud_manager):
+
+        # ip-addresses might be provided as a flat array or as a following dict:
+        # {'ip_addresses': {'ip_address': [...]}} || {'ip_address': [...]}
+
+        if 'ip_addresses' in ip_addresses:
+            ip_addresses = ip_addresses['ip_addresses']
+
+        if 'ip_address' in ip_addresses:
+            ip_addresses = ip_addresses['ip_address']
+
+        ip_address_objs = list()
+        for ip_addr in ip_addresses:
+            ip_address_objs.append(IP_address(cloud_manager=cloud_manager, **ip_addr))
+        return ip_address_objs

upcloud_api/storage.py

@@ -112,12 +112,24 @@ def prepare_post_body(self, storage_title=None, storage_title_id=None):
 
     @staticmethod
     def _create_storage_objs(storages, cloud_manager):
-        if 'storage' in storages:
-            storages = storages['storage']
+
+        # storages might be provided as a flat array or as a following dict:
+        # {'storage_devices': {'storage_device': [...]}} || {'storage_device': [...]}
+
+        if 'storage_devices' in storages:
+            storages = storages['storage_devices']
 
         if 'storage_device' in storages:
             storages = storages['storage_device']
 
+        # or {'storages': {'storage': [...]}} || {'storage': [...]}
+
+        if 'storages' in storages:
+            storages = storages['storages']
+
+        if 'storage' in storages:
+            storages = storages['storage']
+
         storage_objs = list()
         for storage in storages:
             storage_objs.append(Storage(cloud_manager=cloud_manager, **storage))