server from template

Author: Elias Nygren

test/test_server_creation.py

@@ -192,3 +192,37 @@ def test_create_server_with_dict(self, manager):
         assert server1.video_model == 'cirrus'
         assert server1.vnc == 'off'
         assert server1.vnc_password == 'aabbccdd'
+
+
+    @responses.activate
+    def test_create_server_from_template(self, manager):
+
+        UUID = '01215a5a-c330-4565-81ca-0e0e22eac672'
+
+        def _from_template_callback(request):
+            request_body = json.loads(request.body)
+            storage = request_body['server']['storage_devices']['storage_device'][0]
+
+            # https://www.upcloud.com/api/8-servers/#creating-from-a-template
+            assert storage['action'] == 'clone'
+            assert storage['storage'] == UUID
+            return (201, {}, Mock.read_from_file('server_create.json'))
+
+        responses.add_callback(
+            responses.POST,
+            Mock.base_url + '/server',
+            content_type='application/json',
+            callback=_from_template_callback
+        )
+
+        manager.create_server(
+            Server(
+                core_number=2,
+                memory_amount=1024,
+                hostname='my.example.com',
+                zone=ZONE.Chicago,
+                storage_devices=[
+                    Storage(storage=UUID, size=10),
+                ]
+            )
+        )

upcloud_api/server.py

@@ -332,19 +332,27 @@ def prepare_post_body(self):
                 storage_title_id += 1
             storage_body = storage.to_dict()
 
-            # setup default titles for storages unless use has specified them
-            # at storage.title
+            # setup default titles for storages unless the user has specified
+            # them at storage.title
             if not hasattr(storage, 'title') or not storage.title:
                 if hasattr(storage, 'os') and storage.os:
                     storage_body['title'] = self.hostname + ' OS disk'
                 else:
                     storage_body['title'] = self.hostname + ' storage disk ' + str(storage_title_id)
 
 
-            # clone from public template OR create empty storage
+            # figure out the storage `action` parameter
+            # public template
             if hasattr(storage, 'os') and storage.os:
                 storage_body['action'] = 'clone'
                 storage_body['storage'] = OperatingSystems.get_OS_UUID(storage.os)
+
+            # private template
+            elif hasattr(storage, 'uuid'):
+                storage_body['action'] = 'clone'
+                storage_body['storage'] = storage.uuid
+
+            # create a new storage
             else:
                 storage_body['action'] = 'create'
 

upcloud_api/storage.py

@@ -36,7 +36,7 @@ def _reset(self, **kwargs):
 
         if 'uuid' in kwargs:
             self.uuid = kwargs['uuid']
-        elif 'storage' in kwargs:
+        elif 'storage' in kwargs:  # let's never use storage.storage internally
             self.uuid = kwargs['storage']
 
         if 'title' in kwargs: