openstack/tempest
Code Issues Proposed changes

Merge "Add config options for enabled extensions"

Browse Source
This commit is contained in:
Jenkins 2013-12-11 00:08:45 +00:00 committed by Gerrit Code Review
commit 9c9453f78d
13 changed files with 156 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
etc/tempest.conf.sample
View File

@ -524,6 +524,16 @@
#disk_format=raw #disk_format=raw
[debug]
#
# Options defined in tempest.config
#
# Enable diagnostic commands (boolean value)
#enable=true
[dashboard] [dashboard]
# #
@ -610,14 +620,15 @@
#operator_role=Member #operator_role=Member
[debug] [network-feature-enabled]
# #
# Options defined in tempest.config # Options defined in tempest.config
# #
# Enable diagnostic commands (boolean value) # A list of enabled extensions with a special entry all which
#enable=true # indicates every extension is enabled (list value)
#api_extensions=all
[service_available] [service_available]
@ -671,8 +682,13 @@
# If false, skip disk config tests (boolean value) # If false, skip disk config tests (boolean value)
#disk_config=true #disk_config=true
# If false, skip flavor extra data test (boolean value) # A list of enabled extensions with a special entry all which
#flavor_extra=true # indicates every extension is enabled (list value)
#api_extensions=all
# A list of enabled v3 extensions with a special entry all
# which indicates every extension is enabled (list value)
#api_v3_extensions=all
# Does the test environment support changing the admin # Does the test environment support changing the admin
# password? (boolean value) # password? (boolean value)
@ -730,4 +746,8 @@
# (boolean value) # (boolean value)
#multi_backend=false #multi_backend=false
# A list of enabled extensions with a special entry all which
# indicates every extension is enabled (list value)
#api_extensions=all

1
tempest/api/compute/__init__.py
View File

@ -26,7 +26,6 @@ CREATE_IMAGE_ENABLED = CONFIG.compute_feature_enabled.create_image
RESIZE_AVAILABLE = CONFIG.compute_feature_enabled.resize RESIZE_AVAILABLE = CONFIG.compute_feature_enabled.resize
CHANGE_PASSWORD_AVAILABLE = CONFIG.compute_feature_enabled.change_password CHANGE_PASSWORD_AVAILABLE = CONFIG.compute_feature_enabled.change_password
DISK_CONFIG_ENABLED = CONFIG.compute_feature_enabled.disk_config DISK_CONFIG_ENABLED = CONFIG.compute_feature_enabled.disk_config
FLAVOR_EXTRA_DATA_ENABLED = CONFIG.compute_feature_enabled.flavor_extra
MULTI_USER = True MULTI_USER = True

40
tempest/api/compute/admin/test_flavors.py
View File

