From 757dc692df50f75d4142e0678611e61d62780456 Mon Sep 17 00:00:00 2001 From: ghanshyam Date: Tue, 8 Aug 2017 04:05:48 +0300 Subject: [PATCH] Remove usage of credentials_factory.AdminManager Tempest is making credentials_factory as stable interface and will be removing the AdminManager class which is wrapper of creating client manager wirth admin cred. admin manager can be instantiated by providing the admin cred to clients.Manager. This commit removes the usage of AdminManager. Change-Id: I321a7985a60ceb0c6230d04e42c2b4c0a804027f --- octavia/tests/tempest/v1/scenario/base.py | 4 +++- octavia/tests/tempest/v2/scenario/base.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/octavia/tests/tempest/v1/scenario/base.py b/octavia/tests/tempest/v1/scenario/base.py index f3948e6fa4..e4556c6207 100644 --- a/octavia/tests/tempest/v1/scenario/base.py +++ b/octavia/tests/tempest/v1/scenario/base.py @@ -30,6 +30,7 @@ from oslo_log import log as logging import six from six.moves.urllib import error from six.moves.urllib import request as urllib2 +from tempest import clients from tempest.common import credentials_factory from tempest.common import waiters from tempest import config @@ -90,7 +91,8 @@ class BaseTestCase(manager.NetworkScenarioTest): self._set_net_and_subnet() # admin network client needed for assigning octavia port to flip - os_admin = credentials_factory.AdminManager() + os_admin = clients.Manager( + credentials_factory.get_configured_admin_credentials()) os_admin.auth_provider.fill_credentials() self.floating_ips_client_admin = os_admin.floating_ips_client self.ports_client_admin = os_admin.ports_client diff --git a/octavia/tests/tempest/v2/scenario/base.py b/octavia/tests/tempest/v2/scenario/base.py index d7fb5bbd8d..95d2339185 100644 --- a/octavia/tests/tempest/v2/scenario/base.py +++ b/octavia/tests/tempest/v2/scenario/base.py @@ -30,6 +30,7 @@ from oslo_log import log as logging import six from six.moves.urllib import error from six.moves.urllib import request as urllib2 +from tempest import clients from tempest.common import credentials_factory from tempest.common import waiters from tempest import config @@ -91,7 +92,8 @@ class BaseTestCase(manager.NetworkScenarioTest): self.quotas_client = quotas_client.QuotasClient(*self.client_args) # admin network client needed for assigning octavia port to flip - os_admin = credentials_factory.AdminManager() + os_admin = clients.Manager( + credentials_factory.get_configured_admin_credentials()) os_admin.auth_provider.fill_credentials() self.floating_ips_client_admin = os_admin.floating_ips_client self.ports_client_admin = os_admin.ports_client