openstack
/
octavia
Code Issues Proposed changes

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
parent 54a880d6c1 757dc692df
commit e9471d728e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
octavia/tests/tempest/v1/scenario/base.py
View File

@ -30,6 +30,7 @@ from oslo_log import log as logging
import six import six
from six.moves.urllib import error from six.moves.urllib import error
from six.moves.urllib import request as urllib2 from six.moves.urllib import request as urllib2
from tempest import clients
from tempest.common import credentials_factory from tempest.common import credentials_factory
from tempest.common import waiters from tempest.common import waiters
from tempest import config from tempest import config
@ -90,7 +91,8 @@ class BaseTestCase(manager.NetworkScenarioTest):
self._set_net_and_subnet() self._set_net_and_subnet()
# admin network client needed for assigning octavia port to flip # 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() os_admin.auth_provider.fill_credentials()
self.floating_ips_client_admin = os_admin.floating_ips_client self.floating_ips_client_admin = os_admin.floating_ips_client
self.ports_client_admin = os_admin.ports_client self.ports_client_admin = os_admin.ports_client

4
octavia/tests/tempest/v2/scenario/base.py
View File

@ -30,6 +30,7 @@ from oslo_log import log as logging
import six import six
from six.moves.urllib import error from six.moves.urllib import error
from six.moves.urllib import request as urllib2 from six.moves.urllib import request as urllib2
from tempest import clients
from tempest.common import credentials_factory from tempest.common import credentials_factory
from tempest.common import waiters from tempest.common import waiters
from tempest import config from tempest import config
@ -91,7 +92,8 @@ class BaseTestCase(manager.NetworkScenarioTest):
self.quotas_client = quotas_client.QuotasClient(*self.client_args) self.quotas_client = quotas_client.QuotasClient(*self.client_args)
# admin network client needed for assigning octavia port to flip # 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() os_admin.auth_provider.fill_credentials()
self.floating_ips_client_admin = os_admin.floating_ips_client self.floating_ips_client_admin = os_admin.floating_ips_client
self.ports_client_admin = os_admin.ports_client self.ports_client_admin = os_admin.ports_client