Merge pull request #26 from UpCloudLtd/0.3.7-devel

0.3.7 devel

Author: Elias Nygren

setup.py

@@ -4,15 +4,15 @@
 
 setup(
     name='upcloud-api',
-    version='0.3.6',
+    version='0.3.7',
     description='UpCloud API Client',
     author='Elias Nygren',
     author_email='[email protected]',
     maintainer='Elias Nygren',
     maintainer_email='[email protected]',
     url='https://github.com/UpCloudLtd/upcloud-python-api',
     packages=['upcloud_api', 'upcloud_api.cloud_manager'],
-    download='https://github.com/UpCloudLtd/upcloud-python-api/tarball/v0.3.6',
+    download='https://github.com/UpCloudLtd/upcloud-python-api/tarball/v0.3.7',
     license='MIT',
     install_requires=[
         'requests>=2.6.0',

test/test_server_creation.py

@@ -106,7 +106,8 @@ def test_server_prepare_post_body_optional_attributes(self):
             vnc_password='my-passwd',
             password_delivery='email',
             login_user=login_user_block('upclouduser', ['this-is-a-SSH-key']),
-            avoid_host='12345678'
+            avoid_host='12345678',
+            user_data='https://my.script.com/some_script.py'
         )
 
         body = server.prepare_post_body()
@@ -125,6 +126,7 @@ def test_server_prepare_post_body_optional_attributes(self):
             }
         }
         assert body['server']['avoid_host'] == '12345678'
+        assert body['server']['user_data'] == 'https://my.script.com/some_script.py'
 
     @responses.activate
     def test_create_server(self, manager):

upcloud_api/__init__.py

@@ -7,7 +7,7 @@
 from __future__ import unicode_literals
 from __future__ import absolute_import
 
-__version__ = '0.3.6'
+__version__ = '0.3.7'
 __author__ = 'Elias Nygren'
 __author_email__ = '[email protected]'
 __license__ = 'MIT'

upcloud_api/ip_address.py

@@ -15,7 +15,7 @@ class IP_address(object):
     ptr_record and server are present only if /server/uuid endpoint was used.
     """
 
-    def __init__(self, access, address, cloud_manager, family='IPv4',
+    def __init__(self, access, cloud_manager, address=None, family='IPv4',
                  ptr_record=None, server=None, *args, **kwargs):
         """
         Initialize IP address with at least access and address.
@@ -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/server.py

@@ -47,7 +47,7 @@ class Server(object):
     optional_fields = [
         'plan', 'core_number', 'memory_amount', 'boot_order', 'firewall', 'nic_model',
         'timezone', 'video_model', 'vnc_password', 'password_delivery', 'avoid_host',
-        'login_user'
+        'login_user', 'user_data'
     ]
 
     def __init__(self, server=None, **kwargs):
@@ -465,7 +465,7 @@ def _self_destruct():
             # first destroy server
             try_it_n_times(operation=self.destroy,
                            expected_error_codes=['SERVER_STATE_ILLEGAL'],
-                           custom_error='stopping server failed')
+                           custom_error='destroying server failed')
 
             # storages may be deleted instantly after server DELETE
             for storage in self.storage_devices:
@@ -481,7 +481,10 @@ def _self_destruct():
             self._wait_for_state_change(['stopped', 'started'])
 
         if self.state == 'started':
-            self.stop()
+            try_it_n_times(operation=self.stop,
+                           expected_error_codes=['SERVER_STATE_ILLEGAL'],
+                           custom_error='stopping server failed')
+
             self._wait_for_state_change(['stopped'])
 
         if self.state == 'stopped':

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))