@ -17,12 +17,10 @@
import uuid import uuid
from tempest.api import compute
from tempest.api.compute import base from tempest.api.compute import base
from tempest.common.utils import data_utils from tempest.common.utils import data_utils
from tempest import exceptions from tempest import exceptions
from tempest.test import attr from tempest import test
from tempest.test import skip_because
class FlavorsAdminTestJSON(base.BaseV2ComputeAdminTest): class FlavorsAdminTestJSON(base.BaseV2ComputeAdminTest):
@ -36,7 +34,7 @@ class FlavorsAdminTestJSON(base.BaseV2ComputeAdminTest):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
super(FlavorsAdminTestJSON, cls).setUpClass() super(FlavorsAdminTestJSON, cls).setUpClass()
if not compute.FLAVOR_EXTRA_DATA_ENABLED: if not test.is_extension_enabled('FlavorExtraData', 'compute'):
msg = "FlavorExtraData extension not enabled." msg = "FlavorExtraData extension not enabled."
raise cls.skipException(msg) raise cls.skipException(msg)
@ -87,19 +85,19 @@ class FlavorsAdminTestJSON(base.BaseV2ComputeAdminTest):
return flavor['id'] return flavor['id']
@attr(type='gate') @test.attr(type='gate')
def test_create_flavor_with_int_id(self): def test_create_flavor_with_int_id(self):
flavor_id = data_utils.rand_int_id(start=1000) flavor_id = data_utils.rand_int_id(start=1000)
new_flavor_id = self._create_flavor(flavor_id) new_flavor_id = self._create_flavor(flavor_id)
self.assertEqual(new_flavor_id, str(flavor_id)) self.assertEqual(new_flavor_id, str(flavor_id))
@attr(type='gate') @test.attr(type='gate')
def test_create_flavor_with_uuid_id(self): def test_create_flavor_with_uuid_id(self):
flavor_id = str(uuid.uuid4()) flavor_id = str(uuid.uuid4())
new_flavor_id = self._create_flavor(flavor_id) new_flavor_id = self._create_flavor(flavor_id)
self.assertEqual(new_flavor_id, flavor_id) self.assertEqual(new_flavor_id, flavor_id)
@attr(type='gate') @test.attr(type='gate')
def test_create_flavor_with_none_id(self): def test_create_flavor_with_none_id(self):
# If nova receives a request with None as flavor_id, # If nova receives a request with None as flavor_id,
# nova generates flavor_id of uuid. # nova generates flavor_id of uuid.
@ -107,7 +105,7 @@ class FlavorsAdminTestJSON(base.BaseV2ComputeAdminTest):
new_flavor_id = self._create_flavor(flavor_id) new_flavor_id = self._create_flavor(flavor_id)
self.assertEqual(new_flavor_id, str(uuid.UUID(new_flavor_id))) self.assertEqual(new_flavor_id, str(uuid.UUID(new_flavor_id)))
@attr(type='gate') @test.attr(type='gate')
def test_create_flavor_verify_entry_in_list_details(self): def test_create_flavor_verify_entry_in_list_details(self):
# Create a flavor and ensure it's details are listed # Create a flavor and ensure it's details are listed
# This operation requires the user to have 'admin' role # This operation requires the user to have 'admin' role
@ -132,7 +130,7 @@ class FlavorsAdminTestJSON(base.BaseV2ComputeAdminTest):
flag = True flag = True
self.assertTrue(flag) self.assertTrue(flag)
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_get_flavor_details_for_deleted_flavor(self): def test_get_flavor_details_for_deleted_flavor(self):
# Delete a flavor and ensure it is not listed # Delete a flavor and ensure it is not listed
# Create a test flavor # Create a test flavor
@ -166,7 +164,7 @@ class FlavorsAdminTestJSON(base.BaseV2ComputeAdminTest):
flag = False flag = False
self.assertTrue(flag) self.assertTrue(flag)
@attr(type='gate') @test.attr(type='gate')
def test_create_list_flavor_without_extra_data(self): def test_create_list_flavor_without_extra_data(self):
# Create a flavor and ensure it is listed # Create a flavor and ensure it is listed
# This operation requires the user to have 'admin' role # This operation requires the user to have 'admin' role
@ -210,8 +208,8 @@ class FlavorsAdminTestJSON(base.BaseV2ComputeAdminTest):
flag = True flag = True
self.assertTrue(flag) self.assertTrue(flag)
@skip_because(bug="1209101") @test.skip_because(bug="1209101")
@attr(type='gate') @test.attr(type='gate')
def test_list_non_public_flavor(self): def test_list_non_public_flavor(self):
# Create a flavor with os-flavor-access:is_public false should # Create a flavor with os-flavor-access:is_public false should
# be present in list_details. # be present in list_details.
@ -244,7 +242,7 @@ class FlavorsAdminTestJSON(base.BaseV2ComputeAdminTest):
flag = True flag = True
self.assertFalse(flag) self.assertFalse(flag)
@attr(type='gate') @test.attr(type='gate')
def test_create_server_with_non_public_flavor(self): def test_create_server_with_non_public_flavor(self):
# Create a flavor with os-flavor-access:is_public false # Create a flavor with os-flavor-access:is_public false
flavor_name = data_utils.rand_name(self.flavor_name_prefix) flavor_name = data_utils.rand_name(self.flavor_name_prefix)
@ -264,7 +262,7 @@ class FlavorsAdminTestJSON(base.BaseV2ComputeAdminTest):
self.os.servers_client.create_server, self.os.servers_client.create_server,
'test', self.image_ref, flavor['id']) 'test', self.image_ref, flavor['id'])
@attr(type='gate') @test.attr(type='gate')
def test_list_public_flavor_with_other_user(self): def test_list_public_flavor_with_other_user(self):
# Create a Flavor with public access. # Create a Flavor with public access.
# Try to List/Get flavor with another user # Try to List/Get flavor with another user
@ -288,7 +286,7 @@ class FlavorsAdminTestJSON(base.BaseV2ComputeAdminTest):
flag = True flag = True
self.assertTrue(flag) self.assertTrue(flag)
@attr(type='gate') @test.attr(type='gate')
def test_is_public_string_variations(self): def test_is_public_string_variations(self):
flavor_id_not_public = data_utils.rand_int_id(start=1000) flavor_id_not_public = data_utils.rand_int_id(start=1000)
flavor_name_not_public = data_utils.rand_name(self.flavor_name_prefix) flavor_name_not_public = data_utils.rand_name(self.flavor_name_prefix)
@ -331,7 +329,7 @@ class FlavorsAdminTestJSON(base.BaseV2ComputeAdminTest):
_test_string_variations(['t', 'true', 'yes', '1'], _test_string_variations(['t', 'true', 'yes', '1'],
flavor_name_public) flavor_name_public)
@attr(type='gate') @test.attr(type='gate')
def test_create_flavor_using_string_ram(self): def test_create_flavor_using_string_ram(self):
flavor_name = data_utils.rand_name(self.flavor_name_prefix) flavor_name = data_utils.rand_name(self.flavor_name_prefix)
new_flavor_id = data_utils.rand_int_id(start=1000) new_flavor_id = data_utils.rand_int_id(start=1000)
@ -349,13 +347,13 @@ class FlavorsAdminTestJSON(base.BaseV2ComputeAdminTest):
self.assertEqual(flavor['ram'], int(ram)) self.assertEqual(flavor['ram'], int(ram))
self.assertEqual(int(flavor['id']), new_flavor_id) self.assertEqual(int(flavor['id']), new_flavor_id)
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_invalid_is_public_string(self): def test_invalid_is_public_string(self):
self.assertRaises(exceptions.BadRequest, self.assertRaises(exceptions.BadRequest,
self.client.list_flavors_with_detail, self.client.list_flavors_with_detail,
{'is_public': 'invalid'}) {'is_public': 'invalid'})
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_create_flavor_as_user(self): def test_create_flavor_as_user(self):
flavor_name = data_utils.rand_name(self.flavor_name_prefix) flavor_name = data_utils.rand_name(self.flavor_name_prefix)
new_flavor_id = data_utils.rand_int_id(start=1000) new_flavor_id = data_utils.rand_int_id(start=1000)
@ -366,13 +364,13 @@ class FlavorsAdminTestJSON(base.BaseV2ComputeAdminTest):
new_flavor_id, ephemeral=self.ephemeral, new_flavor_id, ephemeral=self.ephemeral,
swap=self.swap, rxtx=self.rxtx) swap=self.swap, rxtx=self.rxtx)
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_delete_flavor_as_user(self): def test_delete_flavor_as_user(self):
self.assertRaises(exceptions.Unauthorized, self.assertRaises(exceptions.Unauthorized,
self.user_client.delete_flavor, self.user_client.delete_flavor,
self.flavor_ref_alt) self.flavor_ref_alt)
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_create_flavor_using_invalid_ram(self): def test_create_flavor_using_invalid_ram(self):
flavor_name = data_utils.rand_name(self.flavor_name_prefix) flavor_name = data_utils.rand_name(self.flavor_name_prefix)
new_flavor_id = data_utils.rand_int_id(start=1000) new_flavor_id = data_utils.rand_int_id(start=1000)
@ -382,7 +380,7 @@ class FlavorsAdminTestJSON(base.BaseV2ComputeAdminTest):
flavor_name, -1, self.vcpus, flavor_name, -1, self.vcpus,
self.disk, new_flavor_id) self.disk, new_flavor_id)
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_create_flavor_using_invalid_vcpus(self): def test_create_flavor_using_invalid_vcpus(self):
flavor_name = data_utils.rand_name(self.flavor_name_prefix) flavor_name = data_utils.rand_name(self.flavor_name_prefix)
new_flavor_id = data_utils.rand_int_id(start=1000) new_flavor_id = data_utils.rand_int_id(start=1000)

