wip

Author: Faustasm

sandbox.py

@@ -0,0 +1,8 @@
+import upcloud_api
+from upcloud_api import Server, Storage, ZONE, login_user_block
+
+manager = upcloud_api.CloudManager('techconsult', 'LetMeTest123')
+manager.authenticate()
+
+
+storages = manager.get_storages(storage_type='template')

test/json_data/fagfdg.json

@@ -0,0 +1,158 @@
+{
+  "storages":
+  {
+    "storage":
+    [
+      {
+        "access": "public",
+        "license": 3.36,
+        "size": 28,
+        "state": "online",
+        "title": "Windows Server 2016 Datacenter",
+        "type": "template",
+        "uuid": "01000000-0000-4000-8000-000010060200"
+      },
+      {
+        "access": "public",
+        "license": 0.694,
+        "size": 29,
+        "state": "online",
+        "title": "Windows Server 2016 Standard",
+        "type": "template",
+        "uuid": "01000000-0000-4000-8000-000010060300"
+      },
+      {
+        "access": "public",
+        "license": 3.36,
+        "size": 25,
+        "state": "online",
+        "title": "Windows Server 2019 Datacenter",
+        "type": "template",
+        "uuid": "01000000-0000-4000-8000-000010070200"
+      },
+      {
+        "access": "public",
+        "license": 0.694,
+        "size": 25,
+        "state": "online",
+        "title": "Windows Server 2019 Standard",
+        "type": "template",
+        "uuid": "01000000-0000-4000-8000-000010070300"
+      },
+      {
+        "access": "public",
+        "license": 0,
+        "size": 3,
+        "state": "online",
+        "title": "Debian GNU/Linux 9 (Stretch)",
+        "type": "template",
+        "uuid": "01000000-0000-4000-8000-000020040100"
+      },
+      {
+        "access": "public",
+        "license": 0,
+        "size": 3,
+        "state": "online",
+        "title": "Debian GNU/Linux 10 (Buster)",
+        "type": "template",
+        "uuid": "01000000-0000-4000-8000-000020050100"
+      },
+      {
+        "access": "public",
+        "license": 0,
+        "size": 3,
+        "state": "online",
+        "title": "Ubuntu Server 16.04 LTS (Xenial Xerus)",
+        "type": "template",
+        "uuid": "01000000-0000-4000-8000-000030060200"
+      },
+      {
+        "access": "public",
+        "license": 0,
+        "size": 4,
+        "state": "online",
+        "title": "Ubuntu Server 18.04 LTS (Bionic Beaver)",
+        "type": "template",
+        "uuid": "01000000-0000-4000-8000-000030080200"
+      },
+      {
+        "access": "public",
+        "license": 0,
+        "size": 4,
+        "state": "online",
+        "title": "Ubuntu Server 20.04 LTS (Focal Fossa)",
+        "type": "template",
+        "uuid": "01000000-0000-4000-8000-000030200200"
+      },
+      {
+        "access": "public",
+        "license": 0,
+        "size": 3,
+        "state": "online",
+        "title": "CentOS 6.10",
+        "type": "template",
+        "uuid": "01000000-0000-4000-8000-000050010200"
+      },
+      {
+        "access": "public",
+        "license": 0,
+        "size": 3,
+        "state": "online",
+        "title": "CentOS 7",
+        "type": "template",
+        "uuid": "01000000-0000-4000-8000-000050010300"
+      },
+      {
+        "access": "public",
+        "license": 0,
+        "size": 3,
+        "state": "online",
+        "title": "CentOS 8",
+        "type": "template",
+        "uuid": "01000000-0000-4000-8000-000050010400"
+      },
+      {
+        "access": "public",
+        "license": 0,
+        "size": 5,
+        "state": "online",
+        "title": "Plesk Obsidian",
+        "type": "template",
+        "uuid": "01000000-0000-4000-8000-000130010100"
+      },
+      {
+        "access": "private",
+        "license": 0,
+        "size": 10,
+        "state": "online",
+        "tier": "maxiops",
+        "title": "import test",
+        "type": "template",
+        "uuid": "0124fdf2-e3ae-408b-8711-db8a3dddc85b",
+        "zone": "fi-hel1"
+      },
+      {
+        "access": "private",
+        "license": 0,
+        "size": 30,
+        "state": "online",
+        "tier": "maxiops",
+        "title": "class method test 3",
+        "type": "template",
+        "uuid": "0134df64-f6be-408e-b960-6511503471af",
+        "zone": "fi-hel1"
+      },
+      {
+        "access": "private",
+        "license": 0,
+        "size": 10,
+        "state": "online",
+        "tier": "maxiops",
+        "title": "my server template",
+        "type": "template",
+        "uuid": "013721b5-07ca-4d7b-b4ff-e21262223e5b",
+        "zone": "fi-hel2"
+      }
+    ]
+  }
+}

upcloud_api/cloud_manager/storage_mixin.py

@@ -19,6 +19,7 @@ def get_storages(self, storage_type='normal'):
         Storage types: public, private, normal, backup, cdrom, template, favorite
         """
         res = self.get_request('/storage/' + storage_type)
+        print(res)
         return Storage._create_storage_objs(res['storages'], cloud_manager=self)
 
     def get_storage(self, storage):

upcloud_api/server.py

@@ -344,7 +344,7 @@ def prepare_post_body(self):
             # public template
             if hasattr(storage, 'os') and storage.os:
                 storage_body['action'] = 'clone'
-                storage_body['storage'] = OperatingSystems.get_OS_UUID(storage.os)
+                storage_body['storage'] = storage.os
 
             # private template
             elif hasattr(storage, 'uuid'):