Merge "Use '-m' for tempest_coverage.py in tox.ini"
diff --git a/tempest/services/compute/json/flavors_client.py b/tempest/services/compute/json/flavors_client.py
index 56546de..bd339b2 100644
--- a/tempest/services/compute/json/flavors_client.py
+++ b/tempest/services/compute/json/flavors_client.py
@@ -51,20 +51,23 @@
body = json.loads(body)
return resp, body['flavor']
- def create_flavor(self, name, ram, vcpus, disk, ephemeral, flavor_id,
- swap, rxtx):
+ def create_flavor(self, name, ram, vcpus, disk, flavor_id, **kwargs):
"""Creates a new flavor or instance type."""
post_body = {
'name': name,
'ram': ram,
'vcpus': vcpus,
'disk': disk,
- 'OS-FLV-EXT-DATA:ephemeral': ephemeral,
'id': flavor_id,
- 'swap': swap,
- 'rxtx_factor': rxtx,
}
-
+ if kwargs.get('ephemeral'):
+ post_body['OS-FLV-EXT-DATA:ephemeral'] = kwargs.get('ephemeral')
+ if kwargs.get('swap'):
+ post_body['swap'] = kwargs.get('swap')
+ if kwargs.get('rxtx'):
+ post_body['rxtx_factor'] = kwargs.get('rxtx')
+ if kwargs.get('is_public'):
+ post_body['os-flavor-access:is_public'] = kwargs.get('is_public')
post_body = json.dumps({'flavor': post_body})
resp, body = self.post('flavors', post_body, self.headers)
@@ -74,3 +77,13 @@
def delete_flavor(self, flavor_id):
"""Deletes the given flavor."""
return self.delete("flavors/%s" % str(flavor_id))
+
+ def is_resource_deleted(self, id):
+ #Did not use get_flavor_details(id) for verification as it gives
+ #200 ok even for deleted id. LP #981263
+ #we can remove the loop here and use get by ID when bug gets sortedout
+ resp, flavors = self.list_flavors_with_detail()
+ for flavor in flavors:
+ if flavor['id'] == id:
+ return False
+ return True
diff --git a/tempest/services/compute/xml/flavors_client.py b/tempest/services/compute/xml/flavors_client.py
index 2a8ad0d..c011fe4 100644
--- a/tempest/services/compute/xml/flavors_client.py
+++ b/tempest/services/compute/xml/flavors_client.py
@@ -27,7 +27,9 @@
XMLNS_OS_FLV_EXT_DATA = \
- "http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1"
+ "http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1"
+XMLNS_OS_FLV_ACCESS = \
+ "http://docs.openstack.org/compute/ext/flavor_access/api/v1.1"
class FlavorsClientXML(RestClientXML):
@@ -84,8 +86,7 @@
flavor = self._format_flavor(body)
return resp, flavor
- def create_flavor(self, name, ram, vcpus, disk, ephemeral, flavor_id,
- swap, rxtx):
+ def create_flavor(self, name, ram, vcpus, disk, flavor_id, **kwargs):
"""Creates a new flavor or instance type."""
flavor = Element("flavor",
xmlns=XMLNS_11,
@@ -93,12 +94,19 @@
vcpus=vcpus,
disk=disk,
id=flavor_id,
- swap=swap,
- rxtx_factor=rxtx,
name=name)
+ if kwargs.get('rxtx'):
+ flavor.add_attr('rxtx_factor', kwargs.get('rxtx'))
+ if kwargs.get('swap'):
+ flavor.add_attr('swap', kwargs.get('swap'))
+ if kwargs.get('ephemeral'):
+ flavor.add_attr('OS-FLV-EXT-DATA:ephemeral',
+ kwargs.get('ephemeral'))
+ if kwargs.get('is_public'):
+ flavor.add_attr('os-flavor-access:is_public',
+ kwargs.get('is_public'))
flavor.add_attr('xmlns:OS-FLV-EXT-DATA', XMLNS_OS_FLV_EXT_DATA)
- flavor.add_attr('OS-FLV-EXT-DATA:ephemeral', ephemeral)
-
+ flavor.add_attr('xmlns:os-flavor-access', XMLNS_OS_FLV_ACCESS)
resp, body = self.post('flavors', str(Document(flavor)), self.headers)
body = xml_to_json(etree.fromstring(body))
flavor = self._format_flavor(body)
@@ -107,3 +115,13 @@
def delete_flavor(self, flavor_id):
"""Deletes the given flavor."""
return self.delete("flavors/%s" % str(flavor_id), self.headers)
+
+ def is_resource_deleted(self, id):
+ #Did not use get_flavor_details(id) for verification as it gives
+ #200 ok even for deleted id. LP #981263
+ #we can remove the loop here and use get by ID when bug gets sortedout
+ resp, flavors = self.list_flavors_with_detail()
+ for flavor in flavors:
+ if flavor['id'] == id:
+ return False
+ return True
diff --git a/tempest/services/compute/xml/images_client.py b/tempest/services/compute/xml/images_client.py
index 1e8b250..bde9e16 100644
--- a/tempest/services/compute/xml/images_client.py
+++ b/tempest/services/compute/xml/images_client.py
@@ -70,6 +70,13 @@
node.findall('{http://www.w3.org/2005/Atom}link')]
return json
+ def _parse_images(self, xml):
+ json = {'images': []}
+ images = xml.getchildren()
+ for image in images:
+ json['images'].append(self._parse_image(image))
+ return json
+
def create_image(self, server_id, name, meta=None):
"""Creates an image of the original server."""
post_body = Element('createImage', name=name)
@@ -92,7 +99,7 @@
url += '?%s' % urllib.urlencode(params)
resp, body = self.get(url, self.headers)
- body = xml_to_json(etree.fromstring(body))
+ body = self._parse_images(etree.fromstring(body))
return resp, body['images']
def list_images_with_detail(self, params=None):
@@ -104,7 +111,7 @@
url = "images/detail?" + param_list
resp, body = self.get(url, self.headers)
- body = xml_to_json(etree.fromstring(body))
+ body = self._parse_images(etree.fromstring(body))
return resp, body['images']
def get_image(self, image_id):
diff --git a/tempest/services/identity/xml/admin_client.py b/tempest/services/identity/xml/admin_client.py
index 8448ae0..60897e9 100644
--- a/tempest/services/identity/xml/admin_client.py
+++ b/tempest/services/identity/xml/admin_client.py
@@ -136,6 +136,13 @@
body = self._parse_array(etree.fromstring(body))
return resp, body
+ def get_tenant_by_name(self, tenant_name):
+ resp, tenants = self.list_tenants()
+ for tenant in tenants:
+ if tenant['name'] == tenant_name:
+ return tenant
+ raise exceptions.NotFound('No such tenant')
+
def update_tenant(self, tenant_id, **kwargs):
"""Updates a tenant."""
resp, body = self.get_tenant(tenant_id)
@@ -198,6 +205,13 @@
body = self._parse_array(etree.fromstring(body))
return resp, body
+ def get_user_by_username(self, tenant_id, username):
+ resp, users = self.list_users_for_tenant(tenant_id)
+ for user in users:
+ if user['name'] == username:
+ return user
+ raise exceptions.NotFound('No such user')
+
def create_service(self, name, type, **kwargs):
"""Create a service."""
OS_KSADM = "http://docs.openstack.org/identity/api/ext/OS-KSADM/v1.0"
diff --git a/tempest/tests/boto/test_ec2_instance_run.py b/tempest/tests/boto/test_ec2_instance_run.py
index 95ef23c..331e54c 100644
--- a/tempest/tests/boto/test_ec2_instance_run.py
+++ b/tempest/tests/boto/test_ec2_instance_run.py
@@ -121,6 +121,7 @@
self.cancelResourceCleanUp(rcuk)
@attr(type='smoke')
+ @unittest.skip("Skipped until the Bug #1098112 is resolved")
def test_run_terminate_instance(self):
# EC2 run, terminate immediately
image_ami = self.ec2_client.get_image(self.images["ami"]
diff --git a/tempest/tests/compute/admin/test_flavors.py b/tempest/tests/compute/admin/test_flavors.py
index b5ee13a..8172bd4 100644
--- a/tempest/tests/compute/admin/test_flavors.py
+++ b/tempest/tests/compute/admin/test_flavors.py
@@ -29,8 +29,8 @@
Tests Flavors API Create and Delete that require admin privileges
"""
- @staticmethod
- def setUpClass(cls):
+ @classmethod
+ def setUpClass(self, cls):
if not compute.FLAVOR_EXTRA_DATA_ENABLED:
msg = "FlavorExtraData extension not enabled."
raise nose.SkipTest(msg)
@@ -43,61 +43,77 @@
cls.ephemeral = 10
cls.new_flavor_id = 1234
cls.swap = 1024
- cls.rxtx = 1
+ cls.rxtx = 2
@attr(type='positive')
def test_create_flavor(self):
# Create a flavor and ensure it is listed
# This operation requires the user to have 'admin' role
- #Create the flavor
- resp, flavor = self.client.create_flavor(self.flavor_name,
- self.ram, self.vcpus,
- self.disk,
- self.ephemeral,
- self.new_flavor_id,
- self.swap, self.rxtx)
- self.assertEqual(200, resp.status)
- self.assertEqual(flavor['name'], self.flavor_name)
- self.assertEqual(flavor['vcpus'], self.vcpus)
- self.assertEqual(flavor['disk'], self.disk)
- self.assertEqual(flavor['ram'], self.ram)
- self.assertEqual(int(flavor['id']), self.new_flavor_id)
- self.assertEqual(flavor['swap'], self.swap)
- self.assertEqual(flavor['rxtx_factor'], self.rxtx)
- self.assertEqual(flavor['OS-FLV-EXT-DATA:ephemeral'], self.ephemeral)
+ try:
+ #Create the flavor
+ resp, flavor = self.client.create_flavor(self.flavor_name,
+ self.ram, self.vcpus,
+ self.disk,
+ self.new_flavor_id,
+ ephemeral=self.ephemeral,
+ swap=self.swap,
+ rxtx=self.rxtx)
+ self.assertEqual(200, resp.status)
+ self.assertEqual(flavor['name'], self.flavor_name)
+ self.assertEqual(flavor['vcpus'], self.vcpus)
+ self.assertEqual(flavor['disk'], self.disk)
+ self.assertEqual(flavor['ram'], self.ram)
+ self.assertEqual(int(flavor['id']), self.new_flavor_id)
+ self.assertEqual(flavor['swap'], self.swap)
+ self.assertEqual(flavor['rxtx_factor'], self.rxtx)
+ self.assertEqual(flavor['OS-FLV-EXT-DATA:ephemeral'],
+ self.ephemeral)
+ if self._interface == "xml":
+ XMLNS_OS_FLV_ACCESS = "http://docs.openstack.org/compute/ext/"\
+ "flavor_access/api/v2"
+ key = "{" + XMLNS_OS_FLV_ACCESS + "}is_public"
+ self.assertEqual(flavor[key], "True")
+ if self._interface == "json":
+ self.assertEqual(flavor['os-flavor-access:is_public'], True)
- #Verify flavor is retrieved
- resp, flavor = self.client.get_flavor_details(self.new_flavor_id)
- self.assertEqual(resp.status, 200)
- self.assertEqual(flavor['name'], self.flavor_name)
+ #Verify flavor is retrieved
+ resp, flavor = self.client.get_flavor_details(self.new_flavor_id)
+ self.assertEqual(resp.status, 200)
+ self.assertEqual(flavor['name'], self.flavor_name)
- #Delete the flavor
- resp, body = self.client.delete_flavor(flavor['id'])
- self.assertEqual(resp.status, 202)
+ finally:
+ #Delete the flavor
+ resp, body = self.client.delete_flavor(self.new_flavor_id)
+ self.assertEqual(resp.status, 202)
+ self.client.wait_for_resource_deletion(self.new_flavor_id)
@attr(type='positive')
def test_create_flavor_verify_entry_in_list_details(self):
# Create a flavor and ensure it's details are listed
# This operation requires the user to have 'admin' role
- #Create the flavor
- resp, flavor = self.client.create_flavor(self.flavor_name,
- self.ram, self.vcpus,
- self.disk,
- self.ephemeral,
- self.new_flavor_id,
- self.swap, self.rxtx)
- flag = False
- #Verify flavor is retrieved
- resp, flavors = self.client.list_flavors_with_detail()
- self.assertEqual(resp.status, 200)
- for flavor in flavors:
- if flavor['name'] == self.flavor_name:
- flag = True
- self.assertTrue(flag)
+ try:
+ #Create the flavor
+ resp, flavor = self.client.create_flavor(self.flavor_name,
+ self.ram, self.vcpus,
+ self.disk,
+ self.new_flavor_id,
+ ephemeral=self.ephemeral,
+ swap=self.swap,
+ rxtx=self.rxtx)
+ flag = False
+ #Verify flavor is retrieved
+ resp, flavors = self.client.list_flavors_with_detail()
+ self.assertEqual(resp.status, 200)
+ for flavor in flavors:
+ if flavor['name'] == self.flavor_name:
+ flag = True
+ self.assertTrue(flag)
- #Delete the flavor
- resp, body = self.client.delete_flavor(self.new_flavor_id)
- self.assertEqual(resp.status, 202)
+ finally:
+ #Delete the flavor
+ resp, body = self.client.delete_flavor(self.new_flavor_id)
+ self.assertEqual(resp.status, 202)
+ self.client.wait_for_resource_deletion(self.new_flavor_id)
@attr(type='negative')
def test_get_flavor_details_for_deleted_flavor(self):
@@ -106,9 +122,10 @@
resp, flavor = self.client.create_flavor(self.flavor_name,
self.ram,
self.vcpus, self.disk,
- self.ephemeral,
self.new_flavor_id,
- self.swap, self.rxtx)
+ ephemeral=self.ephemeral,
+ swap=self.swap,
+ rxtx=self.rxtx)
self.assertEquals(200, resp.status)
# Delete the flavor
@@ -129,20 +146,118 @@
flag = False
self.assertTrue(flag)
+ def test_create_list_flavor_without_extra_data(self):
+ #Create a flavor and ensure it is listed
+ #This operation requires the user to have 'admin' role
+ try:
+ #Create the flavor
+ resp, flavor = self.client.create_flavor(self.flavor_name,
+ self.ram, self.vcpus,
+ self.disk,
+ self.new_flavor_id)
+ self.assertEqual(200, resp.status)
+ self.assertEqual(flavor['name'], self.flavor_name)
+ self.assertEqual(flavor['ram'], self.ram)
+ self.assertEqual(flavor['vcpus'], self.vcpus)
+ self.assertEqual(flavor['disk'], self.disk)
+ self.assertEqual(int(flavor['id']), self.new_flavor_id)
+ self.assertEqual(flavor['swap'], '')
+ self.assertEqual(int(flavor['rxtx_factor']), 1)
+ self.assertEqual(int(flavor['OS-FLV-EXT-DATA:ephemeral']), 0)
+ if self._interface == "xml":
+ XMLNS_OS_FLV_ACCESS = "http://docs.openstack.org/compute/ext/"\
+ "flavor_access/api/v2"
+ key = "{" + XMLNS_OS_FLV_ACCESS + "}is_public"
+ self.assertEqual(flavor[key], "True")
+ if self._interface == "json":
+ self.assertEqual(flavor['os-flavor-access:is_public'], True)
+
+ #Verify flavor is retrieved
+ resp, flavor = self.client.get_flavor_details(self.new_flavor_id)
+ self.assertEqual(resp.status, 200)
+ self.assertEqual(flavor['name'], self.flavor_name)
+ #Check if flavor is present in list
+ resp, flavors = self.client.list_flavors_with_detail()
+ self.assertEqual(resp.status, 200)
+ for flavor in flavors:
+ if flavor['name'] == self.flavor_name:
+ flag = True
+ self.assertTrue(flag)
+
+ finally:
+ #Delete the flavor
+ resp, body = self.client.delete_flavor(self.new_flavor_id)
+ self.assertEqual(resp.status, 202)
+ self.client.wait_for_resource_deletion(self.new_flavor_id)
+
+ @attr(type='positive')
+ def test_flavor_not_public_verify_entry_not_in_list_details(self):
+ #Create a flavor with os-flavor-access:is_public false should not
+ #be present in list_details.
+ #This operation requires the user to have 'admin' role
+ try:
+ #Create the flavor
+ resp, flavor = self.client.create_flavor(self.flavor_name,
+ self.ram, self.vcpus,
+ self.disk,
+ self.new_flavor_id,
+ is_public="False")
+ flag = False
+ #Verify flavor is retrieved
+ resp, flavors = self.client.list_flavors_with_detail()
+ self.assertEqual(resp.status, 200)
+ for flavor in flavors:
+ if flavor['name'] == self.flavor_name:
+ flag = True
+ self.assertFalse(flag)
+ finally:
+ #Delete the flavor
+ resp, body = self.client.delete_flavor(self.new_flavor_id)
+ self.assertEqual(resp.status, 202)
+
+ def test_list_public_flavor_with_other_user(self):
+ #Create a Flavor with public access.
+ #Try to List/Get flavor with another user
+ try:
+ #Create the flavor
+ resp, flavor = self.client.create_flavor(self.flavor_name,
+ self.ram, self.vcpus,
+ self.disk,
+ self.new_flavor_id,
+ is_public="True")
+ flag = False
+ self.new_client = self.flavors_client
+ #Verify flavor is retrieved with new user
+ resp, flavors = self.new_client.list_flavors_with_detail()
+ self.assertEqual(resp.status, 200)
+ for flavor in flavors:
+ if flavor['name'] == self.flavor_name:
+ flag = True
+ self.assertTrue(flag)
+ finally:
+ #Delete the flavor
+ resp, body = self.client.delete_flavor(self.new_flavor_id)
+ self.assertEqual(resp.status, 202)
+ self.client.wait_for_resource_deletion(self.new_flavor_id)
+
class FlavorsAdminTestXML(base.BaseComputeAdminTestXML,
+ base.BaseComputeTestXML,
FlavorsAdminTestBase):
@classmethod
def setUpClass(cls):
super(FlavorsAdminTestXML, cls).setUpClass()
+ base.BaseComputeTestXML.setUpClass()
FlavorsAdminTestBase.setUpClass(cls)
class FlavorsAdminTestJSON(base.BaseComputeAdminTestJSON,
+ base.BaseComputeTestJSON,
FlavorsAdminTestBase):
@classmethod
def setUpClass(cls):
super(FlavorsAdminTestJSON, cls).setUpClass()
+ base.BaseComputeTestJSON.setUpClass()
FlavorsAdminTestBase.setUpClass(cls)
diff --git a/tempest/tests/compute/base.py b/tempest/tests/compute/base.py
index e315d78..8044d01 100644
--- a/tempest/tests/compute/base.py
+++ b/tempest/tests/compute/base.py
@@ -100,7 +100,7 @@
operate in an isolated tenant container.
"""
admin_client = cls._get_identity_admin_client()
- rand_name_root = cls.__name__
+ rand_name_root = rand_name(cls.__name__)
if cls.isolated_creds:
# Main user already created. Create the alt one...
rand_name_root += '-alt'
diff --git a/tempest/tests/compute/images/test_images.py b/tempest/tests/compute/images/test_images.py
index 6ebcbbc..95678a2 100644
--- a/tempest/tests/compute/images/test_images.py
+++ b/tempest/tests/compute/images/test_images.py
@@ -57,6 +57,7 @@
name = rand_name('image')
meta = {'image_type': 'test'}
resp, body = self.client.create_image(server['id'], name, meta)
+ self.assertEqual(202, resp.status)
image_id = parse_image_id(resp['location'])
self.client.wait_for_image_resp_code(image_id, 200)
self.client.wait_for_image_status(image_id, 'ACTIVE')
diff --git a/tempest/tests/volume/test_volumes_actions.py b/tempest/tests/volume/test_volumes_actions.py
index 7eddb67..155acb6 100644
--- a/tempest/tests/volume/test_volumes_actions.py
+++ b/tempest/tests/volume/test_volumes_actions.py
@@ -46,7 +46,10 @@
super(VolumesActionsTest, cls).tearDownClass()
# Delete the test instance and volume
cls.client.delete_volume(cls.volume['id'])
+ cls.client.wait_for_resource_deletion(cls.volume['id'])
+
cls.servers_client.delete_server(cls.server['id'])
+ cls.client.wait_for_resource_deletion(cls.server['id'])
@attr(type='smoke')
def test_attach_detach_volume_to_instance(self):
diff --git a/tempest/tests/volume/test_volumes_list.py b/tempest/tests/volume/test_volumes_list.py
index 26a85b7..2fc1353 100644
--- a/tempest/tests/volume/test_volumes_list.py
+++ b/tempest/tests/volume/test_volumes_list.py
@@ -87,8 +87,9 @@
# because the backing file size of the volume group is
# too small. So, here, we clean up whatever we did manage
# to create and raise a SkipTest
- for volume in cls.volume_id_list:
- cls.client.delete_volume(volume)
+ for volid in cls.volume_id_list:
+ cls.client.delete_volume(volid)
+ cls.client.wait_for_resource_deletion(volid)
msg = ("Failed to create ALL necessary volumes to run "
"test. This typically means that the backing file "
"size of the nova-volumes group is too small to "
@@ -99,9 +100,9 @@
@classmethod
def tearDownClass(cls):
# Delete the created volumes
- for volume in cls.volume_id_list:
- resp, _ = cls.client.delete_volume(volume)
- cls.client.wait_for_resource_deletion(volume)
+ for volid in cls.volume_id_list:
+ resp, _ = cls.client.delete_volume(volid)
+ cls.client.wait_for_resource_deletion(volid)
super(VolumeListTestXML, cls).tearDownClass()
@@ -133,8 +134,9 @@
# because the backing file size of the volume group is
# too small. So, here, we clean up whatever we did manage
# to create and raise a SkipTest
- for volume in cls.volume_id_list:
- cls.client.delete_volume(volume)
+ for volid in cls.volume_id_list:
+ cls.client.delete_volume(volid)
+ cls.client.wait_for_resource_deletion(volid)
msg = ("Failed to create ALL necessary volumes to run "
"test. This typically means that the backing file "
"size of the nova-volumes group is too small to "
@@ -145,7 +147,7 @@
@classmethod
def tearDownClass(cls):
# Delete the created volumes
- for volume in cls.volume_id_list:
- resp, _ = cls.client.delete_volume(volume)
- cls.client.wait_for_resource_deletion(volume)
+ for volid in cls.volume_id_list:
+ resp, _ = cls.client.delete_volume(volid)
+ cls.client.wait_for_resource_deletion(volid)
super(VolumeListTestJSON, cls).tearDownClass()