Merge pull request #1 from Faustasm/api_version_update_and_storage_cloning

Api version update and storage cloning

Author: Faustasm

test/conftest.py

@@ -32,7 +32,7 @@ def read_from_file(filename):
 
 
 class Mock(object):
-    base_url = 'https://api.upcloud.com/1.2'
+    base_url = 'https://api.upcloud.com/1.3'
 
     @staticmethod
     def read_from_file(filename):
@@ -61,11 +61,14 @@ def __put_post_callback(request, target, data):
         return(200, {}, json.dumps(data))
 
     @staticmethod
-    def mock_post(target):
-        data = json.loads(Mock.read_from_file(target + '_post.json'))
+    def mock_post(target, empty_content=False):
 
         def callback(request):
-            return Mock.__put_post_callback(request, target, data)
+            if not empty_content:
+                data = json.loads(Mock.read_from_file(target + '_post.json'))
+                return Mock.__put_post_callback(request, target, data)
+            else:
+                return(200, {}, '{}')
 
         responses.add_callback(responses.POST, Mock.base_url + '/' + target,
                                callback=callback,

test/json_data/storage_01d4fcd4-e446-433b-8a9c-551a1284952e_clone_post.json

@@ -0,0 +1,22 @@
+{
+	"storage" : {
+		"access" : "private",
+		"backup_rule": "",
+		"backups" : {
+			"backup" : []
+			},
+		"license" : 0,
+		"servers" : {
+			"server" : [
+				"00798b85-efdc-41ca-8021-f6ef457b8531"
+			]
+		},
+		"size" : 666,
+		"state" : "online",
+		"tier" : "maxiops",
+		"title" : "cloned-storage-test",
+		"type" : "normal",
+		"uuid" : "01d3e9ad-8ff5-4a52-9fa2-48938e488e78",
+		"zone" : "fi-hel1"
+	}
+}

test/test_storage.py

@@ -34,6 +34,31 @@ def test_storage_create(self, manager):
         assert storage.title == "My data collection"
         assert storage.zone == "fi-hel1"
 
+    @responses.activate
+    def test_clone_storage(self, manager):
+        data = Mock.mock_get("storage/01d4fcd4-e446-433b-8a9c-551a1284952e")
+        storage = manager.get_storage("01d4fcd4-e446-433b-8a9c-551a1284952e")
+
+        Mock.mock_post("storage/01d4fcd4-e446-433b-8a9c-551a1284952e/clone")
+        cloned_storage = manager.clone_storage(storage, 'cloned-storage-test', 'fi-hel1')
+        assert type(cloned_storage).__name__ == "Storage"
+        assert cloned_storage.size == 666
+        assert cloned_storage.tier == "maxiops"
+        assert cloned_storage.title == "cloned-storage-test"
+        assert cloned_storage.zone == "fi-hel1"
+
+    @responses.activate
+    def test_cancel_clone_storage(self, manager):
+        data = Mock.mock_get("storage/01d4fcd4-e446-433b-8a9c-551a1284952e")
+        storage = manager.get_storage("01d4fcd4-e446-433b-8a9c-551a1284952e")
+
+        Mock.mock_post("storage/01d4fcd4-e446-433b-8a9c-551a1284952e/clone")
+        cloned_storage = manager.clone_storage(storage, 'cloned-storage-test', 'fi-hel1')
+
+        Mock.mock_post("storage/01d3e9ad-8ff5-4a52-9fa2-48938e488e78/cancel", empty_content=True)
+        res = manager.cancel_clone_storage(cloned_storage)
+        assert res == {}
+
     @responses.activate
     def test_storage_update(self, manager):
 
@@ -61,7 +86,6 @@ def test_storage_delete(self, manager):
         res = manager.delete_storage("01d4fcd4-e446-433b-8a9c-551a1284952e")
         assert res == {}
 
-
     @responses.activate
     def test_storage_delete_oop(self, manager):
         data = Mock.mock_get("storage/01d4fcd4-e446-433b-8a9c-551a1284952e")

upcloud_api/cloud_manager/base.py

@@ -12,7 +12,7 @@ class BaseAPI(object):
     """
 
     api = 'api.upcloud.com'
-    api_v = '1.2'
+    api_v = '1.3'
 
     def __init__(self, token, timeout=None):  # noqa
         self.token = token

upcloud_api/cloud_manager/storage_mixin.py

@@ -66,6 +66,22 @@ def delete_storage(self, UUID):
         """
         return self.request('DELETE', '/storage/' + UUID)
 
+    def clone_storage(self, storage, title, zone, tier=None):
+        """
+        Clones a Storage object. Returns an object based on the API's response.
+        """
+        body = {'storage': {'title': title, 'zone': zone}}
+        if tier:
+            body['storage']['tier'] = tier
+        res = self.request('POST', '/storage/{0}/clone'.format(str(storage)), body)
+        return Storage(cloud_manager=self, **res['storage'])
+
+    def cancel_clone_storage(self, storage):
+        """
+        Cancels a running cloning operation and deletes the incomplete copy.
+        """
+        return self.request('POST', '/storage/{0}/cancel'.format(str(storage)))
+
     def attach_storage(self, server, storage, storage_type, address):
         """
         Attach a Storage object to a Server. Return a list of the server's storages.