From f2b005078aca49c979b68c15a9feb69e50b4d648 Mon Sep 17 00:00:00 2001 From: ivan-zhu Date: Fri, 18 Oct 2013 10:06:52 +0800 Subject: [PATCH] add BaseV2ComputeTest as the base class of nova v2 api tests this does refactor in compute.base, add BaseV2ComputeTest as the base class of nova v2 api test. Because there will be nova v3 tests, this change will be convenient to add BaseV3ComputeTest as the base class of nova v3 api tests. In this way, we can split v2 tests with v3 tests easily, and share some common method. Partially implements blueprint nova-v3-api-tests Change-Id: Ie8e0d17a95e8378733dd21ab341dfad1331edf6e --- tempest/api/compute/admin/test_aggregates.py | 2 +- .../compute/admin/test_availability_zone.py | 2 +- tempest/api/compute/admin/test_fixed_ips.py | 2 +- tempest/api/compute/admin/test_flavors.py | 2 +- .../api/compute/admin/test_flavors_access.py | 2 +- .../compute/admin/test_flavors_extra_specs.py | 2 +- tempest/api/compute/admin/test_hosts.py | 2 +- tempest/api/compute/admin/test_hypervisor.py | 2 +- tempest/api/compute/admin/test_quotas.py | 2 +- tempest/api/compute/admin/test_servers.py | 2 +- tempest/api/compute/admin/test_services.py | 2 +- .../compute/admin/test_simple_tenant_usage.py | 2 +- tempest/api/compute/base.py | 57 +++++++++++-------- tempest/api/compute/flavors/test_flavors.py | 2 +- .../floating_ips/test_floating_ips_actions.py | 2 +- .../floating_ips/test_list_floating_ips.py | 2 +- .../api/compute/images/test_image_metadata.py | 2 +- tempest/api/compute/images/test_images.py | 2 +- .../compute/images/test_images_oneserver.py | 2 +- .../compute/images/test_list_image_filters.py | 2 +- .../api/compute/images/test_list_images.py | 2 +- tempest/api/compute/keypairs/test_keypairs.py | 2 +- .../compute/limits/test_absolute_limits.py | 2 +- .../test_security_group_rules.py | 2 +- .../security_groups/test_security_groups.py | 2 +- .../compute/servers/test_attach_interfaces.py | 2 +- .../api/compute/servers/test_create_server.py | 2 +- .../api/compute/servers/test_disk_config.py | 2 +- .../compute/servers/test_instance_actions.py | 2 +- .../servers/test_list_server_filters.py | 2 +- .../servers/test_list_servers_negative.py | 2 +- .../compute/servers/test_multiple_create.py | 2 +- .../compute/servers/test_server_actions.py | 2 +- .../compute/servers/test_server_addresses.py | 2 +- .../compute/servers/test_server_metadata.py | 2 +- .../servers/test_server_personality.py | 2 +- .../api/compute/servers/test_server_rescue.py | 2 +- tempest/api/compute/servers/test_servers.py | 2 +- .../compute/servers/test_servers_negative.py | 2 +- .../servers/test_virtual_interfaces.py | 2 +- tempest/api/compute/test_auth_token.py | 2 +- tempest/api/compute/test_authorization.py | 2 +- tempest/api/compute/test_extensions.py | 2 +- .../api/compute/test_live_block_migration.py | 2 +- tempest/api/compute/test_quotas.py | 2 +- .../api/compute/volumes/test_attach_volume.py | 2 +- .../api/compute/volumes/test_volumes_get.py | 2 +- .../api/compute/volumes/test_volumes_list.py | 2 +- .../compute/volumes/test_volumes_negative.py | 2 +- 49 files changed, 80 insertions(+), 73 deletions(-) diff --git a/tempest/api/compute/admin/test_aggregates.py b/tempest/api/compute/admin/test_aggregates.py index 14ab23649b..e8acec59c6 100644 --- a/tempest/api/compute/admin/test_aggregates.py +++ b/tempest/api/compute/admin/test_aggregates.py @@ -22,7 +22,7 @@ from tempest import exceptions from tempest.test import attr -class AggregatesAdminTestJSON(base.BaseComputeAdminTest): +class AggregatesAdminTestJSON(base.BaseV2ComputeAdminTest): """ Tests Aggregates API that require admin privileges diff --git a/tempest/api/compute/admin/test_availability_zone.py b/tempest/api/compute/admin/test_availability_zone.py index d1e1be619e..d6488c4f59 100644 --- a/tempest/api/compute/admin/test_availability_zone.py +++ b/tempest/api/compute/admin/test_availability_zone.py @@ -20,7 +20,7 @@ from tempest import exceptions from tempest.test import attr -class AvailabilityZoneAdminTestJSON(base.BaseComputeAdminTest): +class AvailabilityZoneAdminTestJSON(base.BaseV2ComputeAdminTest): """ Tests Availability Zone API List that require admin privileges diff --git a/tempest/api/compute/admin/test_fixed_ips.py b/tempest/api/compute/admin/test_fixed_ips.py index ee262df7a0..766589e684 100644 --- a/tempest/api/compute/admin/test_fixed_ips.py +++ b/tempest/api/compute/admin/test_fixed_ips.py @@ -20,7 +20,7 @@ from tempest import exceptions from tempest.test import attr -class FixedIPsTestJson(base.BaseComputeAdminTest): +class FixedIPsTestJson(base.BaseV2ComputeAdminTest): _interface = 'json' @classmethod diff --git a/tempest/api/compute/admin/test_flavors.py b/tempest/api/compute/admin/test_flavors.py index 004268ed3b..75b8dadad3 100644 --- a/tempest/api/compute/admin/test_flavors.py +++ b/tempest/api/compute/admin/test_flavors.py @@ -24,7 +24,7 @@ from tempest.test import attr from tempest.test import skip_because -class FlavorsAdminTestJSON(base.BaseComputeAdminTest): +class FlavorsAdminTestJSON(base.BaseV2ComputeAdminTest): """ Tests Flavors API Create and Delete that require admin privileges diff --git a/tempest/api/compute/admin/test_flavors_access.py b/tempest/api/compute/admin/test_flavors_access.py index 82138391be..b9a454dea4 100644 --- a/tempest/api/compute/admin/test_flavors_access.py +++ b/tempest/api/compute/admin/test_flavors_access.py @@ -25,7 +25,7 @@ from tempest import exceptions from tempest.test import attr -class FlavorsAccessTestJSON(base.BaseComputeAdminTest): +class FlavorsAccessTestJSON(base.BaseV2ComputeAdminTest): """ Tests Flavor Access API extension. diff --git a/tempest/api/compute/admin/test_flavors_extra_specs.py b/tempest/api/compute/admin/test_flavors_extra_specs.py index fb6a463e58..84457ccece 100644 --- a/tempest/api/compute/admin/test_flavors_extra_specs.py +++ b/tempest/api/compute/admin/test_flavors_extra_specs.py @@ -23,7 +23,7 @@ from tempest import exceptions from tempest.test import attr -class FlavorsExtraSpecsTestJSON(base.BaseComputeAdminTest): +class FlavorsExtraSpecsTestJSON(base.BaseV2ComputeAdminTest): """ Tests Flavor Extra Spec API extension. diff --git a/tempest/api/compute/admin/test_hosts.py b/tempest/api/compute/admin/test_hosts.py index bf094283be..aa769ba9bc 100644 --- a/tempest/api/compute/admin/test_hosts.py +++ b/tempest/api/compute/admin/test_hosts.py @@ -21,7 +21,7 @@ from tempest import exceptions from tempest.test import attr -class HostsAdminTestJSON(base.BaseComputeAdminTest): +class HostsAdminTestJSON(base.BaseV2ComputeAdminTest): """ Tests hosts API using admin privileges. diff --git a/tempest/api/compute/admin/test_hypervisor.py b/tempest/api/compute/admin/test_hypervisor.py index 5ca16f4436..0919d2ebed 100644 --- a/tempest/api/compute/admin/test_hypervisor.py +++ b/tempest/api/compute/admin/test_hypervisor.py @@ -20,7 +20,7 @@ from tempest import exceptions from tempest.test import attr -class HypervisorAdminTestJSON(base.BaseComputeAdminTest): +class HypervisorAdminTestJSON(base.BaseV2ComputeAdminTest): """ Tests Hypervisors API that require admin privileges diff --git a/tempest/api/compute/admin/test_quotas.py b/tempest/api/compute/admin/test_quotas.py index 757dfc0b90..0d0073dc5f 100644 --- a/tempest/api/compute/admin/test_quotas.py +++ b/tempest/api/compute/admin/test_quotas.py @@ -23,7 +23,7 @@ from tempest.test import attr from tempest.test import skip_because -class QuotasAdminTestJSON(base.BaseComputeAdminTest): +class QuotasAdminTestJSON(base.BaseV2ComputeAdminTest): _interface = 'json' @classmethod diff --git a/tempest/api/compute/admin/test_servers.py b/tempest/api/compute/admin/test_servers.py index 97e0e699af..ebc661cdee 100644 --- a/tempest/api/compute/admin/test_servers.py +++ b/tempest/api/compute/admin/test_servers.py @@ -22,7 +22,7 @@ from tempest.test import attr from tempest.test import skip_because -class ServersAdminTestJSON(base.BaseComputeAdminTest): +class ServersAdminTestJSON(base.BaseV2ComputeAdminTest): """ Tests Servers API using admin privileges diff --git a/tempest/api/compute/admin/test_services.py b/tempest/api/compute/admin/test_services.py index 434ea2f5e1..327d8b89a1 100644 --- a/tempest/api/compute/admin/test_services.py +++ b/tempest/api/compute/admin/test_services.py @@ -21,7 +21,7 @@ from tempest import exceptions from tempest.test import attr -class ServicesAdminTestJSON(base.BaseComputeAdminTest): +class ServicesAdminTestJSON(base.BaseV2ComputeAdminTest): """ Tests Services API. List and Enable/Disable require admin privileges. diff --git a/tempest/api/compute/admin/test_simple_tenant_usage.py b/tempest/api/compute/admin/test_simple_tenant_usage.py index ce058992c1..3178eade26 100644 --- a/tempest/api/compute/admin/test_simple_tenant_usage.py +++ b/tempest/api/compute/admin/test_simple_tenant_usage.py @@ -23,7 +23,7 @@ from tempest.test import attr import time -class TenantUsagesTestJSON(base.BaseComputeAdminTest): +class TenantUsagesTestJSON(base.BaseV2ComputeAdminTest): _interface = 'json' diff --git a/tempest/api/compute/base.py b/tempest/api/compute/base.py index 885adcf1e7..b5c499b447 100644 --- a/tempest/api/compute/base.py +++ b/tempest/api/compute/base.py @@ -54,37 +54,19 @@ class BaseComputeTest(tempest.test.BaseTestCase): os = clients.Manager(interface=cls._interface) cls.os = os - cls.servers_client = os.servers_client - cls.flavors_client = os.flavors_client - cls.images_client = os.images_client - cls.extensions_client = os.extensions_client - cls.floating_ips_client = os.floating_ips_client - cls.keypairs_client = os.keypairs_client - cls.security_groups_client = os.security_groups_client - cls.quotas_client = os.quotas_client - cls.limits_client = os.limits_client - cls.volumes_extensions_client = os.volumes_extensions_client - cls.volumes_client = os.volumes_client - cls.interfaces_client = os.interfaces_client - cls.fixed_ips_client = os.fixed_ips_client - cls.availability_zone_client = os.availability_zone_client - cls.aggregates_client = os.aggregates_client - cls.services_client = os.services_client - cls.hypervisor_client = os.hypervisor_client + cls.build_interval = cls.config.compute.build_interval cls.build_timeout = cls.config.compute.build_timeout cls.ssh_user = cls.config.compute.ssh_user - cls.image_ssh_user = cls.config.compute.image_ssh_user - cls.image_ssh_password = cls.config.compute.image_ssh_password cls.image_ref = cls.config.compute.image_ref cls.image_ref_alt = cls.config.compute.image_ref_alt cls.flavor_ref = cls.config.compute.flavor_ref cls.flavor_ref_alt = cls.config.compute.flavor_ref_alt + cls.image_ssh_user = cls.config.compute.image_ssh_user + cls.image_ssh_password = cls.config.compute.image_ssh_password cls.servers = [] cls.images = [] - cls.servers_client_v3_auth = os.servers_client_v3_auth - @classmethod def clear_servers(cls): for server in cls.servers: @@ -162,7 +144,7 @@ class BaseComputeTest(tempest.test.BaseTestCase): @classmethod def create_image_from_server(cls, server_id, **kwargs): - """Wrapper utility that returns a test server.""" + """Wrapper utility that returns an image created from the server.""" name = rand_name(cls.__name__ + "-image") if 'name' in kwargs: name = kwargs.pop('name') @@ -195,12 +177,37 @@ class BaseComputeTest(tempest.test.BaseTestCase): time.sleep(self.build_interval) -class BaseComputeAdminTest(BaseComputeTest): - """Base test case class for all Compute Admin API tests.""" +class BaseV2ComputeTest(BaseComputeTest): @classmethod def setUpClass(cls): - super(BaseComputeAdminTest, cls).setUpClass() + super(BaseV2ComputeTest, cls).setUpClass() + cls.servers_client = cls.os.servers_client + cls.flavors_client = cls.os.flavors_client + cls.images_client = cls.os.images_client + cls.extensions_client = cls.os.extensions_client + cls.floating_ips_client = cls.os.floating_ips_client + cls.keypairs_client = cls.os.keypairs_client + cls.security_groups_client = cls.os.security_groups_client + cls.quotas_client = cls.os.quotas_client + cls.limits_client = cls.os.limits_client + cls.volumes_extensions_client = cls.os.volumes_extensions_client + cls.volumes_client = cls.os.volumes_client + cls.interfaces_client = cls.os.interfaces_client + cls.fixed_ips_client = cls.os.fixed_ips_client + cls.availability_zone_client = cls.os.availability_zone_client + cls.aggregates_client = cls.os.aggregates_client + cls.services_client = cls.os.services_client + cls.hypervisor_client = cls.os.hypervisor_client + cls.servers_client_v3_auth = cls.os.servers_client_v3_auth + + +class BaseV2ComputeAdminTest(BaseV2ComputeTest): + """Base test case class for Compute Admin V2 API tests.""" + + @classmethod + def setUpClass(cls): + super(BaseV2ComputeAdminTest, cls).setUpClass() admin_username = cls.config.compute_admin.username admin_password = cls.config.compute_admin.password admin_tenant = cls.config.compute_admin.tenant_name diff --git a/tempest/api/compute/flavors/test_flavors.py b/tempest/api/compute/flavors/test_flavors.py index cea13a0903..eac98ea36c 100644 --- a/tempest/api/compute/flavors/test_flavors.py +++ b/tempest/api/compute/flavors/test_flavors.py @@ -20,7 +20,7 @@ from tempest import exceptions from tempest.test import attr -class FlavorsTestJSON(base.BaseComputeTest): +class FlavorsTestJSON(base.BaseV2ComputeTest): _interface = 'json' @classmethod diff --git a/tempest/api/compute/floating_ips/test_floating_ips_actions.py b/tempest/api/compute/floating_ips/test_floating_ips_actions.py index a5a361e35d..ff7188bf9f 100644 --- a/tempest/api/compute/floating_ips/test_floating_ips_actions.py +++ b/tempest/api/compute/floating_ips/test_floating_ips_actions.py @@ -23,7 +23,7 @@ from tempest import exceptions from tempest.test import attr -class FloatingIPsTestJSON(base.BaseComputeTest): +class FloatingIPsTestJSON(base.BaseV2ComputeTest): _interface = 'json' server_id = None floating_ip = None diff --git a/tempest/api/compute/floating_ips/test_list_floating_ips.py b/tempest/api/compute/floating_ips/test_list_floating_ips.py index fb9610a85b..7fec2d16ed 100644 --- a/tempest/api/compute/floating_ips/test_list_floating_ips.py +++ b/tempest/api/compute/floating_ips/test_list_floating_ips.py @@ -23,7 +23,7 @@ from tempest import exceptions from tempest.test import attr -class FloatingIPDetailsTestJSON(base.BaseComputeTest): +class FloatingIPDetailsTestJSON(base.BaseV2ComputeTest): _interface = 'json' @classmethod diff --git a/tempest/api/compute/images/test_image_metadata.py b/tempest/api/compute/images/test_image_metadata.py index 8f195145e4..df857bf96d 100644 --- a/tempest/api/compute/images/test_image_metadata.py +++ b/tempest/api/compute/images/test_image_metadata.py @@ -21,7 +21,7 @@ from tempest import exceptions from tempest.test import attr -class ImagesMetadataTestJSON(base.BaseComputeTest): +class ImagesMetadataTestJSON(base.BaseV2ComputeTest): _interface = 'json' @classmethod diff --git a/tempest/api/compute/images/test_images.py b/tempest/api/compute/images/test_images.py index 57f26f89a3..383ea1d0eb 100644 --- a/tempest/api/compute/images/test_images.py +++ b/tempest/api/compute/images/test_images.py @@ -23,7 +23,7 @@ from tempest import exceptions from tempest.test import attr -class ImagesTestJSON(base.BaseComputeTest): +class ImagesTestJSON(base.BaseV2ComputeTest): _interface = 'json' @classmethod diff --git a/tempest/api/compute/images/test_images_oneserver.py b/tempest/api/compute/images/test_images_oneserver.py index bb04f1dac7..26c8003340 100644 --- a/tempest/api/compute/images/test_images_oneserver.py +++ b/tempest/api/compute/images/test_images_oneserver.py @@ -30,7 +30,7 @@ from tempest.test import skip_because LOG = logging.getLogger(__name__) -class ImagesOneServerTestJSON(base.BaseComputeTest): +class ImagesOneServerTestJSON(base.BaseV2ComputeTest): _interface = 'json' def tearDown(self): diff --git a/tempest/api/compute/images/test_list_image_filters.py b/tempest/api/compute/images/test_list_image_filters.py index 8a8d5bdc2c..8d4e47b5b2 100644 --- a/tempest/api/compute/images/test_list_image_filters.py +++ b/tempest/api/compute/images/test_list_image_filters.py @@ -25,7 +25,7 @@ from tempest.test import attr LOG = logging.getLogger(__name__) -class ListImageFiltersTestJSON(base.BaseComputeTest): +class ListImageFiltersTestJSON(base.BaseV2ComputeTest): _interface = 'json' @classmethod diff --git a/tempest/api/compute/images/test_list_images.py b/tempest/api/compute/images/test_list_images.py index 0647f8670b..a6726b6413 100644 --- a/tempest/api/compute/images/test_list_images.py +++ b/tempest/api/compute/images/test_list_images.py @@ -19,7 +19,7 @@ from tempest.api.compute import base from tempest.test import attr -class ListImagesTestJSON(base.BaseComputeTest): +class ListImagesTestJSON(base.BaseV2ComputeTest): _interface = 'json' @classmethod diff --git a/tempest/api/compute/keypairs/test_keypairs.py b/tempest/api/compute/keypairs/test_keypairs.py index 807315a120..c2505313ba 100644 --- a/tempest/api/compute/keypairs/test_keypairs.py +++ b/tempest/api/compute/keypairs/test_keypairs.py @@ -21,7 +21,7 @@ from tempest import exceptions from tempest.test import attr -class KeyPairsTestJSON(base.BaseComputeTest): +class KeyPairsTestJSON(base.BaseV2ComputeTest): _interface = 'json' @classmethod diff --git a/tempest/api/compute/limits/test_absolute_limits.py b/tempest/api/compute/limits/test_absolute_limits.py index d2430dfcb4..28092449c4 100644 --- a/tempest/api/compute/limits/test_absolute_limits.py +++ b/tempest/api/compute/limits/test_absolute_limits.py @@ -20,7 +20,7 @@ from tempest import exceptions from tempest.test import attr -class AbsoluteLimitsTestJSON(base.BaseComputeTest): +class AbsoluteLimitsTestJSON(base.BaseV2ComputeTest): _interface = 'json' @classmethod diff --git a/tempest/api/compute/security_groups/test_security_group_rules.py b/tempest/api/compute/security_groups/test_security_group_rules.py index 5faa9a4800..9dc164db8e 100644 --- a/tempest/api/compute/security_groups/test_security_group_rules.py +++ b/tempest/api/compute/security_groups/test_security_group_rules.py @@ -23,7 +23,7 @@ from tempest.test import attr from tempest.test import skip_because -class SecurityGroupRulesTestJSON(base.BaseComputeTest): +class SecurityGroupRulesTestJSON(base.BaseV2ComputeTest): _interface = 'json' @classmethod diff --git a/tempest/api/compute/security_groups/test_security_groups.py b/tempest/api/compute/security_groups/test_security_groups.py index 2d9c62d0a4..6e08700e57 100644 --- a/tempest/api/compute/security_groups/test_security_groups.py +++ b/tempest/api/compute/security_groups/test_security_groups.py @@ -25,7 +25,7 @@ from tempest.test import attr from tempest.test import skip_because -class SecurityGroupsTestJSON(base.BaseComputeTest): +class SecurityGroupsTestJSON(base.BaseV2ComputeTest): _interface = 'json' @classmethod diff --git a/tempest/api/compute/servers/test_attach_interfaces.py b/tempest/api/compute/servers/test_attach_interfaces.py index 9f66a6c202..c554dc225f 100644 --- a/tempest/api/compute/servers/test_attach_interfaces.py +++ b/tempest/api/compute/servers/test_attach_interfaces.py @@ -19,7 +19,7 @@ from tempest.test import attr import time -class AttachInterfacesTestJSON(base.BaseComputeTest): +class AttachInterfacesTestJSON(base.BaseV2ComputeTest): _interface = 'json' @classmethod diff --git a/tempest/api/compute/servers/test_create_server.py b/tempest/api/compute/servers/test_create_server.py index 31ca387450..adbc048d3f 100644 --- a/tempest/api/compute/servers/test_create_server.py +++ b/tempest/api/compute/servers/test_create_server.py @@ -28,7 +28,7 @@ import tempest.config from tempest.test import attr -class ServersTestJSON(base.BaseComputeTest): +class ServersTestJSON(base.BaseV2ComputeTest): _interface = 'json' run_ssh = tempest.config.TempestConfig().compute.run_ssh disk_config = 'AUTO' diff --git a/tempest/api/compute/servers/test_disk_config.py b/tempest/api/compute/servers/test_disk_config.py index 9abb86a99d..64801f2acd 100644 --- a/tempest/api/compute/servers/test_disk_config.py +++ b/tempest/api/compute/servers/test_disk_config.py @@ -22,7 +22,7 @@ from tempest.api.compute import base from tempest.test import attr -class ServerDiskConfigTestJSON(base.BaseComputeTest): +class ServerDiskConfigTestJSON(base.BaseV2ComputeTest): _interface = 'json' @classmethod diff --git a/tempest/api/compute/servers/test_instance_actions.py b/tempest/api/compute/servers/test_instance_actions.py index f13e51e19e..61be50acbb 100644 --- a/tempest/api/compute/servers/test_instance_actions.py +++ b/tempest/api/compute/servers/test_instance_actions.py @@ -20,7 +20,7 @@ from tempest import exceptions from tempest.test import attr -class InstanceActionsTestJSON(base.BaseComputeTest): +class InstanceActionsTestJSON(base.BaseV2ComputeTest): _interface = 'json' @classmethod diff --git a/tempest/api/compute/servers/test_list_server_filters.py b/tempest/api/compute/servers/test_list_server_filters.py index 8e95671e50..778b8ec4e9 100644 --- a/tempest/api/compute/servers/test_list_server_filters.py +++ b/tempest/api/compute/servers/test_list_server_filters.py @@ -24,7 +24,7 @@ from tempest.test import attr from tempest.test import skip_because -class ListServerFiltersTestJSON(base.BaseComputeTest): +class ListServerFiltersTestJSON(base.BaseV2ComputeTest): _interface = 'json' @classmethod diff --git a/tempest/api/compute/servers/test_list_servers_negative.py b/tempest/api/compute/servers/test_list_servers_negative.py index 9dd2e27620..bef45a7f1f 100644 --- a/tempest/api/compute/servers/test_list_servers_negative.py +++ b/tempest/api/compute/servers/test_list_servers_negative.py @@ -24,7 +24,7 @@ from tempest import exceptions from tempest.test import attr -class ListServersNegativeTestJSON(base.BaseComputeTest): +class ListServersNegativeTestJSON(base.BaseV2ComputeTest): _interface = 'json' @classmethod diff --git a/tempest/api/compute/servers/test_multiple_create.py b/tempest/api/compute/servers/test_multiple_create.py index 7e4a70bf55..d582894fb2 100644 --- a/tempest/api/compute/servers/test_multiple_create.py +++ b/tempest/api/compute/servers/test_multiple_create.py @@ -21,7 +21,7 @@ from tempest import exceptions from tempest.test import attr -class MultipleCreateTestJSON(base.BaseComputeTest): +class MultipleCreateTestJSON(base.BaseV2ComputeTest): _interface = 'json' _name = 'multiple-create-test' diff --git a/tempest/api/compute/servers/test_server_actions.py b/tempest/api/compute/servers/test_server_actions.py index f073ebc935..6f50a02460 100644 --- a/tempest/api/compute/servers/test_server_actions.py +++ b/tempest/api/compute/servers/test_server_actions.py @@ -30,7 +30,7 @@ from tempest.test import attr from tempest.test import skip_because -class ServerActionsTestJSON(base.BaseComputeTest): +class ServerActionsTestJSON(base.BaseV2ComputeTest): _interface = 'json' resize_available = tempest.config.TempestConfig().compute.resize_available run_ssh = tempest.config.TempestConfig().compute.run_ssh diff --git a/tempest/api/compute/servers/test_server_addresses.py b/tempest/api/compute/servers/test_server_addresses.py index b1b9253f58..a594f6cfe5 100644 --- a/tempest/api/compute/servers/test_server_addresses.py +++ b/tempest/api/compute/servers/test_server_addresses.py @@ -20,7 +20,7 @@ from tempest import exceptions from tempest.test import attr -class ServerAddressesTest(base.BaseComputeTest): +class ServerAddressesTest(base.BaseV2ComputeTest): _interface = 'json' @classmethod diff --git a/tempest/api/compute/servers/test_server_metadata.py b/tempest/api/compute/servers/test_server_metadata.py index 15c3e6b99d..4e45e4b829 100644 --- a/tempest/api/compute/servers/test_server_metadata.py +++ b/tempest/api/compute/servers/test_server_metadata.py @@ -20,7 +20,7 @@ from tempest import exceptions from tempest.test import attr -class ServerMetadataTestJSON(base.BaseComputeTest): +class ServerMetadataTestJSON(base.BaseV2ComputeTest): _interface = 'json' @classmethod diff --git a/tempest/api/compute/servers/test_server_personality.py b/tempest/api/compute/servers/test_server_personality.py index 20197326eb..ba5c0df66a 100644 --- a/tempest/api/compute/servers/test_server_personality.py +++ b/tempest/api/compute/servers/test_server_personality.py @@ -22,7 +22,7 @@ from tempest import exceptions from tempest.test import attr -class ServerPersonalityTestJSON(base.BaseComputeTest): +class ServerPersonalityTestJSON(base.BaseV2ComputeTest): _interface = 'json' @classmethod diff --git a/tempest/api/compute/servers/test_server_rescue.py b/tempest/api/compute/servers/test_server_rescue.py index 82559d57f5..b25eb528c7 100644 --- a/tempest/api/compute/servers/test_server_rescue.py +++ b/tempest/api/compute/servers/test_server_rescue.py @@ -22,7 +22,7 @@ from tempest import exceptions from tempest.test import attr -class ServerRescueTestJSON(base.BaseComputeTest): +class ServerRescueTestJSON(base.BaseV2ComputeTest): _interface = 'json' run_ssh = tempest.config.TempestConfig().compute.run_ssh diff --git a/tempest/api/compute/servers/test_servers.py b/tempest/api/compute/servers/test_servers.py index 5ce51c0ce9..92ffd3a9fe 100644 --- a/tempest/api/compute/servers/test_servers.py +++ b/tempest/api/compute/servers/test_servers.py @@ -20,7 +20,7 @@ from tempest.common.utils.data_utils import rand_name from tempest.test import attr -class ServersTestJSON(base.BaseComputeTest): +class ServersTestJSON(base.BaseV2ComputeTest): _interface = 'json' @classmethod diff --git a/tempest/api/compute/servers/test_servers_negative.py b/tempest/api/compute/servers/test_servers_negative.py index 7062a3b633..916b1bac42 100644 --- a/tempest/api/compute/servers/test_servers_negative.py +++ b/tempest/api/compute/servers/test_servers_negative.py @@ -26,7 +26,7 @@ from tempest import exceptions from tempest.test import attr -class ServersNegativeTestJSON(base.BaseComputeTest): +class ServersNegativeTestJSON(base.BaseV2ComputeTest): _interface = 'json' def setUp(self): diff --git a/tempest/api/compute/servers/test_virtual_interfaces.py b/tempest/api/compute/servers/test_virtual_interfaces.py index 2c7ff32470..a00e8ed3ab 100644 --- a/tempest/api/compute/servers/test_virtual_interfaces.py +++ b/tempest/api/compute/servers/test_virtual_interfaces.py @@ -25,7 +25,7 @@ from tempest.test import attr from tempest.test import skip_because -class VirtualInterfacesTestJSON(base.BaseComputeTest): +class VirtualInterfacesTestJSON(base.BaseV2ComputeTest): _interface = 'json' CONF = config.TempestConfig() diff --git a/tempest/api/compute/test_auth_token.py b/tempest/api/compute/test_auth_token.py index bbe92ef519..ffeede8afd 100644 --- a/tempest/api/compute/test_auth_token.py +++ b/tempest/api/compute/test_auth_token.py @@ -19,7 +19,7 @@ from tempest.api.compute import base import tempest.config as config -class AuthTokenTestJSON(base.BaseComputeTest): +class AuthTokenTestJSON(base.BaseV2ComputeTest): _interface = 'json' @classmethod diff --git a/tempest/api/compute/test_authorization.py b/tempest/api/compute/test_authorization.py index 0a8595f13c..a7d93103d1 100644 --- a/tempest/api/compute/test_authorization.py +++ b/tempest/api/compute/test_authorization.py @@ -27,7 +27,7 @@ from tempest.test import attr LOG = logging.getLogger(__name__) -class AuthorizationTestJSON(base.BaseComputeTest): +class AuthorizationTestJSON(base.BaseV2ComputeTest): _interface = 'json' @classmethod diff --git a/tempest/api/compute/test_extensions.py b/tempest/api/compute/test_extensions.py index c1b7aa5ef1..8f1e44674d 100644 --- a/tempest/api/compute/test_extensions.py +++ b/tempest/api/compute/test_extensions.py @@ -20,7 +20,7 @@ from tempest.api.compute import base from tempest.test import attr -class ExtensionsTestJSON(base.BaseComputeTest): +class ExtensionsTestJSON(base.BaseV2ComputeTest): _interface = 'json' @attr(type='gate') diff --git a/tempest/api/compute/test_live_block_migration.py b/tempest/api/compute/test_live_block_migration.py index 65daee019e..bb8b3722ef 100644 --- a/tempest/api/compute/test_live_block_migration.py +++ b/tempest/api/compute/test_live_block_migration.py @@ -26,7 +26,7 @@ from tempest import exceptions from tempest.test import attr -class LiveBlockMigrationTestJSON(base.BaseComputeAdminTest): +class LiveBlockMigrationTestJSON(base.BaseV2ComputeAdminTest): _host_key = 'OS-EXT-SRV-ATTR:host' _interface = 'json' diff --git a/tempest/api/compute/test_quotas.py b/tempest/api/compute/test_quotas.py index 6453cf46f6..4617bd2d03 100644 --- a/tempest/api/compute/test_quotas.py +++ b/tempest/api/compute/test_quotas.py @@ -19,7 +19,7 @@ from tempest.api.compute import base from tempest.test import attr -class QuotasTestJSON(base.BaseComputeTest): +class QuotasTestJSON(base.BaseV2ComputeTest): _interface = 'json' @classmethod diff --git a/tempest/api/compute/volumes/test_attach_volume.py b/tempest/api/compute/volumes/test_attach_volume.py index ee1ad9e568..a993077340 100644 --- a/tempest/api/compute/volumes/test_attach_volume.py +++ b/tempest/api/compute/volumes/test_attach_volume.py @@ -23,7 +23,7 @@ import tempest.config from tempest.test import attr -class AttachVolumeTestJSON(base.BaseComputeTest): +class AttachVolumeTestJSON(base.BaseV2ComputeTest): _interface = 'json' run_ssh = tempest.config.TempestConfig().compute.run_ssh diff --git a/tempest/api/compute/volumes/test_volumes_get.py b/tempest/api/compute/volumes/test_volumes_get.py index fba8347a8c..192d81eb31 100644 --- a/tempest/api/compute/volumes/test_volumes_get.py +++ b/tempest/api/compute/volumes/test_volumes_get.py @@ -20,7 +20,7 @@ from tempest.common.utils.data_utils import rand_name from tempest.test import attr -class VolumesGetTestJSON(base.BaseComputeTest): +class VolumesGetTestJSON(base.BaseV2ComputeTest): _interface = 'json' diff --git a/tempest/api/compute/volumes/test_volumes_list.py b/tempest/api/compute/volumes/test_volumes_list.py index 956abdf1cb..b4e00f9c7d 100644 --- a/tempest/api/compute/volumes/test_volumes_list.py +++ b/tempest/api/compute/volumes/test_volumes_list.py @@ -20,7 +20,7 @@ from tempest.common.utils.data_utils import rand_name from tempest.test import attr -class VolumesTestJSON(base.BaseComputeTest): +class VolumesTestJSON(base.BaseV2ComputeTest): """ This test creates a number of 1G volumes. To run successfully, diff --git a/tempest/api/compute/volumes/test_volumes_negative.py b/tempest/api/compute/volumes/test_volumes_negative.py index 90e6946ba0..785902eb2a 100644 --- a/tempest/api/compute/volumes/test_volumes_negative.py +++ b/tempest/api/compute/volumes/test_volumes_negative.py @@ -23,7 +23,7 @@ from tempest import exceptions from tempest.test import attr -class VolumesNegativeTest(base.BaseComputeTest): +class VolumesNegativeTest(base.BaseV2ComputeTest): _interface = 'json' @classmethod