commit 4495c04252b4f6330048b43c1992c5d04a4aecce
author rajat29 <rajat.sharma@nectechnologies.in> Wed Jun 28 15:37:16 2017 +0530
committer Rajat Sharma <rajat.sharma@nectechnologies.in> Thu Jun 29 11:20:02 2017 +0000
tree 0c7302c820662d2ab0984c75ff0c5c3050af5528
parent 3c9015b201ce779ed1e8775705b0a8a997047c32

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

neutron/tests/tempest/scenario/test_floatingip.py

diff --git a/neutron/tests/tempest/scenario/test_floatingip.py b/neutron/tests/tempest/scenario/test_floatingip.py
index 1ccb6ac..7998690 100644
--- a/neutron/tests/tempest/scenario/test_floatingip.py
+++ b/neutron/tests/tempest/scenario/test_floatingip.py
@@ -45,7 +45,7 @@
         cls.create_router_interface(cls.router['id'], cls.subnet['id'])
         cls.keypair = cls.create_keypair()
 
-        cls.secgroup = cls.manager.network_client.create_security_group(
+        cls.secgroup = cls.os_primary.network_client.create_security_group(
             name=data_utils.rand_name('secgroup-'))['security_group']
         cls.security_groups.append(cls.secgroup)
         cls.create_loginable_secgroup_rule(secgroup_id=cls.secgroup['id'])
@@ -77,7 +77,7 @@
             image_ref=CONF.compute.image_ref,
             key_name=self.keypair['name'],
             networks=[{'port': port['id']}])['server']
-        waiters.wait_for_server_status(self.manager.servers_client,
+        waiters.wait_for_server_status(self.os_primary.servers_client,
                                        server['id'],
                                        constants.SERVER_STATUS_ACTIVE)
         return {'port': port, 'fip': fip, 'server': server}