Merge pull request #5 from TechConsult/refactor

Code refactor

Author: Faustasm

upcloud_api/cloud_manager/base.py

@@ -74,6 +74,12 @@ def put_request(self, endpoint, body=None, timeout=-1, request_to_api=True):
         """
         return self.request('PUT', endpoint, body, timeout, request_to_api=request_to_api)
 
+    def delete_request(self, endpoint, body=None, timeout=-1):
+        """
+        Perform a DELETE request to a given endpoint in UpCloud's API.
+        """
+        return self.request('DELETE', endpoint, body, timeout)
+
     def __error_middleware(self, res, res_json):
         """
         Middleware that raises an exception when HTTP statuscode is an error code.

upcloud_api/cloud_manager/firewall_mixin.py

@@ -59,7 +59,7 @@ def delete_firewall_rule(self, server_uuid, firewall_rule_position):
         Delete a firewall rule based on a server uuid and rule position.
         """
         url = '/server/{0}/firewall_rule/{1}'.format(server_uuid, firewall_rule_position)
-        return self.request('DELETE', url)
+        return self.delete_request(url)
 
     def configure_firewall(self, server, firewall_rule_bodies):
         """

upcloud_api/cloud_manager/ip_address_mixin.py

@@ -41,7 +41,7 @@ def attach_ip(self, server, family='IPv4'):
             }
         }
 
-        res = self.request('POST', '/ip_address', body)
+        res = self.post_request('/ip_address', body)
         return IPAddress(cloud_manager=self, **res['ip_address'])
 
     def modify_ip(self, ip_addr, ptr_record):
@@ -56,7 +56,7 @@ def modify_ip(self, ip_addr, ptr_record):
             }
         }
 
-        res = self.request('PUT', '/ip_address/' + str(ip_addr), body)
+        res = self.put_request('/ip_address/' + str(ip_addr), body)
         return IPAddress(cloud_manager=self, **res['ip_address'])
 
     def release_ip(self, ip_addr):
@@ -65,4 +65,4 @@ def release_ip(self, ip_addr):
 
         Accepts an IPAddress instance (object) or its address (string).
         """
-        return self.request('DELETE', '/ip_address/' + str(ip_addr))
+        return self.delete_request('/ip_address/' + str(ip_addr))

upcloud_api/cloud_manager/server_mixin.py

@@ -138,7 +138,7 @@ def modify_server(self, UUID, **kwargs):
                 Exception('{0} is not an updateable field'.format(arg))
             body['server'][arg] = kwargs[arg]
 
-        res = self.request('PUT', '/server/{0}'.format(UUID), body)
+        res = self.put_request('/server/{0}'.format(UUID), body)
         server = res['server']
 
         # Populate subobjects
@@ -164,7 +164,7 @@ def delete_server(self, UUID):
 
         Returns an empty object.
         """
-        return self.request('DELETE', '/server/{0}'.format(UUID))
+        return self.delete_request('/server/{0}'.format(UUID))
 
     def get_server_data(self, UUID):
         """

upcloud_api/cloud_manager/storage_mixin.py

@@ -52,7 +52,7 @@ def _modify_storage(self, storage, size, title, backup_rule={}):
             body['storage']['title'] = title
         if backup_rule:
             body['storage']['backup_rule'] = backup_rule
-        return self.request('PUT', '/storage/' + str(storage), body)
+        return self.put_request('/storage/' + str(storage), body)
 
     def modify_storage(self, storage, size, title, backup_rule={}):
         """
@@ -65,7 +65,7 @@ def delete_storage(self, UUID):
         """
         Destroy a Storage object.
         """
-        return self.request('DELETE', '/storage/' + UUID)
+        return self.delete_request('/storage/' + UUID)
 
     def clone_storage(self, storage, title, zone, tier=None):
         """
@@ -74,14 +74,14 @@ def clone_storage(self, storage, title, zone, tier=None):
         body = {'storage': {'title': title, 'zone': zone}}
         if tier:
             body['storage']['tier'] = tier
-        res = self.request('POST', '/storage/{0}/clone'.format(str(storage)), body)
+        res = self.post_request('/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)))
+        return self.post_request('/storage/{0}/cancel'.format(str(storage)))
 
     def attach_storage(self, server, storage, storage_type, address):
         """

upcloud_api/cloud_manager/tag_mixin.py

@@ -33,7 +33,7 @@ def create_tag(self, name, description=None, servers=[]):
         """
         servers = [str(server) for server in servers]
         body = {'tag': Tag(name, description, servers).to_dict()}
-        res = self.request('POST', '/tag', body)
+        res = self.post_request('/tag', body)
 
         return Tag(cloud_manager=self, **res['tag'])
 
@@ -44,7 +44,7 @@ def _modify_tag(self, name, description, servers, new_name):
         Private method used by the Tag class and TagManager.modify_tag.
         """
         body = {'tag': Tag(new_name, description, servers).to_dict()}
-        res = self.request('PUT', '/tag/' + name, body)
+        res = self.put_request('/tag/' + name, body)
         return res['tag']
 
     def modify_tag(self, name, description=None, servers=None, new_name=None):
@@ -82,4 +82,4 @@ def remove_tags(self, server, tags):
 
     def delete_tag(self, tag):
         """Delete the Tag. Returns and empty object."""
-        return self.request('DELETE', '/tag/' + str(tag))
+        return self.delete_request('/tag/' + str(tag))

upcloud_api/storage.py

@@ -72,6 +72,14 @@ def save(self):
         res = self.cloud_manager._modify_storage(self, self.size, self.title)
         self._reset(**res['storage'])
 
+    def update(self, size, title):
+        """
+        Update the storage to the API.
+        """
+        self.size = size
+        self.title = title
+        self.save()
+
     def __str__(self):
         """
         String representation of Storage.