openstack/tempest
Code Issues Proposed changes

Merge "Cleanup the orchestration client init and attr"

Browse Source
This commit is contained in:
Jenkins 2017-07-18 15:53:28 +00:00 committed by Gerrit Code Review
commit 55e301689c
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tempest/clients.py
View File

@ -18,7 +18,6 @@ from tempest.lib import auth
from tempest.lib import exceptions as lib_exc from tempest.lib import exceptions as lib_exc
from tempest.lib.services import clients from tempest.lib.services import clients
from tempest.services import object_storage from tempest.services import object_storage
from tempest.services import orchestration
CONF = config.CONF CONF = config.CONF
@ -49,15 +48,6 @@ class Manager(clients.ServiceClients):
self._set_image_clients() self._set_image_clients()
self._set_network_clients() self._set_network_clients()
self.orchestration_client = orchestration.OrchestrationClient(
self.auth_provider,
CONF.orchestration.catalog_type,
CONF.orchestration.region or CONF.identity.region,
endpoint_type=CONF.orchestration.endpoint_type,
build_interval=CONF.orchestration.build_interval,
build_timeout=CONF.orchestration.build_timeout,
**self.default_params)
def _set_network_clients(self): def _set_network_clients(self):
self.network_agents_client = self.network.AgentsClient() self.network_agents_client = self.network.AgentsClient()
self.network_extensions_client = self.network.ExtensionsClient() self.network_extensions_client = self.network.ExtensionsClient()

4
tempest/cmd/cleanup_service.py
View File

@ -213,7 +213,9 @@ class ServerGroupService(ServerService):
class StackService(BaseService): class StackService(BaseService):
def __init__(self, manager, **kwargs): def __init__(self, manager, **kwargs):
super(StackService, self).__init__(kwargs) super(StackService, self).__init__(kwargs)
self.client = manager.orchestration_client params = config.service_client_config('orchestration')
self.client = manager.orchestration.OrchestrationClient(
manager.auth_provider, **params)
def list(self): def list(self):
client = self.client client = self.client