9
tempest/api/compute/admin/test_flavors_access.py
View File

@ -15,10 +15,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from tempest.api import compute
from tempest.api.compute import base from tempest.api.compute import base
from tempest.common.utils import data_utils from tempest.common.utils import data_utils
from tempest.test import attr from tempest import test
class FlavorsAccessTestJSON(base.BaseV2ComputeAdminTest): class FlavorsAccessTestJSON(base.BaseV2ComputeAdminTest):
@ -33,7 +32,7 @@ class FlavorsAccessTestJSON(base.BaseV2ComputeAdminTest):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
super(FlavorsAccessTestJSON, cls).setUpClass() super(FlavorsAccessTestJSON, cls).setUpClass()
if not compute.FLAVOR_EXTRA_DATA_ENABLED: if not test.is_extension_enabled('FlavorExtraData', 'compute'):
msg = "FlavorExtraData extension not enabled." msg = "FlavorExtraData extension not enabled."
raise cls.skipException(msg) raise cls.skipException(msg)
@ -51,7 +50,7 @@ class FlavorsAccessTestJSON(base.BaseV2ComputeAdminTest):
cls.vcpus = 1 cls.vcpus = 1
cls.disk = 10 cls.disk = 10
@attr(type='gate') @test.attr(type='gate')
def test_flavor_access_list_with_private_flavor(self): def test_flavor_access_list_with_private_flavor(self):
# Test to list flavor access successfully by querying private flavor # Test to list flavor access successfully by querying private flavor
flavor_name = data_utils.rand_name(self.flavor_name_prefix) flavor_name = data_utils.rand_name(self.flavor_name_prefix)
@ -70,7 +69,7 @@ class FlavorsAccessTestJSON(base.BaseV2ComputeAdminTest):
self.assertEqual(str(new_flavor_id), str(first_flavor['flavor_id'])) self.assertEqual(str(new_flavor_id), str(first_flavor['flavor_id']))
self.assertEqual(self.adm_tenant_id, first_flavor['tenant_id']) self.assertEqual(self.adm_tenant_id, first_flavor['tenant_id'])
@attr(type='gate') @test.attr(type='gate')
def test_flavor_access_add_remove(self): def test_flavor_access_add_remove(self):
# Test to add and remove flavor access to a given tenant. # Test to add and remove flavor access to a given tenant.
flavor_name = data_utils.rand_name(self.flavor_name_prefix) flavor_name = data_utils.rand_name(self.flavor_name_prefix)

15
tempest/api/compute/admin/test_flavors_access_negative.py
View File

@ -17,11 +17,10 @@
import uuid import uuid
from tempest.api import compute
from tempest.api.compute import base from tempest.api.compute import base
from tempest.common.utils import data_utils from tempest.common.utils import data_utils
from tempest import exceptions from tempest import exceptions
from tempest.test import attr from tempest import test
class FlavorsAccessNegativeTestJSON(base.BaseV2ComputeAdminTest): class FlavorsAccessNegativeTestJSON(base.BaseV2ComputeAdminTest):
@ -36,7 +35,7 @@ class FlavorsAccessNegativeTestJSON(base.BaseV2ComputeAdminTest):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
super(FlavorsAccessNegativeTestJSON, cls).setUpClass() super(FlavorsAccessNegativeTestJSON, cls).setUpClass()
if not compute.FLAVOR_EXTRA_DATA_ENABLED: if not test.is_extension_enabled('FlavorExtraData', 'compute'):
msg = "FlavorExtraData extension not enabled." msg = "FlavorExtraData extension not enabled."
raise cls.skipException(msg) raise cls.skipException(msg)
@ -54,7 +53,7 @@ class FlavorsAccessNegativeTestJSON(base.BaseV2ComputeAdminTest):
cls.vcpus = 1 cls.vcpus = 1
cls.disk = 10 cls.disk = 10
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_flavor_access_list_with_public_flavor(self): def test_flavor_access_list_with_public_flavor(self):
# Test to list flavor access with exceptions by querying public flavor # Test to list flavor access with exceptions by querying public flavor
flavor_name = data_utils.rand_name(self.flavor_name_prefix) flavor_name = data_utils.rand_name(self.flavor_name_prefix)
@ -70,7 +69,7 @@ class FlavorsAccessNegativeTestJSON(base.BaseV2ComputeAdminTest):
self.client.list_flavor_access, self.client.list_flavor_access,
new_flavor_id) new_flavor_id)
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_flavor_non_admin_add(self): def test_flavor_non_admin_add(self):
# Test to add flavor access as a user without admin privileges. # Test to add flavor access as a user without admin privileges.
flavor_name = data_utils.rand_name(self.flavor_name_prefix) flavor_name = data_utils.rand_name(self.flavor_name_prefix)
@ -86,7 +85,7 @@ class FlavorsAccessNegativeTestJSON(base.BaseV2ComputeAdminTest):
new_flavor['id'], new_flavor['id'],
self.tenant_id) self.tenant_id)
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_flavor_non_admin_remove(self): def test_flavor_non_admin_remove(self):
# Test to remove flavor access as a user without admin privileges. # Test to remove flavor access as a user without admin privileges.
flavor_name = data_utils.rand_name(self.flavor_name_prefix) flavor_name = data_utils.rand_name(self.flavor_name_prefix)
@ -106,7 +105,7 @@ class FlavorsAccessNegativeTestJSON(base.BaseV2ComputeAdminTest):
new_flavor['id'], new_flavor['id'],
self.tenant_id) self.tenant_id)
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_add_flavor_access_duplicate(self): def test_add_flavor_access_duplicate(self):
# Create a new flavor. # Create a new flavor.
flavor_name = data_utils.rand_name(self.flavor_name_prefix) flavor_name = data_utils.rand_name(self.flavor_name_prefix)
@ -130,7 +129,7 @@ class FlavorsAccessNegativeTestJSON(base.BaseV2ComputeAdminTest):
new_flavor['id'], new_flavor['id'],
self.tenant_id) self.tenant_id)
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_remove_flavor_access_not_found(self): def test_remove_flavor_access_not_found(self):
# Create a new flavor. # Create a new flavor.
flavor_name = data_utils.rand_name(self.flavor_name_prefix) flavor_name = data_utils.rand_name(self.flavor_name_prefix)

