support Server.user_data

Elias Nygren · Elias Nygren · commit 89898418985d · 2016-08-01T08:20:26.000+03:00
diff --git a/test/test_server_creation.py b/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):
diff --git a/upcloud_api/server.py b/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):

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,8 @@ def test_server_prepare_post_body_optional_attributes(self):`
`106`	`106`	`vnc_password='my-passwd',`
`107`	`107`	`password_delivery='email',`
`108`	`108`	`login_user=login_user_block('upclouduser', ['this-is-a-SSH-key']),`
`109`		`- avoid_host='12345678'`
	`109`	`+ avoid_host='12345678',`
	`110`	`+ user_data='https://my.script.com/some_script.py'`
`110`	`111`	`)`
`111`	`112`
`112`	`113`	`body = server.prepare_post_body()`
`@@ -125,6 +126,7 @@ def test_server_prepare_post_body_optional_attributes(self):`
`125`	`126`	`}`
`126`	`127`	`}`
`127`	`128`	`assert body['server']['avoid_host'] == '12345678'`
	`129`	`+ assert body['server']['user_data'] == 'https://my.script.com/some_script.py'`
`128`	`130`
`129`	`131`	`@responses.activate`
`130`	`132`	`def test_create_server(self, manager):`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class Server(object):`
`47`	`47`	`optional_fields = [`
`48`	`48`	`'plan', 'core_number', 'memory_amount', 'boot_order', 'firewall', 'nic_model',`
`49`	`49`	`'timezone', 'video_model', 'vnc_password', 'password_delivery', 'avoid_host',`
`50`		`- 'login_user'`
	`50`	`+ 'login_user', 'user_data'`
`51`	`51`	`]`
`52`	`52`
`53`	`53`	`def __init__(self, server=None, **kwargs):`