Added image metadata tests, fixed minor bug in servers service with metadata
Change-Id: Ia77280ce393619c7dc3f700a7fa4c45305a2defb
diff --git a/storm/services/nova/json/images_client.py b/storm/services/nova/json/images_client.py
index 70902c8..e8a1326 100644
--- a/storm/services/nova/json/images_client.py
+++ b/storm/services/nova/json/images_client.py
@@ -70,11 +70,15 @@
"""Deletes the provided image"""
return self.client.delete("images/%s" % str(image_id))
- def wait_for_image_exists(self, image_id):
+ def wait_for_image_resp_code(self, image_id, code):
+ """
+ Waits until the HTTP response code for the request matches the
+ expected value
+ """
resp, body = self.client.get("images/%s" % str(image_id))
start = int(time.time())
- while resp.status != 200:
+ while resp.status != code:
time.sleep(self.build_interval)
resp, body = self.client.get("images/%s" % str(image_id))
@@ -97,39 +101,45 @@
raise exceptions.BuildErrorException
def list_image_metadata(self, image_id):
+ """Lists all metadata items for an image"""
resp, body = self.client.get("images/%s/metadata" % str(image_id))
body = json.loads(body)
- return resp, body
+ return resp, body['metadata']
def set_image_metadata(self, image_id, meta):
+ """Sets the metadata for an image"""
post_body = json.dumps({'metadata': meta})
resp, body = self.client.put('images/%s/metadata' %
str(image_id), post_body, self.headers)
body = json.loads(body)
- return resp, body
+ return resp, body['metadata']
def update_image_metadata(self, image_id, meta):
+ """Updates the metadata for an image"""
post_body = json.dumps({'metadata': meta})
resp, body = self.client.post('images/%s/metadata' %
str(image_id), post_body, self.headers)
body = json.loads(body)
- return resp, body
+ return resp, body['metadata']
def get_image_metadata_item(self, image_id, key):
+ """Returns the value for a specific image metadata key"""
resp, body = self.client.get("images/%s/metadata/%s" %
(str(image_id), key))
body = json.loads(body)
- return resp, body
+ return resp, body['meta']
def set_image_metadata_item(self, image_id, key, meta):
+ """Sets the value for a specific image metadata key"""
post_body = json.dumps({'meta': meta})
- resp, body = self.client.put('images/%s/metdata/%s' %
- (str(image_id), key),
- post_body, self.headers)
+ resp, body = self.client.put('images/%s/metadata/%s' %
+ (str(image_id), key), post_body,
+ self.headers)
body = json.loads(body)
- return resp, body
+ return resp, body['meta']
def delete_image_metadata_item(self, image_id, key):
+ """Deletes a single image metadata key/value pair"""
resp, body = self.client.delete("images/%s/metadata/%s" %
(str(image_id), key))
return resp, body
diff --git a/storm/services/nova/json/servers_client.py b/storm/services/nova/json/servers_client.py
index 6bad76e..e65173f 100644
--- a/storm/services/nova/json/servers_client.py
+++ b/storm/services/nova/json/servers_client.py
@@ -285,7 +285,7 @@
def set_server_metadata_item(self, server_id, key, meta):
post_body = json.dumps({'meta': meta})
- resp, body = self.client.put('servers/%s/metdata/%s' %
+ resp, body = self.client.put('servers/%s/metadata/%s' %
(str(server_id), key),
post_body, self.headers)
body = json.loads(body)