From 640c365a528c21123dde557e581c7dccf401513a Mon Sep 17 00:00:00 2001 From: Vu Cong Tuan Date: Wed, 4 Oct 2017 13:54:32 +0700 Subject: [PATCH] Replace the usage of some aliases in tempest In tempest, following aliases have been moved in version Pike and will be removed in version Queens: * manager > os_primary [1] * admin_manager > os_admin [2] * os_adm > os_admin [3] * os > os_primary [4] * alt_manager > os_alt [5] [1] https://review.openstack.org/#/c/468036/ [2] https://review.openstack.org/#/c/467852/ [3] https://review.openstack.org/#/c/467605/ [4] https://review.openstack.org/#/c/466991/ [5] https://review.openstack.org/#/c/457555/ Change-Id: Icd2ba2fd8e47cf0d515e6004c3793b499eef802e --- .../api/compute/servers/test_create_server.py | 4 +- .../tests/api/compute/servers/test_servers.py | 4 +- .../api/compute/volumes/test_attach_volume.py | 4 +- .../tests/scenario/manager.py | 44 +++++++++---------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/nova_lxd_tempest_plugin/tests/api/compute/servers/test_create_server.py b/nova_lxd_tempest_plugin/tests/api/compute/servers/test_create_server.py index 2355310c..8ae0ff71 100644 --- a/nova_lxd_tempest_plugin/tests/api/compute/servers/test_create_server.py +++ b/nova_lxd_tempest_plugin/tests/api/compute/servers/test_create_server.py @@ -37,8 +37,8 @@ class LXDServersTestJSON(base.BaseV2ComputeAdminTest): @classmethod def setup_clients(cls): super(LXDServersTestJSON, cls).setup_clients() - cls.client = cls.os_adm.servers_client - cls.flavors_client = cls.os_adm.flavors_client + cls.client = cls.os_admin.servers_client + cls.flavors_client = cls.os_admin.flavors_client @classmethod def resource_setup(cls): diff --git a/nova_lxd_tempest_plugin/tests/api/compute/servers/test_servers.py b/nova_lxd_tempest_plugin/tests/api/compute/servers/test_servers.py index f581e5aa..ba48a629 100644 --- a/nova_lxd_tempest_plugin/tests/api/compute/servers/test_servers.py +++ b/nova_lxd_tempest_plugin/tests/api/compute/servers/test_servers.py @@ -36,8 +36,8 @@ class LXDServersWithSpecificFlavorTestJSON(base.BaseV2ComputeAdminTest): @classmethod def setup_clients(cls): super(LXDServersWithSpecificFlavorTestJSON, cls).setup_clients() - cls.flavor_client = cls.os_adm.flavors_client - cls.client = cls.os_adm.servers_client + cls.flavor_client = cls.os_admin.flavors_client + cls.client = cls.os_admin.servers_client @classmethod def resource_setup(cls): diff --git a/nova_lxd_tempest_plugin/tests/api/compute/volumes/test_attach_volume.py b/nova_lxd_tempest_plugin/tests/api/compute/volumes/test_attach_volume.py index 1ca4d5c0..021fa8d9 100644 --- a/nova_lxd_tempest_plugin/tests/api/compute/volumes/test_attach_volume.py +++ b/nova_lxd_tempest_plugin/tests/api/compute/volumes/test_attach_volume.py @@ -41,8 +41,8 @@ class LXDVolumeTests(base.BaseV2ComputeAdminTest): @classmethod def setup_clients(cls): super(LXDVolumeTests, cls).setup_clients() - cls.client = cls.os_adm.servers_client - cls.flavors_client = cls.os_adm.flavors_client + cls.client = cls.os_admin.servers_client + cls.flavors_client = cls.os_admin.flavors_client @classmethod def resource_setup(cls): diff --git a/nova_lxd_tempest_plugin/tests/scenario/manager.py b/nova_lxd_tempest_plugin/tests/scenario/manager.py index 18d55f26..79189daf 100644 --- a/nova_lxd_tempest_plugin/tests/scenario/manager.py +++ b/nova_lxd_tempest_plugin/tests/scenario/manager.py @@ -47,45 +47,45 @@ class ScenarioTest(tempest.test.BaseTestCase): def setup_clients(cls): super(ScenarioTest, cls).setup_clients() # Clients (in alphabetical order) - cls.flavors_client = cls.manager.flavors_client + cls.flavors_client = cls.os_primary.flavors_client cls.compute_floating_ips_client = ( - cls.manager.compute_floating_ips_client) + cls.os_primary.compute_floating_ips_client) if CONF.service_available.glance: # Check if glance v1 is available to determine which client to use. if CONF.image_feature_enabled.api_v1: - cls.image_client = cls.manager.image_client + cls.image_client = cls.os_primary.image_client elif CONF.image_feature_enabled.api_v2: - cls.image_client = cls.manager.image_client_v2 + cls.image_client = cls.os_primary.image_client_v2 else: raise lib_exc.InvalidConfiguration( 'Either api_v1 or api_v2 must be True in ' '[image-feature-enabled].') # Compute image client - cls.compute_images_client = cls.manager.compute_images_client - cls.keypairs_client = cls.manager.keypairs_client + cls.compute_images_client = cls.os_primary.compute_images_client + cls.keypairs_client = cls.os_primary.keypairs_client # Nova security groups client cls.compute_security_groups_client = ( - cls.manager.compute_security_groups_client) + cls.os_primary.compute_security_groups_client) cls.compute_security_group_rules_client = ( - cls.manager.compute_security_group_rules_client) - cls.servers_client = cls.manager.servers_client - cls.interface_client = cls.manager.interfaces_client + cls.os_primary.compute_security_group_rules_client) + cls.servers_client = cls.os_primary.servers_client + cls.interface_client = cls.os_primary.interfaces_client # Neutron network client - cls.networks_client = cls.manager.networks_client - cls.ports_client = cls.manager.ports_client - cls.routers_client = cls.manager.routers_client - cls.subnets_client = cls.manager.subnets_client - cls.floating_ips_client = cls.manager.floating_ips_client - cls.security_groups_client = cls.manager.security_groups_client + cls.networks_client = cls.os_primary.networks_client + cls.ports_client = cls.os_primary.ports_client + cls.routers_client = cls.os_primary.routers_client + cls.subnets_client = cls.os_primary.subnets_client + cls.floating_ips_client = cls.os_primary.floating_ips_client + cls.security_groups_client = cls.os_primary.security_groups_client cls.security_group_rules_client = ( - cls.manager.security_group_rules_client) + cls.os_primary.security_group_rules_client) if CONF.volume_feature_enabled.api_v2: - cls.volumes_client = cls.manager.volumes_v2_client - cls.snapshots_client = cls.manager.snapshots_v2_client + cls.volumes_client = cls.os_primary.volumes_v2_client + cls.snapshots_client = cls.os_primary.snapshots_v2_client else: - cls.volumes_client = cls.manager.volumes_client - cls.snapshots_client = cls.manager.snapshots_client + cls.volumes_client = cls.os_primary.volumes_client + cls.snapshots_client = cls.os_primary.snapshots_client # ## Test functions library # @@ -138,7 +138,7 @@ class ScenarioTest(tempest.test.BaseTestCase): # Needed for the cross_tenant_traffic test: if clients is None: - clients = self.manager + clients = self.os_primary if name is None: name = data_utils.rand_name(self.__class__.__name__ + "-server")