Merge "Remove duplicate calls to clear_servers"
diff --git a/tempest/services/compute/admin/json/quotas_client.py b/tempest/services/compute/admin/json/quotas_client.py
index 0a4bd72..b886834 100644
--- a/tempest/services/compute/admin/json/quotas_client.py
+++ b/tempest/services/compute/admin/json/quotas_client.py
@@ -37,38 +37,38 @@
"""
post_body = {}
- if injected_file_content_bytes >= 0:
+ if injected_file_content_bytes is not None:
post_body['injected_file_content_bytes'] = \
injected_file_content_bytes
- if metadata_items >= 0:
+ if metadata_items is not None:
post_body['metadata_items'] = metadata_items
- if ram >= 0:
+ if ram is not None:
post_body['ram'] = ram
- if floating_ips >= 0:
+ if floating_ips is not None:
post_body['floating_ips'] = floating_ips
- if key_pairs >= 0:
+ if key_pairs is not None:
post_body['key_pairs'] = key_pairs
- if instances >= 0:
+ if instances is not None:
post_body['instances'] = instances
- if security_group_rules >= 0:
+ if security_group_rules is not None:
post_body['security_group_rules'] = security_group_rules
- if injected_files >= 0:
+ if injected_files is not None:
post_body['injected_files'] = injected_files
- if cores >= 0:
+ if cores is not None:
post_body['cores'] = cores
- if injected_file_path_bytes >= 0:
+ if injected_file_path_bytes is not None:
post_body['injected_file_path_bytes'] = injected_file_path_bytes
- if security_groups >= 0:
+ if security_groups is not None:
post_body['security_groups'] = security_groups
post_body = json.dumps({'quota_set': post_body})
diff --git a/tempest/services/compute/json/volumes_extensions_client.py b/tempest/services/compute/json/volumes_extensions_client.py
index a5f6ec3..e4271d9 100644
--- a/tempest/services/compute/json/volumes_extensions_client.py
+++ b/tempest/services/compute/json/volumes_extensions_client.py
@@ -105,7 +105,7 @@
def is_resource_deleted(self, id):
try:
- self.get_volume(id, wait=True)
+ self.get_volume(id)
except exceptions.NotFound:
return True
return False
diff --git a/tempest/services/compute/xml/images_client.py b/tempest/services/compute/xml/images_client.py
index bde9e16..3b01efb 100644
--- a/tempest/services/compute/xml/images_client.py
+++ b/tempest/services/compute/xml/images_client.py
@@ -39,43 +39,43 @@
self.build_timeout = self.config.compute.build_timeout
def _parse_server(self, node):
- json = xml_to_json(node)
- return self._parse_links(node, json)
+ data = xml_to_json(node)
+ return self._parse_links(node, data)
def _parse_image(self, node):
"""Parses detailed XML image information into dictionary."""
- json = xml_to_json(node)
+ data = xml_to_json(node)
- self._parse_links(node, json)
+ self._parse_links(node, data)
# parse all metadata
- if 'metadata' in json:
+ if 'metadata' in data:
tag = node.find('{%s}metadata' % XMLNS_11)
- json['metadata'] = dict((x.get('key'), x.text)
+ data['metadata'] = dict((x.get('key'), x.text)
for x in tag.getchildren())
# parse server information
- if 'server' in json:
+ if 'server' in data:
tag = node.find('{%s}server' % XMLNS_11)
- json['server'] = self._parse_server(tag)
- return json
+ data['server'] = self._parse_server(tag)
+ return data
- def _parse_links(self, node, json):
+ def _parse_links(self, node, data):
"""Append multiple links under a list."""
# look for links
- if 'link' in json:
+ if 'link' in data:
# remove single link element
- del json['link']
- json['links'] = [xml_to_json(x) for x in
+ del data['link']
+ data['links'] = [xml_to_json(x) for x in
node.findall('{http://www.w3.org/2005/Atom}link')]
- return json
+ return data
def _parse_images(self, xml):
- json = {'images': []}
+ data = {'images': []}
images = xml.getchildren()
for image in images:
- json['images'].append(self._parse_image(image))
- return json
+ data['images'].append(self._parse_image(image))
+ return data
def create_image(self, server_id, name, meta=None):
"""Creates an image of the original server."""
@@ -160,9 +160,17 @@
body = xml_to_json(etree.fromstring(body))
return resp, body['metadata']
+ def _metadata_body(image_id, meta):
+ post_body = Document('metadata')
+ for k, v in meta:
+ text = Text(v)
+ metadata = Element('meta', text, key=k)
+ post_body.append(metadata)
+ return post_body
+
def set_image_metadata(self, image_id, meta):
"""Sets the metadata for an image."""
- post_body = json.dumps({'metadata': meta})
+ post_body = self._metadata_body(image_id, meta)
resp, body = self.put('images/%s/metadata' % str(image_id),
post_body, self.headers)
body = xml_to_json(etree.fromstring(body))
@@ -170,13 +178,7 @@
def update_image_metadata(self, image_id, meta):
"""Updates the metadata for an image."""
- post_body = Element('metadata', meta)
- for k, v in meta:
- metadata = Element('meta', key=k)
- text = Text(v)
- metadata.append(text)
- post_body.append(metadata)
-
+ post_body = self._metadata_body(image_id, meta)
resp, body = self.post('images/%s/metadata' % str(image_id),
post_body, self.headers)
body = xml_to_json(etree.fromstring(body))
@@ -191,7 +193,15 @@
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})
+ post_body = Document('meta', Text(meta), key=key)
+ resp, body = self.post('images/%s/metadata/%s' % (str(image_id), key),
+ post_body, self.headers)
+ body = xml_to_json(etree.fromstring(body))
+ return resp, body['meta']
+
+ def update_image_metadata_item(self, image_id, key, meta):
+ """Sets the value for a specific image metadata key."""
+ post_body = Document('meta', Text(meta), key=key)
resp, body = self.put('images/%s/metadata/%s' % (str(image_id), key),
post_body, self.headers)
body = xml_to_json(etree.fromstring(body))
diff --git a/tempest/services/compute/xml/volumes_extensions_client.py b/tempest/services/compute/xml/volumes_extensions_client.py
index 60ef398..69b9bac 100644
--- a/tempest/services/compute/xml/volumes_extensions_client.py
+++ b/tempest/services/compute/xml/volumes_extensions_client.py
@@ -141,7 +141,7 @@
def is_resource_deleted(self, id):
try:
- self.get_volume(id, wait=True)
+ self.get_volume(id)
except exceptions.NotFound:
return True
return False
diff --git a/tempest/services/identity/json/identity_client.py b/tempest/services/identity/json/identity_client.py
index 403a3ac..68e7d4b 100644
--- a/tempest/services/identity/json/identity_client.py
+++ b/tempest/services/identity/json/identity_client.py
@@ -244,8 +244,10 @@
if headers is None:
headers = {}
+ self._log_request(method, url, headers, body)
resp, resp_body = self.http_obj.request(url, method,
headers=headers, body=body)
+ self._log_response(resp, resp_body)
if resp.status in (401, 403):
resp_body = json.loads(resp_body)
diff --git a/tempest/services/identity/xml/identity_client.py b/tempest/services/identity/xml/identity_client.py
index 1b96ae0..2431282 100644
--- a/tempest/services/identity/xml/identity_client.py
+++ b/tempest/services/identity/xml/identity_client.py
@@ -45,8 +45,8 @@
return array
def _parse_body(self, body):
- json = xml_to_json(body)
- return json
+ data = xml_to_json(body)
+ return data
def has_admin_extensions(self):
"""
@@ -272,9 +272,10 @@
self.http_obj = httplib2.Http(disable_ssl_certificate_validation=dscv)
if headers is None:
headers = {}
-
+ self._log_request(method, url, headers, body)
resp, resp_body = self.http_obj.request(url, method,
headers=headers, body=body)
+ self._log_response(resp, resp_body)
if resp.status in (401, 403):
resp_body = json.loads(resp_body)
diff --git a/tempest/services/image/json/image_client.py b/tempest/services/image/json/image_client.py
index d595ec3..e9276aa 100644
--- a/tempest/services/image/json/image_client.py
+++ b/tempest/services/image/json/image_client.py
@@ -16,6 +16,7 @@
# under the License.
import copy
+import errno
import json
import os
import time
diff --git a/tempest/services/volume/json/volumes_client.py b/tempest/services/volume/json/volumes_client.py
index 75e1a8b..ff1556f 100644
--- a/tempest/services/volume/json/volumes_client.py
+++ b/tempest/services/volume/json/volumes_client.py
@@ -125,7 +125,7 @@
def is_resource_deleted(self, id):
try:
- self.get_volume(id, wait=True)
+ self.get_volume(id)
except exceptions.NotFound:
return True
return False
diff --git a/tempest/services/volume/xml/volumes_client.py b/tempest/services/volume/xml/volumes_client.py
index 862ffae..5041869 100644
--- a/tempest/services/volume/xml/volumes_client.py
+++ b/tempest/services/volume/xml/volumes_client.py
@@ -151,7 +151,7 @@
def is_resource_deleted(self, id):
try:
- self.get_volume(id, wait=True)
+ self.get_volume(id)
except exceptions.NotFound:
return True
return False
diff --git a/tempest/tests/compute/base.py b/tempest/tests/compute/base.py
index f2af1fc..594535f 100644
--- a/tempest/tests/compute/base.py
+++ b/tempest/tests/compute/base.py
@@ -154,7 +154,7 @@
@classmethod
def clear_isolated_creds(cls):
if not cls.isolated_creds:
- pass
+ return
admin_client = cls._get_identity_admin_client()
for user, tenant in cls.isolated_creds:
diff --git a/tempest/tests/compute/servers/test_console_output.py b/tempest/tests/compute/servers/test_console_output.py
index 78639f8..bdf449d 100644
--- a/tempest/tests/compute/servers/test_console_output.py
+++ b/tempest/tests/compute/servers/test_console_output.py
@@ -28,7 +28,6 @@
@classmethod
def setUpClass(self, cls):
cls.name = rand_name('server')
- cls.client = cls.servers_client
resp, server = cls.servers_client.create_server(cls.name,
cls.image_ref,
cls.flavor_ref)
@@ -45,7 +44,8 @@
# Positive test:Should be able to GET the console output
# for a given server_id and number of lines
def get_output():
- resp, output = self.client.get_console_output(self.server_id, 10)
+ resp, output = self.servers_client.get_console_output(
+ self.server_id, 10)
self.assertEqual(200, resp.status)
self.assertNotEqual(output, None)
lines = len(output.split('\n'))
@@ -57,7 +57,8 @@
# Negative test: Should not be able to get the console output
# for an invalid server_id
try:
- resp, output = self.client.get_console_output('!@#$%^&*()', 10)
+ resp, output = self.servers_client.get_console_output(
+ '!@#$%^&*()', 10)
except exceptions.NotFound:
pass
@@ -72,8 +73,8 @@
'REBOOT')
resp, server = self.servers_client.get_server(self.server_id)
if (server['status'] == 'REBOOT'):
- resp, output = self.client.get_console_output(self.server_id,
- 10)
+ resp, output = self.servers_client.get_console_output(
+ self.server_id, 10)
self.assertEqual(200, resp.status)
self.assertNotEqual(output, None)
lines = len(output.split('\n'))
diff --git a/tempest/tests/volume/admin/test_volume_types_extra_specs.py b/tempest/tests/volume/admin/test_volume_types_extra_specs.py
index c743567..f19cd7b 100644
--- a/tempest/tests/volume/admin/test_volume_types_extra_specs.py
+++ b/tempest/tests/volume/admin/test_volume_types_extra_specs.py
@@ -39,7 +39,6 @@
adm_tenant)
vol_type_name = rand_name('Volume-type-')
- cls.extra_spec = {"spec1": "val1"}
resp, cls.volume_type = cls.client.create_volume_type(vol_type_name)
@classmethod
@@ -50,6 +49,12 @@
def test_volume_type_extra_specs_list(self):
# List Volume types extra specs.
try:
+ extra_specs = {"spec1": "val1"}
+ resp, body = self.client.\
+ create_volume_type_extra_specs(self.volume_type['id'], extra_specs)
+ self.assertEqual(200, resp.status)
+ self.assertEqual(extra_specs, body,
+ "Volume type extra spec incorrectly created")
resp, body = self.client.\
list_volume_types_extra_specs(self.volume_type['id'])
self.assertEqual(200, resp.status)
@@ -62,49 +67,46 @@
def test_volume_type_extra_specs_update(self):
# Update volume type extra specs
try:
- extra_spec = {"spec1": "val2"}
- resp, body = self.client.\
- update_volume_type_extra_specs(self.volume_type['id'],
- extra_spec.keys()[0],
- extra_spec)
- self.assertEqual(200, resp.status)
- self.assertTrue('spec1' in body,
- "Volume type extra spec incorrectly updated")
- self.assertEqual(extra_spec['spec1'], body['spec1'],
- "Volume type extra spec incorrectly updated")
- except Exception:
- self.fail("Couldnt update volume type extra spec")
-
- def test_volume_type_extra_spec_create_delete(self):
- # Create/Delete volume type extra spec.
- try:
extra_specs = {"spec2": "val1"}
resp, body = self.client.\
create_volume_type_extra_specs(self.volume_type['id'], extra_specs)
self.assertEqual(200, resp.status)
self.assertEqual(extra_specs, body,
"Volume type extra spec incorrectly created")
- resp, _ = self.client.\
- delete_volume_type_extra_specs(self.volume_type['id'],
- extra_specs.keys()[0])
- self.assertEqual(202, resp.status)
- except Exception:
- self.fail("Could not create a volume_type extra spec")
- def test_volume_type_extra_spec_create_get(self):
- # Create/get volume type extra spec
+ extra_spec = {"spec2": "val2"}
+ resp, body = self.client.\
+ update_volume_type_extra_specs(self.volume_type['id'],
+ extra_spec.keys()[0],
+ extra_spec)
+ self.assertEqual(200, resp.status)
+ self.assertTrue('spec2' in body,
+ "Volume type extra spec incorrectly updated")
+ self.assertEqual(extra_spec['spec2'], body['spec2'],
+ "Volume type extra spec incorrectly updated")
+ except Exception:
+ self.fail("Couldnt update volume type extra spec")
+
+ def test_volume_type_extra_spec_create_get_delete(self):
+ # Create/Get/Delete volume type extra spec.
try:
- extra_specs = {"spec1": "val1"}
+ extra_specs = {"spec3": "val1"}
resp, body = self.client.\
create_volume_type_extra_specs(self.volume_type['id'], extra_specs)
self.assertEqual(200, resp.status)
self.assertEqual(extra_specs, body,
"Volume type extra spec incorrectly created")
+
resp, fetched_vol_type_extra_spec = self.client.\
get_volume_type_extra_specs(self.volume_type['id'],
extra_specs.keys()[0])
self.assertEqual(200, resp.status)
self.assertEqual(extra_specs, body,
"Volume type extra spec incorrectly fetched")
+
+ resp, _ = self.client.\
+ delete_volume_type_extra_specs(self.volume_type['id'],
+ extra_specs.keys()[0])
+ self.assertEqual(202, resp.status)
except Exception:
self.fail("Could not create a volume_type extra spec")
diff --git a/tempest/tests/volume/base.py b/tempest/tests/volume/base.py
index 6625180..c91244f 100644
--- a/tempest/tests/volume/base.py
+++ b/tempest/tests/volume/base.py
@@ -113,7 +113,7 @@
@classmethod
def clear_isolated_creds(cls):
if not cls.isolated_creds:
- pass
+ return
admin_client = cls._get_identity_admin_client()
for user, tenant in cls.isolated_creds: