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
Closes-bug: 1697588
Change-Id: Ib41a1bcff70cc7323b90a222c9f64d66e0203e53
diff --git a/neutron/tests/tempest/scenario/base.py b/neutron/tests/tempest/scenario/base.py
index 15a722a..5ccbd1c 100644
--- a/neutron/tests/tempest/scenario/base.py
+++ b/neutron/tests/tempest/scenario/base.py
@@ -41,7 +41,7 @@
@classmethod
def resource_cleanup(cls):
for keypair in cls.keypairs:
- cls.manager.keypairs_client.delete_keypair(
+ cls.os_primary.keypairs_client.delete_keypair(
keypair_name=keypair['name'])
super(BaseTempestTestCase, cls).resource_cleanup()
@@ -89,7 +89,7 @@
@classmethod
def create_keypair(cls, client=None):
- client = client or cls.manager.keypairs_client
+ client = client or cls.os_primary.keypairs_client
name = data_utils.rand_name('keypair-test')
body = client.create_keypair(name=name)
cls.keypairs.append(body['keypair'])
@@ -97,7 +97,7 @@
@classmethod
def create_secgroup_rules(cls, rule_list, secgroup_id=None):
- client = cls.manager.network_client
+ client = cls.os_primary.network_client
if not secgroup_id:
sgs = client.list_security_groups()['security_groups']
for sg in sgs: