commit cf1868b7cdd3f3a3461f273a289f130783437d6f
author Frederic Lepied <frederic.lepied@enovance.com> Sun Jul 28 18:07:15 2013 -0400
committer Frederic Lepied <frederic.lepied@enovance.com> Sun Jul 28 18:07:15 2013 -0400
tree 759a8053d978bb7f6dfeb9013d99200426e6e003
parent 7f5e65bc18ccc73a72ed46c319978f79a285dc83

Allow to run swift and keystone api tests standalone

Protect glance init using the config settings.

Change-Id: If8196dbbccd8dbb1ec9f8075d978608e7f709e99
Fixes: bug 1205923

tempest/clients.py

diff --git a/tempest/clients.py b/tempest/clients.py
index 2154f8b..02ab711 100644
--- a/tempest/clients.py
+++ b/tempest/clients.py
@@ -296,7 +296,8 @@
         try:
             self.servers_client = SERVERS_CLIENTS[interface](*client_args)
             self.limits_client = LIMITS_CLIENTS[interface](*client_args)
-            self.images_client = IMAGES_CLIENTS[interface](*client_args)
+            if self.config.service_available.glance:
+                self.images_client = IMAGES_CLIENTS[interface](*client_args)
             self.keypairs_client = KEYPAIRS_CLIENTS[interface](*client_args)
             self.quotas_client = QUOTAS_CLIENTS[interface](*client_args)
             self.flavors_client = FLAVORS_CLIENTS[interface](*client_args)
@@ -341,8 +342,9 @@
         self.network_client = NetworkClient(*client_args)
         self.hosts_client = HostsClientJSON(*client_args)
         self.account_client = AccountClient(*client_args)
-        self.image_client = ImageClientJSON(*client_args)
-        self.image_client_v2 = ImageClientV2JSON(*client_args)
+        if self.config.service_available.glance:
+            self.image_client = ImageClientJSON(*client_args)
+            self.image_client_v2 = ImageClientV2JSON(*client_args)
         self.container_client = ContainerClient(*client_args)
         self.object_client = ObjectClient(*client_args)
         self.orchestration_client = OrchestrationClient(*client_args)