diff --git a/ironic_tempest_plugin/manager.py b/ironic_tempest_plugin/manager.py index 130eff9550..560a6cce4a 100644 --- a/ironic_tempest_plugin/manager.py +++ b/ironic_tempest_plugin/manager.py @@ -49,45 +49,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 # @@ -140,7 +140,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") @@ -507,7 +507,7 @@ class NetworkScenarioTest(ScenarioTest): return network 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 diff --git a/ironic_tempest_plugin/tests/scenario/baremetal_standalone_manager.py b/ironic_tempest_plugin/tests/scenario/baremetal_standalone_manager.py index 25fb74eb29..1d19c47366 100644 --- a/ironic_tempest_plugin/tests/scenario/baremetal_standalone_manager.py +++ b/ironic_tempest_plugin/tests/scenario/baremetal_standalone_manager.py @@ -62,7 +62,7 @@ class BaremetalStandaloneManager(bm.BaremetalScenarioTest, m = ('Configuration option "[compute]/fixed_network_name" ' 'must be set.') raise lib_exc.InvalidConfiguration(m) - network = cls.admin_manager.networks_client.list_networks( + network = cls.os_admin.networks_client.list_networks( name=CONF.compute.fixed_network_name)['networks'][0] return network, subnet, router @@ -148,10 +148,10 @@ class BaremetalStandaloneManager(bm.BaremetalScenarioTest, @classmethod def cleanup_floating_ip(cls, ip_address): """Removes floating IP.""" - body = cls.admin_manager.floating_ips_client.list_floatingips() + body = cls.os_admin.floating_ips_client.list_floatingips() floating_ip_id = [f['id'] for f in body['floatingips'] if f['floating_ip_address'] == ip_address][0] - cls.admin_manager.floating_ips_client.delete_floatingip(floating_ip_id) + cls.os_admin.floating_ips_client.delete_floatingip(floating_ip_id) @classmethod @bm.retry_on_conflict diff --git a/ironic_tempest_plugin/tests/scenario/test_baremetal_multitenancy.py b/ironic_tempest_plugin/tests/scenario/test_baremetal_multitenancy.py index d5126d8ea0..2311e8ce86 100644 --- a/ironic_tempest_plugin/tests/scenario/test_baremetal_multitenancy.py +++ b/ironic_tempest_plugin/tests/scenario/test_baremetal_multitenancy.py @@ -90,12 +90,12 @@ class BaremetalMultitenancy(baremetal_manager.BaremetalScenarioTest, fixed_ip2 = '10.0.100.5' keypair = self.create_keypair() network, subnet, router = self.create_tenant_network( - self.manager, tenant_cidr) + self.os_primary, tenant_cidr) # Boot 2 instances in the primary tenant network # and check L2 connectivity between them instance1, node1 = self.boot_instance( - clients=self.manager, + clients=self.os_primary, keypair=keypair, net_id=network['id'], fixed_ip=fixed_ip1