Merge pull request #8 from UpCloudLtd/ansible-features

Ansible features

Author: Elias Nygren

test/json_data/server.json

@@ -8,7 +8,12 @@
 				"hostname" : "fi.example.com",
 				"memory_amount" : "512",
 				"uuid" : "00798b85-efdc-41ca-8021-f6ef457b8531",
-				"state" : "started"
+				"state" : "started",
+				"tags": {
+					"tag": [
+						"web1"
+					]
+				}
 			},
 			{
 				"zone" : "uk-lon1",
@@ -17,8 +22,13 @@
 				"hostname" : "uk.example.com",
 				"memory_amount" : "512",
 				"uuid" : "009d64ef-31d1-4684-a26b-c86c955cbf46",
-				"state" : "stopped"
+				"state" : "stopped",
+				"tags": {
+					"tag": [
+						"web2"
+					]
+				}
 			}
 		]
 	}
-}
+}

test/json_data/server_00798b85-efdc-41ca-8021-f6ef457b8531.json

@@ -31,6 +31,11 @@
 				}
 			]
 		},
+		"tags": {
+			"tag": [
+				"web1"
+			]
+		},
 		"timezone" : "UTC",
 		"title" : "Helsinki server",
 		"uuid" : "00798b85-efdc-41ca-8021-f6ef457b8531",
@@ -41,4 +46,4 @@
 		"vnc_port" : "00000",
 		"zone" : "fi-hel1"
 	}
-}
+}

test/json_data/server_009d64ef-31d1-4684-a26b-c86c955cbf46.json

@@ -31,6 +31,11 @@
 				}
 			]
 		},
+		"tags": {
+			"tag": [
+				"web2"
+			]
+		},
 		"timezone" : "UTC",
 		"title" : "London server",
 		"uuid" : "009d64ef-31d1-4684-a26b-c86c955cbf46",
@@ -41,4 +46,4 @@
 		"vnc_port" : "00000",
 		"zone" : "uk-lon1"
 	}
-}
+}

upcloud/cloud_manager/server_mixin.py

@@ -2,17 +2,15 @@
 from __future__ import print_function
 from __future__ import division
 from __future__ import absolute_import
-from builtins import dict
-from builtins import str
+from builtins import dict, str, object
+
 from future import standard_library
 standard_library.install_aliases()
-from builtins import object
-from ..ip_address import IP_address
-from ..storage import Storage 
-
-from ..server import Server
 
-from ..tools import assignIfExists
+from upcloud.tools import assignIfExists
+from upcloud import IP_address
+from upcloud import Storage
+from upcloud import Server
 
 
 class ServerManager(object):
@@ -22,15 +20,17 @@ class ServerManager(object):
 
 	def get_servers(self, populate=False):
 		"""
-		Returns a list of (populated or unpopulated) Server instances. 
+		Returns a list of (populated or unpopulated) Server instances.
 		Populate = False (default) => 1 API request, returns unpopulated Server instances.
 		Populate = True => Does 1 + n API requests (n = # of servers), returns populated Server instances.
 		"""
-		
-		servers = self.get_request("/server")["servers"]["server"]		
+
+		servers = self.get_request("/server")["servers"]["server"]
 
 		server_list = list()
 		for server in servers:
+			# remove the extra "tag" dict to simplify accessing tags
+			server['tags'] = server['tags']['tag']
 			server_list.append( Server(server, cloud_manager = self) )
 
 		if( populate ):
@@ -39,30 +39,33 @@ def get_servers(self, populate=False):
 
 		return server_list
 
-	
+
 	def get_server(self, UUID):
 		"""
 		Returns a (populated) Server instance.
 		"""
 		server, IP_addresses, storages = self.get_server_data(UUID)
