Merge "Remove usage of credentials_factory.AdminManager"

This commit is contained in:
Jenkins 2017-08-09 08:26:37 +00:00 committed by Gerrit Code Review
commit e9471d728e
2 changed files with 6 additions and 2 deletions

View File

@ -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

View File

@ -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