commit c95eb85a4f54ed55ec25e6cd34f2f473fa25109d
author Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp> Thu Jan 22 01:57:57 2015 +0000
committer Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp> Thu Jan 29 00:46:21 2015 +0000
tree 1315178fd78f9b98492ddba497fb1d9541260398
parent d7df383651ba21188ebc37df00052e030fcafc49

Add _set_object_storage_clients() to client setting

There are three clients for object_storage, and this patch adds
an internal method for code cleanup.

Change-Id: I0a09b9de9822106b8f0a816ae064f07691097d39

tempest/clients.py

diff --git a/tempest/clients.py b/tempest/clients.py
index e362ac0..32c6410 100644
--- a/tempest/clients.py
+++ b/tempest/clients.py
@@ -159,6 +159,7 @@
         self._set_compute_clients()
         self._set_identity_clients()
         self._set_volume_clients()
+        self._set_object_storage_clients()
 
         self.baremetal_client = BaremetalClientJSON(self.auth_provider)
         self.network_client = NetworkClientJSON(
@@ -193,12 +194,9 @@
                            self.credentials.tenant_name)
 
         # common clients
-        self.account_client = AccountClient(self.auth_provider)
         if CONF.service_available.glance:
             self.image_client = ImageClientJSON(self.auth_provider)
             self.image_client_v2 = ImageClientV2JSON(self.auth_provider)
-        self.container_client = ContainerClient(self.auth_provider)
-        self.object_client = ObjectClient(self.auth_provider)
         self.orchestration_client = OrchestrationClient(
             self.auth_provider,
             CONF.orchestration.catalog_type,
@@ -315,6 +313,11 @@
         self.volume_types_v2_client = VolumeTypesV2ClientJSON(
             self.auth_provider)
 
+    def _set_object_storage_clients(self):
+        self.account_client = AccountClient(self.auth_provider)
+        self.container_client = ContainerClient(self.auth_provider)
+        self.object_client = ObjectClient(self.auth_provider)
+
 
 class AdminManager(Manager):