From 42415669331631e4f55e30d6a9d37c9baf77d7ef Mon Sep 17 00:00:00 2001 From: Hongbin Lu Date: Fri, 20 May 2016 09:55:48 -0500 Subject: [PATCH] Update Magnum service name and description After this patch [1], Magnum is no longer the "Container Service", it became the "Container Infrastructure Management Service". This commit updates the service name and description accordingly: * Change service name from "container" to "container-infra" * Update service description to reflect its mission [1] https://review.openstack.org/#/c/311476/ Depends-On: I55205ff2b304678d2b53bbd4d66403078c6baac8 Closes-Bug: #1584251 Change-Id: I5c271bf3fc4d6ccecaf2918aca28ce946bcc6b22 --- magnum/tests/functional/common/client.py | 2 +- magnum/tests/functional/common/manager.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/magnum/tests/functional/common/client.py b/magnum/tests/functional/common/client.py index c50da02..d61c8da 100644 --- a/magnum/tests/functional/common/client.py +++ b/magnum/tests/functional/common/client.py @@ -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 ) diff --git a/magnum/tests/functional/common/manager.py b/magnum/tests/functional/common/manager.py index 156d9af..27cb28a 100644 --- a/magnum/tests/functional/common/manager.py +++ b/magnum/tests/functional/common/manager.py @@ -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)