tempest: update on removal of cred manager aliases

Aliases are deprecated for cred manager [1], update existing occurences
in tempest plugin (including currently commented code for multinode
tests)

[1] I5f7164f7a7ec5d4380ca22885000caa0183a0bf7

Change-Id: I2d204cca39a5fd445fc9a3c66913396b38e51fad
Closes-Bug: #1697588

networking_sfc/tests/tempest_plugin/tests/flowclassifier_client.py

@@ -24,7 +24,7 @@ class FlowClassifierClientMixin(object):
     @classmethod
     def resource_setup(cls):
         super(FlowClassifierClientMixin, cls).resource_setup()
-        manager = cls.admin_manager
+        manager = cls.os_admin
         cls.flowclassifier_client = (
             flowclassifier_client.FlowClassifierClient(
                 manager.auth_provider,

networking_sfc/tests/tempest_plugin/tests/scenario/manager.py

@@ -749,7 +749,7 @@ class NetworkScenarioTest(ScenarioTest):
             :returns: True if subnet with cidr already exist in tenant
                   False else
             """
-            cidr_in_use = self.admin_manager.subnets_client.list_subnets(
+            cidr_in_use = self.os_admin.subnets_client.list_subnets(
                 tenant_id=tenant_id, cidr=cidr)['subnets']
             return len(cidr_in_use) != 0
 
@@ -798,7 +798,7 @@ class NetworkScenarioTest(ScenarioTest):
         return subnet
 
     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
@@ -828,7 +828,7 @@ class NetworkScenarioTest(ScenarioTest):
         return port_map[0]
 
     def _get_network_by_name(self, network_name):
-        net = self.admin_manager.networks_client.list_networks(
+        net = self.os_admin.networks_client.list_networks(
             name=network_name)['networks']
         self.assertNotEqual(len(net), 0,
                             "Unable to get network by name: %s" % network_name)

networking_sfc/tests/tempest_plugin/tests/scenario/test_sfc_multinode.py

@@ -35,32 +35,32 @@ class TestSfcMultinode(test_sfc.TestSfc):
     # @classmethod
     # def setup_credentials(cls):
     #     super(TestSfcMultinode, cls).setup_credentials()
-    #     cls.os_primary = cls.admin_manager
+    #     cls.os_primary = cls.os_admin
     #     cls.os = cls.os_adm
 
     @classmethod
     def setup_clients(cls):
         super(TestSfcMultinode, cls).setup_clients()
         # Use admin client by default
-        # cls.os_primary = cls.admin_manager
+        # cls.os_primary = cls.os_admin
         # this is needed so that we can use the availability_zone:host
         # scheduler hint, which is admin_only by default
-        # cls.servers_client = cls.admin_manager.servers_client
+        # cls.servers_client = cls.os_admin.servers_client
         # super(TestSfcMultinode, cls).resource_setup()
 
     def _setup_security_group(self):
         self.security_group = self._create_security_group(
             security_group_rules_client=(
-                self.admin_manager.security_group_rules_client
+                self.os_admin.security_group_rules_client
             ),
-            security_groups_client=self.admin_manager.security_groups_client
+            security_groups_client=self.os_admin.security_groups_client
         )
         self._create_security_group_rule(
             self.security_group,
             security_group_rules_client=(
-                self.admin_manager.security_group_rules_client
+                self.os_admin.security_group_rules_client
             ),
-            security_groups_client=self.admin_manager.security_groups_client,
+            security_groups_client=self.os_admin.security_groups_client,
             protocol=None,
             direction='ingress'
         )
@@ -94,7 +94,7 @@ class TestSfcMultinode(test_sfc.TestSfc):
             availability_zone='%(zone)s:%(host_name)s' % host,
             networks=[{'uuid': network['id']}],
             wait_until='ACTIVE',
-            clients=self.admin_manager,
+            clients=self.os_admin,
             **kwargs)
         waiters.wait_for_server_status(self.servers_client,
                                        server['id'], 'ACTIVE')

networking_sfc/tests/tempest_plugin/tests/sfc_client.py

@@ -24,7 +24,7 @@ class SfcClientMixin(object):
     @classmethod
     def resource_setup(cls):
         super(SfcClientMixin, cls).resource_setup()
-        manager = cls.admin_manager
+        manager = cls.os_admin
         cls.portchain_client = (
             sfc_client.PortChainClient(
                 manager.auth_provider,