openstack
/
magnum-tempest-plugin
Code Issues Proposed changes

Merge "Update Magnum service name and description"

This commit is contained in:
Jenkins 2016-05-26 00:39:05 +00:00 committed by Gerrit Code Review
parent 8d20ba13d0 4241566933
commit 67cde26246
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magnum/tests/functional/common/client.py
View File

@ -26,7 +26,7 @@ class MagnumClient(rest_client.RestClient):
def __init__(self, auth_provider):
super(MagnumClient, self).__init__(
auth_provider=auth_provider,
service='container',
service='container-infra',
region=config.Config.region,
disable_ssl_certificate_validation=True
)

5
magnum/tests/functional/common/manager.py
View File

@ -26,7 +26,7 @@ class Manager(clients.Manager):
if not credentials:
credentials = common_creds.get_configured_credentials(
'identity_admin')
super(Manager, self).__init__(credentials, 'container')
super(Manager, self).__init__(credentials, 'container-infra')
self.auth_provider.orig_base_url = self.auth_provider.base_url
self.auth_provider.base_url = self.bypassed_base_url
if request_type == 'baymodel':
@ -42,7 +42,8 @@ class Manager(clients.Manager):
self.client = client.MagnumClient(self.auth_provider)
def bypassed_base_url(self, filters, auth_data=None):
if config.Config.magnum_url and filters['service'] == 'container':
if (config.Config.magnum_url and
filters['service'] == 'container-infra'):
return config.Config.magnum_url
return self.auth_provider.orig_base_url(filters, auth_data=auth_data)