11
tempest/api/compute/admin/test_flavors_extra_specs.py
View File

@ -15,10 +15,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from tempest.api import compute
from tempest.api.compute import base from tempest.api.compute import base
from tempest.common.utils import data_utils from tempest.common.utils import data_utils
from tempest.test import attr from tempest import test
class FlavorsExtraSpecsTestJSON(base.BaseV2ComputeAdminTest): class FlavorsExtraSpecsTestJSON(base.BaseV2ComputeAdminTest):
@ -34,7 +33,7 @@ class FlavorsExtraSpecsTestJSON(base.BaseV2ComputeAdminTest):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
super(FlavorsExtraSpecsTestJSON, cls).setUpClass() super(FlavorsExtraSpecsTestJSON, cls).setUpClass()
if not compute.FLAVOR_EXTRA_DATA_ENABLED: if not test.is_extension_enabled('FlavorExtraData', 'compute'):
msg = "FlavorExtraData extension not enabled." msg = "FlavorExtraData extension not enabled."
raise cls.skipException(msg) raise cls.skipException(msg)
@ -61,7 +60,7 @@ class FlavorsExtraSpecsTestJSON(base.BaseV2ComputeAdminTest):
cls.client.wait_for_resource_deletion(cls.flavor['id']) cls.client.wait_for_resource_deletion(cls.flavor['id'])
super(FlavorsExtraSpecsTestJSON, cls).tearDownClass() super(FlavorsExtraSpecsTestJSON, cls).tearDownClass()
@attr(type='gate') @test.attr(type='gate')
def test_flavor_set_get_update_show_unset_keys(self): def test_flavor_set_get_update_show_unset_keys(self):
# Test to SET, GET, UPDATE, SHOW, UNSET flavor extra # Test to SET, GET, UPDATE, SHOW, UNSET flavor extra
# spec as a user with admin privileges. # spec as a user with admin privileges.
@ -101,7 +100,7 @@ class FlavorsExtraSpecsTestJSON(base.BaseV2ComputeAdminTest):
self.client.unset_flavor_extra_spec(self.flavor['id'], "key2") self.client.unset_flavor_extra_spec(self.flavor['id'], "key2")
self.assertEqual(unset_resp.status, 200) self.assertEqual(unset_resp.status, 200)
@attr(type='gate') @test.attr(type='gate')
def test_flavor_non_admin_get_all_keys(self): def test_flavor_non_admin_get_all_keys(self):
specs = {"key1": "value1", "key2": "value2"} specs = {"key1": "value1", "key2": "value2"}
set_resp, set_body = self.client.set_flavor_extra_spec( set_resp, set_body = self.client.set_flavor_extra_spec(
@ -113,7 +112,7 @@ class FlavorsExtraSpecsTestJSON(base.BaseV2ComputeAdminTest):
for key in specs: for key in specs:
self.assertEqual(body[key], specs[key]) self.assertEqual(body[key], specs[key])
@attr(type='gate') @test.attr(type='gate')
def test_flavor_non_admin_get_specific_key(self): def test_flavor_non_admin_get_specific_key(self):
specs = {"key1": "value1", "key2": "value2"} specs = {"key1": "value1", "key2": "value2"}
resp, body = self.client.set_flavor_extra_spec( resp, body = self.client.set_flavor_extra_spec(

19
tempest/api/compute/admin/test_flavors_extra_specs_negative.py
View File

@ -16,11 +16,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from tempest.api import compute
from tempest.api.compute import base from tempest.api.compute import base
from tempest.common.utils import data_utils from tempest.common.utils import data_utils
from tempest import exceptions from tempest import exceptions
from tempest.test import attr from tempest import test
class FlavorsExtraSpecsNegativeTestJSON(base.BaseV2ComputeAdminTest): class FlavorsExtraSpecsNegativeTestJSON(base.BaseV2ComputeAdminTest):
@ -35,7 +34,7 @@ class FlavorsExtraSpecsNegativeTestJSON(base.BaseV2ComputeAdminTest):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
super(FlavorsExtraSpecsNegativeTestJSON, cls).setUpClass() super(FlavorsExtraSpecsNegativeTestJSON, cls).setUpClass()
if not compute.FLAVOR_EXTRA_DATA_ENABLED: if not test.is_extension_enabled('FlavorExtraData', 'compute'):
msg = "FlavorExtraData extension not enabled." msg = "FlavorExtraData extension not enabled."
raise cls.skipException(msg) raise cls.skipException(msg)
@ -62,7 +61,7 @@ class FlavorsExtraSpecsNegativeTestJSON(base.BaseV2ComputeAdminTest):
cls.client.wait_for_resource_deletion(cls.flavor['id']) cls.client.wait_for_resource_deletion(cls.flavor['id'])
super(FlavorsExtraSpecsNegativeTestJSON, cls).tearDownClass() super(FlavorsExtraSpecsNegativeTestJSON, cls).tearDownClass()
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_flavor_non_admin_set_keys(self): def test_flavor_non_admin_set_keys(self):
# Test to SET flavor extra spec as a user without admin privileges. # Test to SET flavor extra spec as a user without admin privileges.
specs = {"key1": "value1", "key2": "value2"} specs = {"key1": "value1", "key2": "value2"}
@ -71,7 +70,7 @@ class FlavorsExtraSpecsNegativeTestJSON(base.BaseV2ComputeAdminTest):
self.flavor['id'], self.flavor['id'],
specs) specs)
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_flavor_non_admin_update_specific_key(self): def test_flavor_non_admin_update_specific_key(self):
# non admin user is not allowed to update flavor extra spec # non admin user is not allowed to update flavor extra spec
specs = {"key1": "value1", "key2": "value2"} specs = {"key1": "value1", "key2": "value2"}
@ -86,7 +85,7 @@ class FlavorsExtraSpecsNegativeTestJSON(base.BaseV2ComputeAdminTest):
'key1', 'key1',
key1='value1_new') key1='value1_new')
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_flavor_non_admin_unset_keys(self): def test_flavor_non_admin_unset_keys(self):
specs = {"key1": "value1", "key2": "value2"} specs = {"key1": "value1", "key2": "value2"}
set_resp, set_body = self.client.set_flavor_extra_spec( set_resp, set_body = self.client.set_flavor_extra_spec(
@ -97,7 +96,7 @@ class FlavorsExtraSpecsNegativeTestJSON(base.BaseV2ComputeAdminTest):
self.flavor['id'], self.flavor['id'],
'key1') 'key1')
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_flavor_unset_nonexistent_key(self): def test_flavor_unset_nonexistent_key(self):
nonexistent_key = data_utils.rand_name('flavor_key') nonexistent_key = data_utils.rand_name('flavor_key')
self.assertRaises(exceptions.NotFound, self.assertRaises(exceptions.NotFound,
@ -105,14 +104,14 @@ class FlavorsExtraSpecsNegativeTestJSON(base.BaseV2ComputeAdminTest):
self.flavor['id'], self.flavor['id'],
nonexistent_key) nonexistent_key)
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_flavor_get_nonexistent_key(self): def test_flavor_get_nonexistent_key(self):
self.assertRaises(exceptions.NotFound, self.assertRaises(exceptions.NotFound,
self.flavors_client.get_flavor_extra_spec_with_key, self.flavors_client.get_flavor_extra_spec_with_key,
self.flavor['id'], self.flavor['id'],
"nonexistent_key") "nonexistent_key")
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_flavor_update_mismatch_key(self): def test_flavor_update_mismatch_key(self):
# the key will be updated should be match the key in the body # the key will be updated should be match the key in the body
self.assertRaises(exceptions.BadRequest, self.assertRaises(exceptions.BadRequest,
@ -121,7 +120,7 @@ class FlavorsExtraSpecsNegativeTestJSON(base.BaseV2ComputeAdminTest):
"key2", "key2",
key1="value") key1="value")
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_flavor_update_more_key(self): def test_flavor_update_more_key(self):
# there should be just one item in the request body # there should be just one item in the request body
self.assertRaises(exceptions.BadRequest, self.assertRaises(exceptions.BadRequest,

9
tempest/api/compute/v3/admin/test_flavors_access.py
View File

@ -15,10 +15,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from tempest.api import compute
from tempest.api.compute import base from tempest.api.compute import base
from tempest.common.utils import data_utils from tempest.common.utils import data_utils
from tempest.test import attr from tempest import test
class FlavorsAccessTestJSON(base.BaseV2ComputeAdminTest): class FlavorsAccessTestJSON(base.BaseV2ComputeAdminTest):
@ -33,7 +32,7 @@ class FlavorsAccessTestJSON(base.BaseV2ComputeAdminTest):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
super(FlavorsAccessTestJSON, cls).setUpClass() super(FlavorsAccessTestJSON, cls).setUpClass()
if not compute.FLAVOR_EXTRA_DATA_ENABLED: if not test.is_extension_enabled('FlavorExtraData', 'compute'):
msg = "FlavorExtraData extension not enabled." msg = "FlavorExtraData extension not enabled."
raise cls.skipException(msg) raise cls.skipException(msg)
@ -51,7 +50,7 @@ class FlavorsAccessTestJSON(base.BaseV2ComputeAdminTest):
cls.vcpus = 1 cls.vcpus = 1
cls.disk = 10 cls.disk = 10
@attr(type='gate') @test.attr(type='gate')
def test_flavor_access_list_with_private_flavor(self): def test_flavor_access_list_with_private_flavor(self):
# Test to list flavor access successfully by querying private flavor # Test to list flavor access successfully by querying private flavor
flavor_name = data_utils.rand_name(self.flavor_name_prefix) flavor_name = data_utils.rand_name(self.flavor_name_prefix)
@ -70,7 +69,7 @@ class FlavorsAccessTestJSON(base.BaseV2ComputeAdminTest):
self.assertEqual(str(new_flavor_id), str(first_flavor['flavor_id'])) self.assertEqual(str(new_flavor_id), str(first_flavor['flavor_id']))
self.assertEqual(self.adm_tenant_id, first_flavor['tenant_id']) self.assertEqual(self.adm_tenant_id, first_flavor['tenant_id'])
@attr(type='gate') @test.attr(type='gate')
def test_flavor_access_add_remove(self): def test_flavor_access_add_remove(self):
# Test to add and remove flavor access to a given tenant. # Test to add and remove flavor access to a given tenant.
flavor_name = data_utils.rand_name(self.flavor_name_prefix) flavor_name = data_utils.rand_name(self.flavor_name_prefix)

15
tempest/api/compute/v3/admin/test_flavors_access_negative.py
View File

@ -17,11 +17,10 @@
import uuid import uuid
from tempest.api import compute
from tempest.api.compute import base from tempest.api.compute import base
from tempest.common.utils import data_utils from tempest.common.utils import data_utils
from tempest import exceptions from tempest import exceptions
from tempest.test import attr from tempest import test
class FlavorsAccessNegativeTestJSON(base.BaseV2ComputeAdminTest): class FlavorsAccessNegativeTestJSON(base.BaseV2ComputeAdminTest):
@ -36,7 +35,7 @@ class FlavorsAccessNegativeTestJSON(base.BaseV2ComputeAdminTest):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
super(FlavorsAccessNegativeTestJSON, cls).setUpClass() super(FlavorsAccessNegativeTestJSON, cls).setUpClass()
if not compute.FLAVOR_EXTRA_DATA_ENABLED: if not test.is_extension_enabled('FlavorExtraData', 'compute'):
msg = "FlavorExtraData extension not enabled." msg = "FlavorExtraData extension not enabled."
raise cls.skipException(msg) raise cls.skipException(msg)
@ -54,7 +53,7 @@ class FlavorsAccessNegativeTestJSON(base.BaseV2ComputeAdminTest):
cls.vcpus = 1 cls.vcpus = 1
cls.disk = 10 cls.disk = 10
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_flavor_access_list_with_public_flavor(self): def test_flavor_access_list_with_public_flavor(self):
# Test to list flavor access with exceptions by querying public flavor # Test to list flavor access with exceptions by querying public flavor
flavor_name = data_utils.rand_name(self.flavor_name_prefix) flavor_name = data_utils.rand_name(self.flavor_name_prefix)
@ -70,7 +69,7 @@ class FlavorsAccessNegativeTestJSON(base.BaseV2ComputeAdminTest):
self.client.list_flavor_access, self.client.list_flavor_access,
new_flavor_id) new_flavor_id)
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_flavor_non_admin_add(self): def test_flavor_non_admin_add(self):
# Test to add flavor access as a user without admin privileges. # Test to add flavor access as a user without admin privileges.
flavor_name = data_utils.rand_name(self.flavor_name_prefix) flavor_name = data_utils.rand_name(self.flavor_name_prefix)
@ -86,7 +85,7 @@ class FlavorsAccessNegativeTestJSON(base.BaseV2ComputeAdminTest):
new_flavor['id'], new_flavor['id'],
self.tenant_id) self.tenant_id)
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_flavor_non_admin_remove(self): def test_flavor_non_admin_remove(self):
# Test to remove flavor access as a user without admin privileges. # Test to remove flavor access as a user without admin privileges.
flavor_name = data_utils.rand_name(self.flavor_name_prefix) flavor_name = data_utils.rand_name(self.flavor_name_prefix)
@ -106,7 +105,7 @@ class FlavorsAccessNegativeTestJSON(base.BaseV2ComputeAdminTest):
new_flavor['id'], new_flavor['id'],
self.tenant_id) self.tenant_id)
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_add_flavor_access_duplicate(self): def test_add_flavor_access_duplicate(self):
# Create a new flavor. # Create a new flavor.
flavor_name = data_utils.rand_name(self.flavor_name_prefix) flavor_name = data_utils.rand_name(self.flavor_name_prefix)
@ -130,7 +129,7 @@ class FlavorsAccessNegativeTestJSON(base.BaseV2ComputeAdminTest):
new_flavor['id'], new_flavor['id'],
self.tenant_id) self.tenant_id)
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_remove_flavor_access_not_found(self): def test_remove_flavor_access_not_found(self):
# Create a new flavor. # Create a new flavor.
flavor_name = data_utils.rand_name(self.flavor_name_prefix) flavor_name = data_utils.rand_name(self.flavor_name_prefix)