-		
-		return Server(	server, 
-						ip_addresses = IP_addresses, 
-						storage_devices = storages, 
+
+		return Server(	server,
+						ip_addresses = IP_addresses,
+						storage_devices = storages,
 						populated = True,
 						cloud_manager = self )
 
 
 	def create_server(self, server):
 		"""
-		Creates a server and its storages based on a (locally created) Server object. 
+		Creates a server and its storages based on a (locally created) Server object.
 		Populates the given Server instance with the API response.
 
+		0.3.0: also supports giving the entire POST body as a dict that is directly
+		serialised into JSON. Refer to the REST API documentation for correct format.
+
 		Example:
 		server1 = Server( core_number = 1,
-					memory_amount = 512, 
-					hostname = "my.example.1", 
-					zone = ZONE.London, 
+					memory_amount = 512,
+					hostname = "my.example.1",
+					zone = ZONE.London,
 					storage_devices = [
 						Storage(os = "Ubuntu 14.04", size=10, tier=maxiops, title='The OS drive'),
 						Storage(size=10),
@@ -75,28 +78,45 @@ def create_server(self, server):
 		- size defaults to 10,
 		- title defaults to hostname + " OS disk" and hostname + " storage disk id" (id is a running starting from 1)
 		- tier defaults to maxiops
-		- valid operating systems are: 
+		- valid operating systems are:
 			"CentOS 6.5", "CentOS 7.0"
 			"Debian 7.8"
 			"Ubuntu 12.04", "Ubuntu 14.04"
 			"Windows 2003","Windows 2008" ,"Windows 2012"
 
 		"""
+		if isinstance(server, Server):
+			body = server.prepare_post_body()
+		else:
+			ip_data = server.pop("ip_addresses", None)
+			storage_data = server.pop("storage_devices", None)
+
+			server_dict = dict()
+			server_dict['cloud_manager'] = self
+			if ip_data: 	 server_dict['ip_addresses'] = IP_address._create_ip_address_objs( ip_data, cloud_manager = self )
+			if storage_data: server_dict['storage_devices'] = Storage._create_storage_objs( storage_data, cloud_manager = self )
+
+			server_from_dict = Server(server, **server_dict)
+			body = server_from_dict.prepare_post_body()
 
-		body = server.prepare_post_body()
 
 		res = self.post_request("/server", body)
-		
+
 		# Populate subobjects
 		IP_addresses = IP_address._create_ip_address_objs( res["server"].pop("ip_addresses"), cloud_manager = self )
 		storages = Storage._create_storage_objs( res["server"].pop("storage_devices"), cloud_manager = self )
 
-		server._reset( res["server"], 
-					ip_addresses = IP_addresses, 
-					storage_devices = storages, 
-					cloud_manager = self,
-					populated = True)
-		return server
+		if isinstance(server, Server):
+			server_to_return = server
+		else:
+			server_to_return = server_from_dict
+
+		server_to_return._reset( res["server"],
+						ip_addresses = IP_addresses,
+						storage_devices = storages,
+						cloud_manager = self,
+						populated = True)
+		return server_to_return
 
 
 	def modify_server(self, UUID, **kwargs):
@@ -113,36 +133,39 @@ def modify_server(self, UUID, **kwargs):
 
 		res = self.request("PUT", "/server/" + UUID, body)
 		server = res["server"]
-		
+
 		# Populate subobjects
 		IP_addresses = IP_address._create_ip_address_objs( server.pop("ip_addresses"), cloud_manager = self )
 		storages = Storage._create_storage_objs( server.pop("storage_devices"), cloud_manager = self )
 
-		return Server(	server, 
-						ip_addresses = IP_addresses, 
-						storage_devices = storages, 
+		return Server(	server,
+						ip_addresses = IP_addresses,
+						storage_devices = storages,
 						populated = True,
 						cloud_manager = self )
 
 
 	def delete_server(self, UUID):
 		"""
-		DELETE '/server/UUID'. Permanently destroys the virtual machine. 
+		DELETE '/server/UUID'. Permanently destroys the virtual machine.
 		DOES NOT remove the storage disks.
 
 		Returns an empty object.
 		"""
 		return self.request("DELETE", "/server/" + UUID)
-	
-	
+
+
 	def get_server_data(self, UUID):
 		"""
-		Returns '/server/uuid' data in Python dict. 
+		Returns '/server/uuid' data in Python dict.
 		Creates object representations of any IP-address and Storage.
 		"""
-		data = self.get_request("/server/" + UUID)		
+		data = self.get_request("/server/" + UUID)
 		server = data["server"]
-		
+
+		# remove the extra "tag" dict to simplify accessing tags
+		server['tags'] = server['tags']['tag']
+
 		# Populate subobjects
 		IP_addresses = IP_address._create_ip_address_objs( server.pop("ip_addresses"), cloud_manager = self )
 		storages = Storage._create_storage_objs( server.pop("storage_devices"), cloud_manager = self )