openstack/ironic
Code Issues Proposed changes

Replace the usage of 'manager' with 'os_primary'

Browse Source 
In tempest, alias 'manager' has been moved to 'os_primary'
in version Pike, and it will be removed in version Queens [1].

The other usages which also need to be replaced, are listed below:
* admin_manager > os_admin [2]
* os_adm > os_admin [3]
* os > os_primary [4]

[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/

Change-Id: I295bc37b903ada341320b73de6ebb4bf31aa955b
This commit is contained in:
Vu Cong Tuan 2017-06-21 18:32:15 +07:00
parent 6fcf371bb7
commit c10bfc9152
3 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
ironic_tempest_plugin/manager.py
View File

@ -49,45 +49,45 @@ class ScenarioTest(tempest.test.BaseTestCase):
def setup_clients(cls): def setup_clients(cls):
super(ScenarioTest, cls).setup_clients() super(ScenarioTest, cls).setup_clients()
# Clients (in alphabetical order) # 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.compute_floating_ips_client = (
cls.manager.compute_floating_ips_client) cls.os_primary.compute_floating_ips_client)
if CONF.service_available.glance: if CONF.service_available.glance:
# Check if glance v1 is available to determine which client to use. # Check if glance v1 is available to determine which client to use.
if CONF.image_feature_enabled.api_v1: 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: 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: else:
raise lib_exc.InvalidConfiguration( raise lib_exc.InvalidConfiguration(
'Either api_v1 or api_v2 must be True in ' 'Either api_v1 or api_v2 must be True in '
'[image-feature-enabled].') '[image-feature-enabled].')
# Compute image client # Compute image client
cls.compute_images_client = cls.manager.compute_images_client cls.compute_images_client = cls.os_primary.compute_images_client
cls.keypairs_client = cls.manager.keypairs_client cls.keypairs_client = cls.os_primary.keypairs_client
# Nova security groups client # Nova security groups client
cls.compute_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.compute_security_group_rules_client = (
cls.manager.compute_security_group_rules_client) cls.os_primary.compute_security_group_rules_client)
cls.servers_client = cls.manager.servers_client cls.servers_client = cls.os_primary.servers_client
cls.interface_client = cls.manager.interfaces_client cls.interface_client = cls.os_primary.interfaces_client
# Neutron network client # Neutron network client
cls.networks_client = cls.manager.networks_client cls.networks_client = cls.os_primary.networks_client
cls.ports_client = cls.manager.ports_client cls.ports_client = cls.os_primary.ports_client
cls.routers_client = cls.manager.routers_client cls.routers_client = cls.os_primary.routers_client
cls.subnets_client = cls.manager.subnets_client cls.subnets_client = cls.os_primary.subnets_client
cls.floating_ips_client = cls.manager.floating_ips_client cls.floating_ips_client = cls.os_primary.floating_ips_client
cls.security_groups_client = cls.manager.security_groups_client cls.security_groups_client = cls.os_primary.security_groups_client
cls.security_group_rules_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: if CONF.volume_feature_enabled.api_v2:
cls.volumes_client = cls.manager.volumes_v2_client cls.volumes_client = cls.os_primary.volumes_v2_client
cls.snapshots_client = cls.manager.snapshots_v2_client cls.snapshots_client = cls.os_primary.snapshots_v2_client
else: else:
cls.volumes_client = cls.manager.volumes_client cls.volumes_client = cls.os_primary.volumes_client
cls.snapshots_client = cls.manager.snapshots_client cls.snapshots_client = cls.os_primary.snapshots_client
# ## Test functions library # ## Test functions library
# #
@ -140,7 +140,7 @@ class ScenarioTest(tempest.test.BaseTestCase):
# Needed for the cross_tenant_traffic test: # Needed for the cross_tenant_traffic test:
if clients is None: if clients is None:
clients = self.manager clients = self.os_primary
if name is None: if name is None:
name = data_utils.rand_name(self.__class__.__name__ + "-server") name = data_utils.rand_name(self.__class__.__name__ + "-server")
@ -507,7 +507,7 @@ class NetworkScenarioTest(ScenarioTest):
return network return network
def _get_server_port_id_and_ip4(self, server, ip_addr=None): 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'] device_id=server['id'], fixed_ip=ip_addr)['ports']
# A port can have more than one IP address in some cases. # A port can have more than one IP address in some cases.
# If the network is dual-stack (IPv4 + IPv6), this port is associated # If the network is dual-stack (IPv4 + IPv6), this port is associated

6
ironic_tempest_plugin/tests/scenario/baremetal_standalone_manager.py
View File

@ -62,7 +62,7 @@ class BaremetalStandaloneManager(bm.BaremetalScenarioTest,
m = ('Configuration option "[compute]/fixed_network_name" ' m = ('Configuration option "[compute]/fixed_network_name" '
'must be set.') 'must be set.')
raise lib_exc.InvalidConfiguration(m) 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] name=CONF.compute.fixed_network_name)['networks'][0]
return network, subnet, router return network, subnet, router
@ -148,10 +148,10 @@ class BaremetalStandaloneManager(bm.BaremetalScenarioTest,
@classmethod @classmethod
def cleanup_floating_ip(cls, ip_address): def cleanup_floating_ip(cls, ip_address):
"""Removes floating IP.""" """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 floating_ip_id = [f['id'] for f in body['floatingips'] if
f['floating_ip_address'] == ip_address][0] 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 @classmethod
@bm.retry_on_conflict @bm.retry_on_conflict

4
ironic_tempest_plugin/tests/scenario/test_baremetal_multitenancy.py
View File

@ -90,12 +90,12 @@ class BaremetalMultitenancy(baremetal_manager.BaremetalScenarioTest,
fixed_ip2 = '10.0.100.5' fixed_ip2 = '10.0.100.5'
keypair = self.create_keypair() keypair = self.create_keypair()
network, subnet, router = self.create_tenant_network( network, subnet, router = self.create_tenant_network(
self.manager, tenant_cidr) self.os_primary, tenant_cidr)
# Boot 2 instances in the primary tenant network # Boot 2 instances in the primary tenant network
# and check L2 connectivity between them # and check L2 connectivity between them
instance1, node1 = self.boot_instance( instance1, node1 = self.boot_instance(
clients=self.manager, clients=self.os_primary,
keypair=keypair, keypair=keypair,
net_id=network['id'], net_id=network['id'],
fixed_ip=fixed_ip1 fixed_ip=fixed_ip1