Merge "Remove positive tag"
diff --git a/run_tests.sh b/run_tests.sh
index f8636c1..f995cde 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -108,6 +108,21 @@
fi
}
+function run_tests_nose {
+ NOSE_WITH_OPENSTACK=1
+ NOSE_OPENSTACK_COLOR=1
+ NOSE_OPENSTACK_RED=15.00
+ NOSE_OPENSTACK_YELLOW=3.00
+ NOSE_OPENSTACK_SHOW_ELAPSED=1
+ NOSE_OPENSTACK_STDOUT=1
+ if [[ "x$noseargs" =~ "tempest" ]]; then
+ noseargs="$testrargs"
+ else
+ noseargs="$noseargs tempest"
+ fi
+ ${wrapper} nosetests $noseargs
+}
+
function run_pep8 {
echo "Running pep8 ..."
${wrapper} flake8
@@ -162,7 +177,13 @@
run_coverage_start
fi
-run_tests
+
+py_version=`${wrapper} python --version 2>&1`
+if [[ $py_version =~ "2.6" ]] ; then
+ run_tests_nose
+else
+ run_tests
+fi
retval=$?
if [ $nova_coverage -eq 1 ]; then
diff --git a/tempest/api/README.rst b/tempest/api/README.rst
index 617fda4..9d8dc10 100644
--- a/tempest/api/README.rst
+++ b/tempest/api/README.rst
@@ -9,15 +9,15 @@
works with the OpenStack API as documented. The current largest
portion of Tempest code is devoted to test cases that do exactly this.
-It's also important to test not only the expected possitive path on
+It's also important to test not only the expected positive path on
APIs, but also to provide them with invalid data to ensure they fail
in expected and documented ways. Over the course of the OpenStack
project Tempest has discovered many fundamental bugs by doing just
this.
-In order for some APIs to return meaniful results, there must be
+In order for some APIs to return meaningful results, there must be
enough data in the system. This means these tests might start by
-spinning up a server, image, etc, then opperating on it.
+spinning up a server, image, etc, then operating on it.
Why are these tests in tempest?
diff --git a/tempest/api/compute/admin/test_flavors.py b/tempest/api/compute/admin/test_flavors.py
index 6d0a5b5..69e15f7 100644
--- a/tempest/api/compute/admin/test_flavors.py
+++ b/tempest/api/compute/admin/test_flavors.py
@@ -15,6 +15,8 @@
# License for the specific language governing permissions and limitations
# under the License.
+import testtools
+
from tempest.api import compute
from tempest.api.compute import base
from tempest.common.utils.data_utils import rand_int_id
@@ -193,9 +195,10 @@
flag = True
self.assertTrue(flag)
+ @testtools.skip("Skipped until the Bug #1209101 is resolved")
@attr(type='gate')
- def test_flavor_not_public_verify_entry_not_in_list_details(self):
- # Create a flavor with os-flavor-access:is_public false should not
+ def test_list_non_public_flavor(self):
+ # Create a flavor with os-flavor-access:is_public false should
# be present in list_details.
# This operation requires the user to have 'admin' role
flavor_name = rand_name(self.flavor_name_prefix)
@@ -208,13 +211,22 @@
new_flavor_id,
is_public="False")
self.addCleanup(self.flavor_clean_up, flavor['id'])
- flag = False
# Verify flavor is retrieved
+ flag = False
resp, flavors = self.client.list_flavors_with_detail()
self.assertEqual(resp.status, 200)
for flavor in flavors:
if flavor['name'] == flavor_name:
flag = True
+ self.assertTrue(flag)
+
+ # Verify flavor is not retrieved with other user
+ flag = False
+ resp, flavors = self.user_client.list_flavors_with_detail()
+ self.assertEqual(resp.status, 200)
+ for flavor in flavors:
+ if flavor['name'] == flavor_name:
+ flag = True
self.assertFalse(flag)
@attr(type='gate')
diff --git a/tempest/api/compute/admin/test_quotas.py b/tempest/api/compute/admin/test_quotas.py
index d8d162e..156274d 100644
--- a/tempest/api/compute/admin/test_quotas.py
+++ b/tempest/api/compute/admin/test_quotas.py
@@ -39,7 +39,8 @@
# NOTE(afazekas): these test cases should always create and use a new
# tenant most of them should be skipped if we can't do that
if cls.config.compute.allow_tenant_isolation:
- cls.demo_tenant_id = cls.isolated_creds[0][0]['tenantId']
+ cls.demo_tenant_id = cls.isolated_creds.get_primary_user().get(
+ 'tenantId')
else:
cls.demo_tenant_id = [tnt['id'] for tnt in tenants if tnt['name']
== cls.config.identity.tenant_name][0]
@@ -83,24 +84,14 @@
'key_pairs': 200, 'injected_file_path_bytes': 512,
'instances': 20, 'security_group_rules': 20,
'cores': 2, 'security_groups': 20}
- try:
- # Update limits for all quota resources
- resp, quota_set = self.adm_client.update_quota_set(
- self.demo_tenant_id,
- **new_quota_set)
- self.addCleanup(self.adm_client.update_quota_set,
- self.demo_tenant_id, **self.default_quota_set)
- self.assertEqual(200, resp.status)
- self.assertEqual(new_quota_set, quota_set)
- except Exception:
- self.fail("Admin could not update quota set for the tenant")
- finally:
- # Reset quota resource limits to default values
- resp, quota_set = self.adm_client.update_quota_set(
- self.demo_tenant_id,
- **self.default_quota_set)
- self.assertEqual(200, resp.status, "Failed to reset quota "
- "defaults")
+ # Update limits for all quota resources
+ resp, quota_set = self.adm_client.update_quota_set(
+ self.demo_tenant_id,
+ **new_quota_set)
+ self.addCleanup(self.adm_client.update_quota_set,
+ self.demo_tenant_id, **self.default_quota_set)
+ self.assertEqual(200, resp.status)
+ self.assertEqual(new_quota_set, quota_set)
# TODO(afazekas): merge these test cases
@attr(type='gate')
diff --git a/tempest/api/compute/base.py b/tempest/api/compute/base.py
index d40b0e0..acf0275 100644
--- a/tempest/api/compute/base.py
+++ b/tempest/api/compute/base.py
@@ -19,6 +19,7 @@
from tempest.api import compute
from tempest import clients
+from tempest.common import isolated_creds
from tempest.common.utils.data_utils import parse_image_id
from tempest.common.utils.data_utils import rand_name
from tempest.openstack.common import log as logging
@@ -35,13 +36,14 @@
@classmethod
def setUpClass(cls):
+ super(BaseComputeTest, cls).setUpClass()
if not cls.config.service_available.nova:
skip_msg = ("%s skipped as nova is not available" % cls.__name__)
raise cls.skipException(skip_msg)
- cls.isolated_creds = []
+ cls.isolated_creds = isolated_creds.IsolatedCreds(cls.__name__)
if cls.config.compute.allow_tenant_isolation:
- creds = cls._get_isolated_creds()
+ creds = cls.isolated_creds.get_primary_creds()
username, tenant_name, password = creds
os = clients.Manager(username=username,
password=password,
@@ -108,7 +110,8 @@
def tearDownClass(cls):
cls.clear_images()
cls.clear_servers()
- cls._clear_isolated_creds()
+ cls.isolated_creds.clear_isolated_creds()
+ super(BaseComputeTest, cls).tearDownClass()
@classmethod
def create_server(cls, **kwargs):
@@ -187,7 +190,7 @@
"in configuration.")
raise cls.skipException(msg)
if cls.config.compute.allow_tenant_isolation:
- creds = cls._get_isolated_creds(admin=True)
+ creds = cls.isolated_creds.get_admin_creds()
admin_username, admin_tenant_name, admin_password = creds
cls.os_adm = clients.Manager(username=admin_username,
password=admin_password,
diff --git a/tempest/api/compute/images/test_images.py b/tempest/api/compute/images/test_images.py
index 4f9364b..2f0ed6b 100644
--- a/tempest/api/compute/images/test_images.py
+++ b/tempest/api/compute/images/test_images.py
@@ -39,7 +39,7 @@
if compute.MULTI_USER:
if cls.config.compute.allow_tenant_isolation:
- creds = cls._get_isolated_creds()
+ creds = cls.isolated_creds.get_alt_creds()
username, tenant_name, password = creds
cls.alt_manager = clients.Manager(username=username,
password=password,
diff --git a/tempest/api/compute/images/test_images_oneserver.py b/tempest/api/compute/images/test_images_oneserver.py
index 14eced2..0052a30 100644
--- a/tempest/api/compute/images/test_images_oneserver.py
+++ b/tempest/api/compute/images/test_images_oneserver.py
@@ -54,7 +54,7 @@
if compute.MULTI_USER:
if cls.config.compute.allow_tenant_isolation:
- creds = cls._get_isolated_creds()
+ creds = cls.isolated_creds.get_alt_creds()
username, tenant_name, password = creds
cls.alt_manager = clients.Manager(username=username,
password=password,
diff --git a/tempest/api/compute/servers/test_list_server_filters.py b/tempest/api/compute/servers/test_list_server_filters.py
index b8f965c..ade7604 100644
--- a/tempest/api/compute/servers/test_list_server_filters.py
+++ b/tempest/api/compute/servers/test_list_server_filters.py
@@ -20,6 +20,7 @@
from tempest.api.compute import base
from tempest.api import utils
from tempest.common.utils.data_utils import rand_name
+from tempest import config
from tempest import exceptions
from tempest.test import attr
@@ -218,6 +219,8 @@
self.assertNotIn(self.s2_name, map(lambda x: x['name'], servers))
self.assertNotIn(self.s3_name, map(lambda x: x['name'], servers))
+ @testtools.skipIf(config.TempestConfig().service_available.neutron,
+ "Skipped until the Bug #1182883 is resolved")
@attr(type='gate')
def test_list_servers_filtered_by_ip_regex(self):
# Filter servers by regex ip
diff --git a/tempest/api/compute/servers/test_list_servers_negative.py b/tempest/api/compute/servers/test_list_servers_negative.py
index bad4a11..14ea174 100644
--- a/tempest/api/compute/servers/test_list_servers_negative.py
+++ b/tempest/api/compute/servers/test_list_servers_negative.py
@@ -35,7 +35,7 @@
if compute.MULTI_USER:
if cls.config.compute.allow_tenant_isolation:
- creds = cls._get_isolated_creds()
+ creds = cls.isolated_creds.get_alt_creds()
username, tenant_name, password = creds
cls.alt_manager = clients.Manager(username=username,
password=password,
diff --git a/tempest/api/compute/test_authorization.py b/tempest/api/compute/test_authorization.py
index 55dba97..60297a9 100644
--- a/tempest/api/compute/test_authorization.py
+++ b/tempest/api/compute/test_authorization.py
@@ -41,7 +41,7 @@
cls.security_client = cls.os.security_groups_client
if cls.config.compute.allow_tenant_isolation:
- creds = cls._get_isolated_creds()
+ creds = cls.isolated_creds.get_alt_creds()
username, tenant_name, password = creds
cls.alt_manager = clients.Manager(username=username,
password=password,
diff --git a/tempest/api/compute/volumes/test_attach_volume.py b/tempest/api/compute/volumes/test_attach_volume.py
index e756870..a3b051e 100644
--- a/tempest/api/compute/volumes/test_attach_volume.py
+++ b/tempest/api/compute/volumes/test_attach_volume.py
@@ -1,6 +1,6 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
-# Copyright 2012 IBM Corp.
+# Copyright 2013 IBM Corp.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -42,10 +42,11 @@
raise cls.skipException(skip_msg)
def _detach(self, server_id, volume_id):
- self.servers_client.detach_volume(server_id, volume_id)
- self.volumes_client.wait_for_volume_status(volume_id, 'available')
+ if self.attached:
+ self.servers_client.detach_volume(server_id, volume_id)
+ self.volumes_client.wait_for_volume_status(volume_id, 'available')
- def _delete(self, volume):
+ def _delete_volume(self):
if self.volume:
self.volumes_client.delete_volume(self.volume['id'])
self.volume = None
@@ -63,6 +64,7 @@
resp, volume = self.volumes_client.create_volume(1,
display_name='test')
self.volume = volume
+ self.addCleanup(self._delete_volume)
self.volumes_client.wait_for_volume_status(volume['id'], 'available')
# Attach the volume to the server
@@ -71,49 +73,41 @@
self.volumes_client.wait_for_volume_status(volume['id'], 'in-use')
self.attached = True
+ self.addCleanup(self._detach, server['id'], volume['id'])
@testtools.skipIf(not run_ssh, 'SSH required for this test')
@attr(type='gate')
def test_attach_detach_volume(self):
# Stop and Start a server with an attached volume, ensuring that
# the volume remains attached.
- try:
- self._create_and_attach()
- server = self.server
- volume = self.volume
+ self._create_and_attach()
+ server = self.server
+ volume = self.volume
- self.servers_client.stop(server['id'])
- self.servers_client.wait_for_server_status(server['id'], 'SHUTOFF')
+ self.servers_client.stop(server['id'])
+ self.servers_client.wait_for_server_status(server['id'], 'SHUTOFF')
- self.servers_client.start(server['id'])
- self.servers_client.wait_for_server_status(server['id'], 'ACTIVE')
+ self.servers_client.start(server['id'])
+ self.servers_client.wait_for_server_status(server['id'], 'ACTIVE')
- linux_client = RemoteClient(server,
- self.ssh_user, server['adminPass'])
- partitions = linux_client.get_partitions()
- self.assertIn(self.device, partitions)
+ linux_client = RemoteClient(server,
+ self.ssh_user, server['adminPass'])
+ partitions = linux_client.get_partitions()
+ self.assertIn(self.device, partitions)
- self._detach(server['id'], volume['id'])
- self.attached = False
+ self._detach(server['id'], volume['id'])
+ self.attached = False
- self.servers_client.stop(server['id'])
- self.servers_client.wait_for_server_status(server['id'], 'SHUTOFF')
+ self.servers_client.stop(server['id'])
+ self.servers_client.wait_for_server_status(server['id'], 'SHUTOFF')
- self.servers_client.start(server['id'])
- self.servers_client.wait_for_server_status(server['id'], 'ACTIVE')
+ self.servers_client.start(server['id'])
+ self.servers_client.wait_for_server_status(server['id'], 'ACTIVE')
- linux_client = RemoteClient(server,
- self.ssh_user, server['adminPass'])
- partitions = linux_client.get_partitions()
- self.assertNotIn(self.device, partitions)
- except Exception:
- self.fail("The test_attach_detach_volume is faild!")
- finally:
- if self.attached:
- self._detach(server['id'], volume['id'])
- # NOTE(maurosr): here we do the cleanup for volume, servers are
- # dealt on BaseComputeTest.tearDownClass
- self._delete(self.volume)
+ linux_client = RemoteClient(server,
+ self.ssh_user, server['adminPass'])
+ partitions = linux_client.get_partitions()
+ self.assertNotIn(self.device, partitions)
class AttachVolumeTestXML(AttachVolumeTestJSON):
diff --git a/tempest/api/identity/admin/v3/test_endpoints.py b/tempest/api/identity/admin/v3/test_endpoints.py
index 9f7b24b..d98fb71 100644
--- a/tempest/api/identity/admin/v3/test_endpoints.py
+++ b/tempest/api/identity/admin/v3/test_endpoints.py
@@ -53,6 +53,7 @@
cls.client.delete_endpoint(e['id'])
for s in cls.service_ids:
cls.identity_client.delete_service(s)
+ super(EndPointsTestJSON, cls).tearDownClass()
@attr(type='gate')
def test_list_endpoints(self):
diff --git a/tempest/api/identity/base.py b/tempest/api/identity/base.py
index 1237ce4..bfb5372 100644
--- a/tempest/api/identity/base.py
+++ b/tempest/api/identity/base.py
@@ -25,6 +25,7 @@
@classmethod
def setUpClass(cls):
+ super(BaseIdentityAdminTest, cls).setUpClass()
os = clients.AdminManager(interface=cls._interface)
cls.client = os.identity_client
cls.token_client = os.token_client
@@ -45,6 +46,7 @@
@classmethod
def tearDownClass(cls):
cls.data.teardown_all()
+ super(BaseIdentityAdminTest, cls).tearDownClass()
def disable_user(self, user_name):
user = self.get_user_by_name(user_name)
diff --git a/tempest/api/image/base.py b/tempest/api/image/base.py
index 086c50e..4f54a15 100644
--- a/tempest/api/image/base.py
+++ b/tempest/api/image/base.py
@@ -15,6 +15,7 @@
# under the License.
from tempest import clients
+from tempest.common import isolated_creds
from tempest.common.utils.data_utils import rand_name
from tempest import exceptions
from tempest.openstack.common import log as logging
@@ -28,14 +29,15 @@
@classmethod
def setUpClass(cls):
- cls.isolated_creds = []
+ super(BaseImageTest, cls).setUpClass()
cls.created_images = []
cls._interface = 'json'
+ cls.isolated_creds = isolated_creds.IsolatedCreds(cls.__name__)
if not cls.config.service_available.glance:
skip_msg = ("%s skipped as glance is not available" % cls.__name__)
raise cls.skipException(skip_msg)
if cls.config.compute.allow_tenant_isolation:
- creds = cls._get_isolated_creds()
+ creds = cls.isolated_creds.get_primary_creds()
username, tenant_name, password = creds
cls.os = clients.Manager(username=username,
password=password,
@@ -53,7 +55,8 @@
for image_id in cls.created_images:
cls.client.wait_for_resource_deletion(image_id)
- cls._clear_isolated_creds()
+ cls.isolated_creds.clear_isolated_creds()
+ super(BaseImageTest, cls).tearDownClass()
@classmethod
def create_image(cls, **kwargs):
diff --git a/tempest/api/network/base.py b/tempest/api/network/base.py
index d3fa763..2a3b3f7 100644
--- a/tempest/api/network/base.py
+++ b/tempest/api/network/base.py
@@ -47,6 +47,7 @@
@classmethod
def setUpClass(cls):
+ super(BaseNetworkTest, cls).setUpClass()
os = clients.Manager()
cls.network_cfg = os.config.network
if not cls.config.service_available.neutron:
@@ -64,6 +65,7 @@
cls.client.delete_subnet(subnet['id'])
for network in cls.networks:
cls.client.delete_network(network['id'])
+ super(BaseNetworkTest, cls).tearDownClass()
@classmethod
def create_network(cls, network_name=None):
diff --git a/tempest/api/object_storage/base.py b/tempest/api/object_storage/base.py
index 5a1fb5a..820328c 100644
--- a/tempest/api/object_storage/base.py
+++ b/tempest/api/object_storage/base.py
@@ -26,6 +26,7 @@
@classmethod
def setUpClass(cls):
+ super(BaseObjectTest, cls).setUpClass()
if not cls.config.service_available.swift:
skip_msg = ("%s skipped as swift is not available" % cls.__name__)
raise cls.skipException(skip_msg)
diff --git a/tempest/api/object_storage/test_container_services.py b/tempest/api/object_storage/test_container_services.py
index 8b9fc8c..eaaed39 100644
--- a/tempest/api/object_storage/test_container_services.py
+++ b/tempest/api/object_storage/test_container_services.py
@@ -31,6 +31,7 @@
@classmethod
def tearDownClass(cls):
cls.delete_containers(cls.containers)
+ super(ContainerTest, cls).tearDownClass()
@attr(type='smoke')
def test_create_container(self):
diff --git a/tempest/api/object_storage/test_container_sync.py b/tempest/api/object_storage/test_container_sync.py
index 5de4df0..d18c2ad 100644
--- a/tempest/api/object_storage/test_container_sync.py
+++ b/tempest/api/object_storage/test_container_sync.py
@@ -50,6 +50,7 @@
def tearDownClass(cls):
for client in cls.clients.values():
cls.delete_containers(cls.containers, client[0], client[1])
+ super(ContainerSyncTest, cls).tearDownClass()
@testtools.skip('Until Bug #1093743 is resolved.')
@attr(type='gate')
diff --git a/tempest/api/object_storage/test_object_expiry.py b/tempest/api/object_storage/test_object_expiry.py
index b546cec..8703480 100644
--- a/tempest/api/object_storage/test_object_expiry.py
+++ b/tempest/api/object_storage/test_object_expiry.py
@@ -41,6 +41,7 @@
NotFound exception and also non empty container cannot be deleted.
"""
cls.delete_containers([cls.container_name])
+ super(ObjectExpiryTest, cls).tearDownClass()
@testtools.skip('Until Bug #1069849 is resolved.')
@attr(type='gate')
diff --git a/tempest/api/object_storage/test_object_services.py b/tempest/api/object_storage/test_object_services.py
index c8d9965..c599562 100644
--- a/tempest/api/object_storage/test_object_services.py
+++ b/tempest/api/object_storage/test_object_services.py
@@ -47,6 +47,7 @@
cls.delete_containers(cls.containers)
# delete the user setup created
cls.data.teardown_all()
+ super(ObjectTest, cls).tearDownClass()
@attr(type='smoke')
def test_create_object(self):
diff --git a/tempest/api/object_storage/test_object_version.py b/tempest/api/object_storage/test_object_version.py
index cda3e4f..2b93c32 100644
--- a/tempest/api/object_storage/test_object_version.py
+++ b/tempest/api/object_storage/test_object_version.py
@@ -29,6 +29,7 @@
@classmethod
def tearDownClass(cls):
cls.delete_containers(cls.containers)
+ super(ContainerTest, cls).tearDownClass()
def assertContainer(self, container, count, byte, versioned):
resp, _ = self.container_client.list_container_metadata(container)
diff --git a/tempest/api/orchestration/base.py b/tempest/api/orchestration/base.py
index d06d942..745dd87 100644
--- a/tempest/api/orchestration/base.py
+++ b/tempest/api/orchestration/base.py
@@ -28,7 +28,7 @@
@classmethod
def setUpClass(cls):
-
+ super(BaseOrchestrationTest, cls).setUpClass()
os = clients.OrchestrationManager()
cls.orchestration_cfg = os.config.orchestration
if not os.config.service_available.heat:
@@ -107,6 +107,7 @@
def tearDownClass(cls):
cls.clear_stacks()
cls.clear_keypairs()
+ super(BaseOrchestrationTest, cls).tearDownClass()
def wait_for(self, condition):
"""Repeatedly calls condition() until a timeout."""
diff --git a/tempest/api/volume/admin/test_multi_backend.py b/tempest/api/volume/admin/test_multi_backend.py
index b64a324..797aa71 100644
--- a/tempest/api/volume/admin/test_multi_backend.py
+++ b/tempest/api/volume/admin/test_multi_backend.py
@@ -81,8 +81,8 @@
cls.volume_id_list.append(cls.volume2['id'])
cls.volume_client.wait_for_volume_status(cls.volume2['id'],
'available')
- except Exception:
- LOG.exception("setup failed")
+ except Exception as e:
+ LOG.exception("setup failed: %s" % e)
cls.tearDownClass()
raise
diff --git a/tempest/api/volume/admin/test_volume_types.py b/tempest/api/volume/admin/test_volume_types.py
index 27caaad..822f691 100644
--- a/tempest/api/volume/admin/test_volume_types.py
+++ b/tempest/api/volume/admin/test_volume_types.py
@@ -38,126 +38,111 @@
auth_url,
adm_tenant)
+ def _delete_volume(self, volume_id):
+ resp, _ = self.volumes_client.delete_volume(volume_id)
+ self.assertEqual(202, resp.status)
+
+ def _delete_volume_type(self, volume_type_id):
+ resp, _ = self.client.delete_volume_type(volume_type_id)
+ self.assertEqual(202, resp.status)
+
@attr(type='smoke')
def test_volume_type_list(self):
# List Volume types.
- try:
- resp, body = self.client.list_volume_types()
- self.assertEqual(200, resp.status)
- self.assertTrue(type(body), list)
- except Exception:
- self.fail("Could not list volume types")
+ resp, body = self.client.list_volume_types()
+ self.assertEqual(200, resp.status)
+ self.assertTrue(type(body), list)
@attr(type='smoke')
def test_create_get_delete_volume_with_volume_type_and_extra_specs(self):
# Create/get/delete volume with volume_type and extra spec.
- try:
- volume = {}
- vol_name = rand_name("volume-")
- vol_type_name = rand_name("volume-type-")
- proto = self.config.volume.storage_protocol
- vendor = self.config.volume.vendor_name
- extra_specs = {"storage_protocol": proto,
- "vendor_name": vendor}
- body = {}
- resp, body = self.client.create_volume_type(
- vol_type_name,
- extra_specs=extra_specs)
- self.assertEqual(200, resp.status)
- self.assertIn('id', body)
- self.assertIn('name', body)
- resp, volume = self.volumes_client.create_volume(
- size=1, display_name=vol_name,
- volume_type=vol_type_name)
- self.assertEqual(200, resp.status)
- self.assertIn('id', volume)
- self.assertIn('display_name', volume)
- self.assertEqual(volume['display_name'], vol_name,
- "The created volume name is not equal "
- "to the requested name")
- self.assertTrue(volume['id'] is not None,
- "Field volume id is empty or not found.")
- self.volumes_client.wait_for_volume_status(volume['id'],
- 'available')
- resp, fetched_volume = self.volumes_client.get_volume(volume['id'])
- self.assertEqual(200, resp.status)
- self.assertEqual(vol_name, fetched_volume['display_name'],
- 'The fetched Volume is different '
- 'from the created Volume')
- self.assertEqual(volume['id'], fetched_volume['id'],
- 'The fetched Volume is different '
- 'from the created Volume')
- self.assertEqual(vol_type_name, fetched_volume['volume_type'],
- 'The fetched Volume is different '
- 'from the created Volume')
- except Exception:
- self.fail("Could not create correct volume with volume_type")
- finally:
- if volume:
- # Delete the Volume if it was created
- resp, _ = self.volumes_client.delete_volume(volume['id'])
- self.assertEqual(202, resp.status)
-
- if body:
- resp, _ = self.client.delete_volume_type(body['id'])
- self.assertEqual(202, resp.status)
+ volume = {}
+ vol_name = rand_name("volume-")
+ vol_type_name = rand_name("volume-type-")
+ proto = self.config.volume.storage_protocol
+ vendor = self.config.volume.vendor_name
+ extra_specs = {"storage_protocol": proto,
+ "vendor_name": vendor}
+ body = {}
+ resp, body = self.client.create_volume_type(
+ vol_type_name,
+ extra_specs=extra_specs)
+ self.assertEqual(200, resp.status)
+ self.assertIn('id', body)
+ self.addCleanup(self._delete_volume_type, body['id'])
+ self.assertIn('name', body)
+ resp, volume = self.volumes_client.create_volume(
+ size=1, display_name=vol_name,
+ volume_type=vol_type_name)
+ self.assertEqual(200, resp.status)
+ self.assertIn('id', volume)
+ self.addCleanup(self._delete_volume, volume['id'])
+ self.assertIn('display_name', volume)
+ self.assertEqual(volume['display_name'], vol_name,
+ "The created volume name is not equal "
+ "to the requested name")
+ self.assertTrue(volume['id'] is not None,
+ "Field volume id is empty or not found.")
+ self.volumes_client.wait_for_volume_status(volume['id'],
+ 'available')
+ resp, fetched_volume = self.volumes_client.get_volume(volume['id'])
+ self.assertEqual(200, resp.status)
+ self.assertEqual(vol_name, fetched_volume['display_name'],
+ 'The fetched Volume is different '
+ 'from the created Volume')
+ self.assertEqual(volume['id'], fetched_volume['id'],
+ 'The fetched Volume is different '
+ 'from the created Volume')
+ self.assertEqual(vol_type_name, fetched_volume['volume_type'],
+ 'The fetched Volume is different '
+ 'from the created Volume')
@attr(type='smoke')
def test_volume_type_create_delete(self):
# Create/Delete volume type.
- try:
- name = rand_name("volume-type-")
- extra_specs = {"storage_protocol": "iSCSI",
- "vendor_name": "Open Source"}
- resp, body = self.client.create_volume_type(
- name,
- extra_specs=extra_specs)
- self.assertEqual(200, resp.status)
- self.assertIn('id', body)
- self.assertIn('name', body)
- self.assertEqual(body['name'], name,
- "The created volume_type name is not equal "
- "to the requested name")
- self.assertTrue(body['id'] is not None,
- "Field volume_type id is empty or not found.")
- resp, _ = self.client.delete_volume_type(body['id'])
- self.assertEqual(202, resp.status)
- except Exception:
- self.fail("Could not create a volume_type")
+ name = rand_name("volume-type-")
+ extra_specs = {"storage_protocol": "iSCSI",
+ "vendor_name": "Open Source"}
+ resp, body = self.client.create_volume_type(
+ name,
+ extra_specs=extra_specs)
+ self.assertEqual(200, resp.status)
+ self.assertIn('id', body)
+ self.addCleanup(self._delete_volume_type, body['id'])
+ self.assertIn('name', body)
+ self.assertEqual(body['name'], name,
+ "The created volume_type name is not equal "
+ "to the requested name")
+ self.assertTrue(body['id'] is not None,
+ "Field volume_type id is empty or not found.")
@attr(type='smoke')
def test_volume_type_create_get(self):
# Create/get volume type.
- try:
- body = {}
- name = rand_name("volume-type-")
- extra_specs = {"storage_protocol": "iSCSI",
- "vendor_name": "Open Source"}
- resp, body = self.client.create_volume_type(
- name,
- extra_specs=extra_specs)
- self.assertEqual(200, resp.status)
- self.assertIn('id', body)
- self.assertIn('name', body)
- self.assertEqual(body['name'], name,
- "The created volume_type name is not equal "
- "to the requested name")
- self.assertTrue(body['id'] is not None,
- "Field volume_type id is empty or not found.")
- resp, fetched_volume_type = self.client.get_volume_type(body['id'])
- self.assertEqual(200, resp.status)
- self.assertEqual(name, fetched_volume_type['name'],
- 'The fetched Volume_type is different '
- 'from the created Volume_type')
- self.assertEqual(str(body['id']), fetched_volume_type['id'],
- 'The fetched Volume_type is different '
- 'from the created Volume_type')
- self.assertEqual(extra_specs, fetched_volume_type['extra_specs'],
- 'The fetched Volume_type is different '
- 'from the created Volume_type')
- except Exception:
- self.fail("Could not create a volume_type")
- finally:
- if body:
- resp, _ = self.client.delete_volume_type(body['id'])
- self.assertEqual(202, resp.status)
+ body = {}
+ name = rand_name("volume-type-")
+ extra_specs = {"storage_protocol": "iSCSI",
+ "vendor_name": "Open Source"}
+ resp, body = self.client.create_volume_type(
+ name,
+ extra_specs=extra_specs)
+ self.assertEqual(200, resp.status)
+ self.assertIn('id', body)
+ self.addCleanup(self._delete_volume_type, body['id'])
+ self.assertIn('name', body)
+ self.assertEqual(body['name'], name,
+ "The created volume_type name is not equal "
+ "to the requested name")
+ self.assertTrue(body['id'] is not None,
+ "Field volume_type id is empty or not found.")
+ resp, fetched_volume_type = self.client.get_volume_type(body['id'])
+ self.assertEqual(200, resp.status)
+ self.assertEqual(name, fetched_volume_type['name'],
+ 'The fetched Volume_type is different '
+ 'from the created Volume_type')
+ self.assertEqual(str(body['id']), fetched_volume_type['id'],
+ 'The fetched Volume_type is different '
+ 'from the created Volume_type')
+ self.assertEqual(extra_specs, fetched_volume_type['extra_specs'],
+ 'The fetched Volume_type is different '
+ 'from the created Volume_type')
diff --git a/tempest/api/volume/admin/test_volume_types_extra_specs.py b/tempest/api/volume/admin/test_volume_types_extra_specs.py
index 417f296..7d94f58 100644
--- a/tempest/api/volume/admin/test_volume_types_extra_specs.py
+++ b/tempest/api/volume/admin/test_volume_types_extra_specs.py
@@ -37,68 +37,59 @@
@attr(type='smoke')
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)
- self.assertTrue(type(body), dict)
- self.assertTrue('spec1' in body, "Incorrect volume type extra"
- " spec returned")
- except Exception:
- self.fail("Could not list volume types extra specs")
+ 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)
+ self.assertTrue(type(body), dict)
+ self.assertTrue('spec1' in body, "Incorrect volume type extra"
+ " spec returned")
@attr(type='gate')
def test_volume_type_extra_specs_update(self):
# Update volume type extra specs
- 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")
+ 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")
- 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")
+ 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")
@attr(type='smoke')
def test_volume_type_extra_spec_create_get_delete(self):
# Create/Get/Delete volume type extra spec.
- try:
- 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")
+ 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, _ = 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.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")
+ resp, _ = self.client.delete_volume_type_extra_specs(
+ self.volume_type['id'],
+ extra_specs.keys()[0])
+ self.assertEqual(202, resp.status)
diff --git a/tempest/api/volume/base.py b/tempest/api/volume/base.py
index 379baa2..7781647 100644
--- a/tempest/api/volume/base.py
+++ b/tempest/api/volume/base.py
@@ -18,6 +18,7 @@
import time
from tempest import clients
+from tempest.common import isolated_creds
from tempest.openstack.common import log as logging
import tempest.test
@@ -30,14 +31,15 @@
@classmethod
def setUpClass(cls):
- cls.isolated_creds = []
+ super(BaseVolumeTest, cls).setUpClass()
+ cls.isolated_creds = isolated_creds.IsolatedCreds(cls.__name__)
if not cls.config.service_available.cinder:
skip_msg = ("%s skipped as Cinder is not available" % cls.__name__)
raise cls.skipException(skip_msg)
if cls.config.compute.allow_tenant_isolation:
- creds = cls._get_isolated_creds()
+ creds = cls.isolated_creds.get_primary_creds()
username, tenant_name, password = creds
os = clients.Manager(username=username,
password=password,
@@ -67,7 +69,8 @@
def tearDownClass(cls):
cls.clear_snapshots()
cls.clear_volumes()
- cls._clear_isolated_creds()
+ cls.isolated_creds.clear_isolated_creds()
+ super(BaseVolumeTest, cls).tearDownClass()
@classmethod
def create_snapshot(cls, volume_id=1, **kwargs):
@@ -149,7 +152,7 @@
"in configuration.")
raise cls.skipException(msg)
if cls.config.compute.allow_tenant_isolation:
- creds = cls._get_isolated_creds(admin=True)
+ creds = cls.isolated_creds.get_admin_creds()
admin_username, admin_tenant_name, admin_password = creds
cls.os_adm = clients.Manager(username=admin_username,
password=admin_password,
diff --git a/tempest/api/volume/test_volumes_get.py b/tempest/api/volume/test_volumes_get.py
index 39f61f3..2e90f16 100644
--- a/tempest/api/volume/test_volumes_get.py
+++ b/tempest/api/volume/test_volumes_get.py
@@ -28,76 +28,65 @@
super(VolumesGetTest, cls).setUpClass()
cls.client = cls.volumes_client
+ def _delete_volume(self, volume_id):
+ resp, _ = self.client.delete_volume(volume_id)
+ self.assertEqual(202, resp.status)
+ self.client.wait_for_resource_deletion(volume_id)
+
def _volume_create_get_delete(self, **kwargs):
# Create a volume, Get it's details and Delete the volume
- try:
- volume = {}
- v_name = rand_name('Volume')
- metadata = {'Type': 'Test'}
- # Create a volume
- resp, volume = self.client.create_volume(size=1,
- display_name=v_name,
- metadata=metadata,
- **kwargs)
- self.assertEqual(200, resp.status)
- self.assertIn('id', volume)
- self.assertIn('display_name', volume)
- self.assertEqual(volume['display_name'], v_name,
- "The created volume name is not equal "
- "to the requested name")
- self.assertTrue(volume['id'] is not None,
- "Field volume id is empty or not found.")
- self.client.wait_for_volume_status(volume['id'], 'available')
- # Get Volume information
- resp, fetched_volume = self.client.get_volume(volume['id'])
- self.assertEqual(200, resp.status)
- self.assertEqual(v_name,
- fetched_volume['display_name'],
- 'The fetched Volume is different '
- 'from the created Volume')
- self.assertEqual(volume['id'],
- fetched_volume['id'],
- 'The fetched Volume is different '
- 'from the created Volume')
- self.assertEqual(metadata,
- fetched_volume['metadata'],
- 'The fetched Volume is different '
- 'from the created Volume')
- except Exception:
- self.fail("Could not create a volume")
- finally:
- if volume:
- # Delete the Volume if it was created
- resp, _ = self.client.delete_volume(volume['id'])
- self.assertEqual(202, resp.status)
- self.client.wait_for_resource_deletion(volume['id'])
+ volume = {}
+ v_name = rand_name('Volume')
+ metadata = {'Type': 'Test'}
+ # Create a volume
+ resp, volume = self.client.create_volume(size=1,
+ display_name=v_name,
+ metadata=metadata,
+ **kwargs)
+ self.assertEqual(200, resp.status)
+ self.assertIn('id', volume)
+ self.addCleanup(self._delete_volume, volume['id'])
+ self.assertIn('display_name', volume)
+ self.assertEqual(volume['display_name'], v_name,
+ "The created volume name is not equal "
+ "to the requested name")
+ self.assertTrue(volume['id'] is not None,
+ "Field volume id is empty or not found.")
+ self.client.wait_for_volume_status(volume['id'], 'available')
+ # Get Volume information
+ resp, fetched_volume = self.client.get_volume(volume['id'])
+ self.assertEqual(200, resp.status)
+ self.assertEqual(v_name,
+ fetched_volume['display_name'],
+ 'The fetched Volume is different '
+ 'from the created Volume')
+ self.assertEqual(volume['id'],
+ fetched_volume['id'],
+ 'The fetched Volume is different '
+ 'from the created Volume')
+ self.assertEqual(metadata,
+ fetched_volume['metadata'],
+ 'The fetched Volume is different '
+ 'from the created Volume')
@attr(type='gate')
def test_volume_get_metadata_none(self):
# Create a volume without passing metadata, get details, and delete
- try:
- volume = {}
- v_name = rand_name('Volume-')
- # Create a volume without metadata
- resp, volume = self.client.create_volume(size=1,
- display_name=v_name,
- metadata={})
- self.assertEqual(200, resp.status)
- self.assertIn('id', volume)
- self.assertIn('display_name', volume)
- self.client.wait_for_volume_status(volume['id'], 'available')
- # GET Volume
- resp, fetched_volume = self.client.get_volume(volume['id'])
- self.assertEqual(200, resp.status)
- self.assertEqual(fetched_volume['metadata'], {})
- except Exception:
- self.fail("Could not get volume metadata")
- finally:
- if volume:
- # Delete the Volume if it was created
- resp, _ = self.client.delete_volume(volume['id'])
- self.assertEqual(202, resp.status)
- self.client.wait_for_resource_deletion(volume['id'])
+ volume = {}
+ v_name = rand_name('Volume-')
+ # Create a volume without metadata
+ resp, volume = self.client.create_volume(size=1,
+ display_name=v_name,
+ metadata={})
+ self.assertEqual(200, resp.status)
+ self.assertIn('id', volume)
+ self.addCleanup(self._delete_volume, volume['id'])
+ self.assertIn('display_name', volume)
+ self.client.wait_for_volume_status(volume['id'], 'available')
+ # GET Volume
+ resp, fetched_volume = self.client.get_volume(volume['id'])
+ self.assertEqual(200, resp.status)
+ self.assertEqual(fetched_volume['metadata'], {})
@attr(type='smoke')
def test_volume_create_get_delete(self):
diff --git a/tempest/common/isolated_creds.py b/tempest/common/isolated_creds.py
new file mode 100644
index 0000000..22e1bd2
--- /dev/null
+++ b/tempest/common/isolated_creds.py
@@ -0,0 +1,248 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2013 IBM Corp.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import keystoneclient.v2_0.client
+
+from tempest import clients
+from tempest.common.utils.data_utils import rand_name
+from tempest import config
+from tempest import exceptions
+from tempest.openstack.common import log as logging
+
+LOG = logging.getLogger(__name__)
+
+
+class IsolatedCreds(object):
+
+ def __init__(self, name, tempest_client=True, interface='json',
+ password='pass'):
+ self.isolated_creds = {}
+ self.name = name
+ self.config = config.TempestConfig()
+ self.tempest_client = tempest_client
+ self.interface = interface
+ self.password = password
+ self.admin_client = self._get_identity_admin_client()
+
+ def _get_keystone_client(self):
+ username = self.config.identity.admin_username
+ password = self.config.identity.admin_password
+ tenant_name = self.config.identity.admin_tenant_name
+ auth_url = self.config.identity.uri
+ dscv = self.config.identity.disable_ssl_certificate_validation
+ return keystoneclient.v2_0.client.Client(username=username,
+ password=password,
+ tenant_name=tenant_name,
+ auth_url=auth_url,
+ insecure=dscv)
+
+ def _get_identity_admin_client(self):
+ """
+ Returns an instance of the Identity Admin API client
+ """
+ if self.tempest_client:
+ os = clients.AdminManager(interface=self.interface)
+ admin_client = os.identity_client
+ else:
+ admin_client = self._get_keystone_client()
+ return admin_client
+
+ def _create_tenant(self, name, description):
+ if self.tempest_client:
+ resp, tenant = self.admin_client.create_tenant(
+ name=name, description=description)
+ else:
+ tenant = self.admin_client.tenants.create(name,
+ description=description)
+ return tenant
+
+ def _get_tenant_by_name(self, name):
+ if self.tempest_client:
+ resp, tenant = self.admin_client.get_tenant_by_name(name)
+ else:
+ tenants = self.admin_client.tenants.list()
+ for ten in tenants:
+ if ten['name'] == name:
+ tenant = ten
+ raise exceptions.NotFound('No such tenant')
+ return tenant
+
+ def _create_user(self, username, password, tenant, email):
+ if self.tempest_client:
+ resp, user = self.admin_client.create_user(username, password,
+ tenant['id'], email)
+ else:
+ user = self.admin_client.users.create(username, password, email,
+ tenant_id=tenant.id)
+ return user
+
+ def _get_user(self, tenant, username):
+ if self.tempest_client:
+ resp, user = self.admin_client.get_user_by_username(tenant['id'],
+ username)
+ else:
+ user = self.admin_client.users.get(username)
+ return user
+
+ def _list_roles(self):
+ if self.tempest_client:
+ resp, roles = self.admin_client.list_roles()
+ else:
+ roles = self.admin_client.roles.list()
+ return roles
+
+ def _assign_user_role(self, tenant, user, role):
+ if self.tempest_client:
+ self.admin_client.assign_user_role(tenant, user, role)
+ else:
+ self.admin_client.roles.add_user_role(user, role, tenant=tenant)
+
+ def _delete_user(self, user):
+ if self.tempest_client:
+ self.admin_client.delete_user(user)
+ else:
+ self.admin_client.users.delete(user)
+
+ def _delete_tenant(self, tenant):
+ if self.tempest_client:
+ self.admin_client.delete_tenant(tenant)
+ else:
+ self.admin_client.tenants.delete(tenant)
+
+ def _create_creds(self, suffix=None, admin=False):
+ rand_name_root = rand_name(self.name)
+ if suffix:
+ rand_name_root += suffix
+ tenant_name = rand_name_root + "-tenant"
+ tenant_desc = tenant_name + "-desc"
+ rand_name_root = rand_name(self.name)
+ tenant = self._create_tenant(name=tenant_name,
+ description=tenant_desc)
+ if suffix:
+ rand_name_root += suffix
+ username = rand_name_root + "-user"
+ email = rand_name_root + "@example.com"
+ user = self._create_user(username, self.password,
+ tenant, email)
+ if admin:
+ role = None
+ try:
+ roles = self._list_roles()
+ if self.tempest_client:
+ role = next(r for r in roles if r['name'] == 'admin')
+ else:
+ role = next(r for r in roles if r.name == 'admin')
+ except StopIteration:
+ msg = "No admin role found"
+ raise exceptions.NotFound(msg)
+ if self.tempest_client:
+ self._assign_user_role(tenant['id'], user['id'], role['id'])
+ else:
+ self._assign_user_role(tenant.id, user.id, role.id)
+ return user, tenant
+
+ def _get_cred_names(self, user, tenant):
+ if self.tempest_client:
+ username = user.get('name')
+ tenant_name = tenant.get('name')
+ else:
+ username = user.name
+ tenant_name = tenant.name
+ return username, tenant_name
+
+ def get_primary_tenant(self):
+ return self.isolated_creds.get('primary')[1]
+
+ def get_primary_user(self):
+ return self.isolated_creds.get('primary')[0]
+
+ def get_alt_tenant(self):
+ return self.isolated_creds.get('alt')[1]
+
+ def get_alt_user(self):
+ return self.isolated_creds.get('alt')[0]
+
+ def get_admin_tenant(self):
+ return self.isolated_creds.get('admin')[1]
+
+ def get_admin_user(self):
+ return self.isolated_creds.get('admin')[0]
+
+ def get_primary_creds(self):
+ if self.isolated_creds.get('primary'):
+ user, tenant = self.isolated_creds['primary']
+ username, tenant_name = self._get_cred_names(user, tenant)
+ else:
+ user, tenant = self._create_creds()
+ username, tenant_name = self._get_cred_names(user, tenant)
+ self.isolated_creds['primary'] = (user, tenant)
+ LOG.info("Aquired isolated creds:\n user: %s, tenant: %s"
+ % (username, tenant_name))
+ return username, tenant_name, self.password
+
+ def get_admin_creds(self):
+ if self.isolated_creds.get('admin'):
+ user, tenant = self.isolated_creds['admin']
+ username, tenant_name = self._get_cred_names(user, tenant)
+ else:
+ user, tenant = self._create_creds(admin=True)
+ username, tenant_name = self._get_cred_names(user, tenant)
+ self.isolated_creds['admin'] = (user, tenant)
+ LOG.info("Aquired admin isolated creds:\n user: %s, tenant: %s"
+ % (username, tenant_name))
+ return username, tenant_name, self.password
+
+ def get_alt_creds(self):
+ if self.isolated_creds.get('alt'):
+ user, tenant = self.isolated_creds['alt']
+ username, tenant_name = self._get_cred_names(user, tenant)
+ else:
+ user, tenant = self._create_creds()
+ username, tenant_name = self._get_cred_names(user, tenant)
+ self.isolated_creds['alt'] = (user, tenant)
+ LOG.info("Aquired alt isolated creds:\n user: %s, tenant: %s"
+ % (username, tenant_name))
+ return username, tenant_name, self.password
+
+ def clear_isolated_creds(self):
+ if not self.isolated_creds:
+ return
+ for cred in self.isolated_creds:
+ user, tenant = self.isolated_creds.get(cred)
+ try:
+ if self.tempest_client:
+ self._delete_user(user['id'])
+ else:
+ self._delete_user(user.id)
+ except exceptions.NotFound:
+ if self.tempest_client:
+ name = user['name']
+ else:
+ name = user.name
+ LOG.warn("user with name: %s not found for delete" % name)
+ pass
+ try:
+ if self.tempest_client:
+ self._delete_tenant(tenant['id'])
+ else:
+ self._delete_tenant(tenant.id)
+ except exceptions.NotFound:
+ if self.tempest_client:
+ name = tenant['name']
+ else:
+ name = tenant.name
+ LOG.warn("tenant with name: %s not found for delete" % name)
+ pass
diff --git a/tempest/common/rest_client.py b/tempest/common/rest_client.py
index 09b87b2..759ab81 100644
--- a/tempest/common/rest_client.py
+++ b/tempest/common/rest_client.py
@@ -166,7 +166,8 @@
elif resp.status == 401:
raise exceptions.AuthenticationFailure(user=user,
- password=password)
+ password=password,
+ tenant=tenant_name)
raise exceptions.IdentityError('Unexpected status code {0}'.format(
resp.status))
diff --git a/tempest/common/ssh.py b/tempest/common/ssh.py
index 04cc851..be350c8 100644
--- a/tempest/common/ssh.py
+++ b/tempest/common/ssh.py
@@ -112,10 +112,10 @@
channel.shutdown_write()
out_data = []
err_data = []
-
- select_params = [channel], [], [], self.channel_timeout
+ poll = select.poll()
+ poll.register(channel, select.POLLIN)
while True:
- ready = select.select(*select_params)
+ ready = poll.poll(self.channel_timeout)
if not any(ready):
raise exceptions.TimeoutException(
"Command: '{0}' executed on host '{1}'.".format(
diff --git a/tempest/exceptions.py b/tempest/exceptions.py
index 448fbdf..62bd8cf 100644
--- a/tempest/exceptions.py
+++ b/tempest/exceptions.py
@@ -105,7 +105,7 @@
class AuthenticationFailure(RestClientException):
message = ("Authentication with user %(user)s and password "
- "%(password)s failed")
+ "%(password)s failed auth using tenant %(tenant)s.")
class EndpointNotFound(TempestException):
diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index c95e867..d0f0127 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -29,6 +29,7 @@
from tempest.api.network import common as net_common
+from tempest.common import isolated_creds
from tempest.common import ssh
from tempest.common.utils.data_utils import rand_name
import tempest.manager
@@ -48,26 +49,24 @@
NOVACLIENT_VERSION = '2'
CINDERCLIENT_VERSION = '1'
- def __init__(self):
+ def __init__(self, username, password, tenant_name):
super(OfficialClientManager, self).__init__()
- self.compute_client = self._get_compute_client()
+ self.compute_client = self._get_compute_client(username,
+ password,
+ tenant_name)
+ self.identity_client = self._get_identity_client(username,
+ password,
+ tenant_name)
self.image_client = self._get_image_client()
- self.identity_client = self._get_identity_client()
self.network_client = self._get_network_client()
- self.volume_client = self._get_volume_client()
+ self.volume_client = self._get_volume_client(username,
+ password,
+ tenant_name)
- def _get_compute_client(self, username=None, password=None,
- tenant_name=None):
+ def _get_compute_client(self, username, password, tenant_name):
# Novaclient will not execute operations for anyone but the
# identified user, so a new client needs to be created for
# each user that operations need to be performed for.
- if not username:
- username = self.config.identity.username
- if not password:
- password = self.config.identity.password
- if not tenant_name:
- tenant_name = self.config.identity.tenant_name
-
self._validate_credentials(username, password, tenant_name)
auth_url = self.config.identity.uri
@@ -84,23 +83,14 @@
insecure=dscv)
def _get_image_client(self):
- keystone = self._get_identity_client()
- token = keystone.auth_token
- endpoint = keystone.service_catalog.url_for(service_type='image',
- endpoint_type='publicURL')
+ token = self.identity_client.auth_token
+ endpoint = self.identity_client.service_catalog.url_for(
+ service_type='image', endpoint_type='publicURL')
dscv = self.config.identity.disable_ssl_certificate_validation
return glanceclient.Client('1', endpoint=endpoint, token=token,
insecure=dscv)
- def _get_volume_client(self, username=None, password=None,
- tenant_name=None):
- if not username:
- username = self.config.identity.username
- if not password:
- password = self.config.identity.password
- if not tenant_name:
- tenant_name = self.config.identity.tenant_name
-
+ def _get_volume_client(self, username, password, tenant_name):
auth_url = self.config.identity.uri
return cinderclient.client.Client(self.CINDERCLIENT_VERSION,
username,
@@ -108,17 +98,9 @@
tenant_name,
auth_url)
- def _get_identity_client(self, username=None, password=None,
- tenant_name=None):
+ def _get_identity_client(self, username, password, tenant_name):
# This identity client is not intended to check the security
# of the identity service, so use admin credentials by default.
- if not username:
- username = self.config.identity.admin_username
- if not password:
- password = self.config.identity.admin_password
- if not tenant_name:
- tenant_name = self.config.identity.admin_tenant_name
-
self._validate_credentials(username, password, tenant_name)
auth_url = self.config.identity.uri
@@ -168,7 +150,18 @@
@classmethod
def setUpClass(cls):
- cls.manager = OfficialClientManager()
+ super(OfficialClientTest, cls).setUpClass()
+ cls.isolated_creds = isolated_creds.IsolatedCreds(
+ __name__, tempest_client=False)
+ if cls.config.compute.allow_tenant_isolation:
+ creds = cls.isolated_creds.get_primary_creds()
+ username, tenant_name, password = creds
+ else:
+ username = cls.config.identity.username
+ password = cls.config.identity.password
+ tenant_name = cls.config.identity.tenant_name
+
+ cls.manager = OfficialClientManager(username, password, tenant_name)
cls.compute_client = cls.manager.compute_client
cls.image_client = cls.manager.image_client
cls.identity_client = cls.manager.identity_client
@@ -216,6 +209,8 @@
# Block until resource deletion has completed or timed-out
tempest.test.call_until_true(is_deletion_complete, 10, 1)
+ cls.isolated_creds.clear_isolated_creds()
+ super(OfficialClientTest, cls).tearDownClass()
@classmethod
def set_resource(cls, key, thing):
diff --git a/tempest/services/botoclients.py b/tempest/services/botoclients.py
index 32ec109..66fb7af 100644
--- a/tempest/services/botoclients.py
+++ b/tempest/services/botoclients.py
@@ -180,7 +180,7 @@
:return: Returns with the first available zone name
"""
for zone in self.get_all_zones():
- #NOTE(afazekas): zone.region_name was None
+ # NOTE(afazekas): zone.region_name was None
if (zone.state == "available" and
zone.region.name == self.connection_data["region"].name):
return zone.name
diff --git a/tempest/services/compute/json/flavors_client.py b/tempest/services/compute/json/flavors_client.py
index 1b965f3..5f58c43 100644
--- a/tempest/services/compute/json/flavors_client.py
+++ b/tempest/services/compute/json/flavors_client.py
@@ -79,9 +79,9 @@
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
+ # 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:
diff --git a/tempest/services/compute/json/keypairs_client.py b/tempest/services/compute/json/keypairs_client.py
index 90b2096..a464816 100644
--- a/tempest/services/compute/json/keypairs_client.py
+++ b/tempest/services/compute/json/keypairs_client.py
@@ -30,11 +30,11 @@
def list_keypairs(self):
resp, body = self.get("os-keypairs")
body = json.loads(body)
- #Each returned keypair is embedded within an unnecessary 'keypair'
- #element which is a deviation from other resources like floating-ips,
- #servers, etc. A bug?
- #For now we shall adhere to the spec, but the spec for keypairs
- #is yet to be found
+ # Each returned keypair is embedded within an unnecessary 'keypair'
+ # element which is a deviation from other resources like floating-ips,
+ # servers, etc. A bug?
+ # For now we shall adhere to the spec, but the spec for keypairs
+ # is yet to be found
return resp, body['keypairs']
def get_keypair(self, key_name):
diff --git a/tempest/services/compute/xml/flavors_client.py b/tempest/services/compute/xml/flavors_client.py
index a6451df..3a8986c 100644
--- a/tempest/services/compute/xml/flavors_client.py
+++ b/tempest/services/compute/xml/flavors_client.py
@@ -30,6 +30,8 @@
"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"
+XMLNS_OS_FLV_WITH_EXT_SPECS = \
+ "http://docs.openstack.org/compute/ext/flavor_with_extra_specs/api/v2.0"
class FlavorsClientXML(RestClientXML):
@@ -49,6 +51,11 @@
if k == '{%s}ephemeral' % XMLNS_OS_FLV_EXT_DATA:
k = 'OS-FLV-EXT-DATA:ephemeral'
+ if k == '{%s}extra_specs' % XMLNS_OS_FLV_WITH_EXT_SPECS:
+ k = 'OS-FLV-WITH-EXT-SPECS:extra_specs'
+ flavor[k] = dict(v)
+ continue
+
try:
v = int(v)
except ValueError:
@@ -117,9 +124,9 @@
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
+ # 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:
diff --git a/tempest/services/image/v1/json/image_client.py b/tempest/services/image/v1/json/image_client.py
index bd48068..1921d78 100644
--- a/tempest/services/image/v1/json/image_client.py
+++ b/tempest/services/image/v1/json/image_client.py
@@ -247,13 +247,13 @@
data = json.loads(data)
return resp, data
- #NOTE(afazekas): just for the wait function
+ # NOTE(afazekas): just for the wait function
def _get_image_status(self, image_id):
resp, meta = self.get_image_meta(image_id)
status = meta['status']
return status
- #NOTE(afazkas): Wait reinvented again. It is not in the correct layer
+ # NOTE(afazkas): Wait reinvented again. It is not in the correct layer
def wait_for_image_status(self, image_id, status):
"""Waits for a Image to reach a given status."""
start_time = time.time()
diff --git a/tempest/services/object_storage/account_client.py b/tempest/services/object_storage/account_client.py
index ce4b127..8defbbb 100644
--- a/tempest/services/object_storage/account_client.py
+++ b/tempest/services/object_storage/account_client.py
@@ -102,7 +102,7 @@
super(AccountClientCustomizedHeader, self).__init__(config, username,
password, auth_url,
tenant_name)
- #Overwrites json-specific header encoding in RestClient
+ # Overwrites json-specific header encoding in RestClient
self.service = self.config.object_storage.catalog_type
self.format = 'json'
diff --git a/tempest/services/object_storage/container_client.py b/tempest/services/object_storage/container_client.py
index 93477fa..dd5f3ec 100644
--- a/tempest/services/object_storage/container_client.py
+++ b/tempest/services/object_storage/container_client.py
@@ -26,7 +26,7 @@
super(ContainerClient, self).__init__(config, username, password,
auth_url, tenant_name)
- #Overwrites json-specific header encoding in RestClient
+ # Overwrites json-specific header encoding in RestClient
self.headers = {}
self.service = self.config.object_storage.catalog_type
self.format = 'json'
@@ -94,8 +94,8 @@
item count is beyond 10,000 item listing limit.
Does not require any paramaters aside from container name.
"""
- #TODO(dwalleck): Rewite using json format to avoid newlines at end of
- #obj names. Set limit to API limit - 1 (max returned items = 9999)
+ # TODO(dwalleck): Rewite using json format to avoid newlines at end of
+ # obj names. Set limit to API limit - 1 (max returned items = 9999)
limit = 9999
if params is not None:
if 'limit' in params:
@@ -114,16 +114,16 @@
if len(objlist) >= limit:
- #Increment marker
+ # Increment marker
marker = objlist[len(objlist) - 1]
- #Get the next chunk of the list
+ # Get the next chunk of the list
objlist.extend(_list_all_container_objects(container,
params={'marker': marker,
'limit': limit}))
return objlist
else:
- #Return final, complete list
+ # Return final, complete list
return objlist"""
def list_container_contents(self, container, params=None):
diff --git a/tempest/services/object_storage/object_client.py b/tempest/services/object_storage/object_client.py
index c894612..181838e 100644
--- a/tempest/services/object_storage/object_client.py
+++ b/tempest/services/object_storage/object_client.py
@@ -155,7 +155,7 @@
super(ObjectClientCustomizedHeader, self).__init__(config, username,
password, auth_url,
tenant_name)
- #Overwrites json-specific header encoding in RestClient
+ # Overwrites json-specific header encoding in RestClient
self.service = self.config.object_storage.catalog_type
self.format = 'json'
diff --git a/tempest/services/volume/json/snapshots_client.py b/tempest/services/volume/json/snapshots_client.py
index 034b452..ce2da90 100644
--- a/tempest/services/volume/json/snapshots_client.py
+++ b/tempest/services/volume/json/snapshots_client.py
@@ -76,11 +76,11 @@
body = json.loads(body)
return resp, body['snapshot']
- #NOTE(afazekas): just for the wait function
+ # NOTE(afazekas): just for the wait function
def _get_snapshot_status(self, snapshot_id):
resp, body = self.get_snapshot(snapshot_id)
status = body['status']
- #NOTE(afazekas): snapshot can reach an "error"
+ # NOTE(afazekas): snapshot can reach an "error"
# state in a "normal" lifecycle
if (status == 'error'):
raise exceptions.SnapshotBuildErrorException(
@@ -88,7 +88,7 @@
return status
- #NOTE(afazkas): Wait reinvented again. It is not in the correct layer
+ # NOTE(afazkas): Wait reinvented again. It is not in the correct layer
def wait_for_snapshot_status(self, snapshot_id, status):
"""Waits for a Snapshot to reach a given status."""
start_time = time.time()
diff --git a/tempest/services/volume/xml/snapshots_client.py b/tempest/services/volume/xml/snapshots_client.py
index 017ca95..51c46da 100644
--- a/tempest/services/volume/xml/snapshots_client.py
+++ b/tempest/services/volume/xml/snapshots_client.py
@@ -81,7 +81,7 @@
display_name: Optional snapshot Name.
display_description: User friendly snapshot description.
"""
- #NOTE(afazekas): it should use the volume namaspace
+ # NOTE(afazekas): it should use the volume namaspace
snapshot = Element("snapshot", xmlns=XMLNS_11, volume_id=volume_id)
for key, value in kwargs.items():
snapshot.add_attr(key, value)
@@ -90,11 +90,11 @@
body = xml_to_json(etree.fromstring(body))
return resp, body
- #NOTE(afazekas): just for the wait function
+ # NOTE(afazekas): just for the wait function
def _get_snapshot_status(self, snapshot_id):
resp, body = self.get_snapshot(snapshot_id)
status = body['status']
- #NOTE(afazekas): snapshot can reach an "error"
+ # NOTE(afazekas): snapshot can reach an "error"
# state in a "normal" lifecycle
if (status == 'error'):
raise exceptions.SnapshotBuildErrorException(
@@ -102,7 +102,7 @@
return status
- #NOTE(afazkas): Wait reinvented again. It is not in the correct layer
+ # NOTE(afazkas): Wait reinvented again. It is not in the correct layer
def wait_for_snapshot_status(self, snapshot_id, status):
"""Waits for a Snapshot to reach a given status."""
start_time = time.time()
diff --git a/tempest/services/volume/xml/volumes_client.py b/tempest/services/volume/xml/volumes_client.py
index 8eda26b..eaa3ae0 100644
--- a/tempest/services/volume/xml/volumes_client.py
+++ b/tempest/services/volume/xml/volumes_client.py
@@ -103,7 +103,7 @@
:param imageRef: When specified the volume is created from this
image
"""
- #NOTE(afazekas): it should use a volume namespace
+ # NOTE(afazekas): it should use a volume namespace
volume = Element("volume", xmlns=XMLNS_11, size=size)
if 'metadata' in kwargs:
diff --git a/tempest/test.py b/tempest/test.py
index 96360ff..7787790 100644
--- a/tempest/test.py
+++ b/tempest/test.py
@@ -15,6 +15,7 @@
# License for the specific language governing permissions and limitations
# under the License.
+import atexit
import os
import time
@@ -24,9 +25,7 @@
import testtools
from tempest import clients
-from tempest.common.utils.data_utils import rand_name
from tempest import config
-from tempest import exceptions
from tempest.openstack.common import log as logging
LOG = logging.getLogger(__name__)
@@ -93,6 +92,17 @@
LOG.info("Overriding skipException to nose SkipTest")
testtools.TestCase.skipException = nose.plugins.skip.SkipTest
+at_exit_set = set()
+
+
+def validate_tearDownClass():
+ if at_exit_set:
+ raise RuntimeError("tearDownClass does not calls the super's"
+ "tearDownClass in these classes: "
+ + str(at_exit_set))
+
+atexit.register(validate_tearDownClass)
+
class BaseTestCase(testtools.TestCase,
testtools.testcase.WithAttributes,
@@ -100,29 +110,43 @@
config = config.TempestConfig()
+ setUpClassCalled = False
+
@classmethod
def setUpClass(cls):
if hasattr(super(BaseTestCase, cls), 'setUpClass'):
super(BaseTestCase, cls).setUpClass()
+ cls.setUpClassCalled = True
- def setUp(cls):
- super(BaseTestCase, cls).setUp()
+ @classmethod
+ def tearDownClass(cls):
+ at_exit_set.remove(cls)
+ if hasattr(super(BaseTestCase, cls), 'tearDownClass'):
+ super(BaseTestCase, cls).tearDownClass()
+
+ def setUp(self):
+ super(BaseTestCase, self).setUp()
+ if not self.setUpClassCalled:
+ raise RuntimeError("setUpClass does not calls the super's"
+ "setUpClass in the "
+ + self.__class__.__name__)
+ at_exit_set.add(self.__class__)
test_timeout = os.environ.get('OS_TEST_TIMEOUT', 0)
try:
test_timeout = int(test_timeout)
except ValueError:
test_timeout = 0
if test_timeout > 0:
- cls.useFixture(fixtures.Timeout(test_timeout, gentle=True))
+ self.useFixture(fixtures.Timeout(test_timeout, gentle=True))
if (os.environ.get('OS_STDOUT_CAPTURE') == 'True' or
os.environ.get('OS_STDOUT_CAPTURE') == '1'):
- stdout = cls.useFixture(fixtures.StringStream('stdout')).stream
- cls.useFixture(fixtures.MonkeyPatch('sys.stdout', stdout))
+ stdout = self.useFixture(fixtures.StringStream('stdout')).stream
+ self.useFixture(fixtures.MonkeyPatch('sys.stdout', stdout))
if (os.environ.get('OS_STDERR_CAPTURE') == 'True' or
os.environ.get('OS_STDERR_CAPTURE') == '1'):
- stderr = cls.useFixture(fixtures.StringStream('stderr')).stream
- cls.useFixture(fixtures.MonkeyPatch('sys.stderr', stderr))
+ stderr = self.useFixture(fixtures.StringStream('stderr')).stream
+ self.useFixture(fixtures.MonkeyPatch('sys.stderr', stderr))
@classmethod
def _get_identity_admin_client(cls):
@@ -143,85 +167,6 @@
cls.config.identity.uri
)
- @classmethod
- def _get_isolated_creds(cls, admin=False):
- """
- Creates a new set of user/tenant/password credentials for a
- **regular** user of the Compute API so that a test case can
- operate in an isolated tenant container.
- """
- admin_client = cls._get_identity_admin_client()
- password = "pass"
-
- while True:
- try:
- rand_name_root = rand_name(cls.__name__)
- if cls.isolated_creds:
- # Main user already created. Create the alt or admin one...
- if admin:
- rand_name_root += '-admin'
- else:
- rand_name_root += '-alt'
- tenant_name = rand_name_root + "-tenant"
- tenant_desc = tenant_name + "-desc"
-
- resp, tenant = admin_client.create_tenant(
- name=tenant_name, description=tenant_desc)
- break
- except exceptions.Duplicate:
- if cls.config.compute.allow_tenant_reuse:
- tenant = admin_client.get_tenant_by_name(tenant_name)
- LOG.info('Re-using existing tenant %s', tenant)
- break
-
- while True:
- try:
- rand_name_root = rand_name(cls.__name__)
- if cls.isolated_creds:
- # Main user already created. Create the alt one...
- rand_name_root += '-alt'
- username = rand_name_root + "-user"
- email = rand_name_root + "@example.com"
- resp, user = admin_client.create_user(username,
- password,
- tenant['id'],
- email)
- break
- except exceptions.Duplicate:
- if cls.config.compute.allow_tenant_reuse:
- user = admin_client.get_user_by_username(tenant['id'],
- username)
- LOG.info('Re-using existing user %s', user)
- break
- # Store the complete creds (including UUID ids...) for later
- # but return just the username, tenant_name, password tuple
- # that the various clients will use.
- cls.isolated_creds.append((user, tenant))
-
- # Assign admin role if this is for admin creds
- if admin:
- _, roles = admin_client.list_roles()
- role = None
- try:
- _, roles = admin_client.list_roles()
- role = next(r for r in roles if r['name'] == 'admin')
- except StopIteration:
- msg = "No admin role found"
- raise exceptions.NotFound(msg)
- admin_client.assign_user_role(tenant['id'], user['id'], role['id'])
-
- return username, tenant_name, password
-
- @classmethod
- def _clear_isolated_creds(cls):
- if not cls.isolated_creds:
- return
- admin_client = cls._get_identity_admin_client()
-
- for user, tenant in cls.isolated_creds:
- admin_client.delete_user(user['id'])
- admin_client.delete_tenant(tenant['id'])
-
def call_until_true(func, duration, sleep_for):
"""
diff --git a/tempest/thirdparty/boto/test.py b/tempest/thirdparty/boto/test.py
index 8812a10..e0c9f06 100644
--- a/tempest/thirdparty/boto/test.py
+++ b/tempest/thirdparty/boto/test.py
@@ -197,6 +197,7 @@
@classmethod
def setUpClass(cls):
+ super(BotoTestCase, cls).setUpClass()
# The trash contains cleanup functions and paramaters in tuples
# (function, *args, **kwargs)
cls._resource_trash_bin = {}
@@ -261,6 +262,10 @@
LOG.exception(exc)
finally:
del cls._resource_trash_bin[key]
+ super(BotoTestCase, cls).tearDownClass()
+ # NOTE(afazekas): let the super called even on exceptions
+ # The real exceptions already logged, if the super throws another,
+ # does not causes hidden issues
if fail_count:
raise exceptions.TearDownException(num=fail_count)
diff --git a/tox.ini b/tox.ini
index dc8980d..471fecb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,6 +27,29 @@
commands =
sh tools/pretty_tox.sh '(?!.*\[.*\bslow\b.*\])(^tempest\.(api|scenario|thirdparty|cli)) {posargs}'
+[testenv:py26-full]
+sitepackages = True
+setenv = VIRTUAL_ENV={envdir}
+ NOSE_WITH_OPENSTACK=1
+ NOSE_OPENSTACK_COLOR=1
+ NOSE_OPENSTACK_RED=15
+ NOSE_OPENSTACK_YELLOW=3
+ NOSE_OPENSTACK_SHOW_ELAPSED=1
+ NOSE_OPENSTACK_STDOUT=1
+commands =
+ nosetests --logging-format '%(asctime)-15s %(message)s' --with-xunit -sv --xunit-file=nosetests-full.xml tempest/api tempest/scenario tempest/thirdparty tempest/cli {posargs}
+
+[testenv:py26-smoke]
+setenv = VIRTUAL_ENV={envdir}
+NOSE_WITH_OPENSTACK=1
+ NOSE_OPENSTACK_COLOR=1
+ NOSE_OPENSTACK_RED=15
+ NOSE_OPENSTACK_YELLOW=3
+ NOSE_OPENSTACK_SHOW_ELAPSED=1
+ NOSE_OPENSTACK_STDOUT=1
+commands =
+ nosetests --logging-format '%(asctime)-15s %(message)s' --with-xunit -sv --attr=type=smoke --xunit-file=nosetests-smoke.xml tempest {posargs}
+
[testenv:smoke]
sitepackages = True
setenv = VIRTUAL_ENV={envdir}