11
tempest/api/compute/v3/admin/test_flavors_extra_specs.py
View File

@ -15,10 +15,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from tempest.api import compute
from tempest.api.compute import base from tempest.api.compute import base
from tempest.common.utils import data_utils from tempest.common.utils import data_utils
from tempest.test import attr from tempest import test
class FlavorsExtraSpecsTestJSON(base.BaseV2ComputeAdminTest): class FlavorsExtraSpecsTestJSON(base.BaseV2ComputeAdminTest):
@ -34,7 +33,7 @@ class FlavorsExtraSpecsTestJSON(base.BaseV2ComputeAdminTest):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
super(FlavorsExtraSpecsTestJSON, cls).setUpClass() super(FlavorsExtraSpecsTestJSON, cls).setUpClass()
if not compute.FLAVOR_EXTRA_DATA_ENABLED: if not test.is_extension_enabled('FlavorExtraData', 'compute'):
msg = "FlavorExtraData extension not enabled." msg = "FlavorExtraData extension not enabled."
raise cls.skipException(msg) raise cls.skipException(msg)
@ -61,7 +60,7 @@ class FlavorsExtraSpecsTestJSON(base.BaseV2ComputeAdminTest):
cls.client.wait_for_resource_deletion(cls.flavor['id']) cls.client.wait_for_resource_deletion(cls.flavor['id'])
super(FlavorsExtraSpecsTestJSON, cls).tearDownClass() super(FlavorsExtraSpecsTestJSON, cls).tearDownClass()
@attr(type='gate') @test.attr(type='gate')
def test_flavor_set_get_update_show_unset_keys(self): def test_flavor_set_get_update_show_unset_keys(self):
# Test to SET, GET, UPDATE, SHOW, UNSET flavor extra # Test to SET, GET, UPDATE, SHOW, UNSET flavor extra
# spec as a user with admin privileges. # spec as a user with admin privileges.
@ -101,7 +100,7 @@ class FlavorsExtraSpecsTestJSON(base.BaseV2ComputeAdminTest):
self.client.unset_flavor_extra_spec(self.flavor['id'], "key2") self.client.unset_flavor_extra_spec(self.flavor['id'], "key2")
self.assertEqual(unset_resp.status, 200) self.assertEqual(unset_resp.status, 200)
@attr(type='gate') @test.attr(type='gate')
def test_flavor_non_admin_get_all_keys(self): def test_flavor_non_admin_get_all_keys(self):
specs = {"key1": "value1", "key2": "value2"} specs = {"key1": "value1", "key2": "value2"}
set_resp, set_body = self.client.set_flavor_extra_spec( set_resp, set_body = self.client.set_flavor_extra_spec(
@ -113,7 +112,7 @@ class FlavorsExtraSpecsTestJSON(base.BaseV2ComputeAdminTest):
for key in specs: for key in specs:
self.assertEqual(body[key], specs[key]) self.assertEqual(body[key], specs[key])
@attr(type='gate') @test.attr(type='gate')
def test_flavor_non_admin_get_specific_key(self): def test_flavor_non_admin_get_specific_key(self):
specs = {"key1": "value1", "key2": "value2"} specs = {"key1": "value1", "key2": "value2"}
resp, body = self.client.set_flavor_extra_spec( resp, body = self.client.set_flavor_extra_spec(

19
tempest/api/compute/v3/admin/test_flavors_extra_specs_negative.py
View File

@ -16,11 +16,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from tempest.api import compute
from tempest.api.compute import base from tempest.api.compute import base
from tempest.common.utils import data_utils from tempest.common.utils import data_utils
from tempest import exceptions from tempest import exceptions
from tempest.test import attr from tempest import test
class FlavorsExtraSpecsNegativeTestJSON(base.BaseV2ComputeAdminTest): class FlavorsExtraSpecsNegativeTestJSON(base.BaseV2ComputeAdminTest):
@ -35,7 +34,7 @@ class FlavorsExtraSpecsNegativeTestJSON(base.BaseV2ComputeAdminTest):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
super(FlavorsExtraSpecsNegativeTestJSON, cls).setUpClass() super(FlavorsExtraSpecsNegativeTestJSON, cls).setUpClass()
if not compute.FLAVOR_EXTRA_DATA_ENABLED: if not test.is_extension_enabled('FlavorExtraData', 'compute'):
msg = "FlavorExtraData extension not enabled." msg = "FlavorExtraData extension not enabled."
raise cls.skipException(msg) raise cls.skipException(msg)
@ -62,7 +61,7 @@ class FlavorsExtraSpecsNegativeTestJSON(base.BaseV2ComputeAdminTest):
cls.client.wait_for_resource_deletion(cls.flavor['id']) cls.client.wait_for_resource_deletion(cls.flavor['id'])
super(FlavorsExtraSpecsNegativeTestJSON, cls).tearDownClass() super(FlavorsExtraSpecsNegativeTestJSON, cls).tearDownClass()
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_flavor_non_admin_set_keys(self): def test_flavor_non_admin_set_keys(self):
# Test to SET flavor extra spec as a user without admin privileges. # Test to SET flavor extra spec as a user without admin privileges.
specs = {"key1": "value1", "key2": "value2"} specs = {"key1": "value1", "key2": "value2"}
@ -71,7 +70,7 @@ class FlavorsExtraSpecsNegativeTestJSON(base.BaseV2ComputeAdminTest):
self.flavor['id'], self.flavor['id'],
specs) specs)
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_flavor_non_admin_update_specific_key(self): def test_flavor_non_admin_update_specific_key(self):
# non admin user is not allowed to update flavor extra spec # non admin user is not allowed to update flavor extra spec
specs = {"key1": "value1", "key2": "value2"} specs = {"key1": "value1", "key2": "value2"}
@ -86,7 +85,7 @@ class FlavorsExtraSpecsNegativeTestJSON(base.BaseV2ComputeAdminTest):
'key1', 'key1',
key1='value1_new') key1='value1_new')
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_flavor_non_admin_unset_keys(self): def test_flavor_non_admin_unset_keys(self):
specs = {"key1": "value1", "key2": "value2"} specs = {"key1": "value1", "key2": "value2"}
set_resp, set_body = self.client.set_flavor_extra_spec( set_resp, set_body = self.client.set_flavor_extra_spec(
@ -97,7 +96,7 @@ class FlavorsExtraSpecsNegativeTestJSON(base.BaseV2ComputeAdminTest):
self.flavor['id'], self.flavor['id'],
'key1') 'key1')
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_flavor_unset_nonexistent_key(self): def test_flavor_unset_nonexistent_key(self):
nonexistent_key = data_utils.rand_name('flavor_key') nonexistent_key = data_utils.rand_name('flavor_key')
self.assertRaises(exceptions.NotFound, self.assertRaises(exceptions.NotFound,
@ -105,14 +104,14 @@ class FlavorsExtraSpecsNegativeTestJSON(base.BaseV2ComputeAdminTest):
self.flavor['id'], self.flavor['id'],
nonexistent_key) nonexistent_key)
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_flavor_get_nonexistent_key(self): def test_flavor_get_nonexistent_key(self):
self.assertRaises(exceptions.NotFound, self.assertRaises(exceptions.NotFound,
self.flavors_client.get_flavor_extra_spec_with_key, self.flavors_client.get_flavor_extra_spec_with_key,
self.flavor['id'], self.flavor['id'],
"nonexistent_key") "nonexistent_key")
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_flavor_update_mismatch_key(self): def test_flavor_update_mismatch_key(self):
# the key will be updated should be match the key in the body # the key will be updated should be match the key in the body
self.assertRaises(exceptions.BadRequest, self.assertRaises(exceptions.BadRequest,
@ -121,7 +120,7 @@ class FlavorsExtraSpecsNegativeTestJSON(base.BaseV2ComputeAdminTest):
"key2", "key2",
key1="value") key1="value")
@attr(type=['negative', 'gate']) @test.attr(type=['negative', 'gate'])
def test_flavor_update_more_key(self): def test_flavor_update_more_key(self):
# there should be just one item in the request body # there should be just one item in the request body
self.assertRaises(exceptions.BadRequest, self.assertRaises(exceptions.BadRequest,

30
tempest/config.py
View File

@ -208,9 +208,14 @@ ComputeFeaturesGroup = [
cfg.BoolOpt('disk_config', cfg.BoolOpt('disk_config',
default=True, default=True,
help="If false, skip disk config tests"), help="If false, skip disk config tests"),
cfg.BoolOpt('flavor_extra', cfg.ListOpt('api_extensions',
default=True, default=['all'],
help="If false, skip flavor extra data test"), help='A list of enabled extensions with a special entry all '
'which indicates every extension is enabled'),
cfg.ListOpt('api_v3_extensions',
default=['all'],
help='A list of enabled v3 extensions with a special entry all'
' which indicates every extension is enabled'),
cfg.BoolOpt('change_password', cfg.BoolOpt('change_password',
default=False, default=False,
help="Does the test environment support changing the admin " help="Does the test environment support changing the admin "
@ -317,6 +322,16 @@ NetworkGroup = [
"connectivity"), "connectivity"),
] ]
network_feature_group = cfg.OptGroup(name='network-feature-enabled',
title='Enabled network service features')
NetworkFeaturesGroup = [
cfg.ListOpt('api_extensions',
default=['all'],
help='A list of enabled extensions with a special entry all '
'which indicates every extension is enabled'),
]
volume_group = cfg.OptGroup(name='volume', volume_group = cfg.OptGroup(name='volume',
title='Block Storage Options') title='Block Storage Options')
@ -360,7 +375,11 @@ volume_feature_group = cfg.OptGroup(name='volume-feature-enabled',
VolumeFeaturesGroup = [ VolumeFeaturesGroup = [
cfg.BoolOpt('multi_backend', cfg.BoolOpt('multi_backend',
default=False, default=False,
help="Runs Cinder multi-backend test (requires 2 backends)") help="Runs Cinder multi-backend test (requires 2 backends)"),
cfg.ListOpt('api_extensions',
default=['all'],
help='A list of enabled extensions with a special entry all '
'which indicates every extension is enabled'),
] ]
@ -659,6 +678,8 @@ class TempestConfig:
register_opt_group(cfg.CONF, image_group, ImageGroup) register_opt_group(cfg.CONF, image_group, ImageGroup)
register_opt_group(cfg.CONF, image_feature_group, ImageFeaturesGroup) register_opt_group(cfg.CONF, image_feature_group, ImageFeaturesGroup)
register_opt_group(cfg.CONF, network_group, NetworkGroup) register_opt_group(cfg.CONF, network_group, NetworkGroup)
register_opt_group(cfg.CONF, network_feature_group,
NetworkFeaturesGroup)
register_opt_group(cfg.CONF, volume_group, VolumeGroup) register_opt_group(cfg.CONF, volume_group, VolumeGroup)
register_opt_group(cfg.CONF, volume_feature_group, register_opt_group(cfg.CONF, volume_feature_group,
VolumeFeaturesGroup) VolumeFeaturesGroup)
@ -680,6 +701,7 @@ class TempestConfig:
self.images = cfg.CONF.image self.images = cfg.CONF.image
self.image_feature_enabled = cfg.CONF['image-feature-enabled'] self.image_feature_enabled = cfg.CONF['image-feature-enabled']
self.network = cfg.CONF.network self.network = cfg.CONF.network
self.network_feature_enabled = cfg.CONF['network-feature-enabled']
self.volume = cfg.CONF.volume self.volume = cfg.CONF.volume
self.volume_feature_enabled = cfg.CONF['volume-feature-enabled'] self.volume_feature_enabled = cfg.CONF['volume-feature-enabled']
self.object_storage = cfg.CONF['object-storage'] self.object_storage = cfg.CONF['object-storage']

36
tempest/test.py
View File

@ -123,6 +123,42 @@ def skip_because(*args, **kwargs):
return decorator return decorator
def requires_ext(*args, **kwargs):
"""A decorator to skip tests if an extension is not enabled
@param extension
@param service
"""
def decorator(func):
@functools.wraps(func)
def wrapper(*func_args, **func_kwargs):
if not is_extension_enabled(kwargs['extension'],
kwargs['service']):
msg = "Skipped because %s extension: %s is not enabled" % (
kwargs['service'], kwargs['extension'])
raise testtools.TestCase.skipException(msg)
return func(*func_args, **func_kwargs)
return wrapper
return decorator
def is_extension_enabled(extension_name, service):
"""A function that will check the list of enabled extensions from config
"""
configs = config.TempestConfig()
config_dict = {
'compute': configs.compute_feature_enabled.api_extensions,
'compute_v3': configs.compute_feature_enabled.api_v3_extensions,
'volume': configs.volume_feature_enabled.api_extensions,
'network': configs.network_feature_enabled.api_extensions,
}
if config_dict[service][0] == 'all':
return True
if extension_name in config_dict[service]:
return True
return False
# there is a mis-match between nose and testtools for older pythons. # there is a mis-match between nose and testtools for older pythons.
# testtools will set skipException to be either # testtools will set skipException to be either
# unittest.case.SkipTest, unittest2.case.SkipTest or an internal skip # unittest.case.SkipTest, unittest2.case.SkipTest or an internal skip