openstack
/
ironic-tempest-plugin
Code Issues Proposed changes

Update after recent removal of cred manager aliases 

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: Ifec0e661031647555dbc03ad1000c50c590afa8c
Closes-bug: 1697588
This commit is contained in:
Luong Anh Tuan 2017-09-25 10:58:17 +07:00
parent 8da9ef5926
commit e7f8f1a25e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ironic_tempest_plugin/tests/scenario/test_baremetal_boot_from_volume.py
View File

@ -114,7 +114,7 @@ class BaremetalBFV(baremetal_manager.BaremetalScenarioTest):
delete_on_termination=delete_on_termination))
return self.boot_instance(
clients=self.manager,
clients=self.os_primary,
keypair=keypair,
**create_kwargs
)

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

@ -108,19 +108,19 @@ class BaremetalMultitenancy(baremetal_manager.BaremetalScenarioTest,
# Boot instance in the alt tenant network and ensure there is no
# L2 connectivity between instances of the different tenants
alt_keypair = self.create_keypair(self.alt_manager.keypairs_client)
alt_keypair = self.create_keypair(self.os_alt.keypairs_client)
alt_network, alt_subnet, alt_router = self.create_tenant_network(
self.alt_manager, tenant_cidr)
self.os_alt, tenant_cidr)
alt_instance, alt_node = self.boot_instance(
keypair=alt_keypair,
clients=self.alt_manager,
clients=self.os_alt,
net_id=alt_network['id'],
fixed_ip=fixed_ip2
)
alt_floating_ip = self.create_floating_ip(
alt_instance,
client=self.alt_manager.floating_ips_client
client=self.os_alt.floating_ips_client
)['floating_ip_address']
self.check_vm_connectivity(ip_address=alt_floating_ip,
@ -149,5 +149,5 @@ class BaremetalMultitenancy(baremetal_manager.BaremetalScenarioTest,
self.terminate_instance(
instance=alt_instance,
servers_client=self.alt_manager.servers_client)
servers_client=self.os_alt.servers_client)
self.terminate_instance(instance=instance1)