From ce1552f077526b66fd011ee6a46242cd004fcbba Mon Sep 17 00:00:00 2001 From: Ken'ichi Ohmichi Date: Mon, 6 Jun 2016 13:05:19 -0700 Subject: [PATCH] Move comptue base test to common dir The compute base test module seems useful for testing the other service clients, so this patch moves the module to common dir to use it on the other service clients tests. Change-Id: I05a0fc2eb8ee0c8ce4a1b505c3eb4214fbf0f5a8 --- tempest/tests/lib/services/{compute => }/base.py | 2 +- .../tests/lib/services/compute/test_agents_client.py | 4 ++-- .../lib/services/compute/test_aggregates_client.py | 4 ++-- .../compute/test_availability_zone_client.py | 4 ++-- .../services/compute/test_baremetal_nodes_client.py | 4 ++-- .../lib/services/compute/test_base_compute_client.py | 12 ++++++------ .../lib/services/compute/test_certificates_client.py | 4 ++-- .../lib/services/compute/test_extensions_client.py | 4 ++-- .../lib/services/compute/test_fixedIPs_client.py | 4 ++-- .../lib/services/compute/test_flavors_client.py | 4 ++-- .../compute/test_floating_ip_pools_client.py | 4 ++-- .../compute/test_floating_ips_bulk_client.py | 4 ++-- .../lib/services/compute/test_floating_ips_client.py | 4 ++-- .../tests/lib/services/compute/test_hosts_client.py | 4 ++-- .../lib/services/compute/test_hypervisor_client.py | 4 ++-- .../tests/lib/services/compute/test_images_client.py | 4 ++-- .../compute/test_instance_usage_audit_log_client.py | 4 ++-- .../lib/services/compute/test_interfaces_client.py | 4 ++-- .../lib/services/compute/test_keypairs_client.py | 4 ++-- .../tests/lib/services/compute/test_limits_client.py | 4 ++-- .../lib/services/compute/test_migrations_client.py | 4 ++-- .../lib/services/compute/test_networks_client.py | 4 ++-- .../services/compute/test_quota_classes_client.py | 4 ++-- .../tests/lib/services/compute/test_quotas_client.py | 4 ++-- .../test_security_group_default_rules_client.py | 4 ++-- .../compute/test_security_group_rules_client.py | 4 ++-- .../services/compute/test_security_groups_client.py | 4 ++-- .../services/compute/test_server_groups_client.py | 4 ++-- .../lib/services/compute/test_servers_client.py | 4 ++-- .../lib/services/compute/test_services_client.py | 4 ++-- .../lib/services/compute/test_snapshots_client.py | 4 ++-- .../services/compute/test_tenant_networks_client.py | 4 ++-- .../services/compute/test_tenant_usages_client.py | 4 ++-- .../lib/services/compute/test_versions_client.py | 4 ++-- .../lib/services/compute/test_volumes_client.py | 4 ++-- 35 files changed, 73 insertions(+), 73 deletions(-) rename tempest/tests/lib/services/{compute => }/base.py (97%) diff --git a/tempest/tests/lib/services/compute/base.py b/tempest/tests/lib/services/base.py similarity index 97% rename from tempest/tests/lib/services/compute/base.py rename to tempest/tests/lib/services/base.py index e77b436071..a244aa2e60 100644 --- a/tempest/tests/lib/services/compute/base.py +++ b/tempest/tests/lib/services/base.py @@ -19,7 +19,7 @@ from tempest.tests import base from tempest.tests.lib import fake_http -class BaseComputeServiceTest(base.TestCase): +class BaseServiceTest(base.TestCase): def create_response(self, body, to_utf=False, status=200, headers=None): json_body = {} if body: diff --git a/tempest/tests/lib/services/compute/test_agents_client.py b/tempest/tests/lib/services/compute/test_agents_client.py index 3c5043db0a..880220e642 100644 --- a/tempest/tests/lib/services/compute/test_agents_client.py +++ b/tempest/tests/lib/services/compute/test_agents_client.py @@ -14,10 +14,10 @@ from tempest.lib.services.compute import agents_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestAgentsClient(base.BaseComputeServiceTest): +class TestAgentsClient(base.BaseServiceTest): FAKE_CREATE_AGENT = { "agent": { "url": "http://foo.com", diff --git a/tempest/tests/lib/services/compute/test_aggregates_client.py b/tempest/tests/lib/services/compute/test_aggregates_client.py index a63380eb5f..674d92a35e 100644 --- a/tempest/tests/lib/services/compute/test_aggregates_client.py +++ b/tempest/tests/lib/services/compute/test_aggregates_client.py @@ -14,10 +14,10 @@ from tempest.lib.services.compute import aggregates_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestAggregatesClient(base.BaseComputeServiceTest): +class TestAggregatesClient(base.BaseServiceTest): FAKE_SHOW_AGGREGATE = { "aggregate": { diff --git a/tempest/tests/lib/services/compute/test_availability_zone_client.py b/tempest/tests/lib/services/compute/test_availability_zone_client.py index d16cf0a1b7..6608592da9 100644 --- a/tempest/tests/lib/services/compute/test_availability_zone_client.py +++ b/tempest/tests/lib/services/compute/test_availability_zone_client.py @@ -14,10 +14,10 @@ from tempest.lib.services.compute import availability_zone_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestAvailabilityZoneClient(base.BaseComputeServiceTest): +class TestAvailabilityZoneClient(base.BaseServiceTest): FAKE_AVAILABIRITY_ZONE_INFO = { "availabilityZoneInfo": diff --git a/tempest/tests/lib/services/compute/test_baremetal_nodes_client.py b/tempest/tests/lib/services/compute/test_baremetal_nodes_client.py index a867c06152..81c54b5da6 100644 --- a/tempest/tests/lib/services/compute/test_baremetal_nodes_client.py +++ b/tempest/tests/lib/services/compute/test_baremetal_nodes_client.py @@ -16,10 +16,10 @@ import copy from tempest.lib.services.compute import baremetal_nodes_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestBareMetalNodesClient(base.BaseComputeServiceTest): +class TestBareMetalNodesClient(base.BaseServiceTest): FAKE_NODE_INFO = {'cpus': '8', 'disk_gb': '64', diff --git a/tempest/tests/lib/services/compute/test_base_compute_client.py b/tempest/tests/lib/services/compute/test_base_compute_client.py index 49d29b37a9..69e8542c68 100644 --- a/tempest/tests/lib/services/compute/test_base_compute_client.py +++ b/tempest/tests/lib/services/compute/test_base_compute_client.py @@ -19,10 +19,10 @@ from tempest.lib import exceptions from tempest.lib.services.compute import base_compute_client from tempest.tests.lib import fake_auth_provider from tempest.tests.lib import fake_http -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestMicroversionHeaderCheck(base.BaseComputeServiceTest): +class TestMicroversionHeaderCheck(base.BaseServiceTest): def setUp(self): super(TestMicroversionHeaderCheck, self).setUp() @@ -72,7 +72,7 @@ class DummyServiceClient1(base_compute_client.BaseComputeClient): return self.get_schema(self.schema_versions_info) -class TestSchemaVersionsNone(base.BaseComputeServiceTest): +class TestSchemaVersionsNone(base.BaseServiceTest): api_microversion = None expected_schema = 'schemav21' @@ -130,7 +130,7 @@ class DummyServiceClient2(base_compute_client.BaseComputeClient): return self.get_schema(self.schema_versions_info) -class TestSchemaVersionsNotFound(base.BaseComputeServiceTest): +class TestSchemaVersionsNotFound(base.BaseServiceTest): api_microversion = '2.10' expected_schema = 'schemav210' @@ -149,7 +149,7 @@ class TestSchemaVersionsNotFound(base.BaseComputeServiceTest): self.client.return_selected_schema) -class TestClientWithoutMicroversionHeader(base.BaseComputeServiceTest): +class TestClientWithoutMicroversionHeader(base.BaseServiceTest): def setUp(self): super(TestClientWithoutMicroversionHeader, self).setUp() @@ -172,7 +172,7 @@ class TestClientWithoutMicroversionHeader(base.BaseComputeServiceTest): self.client.get('fake_url') -class TestClientWithMicroversionHeader(base.BaseComputeServiceTest): +class TestClientWithMicroversionHeader(base.BaseServiceTest): def setUp(self): super(TestClientWithMicroversionHeader, self).setUp() diff --git a/tempest/tests/lib/services/compute/test_certificates_client.py b/tempest/tests/lib/services/compute/test_certificates_client.py index e8123bbe3b..9faef6f477 100644 --- a/tempest/tests/lib/services/compute/test_certificates_client.py +++ b/tempest/tests/lib/services/compute/test_certificates_client.py @@ -16,10 +16,10 @@ import copy from tempest.lib.services.compute import certificates_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestCertificatesClient(base.BaseComputeServiceTest): +class TestCertificatesClient(base.BaseServiceTest): FAKE_CERTIFICATE = { "certificate": { diff --git a/tempest/tests/lib/services/compute/test_extensions_client.py b/tempest/tests/lib/services/compute/test_extensions_client.py index 7415988ad6..d7e217e527 100644 --- a/tempest/tests/lib/services/compute/test_extensions_client.py +++ b/tempest/tests/lib/services/compute/test_extensions_client.py @@ -14,10 +14,10 @@ from tempest.lib.services.compute import extensions_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestExtensionsClient(base.BaseComputeServiceTest): +class TestExtensionsClient(base.BaseServiceTest): FAKE_SHOW_EXTENSION = { "extension": { diff --git a/tempest/tests/lib/services/compute/test_fixedIPs_client.py b/tempest/tests/lib/services/compute/test_fixedIPs_client.py index 6999f248b7..65bda45b88 100644 --- a/tempest/tests/lib/services/compute/test_fixedIPs_client.py +++ b/tempest/tests/lib/services/compute/test_fixedIPs_client.py @@ -14,10 +14,10 @@ from tempest.lib.services.compute import fixed_ips_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestFixedIPsClient(base.BaseComputeServiceTest): +class TestFixedIPsClient(base.BaseServiceTest): FIXED_IP_INFO = {"fixed_ip": {"address": "10.0.0.1", "cidr": "10.11.12.0/24", "host": "localhost", diff --git a/tempest/tests/lib/services/compute/test_flavors_client.py b/tempest/tests/lib/services/compute/test_flavors_client.py index e22b4fe93c..445ee22681 100644 --- a/tempest/tests/lib/services/compute/test_flavors_client.py +++ b/tempest/tests/lib/services/compute/test_flavors_client.py @@ -20,10 +20,10 @@ from oslotest import mockpatch from tempest.lib.services.compute import flavors_client from tempest.tests.lib import fake_auth_provider from tempest.tests.lib import fake_http -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestFlavorsClient(base.BaseComputeServiceTest): +class TestFlavorsClient(base.BaseServiceTest): FAKE_FLAVOR = { "disk": 1, diff --git a/tempest/tests/lib/services/compute/test_floating_ip_pools_client.py b/tempest/tests/lib/services/compute/test_floating_ip_pools_client.py index f30719eb19..b0c00f0991 100644 --- a/tempest/tests/lib/services/compute/test_floating_ip_pools_client.py +++ b/tempest/tests/lib/services/compute/test_floating_ip_pools_client.py @@ -14,10 +14,10 @@ from tempest.lib.services.compute import floating_ip_pools_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestFloatingIPPoolsClient(base.BaseComputeServiceTest): +class TestFloatingIPPoolsClient(base.BaseServiceTest): FAKE_FLOATING_IP_POOLS = { "floating_ip_pools": diff --git a/tempest/tests/lib/services/compute/test_floating_ips_bulk_client.py b/tempest/tests/lib/services/compute/test_floating_ips_bulk_client.py index c16c9857d8..ace76f89af 100644 --- a/tempest/tests/lib/services/compute/test_floating_ips_bulk_client.py +++ b/tempest/tests/lib/services/compute/test_floating_ips_bulk_client.py @@ -15,10 +15,10 @@ from tempest.tests.lib import fake_auth_provider from tempest.lib.services.compute import floating_ips_bulk_client -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestFloatingIPsBulkClient(base.BaseComputeServiceTest): +class TestFloatingIPsBulkClient(base.BaseServiceTest): FAKE_FIP_BULK_LIST = {"floating_ip_info": [{ "address": "10.10.10.1", diff --git a/tempest/tests/lib/services/compute/test_floating_ips_client.py b/tempest/tests/lib/services/compute/test_floating_ips_client.py index 3844ba83f2..92737f2ccc 100644 --- a/tempest/tests/lib/services/compute/test_floating_ips_client.py +++ b/tempest/tests/lib/services/compute/test_floating_ips_client.py @@ -17,10 +17,10 @@ from oslotest import mockpatch from tempest.lib import exceptions as lib_exc from tempest.lib.services.compute import floating_ips_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestFloatingIpsClient(base.BaseComputeServiceTest): +class TestFloatingIpsClient(base.BaseServiceTest): floating_ip = {"fixed_ip": None, "id": "46d61064-13ba-4bf0-9557-69de824c3d6f", diff --git a/tempest/tests/lib/services/compute/test_hosts_client.py b/tempest/tests/lib/services/compute/test_hosts_client.py index d9ff51371c..78537c297f 100644 --- a/tempest/tests/lib/services/compute/test_hosts_client.py +++ b/tempest/tests/lib/services/compute/test_hosts_client.py @@ -14,10 +14,10 @@ from tempest.lib.services.compute import hosts_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestHostsClient(base.BaseComputeServiceTest): +class TestHostsClient(base.BaseServiceTest): FAKE_HOST_DATA = { "host": { "resource": { diff --git a/tempest/tests/lib/services/compute/test_hypervisor_client.py b/tempest/tests/lib/services/compute/test_hypervisor_client.py index fab34da73d..89eb698a47 100644 --- a/tempest/tests/lib/services/compute/test_hypervisor_client.py +++ b/tempest/tests/lib/services/compute/test_hypervisor_client.py @@ -14,10 +14,10 @@ from tempest.lib.services.compute import hypervisor_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestHypervisorClient(base.BaseComputeServiceTest): +class TestHypervisorClient(base.BaseServiceTest): hypervisor_id = "1" hypervisor_name = "hyper.hostname.com" diff --git a/tempest/tests/lib/services/compute/test_images_client.py b/tempest/tests/lib/services/compute/test_images_client.py index 3ebc27ffbc..a9a570d049 100644 --- a/tempest/tests/lib/services/compute/test_images_client.py +++ b/tempest/tests/lib/services/compute/test_images_client.py @@ -19,10 +19,10 @@ from oslotest import mockpatch from tempest.lib import exceptions as lib_exc from tempest.lib.services.compute import images_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestImagesClient(base.BaseComputeServiceTest): +class TestImagesClient(base.BaseServiceTest): # Data Dictionaries used for testing # FAKE_IMAGE_METADATA = { "list": diff --git a/tempest/tests/lib/services/compute/test_instance_usage_audit_log_client.py b/tempest/tests/lib/services/compute/test_instance_usage_audit_log_client.py index e8c22f1378..21764ff5eb 100644 --- a/tempest/tests/lib/services/compute/test_instance_usage_audit_log_client.py +++ b/tempest/tests/lib/services/compute/test_instance_usage_audit_log_client.py @@ -16,10 +16,10 @@ import datetime from tempest.lib.services.compute import instance_usage_audit_log_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestInstanceUsagesAuditLogClient(base.BaseComputeServiceTest): +class TestInstanceUsagesAuditLogClient(base.BaseServiceTest): FAKE_AUDIT_LOG = { "hosts_not_run": [ diff --git a/tempest/tests/lib/services/compute/test_interfaces_client.py b/tempest/tests/lib/services/compute/test_interfaces_client.py index de8e26871a..4d781033c5 100644 --- a/tempest/tests/lib/services/compute/test_interfaces_client.py +++ b/tempest/tests/lib/services/compute/test_interfaces_client.py @@ -14,10 +14,10 @@ from tempest.lib.services.compute import interfaces_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestInterfacesClient(base.BaseComputeServiceTest): +class TestInterfacesClient(base.BaseServiceTest): # Data Values to be used for testing # FAKE_INTERFACE_DATA = { "fixed_ips": [{ diff --git a/tempest/tests/lib/services/compute/test_keypairs_client.py b/tempest/tests/lib/services/compute/test_keypairs_client.py index 7c595ca9fd..ed3b9dd7ff 100644 --- a/tempest/tests/lib/services/compute/test_keypairs_client.py +++ b/tempest/tests/lib/services/compute/test_keypairs_client.py @@ -16,10 +16,10 @@ import copy from tempest.lib.services.compute import keypairs_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestKeyPairsClient(base.BaseComputeServiceTest): +class TestKeyPairsClient(base.BaseServiceTest): FAKE_KEYPAIR = {"keypair": { "public_key": "ssh-rsa foo Generated-by-Nova", diff --git a/tempest/tests/lib/services/compute/test_limits_client.py b/tempest/tests/lib/services/compute/test_limits_client.py index d3f0aee025..5f3fa5a9c0 100644 --- a/tempest/tests/lib/services/compute/test_limits_client.py +++ b/tempest/tests/lib/services/compute/test_limits_client.py @@ -14,10 +14,10 @@ from tempest.lib.services.compute import limits_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestLimitsClient(base.BaseComputeServiceTest): +class TestLimitsClient(base.BaseServiceTest): def setUp(self): super(TestLimitsClient, self).setUp() diff --git a/tempest/tests/lib/services/compute/test_migrations_client.py b/tempest/tests/lib/services/compute/test_migrations_client.py index 5b1578de29..be62c0cc63 100644 --- a/tempest/tests/lib/services/compute/test_migrations_client.py +++ b/tempest/tests/lib/services/compute/test_migrations_client.py @@ -14,10 +14,10 @@ from tempest.lib.services.compute import migrations_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestMigrationsClient(base.BaseComputeServiceTest): +class TestMigrationsClient(base.BaseServiceTest): FAKE_MIGRATION_INFO = {"migrations": [{ "created_at": "2012-10-29T13:42:02", "dest_compute": "compute2", diff --git a/tempest/tests/lib/services/compute/test_networks_client.py b/tempest/tests/lib/services/compute/test_networks_client.py index 4f5c8b93ef..1908b5754f 100644 --- a/tempest/tests/lib/services/compute/test_networks_client.py +++ b/tempest/tests/lib/services/compute/test_networks_client.py @@ -14,10 +14,10 @@ from tempest.lib.services.compute import networks_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestNetworksClient(base.BaseComputeServiceTest): +class TestNetworksClient(base.BaseServiceTest): FAKE_NETWORK = { "bridge": None, diff --git a/tempest/tests/lib/services/compute/test_quota_classes_client.py b/tempest/tests/lib/services/compute/test_quota_classes_client.py index 4b675767d8..22d8b91a3d 100644 --- a/tempest/tests/lib/services/compute/test_quota_classes_client.py +++ b/tempest/tests/lib/services/compute/test_quota_classes_client.py @@ -16,10 +16,10 @@ import copy from tempest.lib.services.compute import quota_classes_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestQuotaClassesClient(base.BaseComputeServiceTest): +class TestQuotaClassesClient(base.BaseServiceTest): FAKE_QUOTA_CLASS_SET = { "injected_file_content_bytes": 10240, diff --git a/tempest/tests/lib/services/compute/test_quotas_client.py b/tempest/tests/lib/services/compute/test_quotas_client.py index 9f5d1f60f2..4c49e8db46 100644 --- a/tempest/tests/lib/services/compute/test_quotas_client.py +++ b/tempest/tests/lib/services/compute/test_quotas_client.py @@ -16,10 +16,10 @@ import copy from tempest.lib.services.compute import quotas_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestQuotasClient(base.BaseComputeServiceTest): +class TestQuotasClient(base.BaseServiceTest): FAKE_QUOTA_SET = { "quota_set": { diff --git a/tempest/tests/lib/services/compute/test_security_group_default_rules_client.py b/tempest/tests/lib/services/compute/test_security_group_default_rules_client.py index 581f7b1e8c..86eee02566 100644 --- a/tempest/tests/lib/services/compute/test_security_group_default_rules_client.py +++ b/tempest/tests/lib/services/compute/test_security_group_default_rules_client.py @@ -14,10 +14,10 @@ from tempest.lib.services.compute import security_group_default_rules_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestSecurityGroupDefaultRulesClient(base.BaseComputeServiceTest): +class TestSecurityGroupDefaultRulesClient(base.BaseServiceTest): FAKE_RULE = { "from_port": 80, "id": 1, diff --git a/tempest/tests/lib/services/compute/test_security_group_rules_client.py b/tempest/tests/lib/services/compute/test_security_group_rules_client.py index 9a7c04d935..2b0a94dd7e 100644 --- a/tempest/tests/lib/services/compute/test_security_group_rules_client.py +++ b/tempest/tests/lib/services/compute/test_security_group_rules_client.py @@ -14,10 +14,10 @@ from tempest.lib.services.compute import security_group_rules_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestSecurityGroupRulesClient(base.BaseComputeServiceTest): +class TestSecurityGroupRulesClient(base.BaseServiceTest): FAKE_SECURITY_GROUP_RULE = { "security_group_rule": { diff --git a/tempest/tests/lib/services/compute/test_security_groups_client.py b/tempest/tests/lib/services/compute/test_security_groups_client.py index 6a11c29c83..d293a08b01 100644 --- a/tempest/tests/lib/services/compute/test_security_groups_client.py +++ b/tempest/tests/lib/services/compute/test_security_groups_client.py @@ -17,10 +17,10 @@ from oslotest import mockpatch from tempest.lib import exceptions as lib_exc from tempest.lib.services.compute import security_groups_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestSecurityGroupsClient(base.BaseComputeServiceTest): +class TestSecurityGroupsClient(base.BaseServiceTest): FAKE_SECURITY_GROUP_INFO = [{ "description": "default", diff --git a/tempest/tests/lib/services/compute/test_server_groups_client.py b/tempest/tests/lib/services/compute/test_server_groups_client.py index cb163a8d13..bf03b84a83 100644 --- a/tempest/tests/lib/services/compute/test_server_groups_client.py +++ b/tempest/tests/lib/services/compute/test_server_groups_client.py @@ -17,10 +17,10 @@ from tempest.tests.lib import fake_auth_provider from tempest.lib.services.compute import server_groups_client from tempest.tests.lib import fake_http -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestServerGroupsClient(base.BaseComputeServiceTest): +class TestServerGroupsClient(base.BaseServiceTest): server_group = { "id": "5bbcc3c4-1da2-4437-a48a-66f15b1b13f9", diff --git a/tempest/tests/lib/services/compute/test_servers_client.py b/tempest/tests/lib/services/compute/test_servers_client.py index 007849739d..93550fdeee 100644 --- a/tempest/tests/lib/services/compute/test_servers_client.py +++ b/tempest/tests/lib/services/compute/test_servers_client.py @@ -16,10 +16,10 @@ import copy from tempest.lib.services.compute import servers_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestServersClient(base.BaseComputeServiceTest): +class TestServersClient(base.BaseServiceTest): FAKE_SERVERS = {'servers': [{ "id": "616fb98f-46ca-475e-917e-2563e5a8cd19", diff --git a/tempest/tests/lib/services/compute/test_services_client.py b/tempest/tests/lib/services/compute/test_services_client.py index 7add187d73..41da39ce7f 100644 --- a/tempest/tests/lib/services/compute/test_services_client.py +++ b/tempest/tests/lib/services/compute/test_services_client.py @@ -16,10 +16,10 @@ import copy from tempest.lib.services.compute import services_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestServicesClient(base.BaseComputeServiceTest): +class TestServicesClient(base.BaseServiceTest): FAKE_SERVICES = { "services": diff --git a/tempest/tests/lib/services/compute/test_snapshots_client.py b/tempest/tests/lib/services/compute/test_snapshots_client.py index b1d8ade60b..1629943803 100644 --- a/tempest/tests/lib/services/compute/test_snapshots_client.py +++ b/tempest/tests/lib/services/compute/test_snapshots_client.py @@ -17,10 +17,10 @@ from oslotest import mockpatch from tempest.lib import exceptions as lib_exc from tempest.lib.services.compute import snapshots_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestSnapshotsClient(base.BaseComputeServiceTest): +class TestSnapshotsClient(base.BaseServiceTest): FAKE_SNAPSHOT = { "createdAt": "2015-10-02T16:27:54.724209", diff --git a/tempest/tests/lib/services/compute/test_tenant_networks_client.py b/tempest/tests/lib/services/compute/test_tenant_networks_client.py index cfb68cc1d3..f71aad9b00 100644 --- a/tempest/tests/lib/services/compute/test_tenant_networks_client.py +++ b/tempest/tests/lib/services/compute/test_tenant_networks_client.py @@ -14,10 +14,10 @@ from tempest.lib.services.compute import tenant_networks_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestTenantNetworksClient(base.BaseComputeServiceTest): +class TestTenantNetworksClient(base.BaseServiceTest): FAKE_NETWORK = { "cidr": "None", diff --git a/tempest/tests/lib/services/compute/test_tenant_usages_client.py b/tempest/tests/lib/services/compute/test_tenant_usages_client.py index 88d093d306..49eae0872f 100644 --- a/tempest/tests/lib/services/compute/test_tenant_usages_client.py +++ b/tempest/tests/lib/services/compute/test_tenant_usages_client.py @@ -14,10 +14,10 @@ from tempest.lib.services.compute import tenant_usages_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestTenantUsagesClient(base.BaseComputeServiceTest): +class TestTenantUsagesClient(base.BaseServiceTest): FAKE_SERVER_USAGES = [{ "ended_at": None, diff --git a/tempest/tests/lib/services/compute/test_versions_client.py b/tempest/tests/lib/services/compute/test_versions_client.py index fc6c1d2087..06ecdc3c83 100644 --- a/tempest/tests/lib/services/compute/test_versions_client.py +++ b/tempest/tests/lib/services/compute/test_versions_client.py @@ -17,10 +17,10 @@ from oslotest import mockpatch from tempest.lib.services.compute import versions_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestVersionsClient(base.BaseComputeServiceTest): +class TestVersionsClient(base.BaseServiceTest): FAKE_INIT_VERSION = { "version": { diff --git a/tempest/tests/lib/services/compute/test_volumes_client.py b/tempest/tests/lib/services/compute/test_volumes_client.py index d16f5b068e..b81cdbbdeb 100644 --- a/tempest/tests/lib/services/compute/test_volumes_client.py +++ b/tempest/tests/lib/services/compute/test_volumes_client.py @@ -19,10 +19,10 @@ from oslotest import mockpatch from tempest.lib import exceptions as lib_exc from tempest.lib.services.compute import volumes_client from tempest.tests.lib import fake_auth_provider -from tempest.tests.lib.services.compute import base +from tempest.tests.lib.services import base -class TestVolumesClient(base.BaseComputeServiceTest): +class TestVolumesClient(base.BaseServiceTest): FAKE_VOLUME = { "id": "521752a6-acf6-4b2d-bc7a-119f9148cd8c",