From c7c497cc3a07dc69187efb8d3459c3a65c08c010 Mon Sep 17 00:00:00 2001 From: "bhavani.cr" Date: Mon, 10 Jul 2017 16:15:35 +0530 Subject: [PATCH] Replace the usage of 'admin_manager' with 'os_admin' In tempest, alias 'admin_manager' has been moved to 'os_admin' 'alt_manager' to 'os_alt' and 'manager' to 'os_primary' in version Pike, and it will be removed in version Queens[1]. [1]I5f7164f7a7ec5d4380ca22885000caa0183a0bf7 Change-Id: I162d5e4a7a9aa65d7abefbe74c1571e3106edcaf Closes-bug: 1697588 --- .../tempest_plugin/tests/scenario/manager.py | 50 +++++++++---------- .../tests/tempest_plugin/tests/taas_client.py | 10 ++-- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/neutron_taas/tests/tempest_plugin/tests/scenario/manager.py b/neutron_taas/tests/tempest_plugin/tests/scenario/manager.py index e366b94..999350b 100644 --- a/neutron_taas/tests/tempest_plugin/tests/scenario/manager.py +++ b/neutron_taas/tests/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") @@ -749,7 +749,7 @@ class NetworkScenarioTest(ScenarioTest): :returns: True if subnet with cidr already exist in tenant False else """ - cidr_in_use = self.admin_manager.subnets_client.list_subnets( + cidr_in_use = self.os_admin.subnets_client.list_subnets( tenant_id=tenant_id, cidr=cidr)['subnets'] return len(cidr_in_use) != 0 @@ -798,7 +798,7 @@ class NetworkScenarioTest(ScenarioTest): return subnet def _get_server_port_id_and_ip4(self, server, ip_addr=None): - ports = self.admin_manager.ports_client.list_ports( + ports = self.os_admin.ports_client.list_ports( device_id=server['id'], fixed_ip=ip_addr)['ports'] # A port can have more than one IP address in some cases. # If the network is dual-stack (IPv4 + IPv6), this port is associated @@ -828,7 +828,7 @@ class NetworkScenarioTest(ScenarioTest): return port_map[0] def _get_network_by_name(self, network_name): - net = self.admin_manager.networks_client.list_networks( + net = self.os_admin.networks_client.list_networks( name=network_name)['networks'] self.assertNotEqual(len(net), 0, "Unable to get network by name: %s" % network_name) diff --git a/neutron_taas/tests/tempest_plugin/tests/taas_client.py b/neutron_taas/tests/tempest_plugin/tests/taas_client.py index f24d772..561f097 100644 --- a/neutron_taas/tests/tempest_plugin/tests/taas_client.py +++ b/neutron_taas/tests/tempest_plugin/tests/taas_client.py @@ -27,23 +27,23 @@ class TaaSClientMixin(object): @classmethod def resource_setup(cls): super(TaaSClientMixin, cls).resource_setup() - manager = cls.manager + os_primary = cls.os_primary cls.tap_services_client = client.TapServicesClient( - manager.auth_provider, + os_primary.auth_provider, CONF.network.catalog_type, CONF.network.region or CONF.identity.region, endpoint_type=CONF.network.endpoint_type, build_interval=CONF.network.build_interval, build_timeout=CONF.network.build_timeout, - **manager.default_params) + **os_primary.default_params) cls.tap_flows_client = client.TapFlowsClient( - manager.auth_provider, + os_primary.auth_provider, CONF.network.catalog_type, CONF.network.region or CONF.identity.region, endpoint_type=CONF.network.endpoint_type, build_interval=CONF.network.build_interval, build_timeout=CONF.network.build_timeout, - **manager.default_params) + **os_primary.default_params) def create_tap_service(self, **kwargs): body = self.tap_services_client.create_tap_service(