allow setting and updating server's plan

Elias Nygren · Elias Nygren · commit 61d33aa55881 · 2015-11-16T09:59:46.000+02:00
diff --git a/test/json_data/server.json b/test/json_data/server.json
@@ -3,6 +3,7 @@
 		"server" : [
 			{
 				"zone" : "fi-hel1",
+				"plan": "custom",
 				"core_number" : "0",
 				"title" : "Helsinki server",
 				"hostname" : "fi.example.com",
@@ -17,6 +18,7 @@
 			},
 			{
 				"zone" : "uk-lon1",
+				"plan": "custom",
 				"core_number" : "0",
 				"title" : "London server",
 				"hostname" : "uk.example.com",
diff --git a/test/json_data/server_00798b85-efdc-41ca-8021-f6ef457b8531.json b/test/json_data/server_00798b85-efdc-41ca-8021-f6ef457b8531.json
@@ -45,6 +45,7 @@
 		"vnc_host" : "fi-he1l.vnc.upcloud.com",
 		"vnc_password" : "aabbccdd",
 		"vnc_port" : "00000",
-		"zone" : "fi-hel1"
+		"zone" : "fi-hel1",
+		"plan": "custom"
 	}
 }
diff --git a/test/json_data/server_009d64ef-31d1-4684-a26b-c86c955cbf46.json b/test/json_data/server_009d64ef-31d1-4684-a26b-c86c955cbf46.json
@@ -44,6 +44,7 @@
 		"vnc_host" : "fi-he1l.vnc.upcloud.com",
 		"vnc_password" : "aabbccdd",
 		"vnc_port" : "00000",
-		"zone" : "uk-lon1"
+		"zone" : "uk-lon1",
+		"plan": "custom"
 	}
 }
diff --git a/test/json_data/server_create.json b/test/json_data/server_create.json
@@ -44,6 +44,7 @@
 		"video_model" : "cirrus",
 		"vnc" : "off",
 		"vnc_password" : "aabbccdd",
-		"zone" : "us-chi1"
+		"zone" : "us-chi1",
+		"plan": "custom"
 	}
-}
+}
diff --git a/upcloud_api/server.py b/upcloud_api/server.py
@@ -26,7 +26,8 @@ class Server(BaseAPI):
 	#
 
 	updateable_fields = [   "boot_order", "core_number", "firewall", "hostname", "memory_amount",
-							"nic_model", "title", "timezone", "video_model", "vnc", "vnc_password" ]
+							"nic_model", "title", "timezone", "video_model", "vnc", "vnc_password",
+							"plan" ]
 
 
 	def __init__(self, server=None, **kwargs):
@@ -263,6 +264,7 @@ def prepare_post_body(self):
 		}
 
 		# optional
+		if hasattr(self, "plan"):        		body["server"]["plan"] = self.plan
 		if hasattr(self, "core_number"):        body["server"]["core_number"] = self.core_number
 		if hasattr(self, "memory_amount"):      body["server"]["memory_amount"] = self.memory_amount
 		if hasattr(self, "boot_order"):         body["server"]["boot_order"] = self.boot_order

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@`
`45`	`45`	`"vnc_host" : "fi-he1l.vnc.upcloud.com",`
`46`	`46`	`"vnc_password" : "aabbccdd",`
`47`	`47`	`"vnc_port" : "00000",`
`48`		`- "zone" : "fi-hel1"`
	`48`	`+ "zone" : "fi-hel1",`
	`49`	`+ "plan": "custom"`
`49`	`50`	`}`
`50`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@`
`44`	`44`	`"vnc_host" : "fi-he1l.vnc.upcloud.com",`
`45`	`45`	`"vnc_password" : "aabbccdd",`
`46`	`46`	`"vnc_port" : "00000",`
`47`		`- "zone" : "uk-lon1"`
	`47`	`+ "zone" : "uk-lon1",`
	`48`	`+ "plan": "custom"`
`48`	`49`	`}`
`49`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,8 @@ class Server(BaseAPI):`
`26`	`26`	`#`
`27`	`27`
`28`	`28`	`updateable_fields = [ "boot_order", "core_number", "firewall", "hostname", "memory_amount",`
`29`		`- "nic_model", "title", "timezone", "video_model", "vnc", "vnc_password" ]`
	`29`	`+ "nic_model", "title", "timezone", "video_model", "vnc", "vnc_password",`
	`30`	`+ "plan" ]`
`30`	`31`
`31`	`32`
`32`	`33`	`def __init__(self, server=None, **kwargs):`
`@@ -263,6 +264,7 @@ def prepare_post_body(self):`
`263`	`264`	`}`
`264`	`265`
`265`	`266`	`# optional`
	`267`	`+ if hasattr(self, "plan"): body["server"]["plan"] = self.plan`
`266`	`268`	`if hasattr(self, "core_number"): body["server"]["core_number"] = self.core_number`
`267`	`269`	`if hasattr(self, "memory_amount"): body["server"]["memory_amount"] = self.memory_amount`
`268`	`270`	`if hasattr(self, "boot_order"): body["server"]["boot_order"] = self.boot_order`