Service client modules in object-storage __init__

Import the object-storage service client classes in the __init__ of the
object-storage module, and define __all__, so that service client classes
may be accessed by importing the object-storage module only.

Change-Id: Ie0d13548d12e0ace4bb611470849d7ddcb23cbcb
Partially-implements: bp client-manager-refactor
This commit is contained in:
Andrea Frittoli (andreaf) 2016-06-17 12:16:22 +01:00 committed by Andrea Frittoli
parent 26300f9bd3
commit 9a22543b4b
2 changed files with 26 additions and 6 deletions

View File

@ -35,9 +35,7 @@ from tempest.services.database.json.versions_client import \
DatabaseVersionsClient
from tempest.services import identity
from tempest.services import image
from tempest.services.object_storage.account_client import AccountClient
from tempest.services.object_storage.container_client import ContainerClient
from tempest.services.object_storage.object_client import ObjectClient
from tempest.services import object_storage
from tempest.services.orchestration.json.orchestration_client import \
OrchestrationClient
from tempest.services import volume
@ -413,6 +411,9 @@ class Manager(manager.Manager):
}
params.update(self.default_params_with_timeout_values)
self.account_client = AccountClient(self.auth_provider, **params)
self.container_client = ContainerClient(self.auth_provider, **params)
self.object_client = ObjectClient(self.auth_provider, **params)
self.account_client = object_storage.AccountClient(self.auth_provider,
**params)
self.container_client = object_storage.ContainerClient(
self.auth_provider, **params)
self.object_client = object_storage.ObjectClient(self.auth_provider,
**params)

View File

@ -0,0 +1,19 @@
# Copyright (c) 2016 Hewlett-Packard Enterprise Development Company, L.P.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not
# use this file except in compliance with the License. You may obtain a copy of
# the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations under
# the License.
from tempest.services.object_storage.account_client import AccountClient
from tempest.services.object_storage.container_client import ContainerClient
from tempest.services.object_storage.object_client import ObjectClient
__all__ = ['AccountClient', 'ContainerClient', 'ObjectClient']