Added server details tests. Also re-added several files that somehow missed the initial commit
Change-Id: I23eb08d2589b5c513b38de2476e44d53f21a79a1
diff --git a/storm/services/nova/json/servers_client.py b/storm/services/nova/json/servers_client.py
new file mode 100644
index 0000000..21cabfa
--- /dev/null
+++ b/storm/services/nova/json/servers_client.py
@@ -0,0 +1,259 @@
+from storm import exceptions
+from storm.common import rest_client
+import json
+import storm.config
+import time
+
+
+class ServersClient(object):
+
+ def __init__(self, username, key, auth_url, tenant_name=None):
+ self.client = rest_client.RestClient(username, key,
+ auth_url, tenant_name)
+ self.config = storm.config.StormConfig()
+ self.build_interval = self.config.nova.build_interval
+ self.build_timeout = self.config.nova.build_timeout
+ self.headers = {'Content-Type': 'application/json',
+ 'Accept': 'application/json'}
+
+ def create_server(self, name, image_ref, flavor_ref, meta=None,
+ personality=None, accessIPv4=None, accessIPv6=None,
+ adminPass=None):
+ """
+ Creates an instance of a server.
+ name: The name of the server.
+ image_ref: The reference to the image used to build the server.
+ flavor_ref: The flavor used to build the server.
+ adminPass: Sets the initial root password.
+ meta: A dictionary of values to be used as metadata.
+ personality: A list of dictionaries for files to be injected into
+ the server.
+ accessIPv4: The IPv4 access address for the server.
+ accessIPv6: The IPv6 access address for the server.
+ """
+
+ post_body = {
+ 'name': name,
+ 'imageRef': image_ref,
+ 'flavorRef': flavor_ref,
+ }
+
+ if meta != None:
+ post_body['metadata'] = meta
+
+ if personality != None:
+ post_body['personality'] = personality
+
+ if adminPass != None:
+ post_body['adminPass'] = adminPass
+
+ if accessIPv4 != None:
+ post_body['accessIPv4'] = accessIPv4
+
+ if accessIPv6 != None:
+ post_body['accessIPv6'] = accessIPv6
+
+ post_body = json.dumps({'server': post_body})
+ resp, body = self.client.post('servers', post_body, self.headers)
+ body = json.loads(body)
+ return resp, body['server']
+
+ def update_server(self, server_id, name=None, meta=None, accessIPv4=None,
+ accessIPv6=None):
+ """
+ Updates the properties of an existing server.
+ server_id: The id of an existing server.
+ name: The name of the server.
+ personality: A list of files to be injected into the server.
+ accessIPv4: The IPv4 access address for the server.
+ accessIPv6: The IPv6 access address for the server.
+ """
+
+ post_body = {}
+
+ if meta != None:
+ post_body['metadata'] = meta
+
+ if name != None:
+ post_body['name'] = name
+
+ if accessIPv4 != None:
+ post_body['accessIPv4'] = accessIPv4
+
+ if accessIPv6 != None:
+ post_body['accessIPv6'] = accessIPv6
+
+ post_body = json.dumps({'server': post_body})
+ resp, body = self.client.put("servers/%s" % str(server_id),
+ post_body, self.headers)
+ body = json.loads(body)
+ return resp, body['server']
+
+ def get_server(self, server_id):
+ """Returns the details of an existing server"""
+ resp, body = self.client.get("servers/%s" % str(server_id))
+ body = json.loads(body)
+ return resp, body['server']
+
+ def delete_server(self, server_id):
+ """Deletes the given server"""
+ return self.client.delete("servers/%s" % str(server_id))
+
+ def list_servers(self, params=None):
+ """Lists all servers for a user"""
+
+ url = 'servers'
+ if params != None:
+ param_list = []
+ for param, value in params.iteritems():
+ param_list.append("%s=%s&" % (param, value))
+
+ url = "servers?" + "".join(param_list)
+
+ resp, body = self.client.get(url)
+ body = json.loads(body)
+ return resp, body
+
+ def list_servers_with_detail(self, params=None):
+ """Lists all servers in detail for a user"""
+
+ url = 'servers/detail'
+ if params != None:
+ param_list = []
+ for param, value in params.iteritems():
+ param_list.append("%s=%s&" % (param, value))
+
+ url = "servers/detail?" + "".join(param_list)
+
+ resp, body = self.client.get(url)
+ body = json.loads(body)
+ return resp, body
+
+ def wait_for_server_status(self, server_id, status):
+ """Waits for a server to reach a given status"""
+ resp, body = self.get_server(server_id)
+ server_status = body['status']
+ start = int(time.time())
+
+ while(server_status != status):
+ time.sleep(self.build_interval)
+ resp, body = self.get_server(server_id)
+ server_status = body['status']
+
+ if(server_status == 'ERROR'):
+ raise exceptions.BuildErrorException
+
+ if (int(time.time()) - start >= self.build_timeout):
+ raise exceptions.TimeoutException
+
+ def list_addresses(self, server_id):
+ """Lists all addresses for a server"""
+ resp, body = self.client.get("servers/%s/ips" % str(server_id))
+ body = json.loads(body)
+ return resp, body['addresses']
+
+ def list_addresses_by_network(self, server_id, network_id):
+ """Lists all addresses of a specific network type for a server"""
+ resp, body = self.client.get("servers/%s/ips/%s" %
+ (str(server_id), network_id))
+ body = json.loads(body)
+ return resp, body
+
+ def change_password(self, server_id, password):
+ """Changes the root password for the server"""
+ post_body = {
+ 'changePassword': {
+ 'adminPass': password,
+ }
+ }
+
+ post_body = json.dumps(post_body)
+ return self.client.post('servers/%s/action' % str(server_id),
+ post_body, self.headers)
+
+ def reboot(self, server_id, reboot_type):
+ """Reboots a server"""
+ post_body = {
+ 'reboot': {
+ 'type': reboot_type,
+ }
+ }
+
+ post_body = json.dumps(post_body)
+ return self.client.post('servers/%s/action' % str(server_id),
+ post_body, self.headers)
+
+ def rebuild(self, server_id, image_ref, name=None, meta=None,
+ personality=None, adminPass=None):
+ """Rebuilds a server with a new image"""
+ post_body = {
+ 'imageRef': image_ref,
+ }
+
+ if name != None:
+ post_body['name'] = name
+
+ if adminPass != None:
+ post_body['adminPass'] = adminPass
+
+ if meta != None:
+ post_body['metadata'] = meta
+
+ if personality != None:
+ post_body['personality'] = personality
+
+ post_body = json.dumps({'rebuild': post_body})
+ resp, body = self.client.post('servers/%s/action' %
+ str(server_id), post_body,
+ self.headers)
+ body = json.loads(body)
+ return resp, body
+
+ def resize(self, server_id, flavor_ref):
+ """Changes the flavor of a server."""
+ post_body = {
+ 'resize': {
+ 'flavorRef': flavor_ref,
+ }
+ }
+
+ post_body = json.dumps(post_body)
+ resp, body = self.client.post('servers/%s/action' %
+ str(server_id), post_body, self.headers)
+ return resp, body
+
+ def confirm_resize(self, server_id):
+ """Confirms the flavor change for a server"""
+ post_body = {
+ 'confirmResize': null
+ }
+
+ post_body = json.dumps(post_body)
+ resp, body = self.client.post('servers/%s/action' %
+ str(server_id), post_body, self.headers)
+ return resp, body
+
+ def revert_resize(self, server_id):
+ """Reverts a server back to its original flavor"""
+ post_body = {
+ 'revertResize': null
+ }
+
+ post_body = json.dumps(post_body)
+ resp, body = self.client.post('servers/%s/action' %
+ str(server_id), post_body, self.headers)
+ return resp, body
+
+ def create_image(self, server_id, image_name):
+ """Creates an image of the given server"""
+ post_body = {
+ 'createImage': {
+ 'name': image_name,
+ }
+ }
+
+ post_body = json.dumps(post_body)
+ resp, body = self.client.post('servers/%s/action' %
+ str(server_id), post_body, self.headers)
+ body = json.loads(body)
+ return resp, body