server and storage optional POST body variables

Author: Elias Nygren

tests/test_server_creation.py

@@ -27,6 +27,17 @@ def test_storage_prepare_post_body(self, manager):
 		assert body2['action'] == 'create'
 		assert body2['size'] == 100	
 
+	def test_storage_prepare_post_body_optional_attributes(self, manager):
+		s2 = Storage(size=100, address="virtio:0", type="disk")
+		body2 = s2.prepare_post_body("my.example.com", 1)
+
+		assert body2['title'] == 'my.example.com storage disk 1'
+		assert body2['tier'] == 'maxiops'
+		assert body2['action'] == 'create'
+		assert body2['size'] == 100
+		assert body2['address'] == "virtio:0"
+		assert body2['type'] == "disk"
+
 	def test_server_init(self, manager):
 		server1 = Server(core_number=2, memory_amount=1024, hostname="my.example.com",zone=ZONE.Chicago, storage_devices=[
 				Storage(os="Ubuntu 14.04", size=10),
@@ -65,6 +76,21 @@ def test_server_prepare_post_body(self):
 		assert body["server"]["hostname"] == server.title
 		assert body["server"]["zone"] == "us-chi1"
 
+	def test_server_prepare_post_body_optional_attributes(self):
+		server = Server(core_number=2, memory_amount=1024, 
+						hostname="my.example.com",zone=ZONE.Chicago, 
+						storage_devices=[ Storage(os="Ubuntu 14.04", size=10)],
+						vnc_password="my-passwd", password_delivery="email" 	)
+		
+		body = server.prepare_post_body()
+		assert body["server"]["title"] == "my.example.com"
+		assert body["server"]["core_number"] == 2
+		assert body["server"]["memory_amount"] == 1024
+		assert body["server"]["hostname"] == server.title
+		assert body["server"]["zone"] == "us-chi1"
+		assert body["server"]["vnc_password"] == "my-passwd"
+		assert body["server"]["password_delivery"] == "email"
+
 	@responses.activate
 	def test_create_server(self, manager):
 

upcloud/server.py

@@ -12,6 +12,8 @@ class Server(BaseAPI):
 	updateable_fields = [ 	"boot_order", "core_number", "firewall", "hostname", "memory_amount", 
 							"nic_model", "title", "timezone", "video_model", "vnc", "vnc_password" ]
 
+	post_fields = []
+
 
 	def __init__(self, *initial_data, **kwargs):
 		object.__setattr__(self, "populated", False)
@@ -162,11 +164,21 @@ def prepare_post_body(self):
 			"title": self.title,
 			"storage_devices": {}
 		}
+
+		# optionals
+		if hasattr(self, "boot_order"): 		body["server"]["boot_order"] = self.boot_order
+		if hasattr(self, "firewall"): 			body["server"]["firewall"] = self.firewall
+		if hasattr(self, "nic_model"):			body["server"]["nic_model"] = self.nic_model
+		if hasattr(self, "password_delivery"):	body["server"]["password_delivery"] = self.password_delivery
+		if hasattr(self, "timezone"):			body["server"]["timezone"] = self.timezone
+		if hasattr(self, "video_model"):		body["server"]["video_model"] = self.video_model
+		if hasattr(self, "vnc_password"):		body["server"]["vnc_password"] = self.vnc_password
+
+
 		body["server"]["storage_devices"] = {
 			"storage_device": []
 		}
 
-
 		storage_title_id = 0 # running number for unique storage titles
 		for storage in self.storage_devices:
 			if storage.os == None:

upcloud/storage.py

@@ -87,6 +87,10 @@ def prepare_post_body(self, hostname, storage_title_id):
 			if body["action"] == "attach" or body["action"] == "clone":
 				body["storage"] = OperatingSystems.get_OS_UUID(self.os)
 
+			# optionals
+			if self.type: 		body["type"] = self.type
+			if self.address:	body["address"] = self.address
+
 			return body
 
 	@staticmethod