Merge "Fixed ceilometer fixture to import common/openstack_libs" into…

… R2.20
Juniper · Jul 13, 2015 · 951c42f · 951c42f
2 parents e7a5195 + 37c1ffd
commit 951c42f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/common/openstack_libs.py b/common/openstack_libs.py
@@ -35,11 +35,15 @@
 try:
     from keystoneclient.v2_0 import client as ks_client
     from keystoneclient import exceptions as ks_exceptions
+    from keystoneclient.auth.identity import v2 as ks_auth_identity_v2
+    from keystoneclient import session as ks_session
     import keystoneclient
 except:
     ks_client = None
     ks_exceptions = None
     keystoneclient = None
+    ks_auth_identity_v2 = None
+    ks_session = None
 
 # import handling for nova
 try:
@@ -49,3 +53,9 @@
     nova_client = None
     nova_exception = None
 
+# import handling for ceilometer
+try:
+    from ceilometerclient import client as ceilo_client
+except:
+    ceilo_client = None
+
diff --git a/fixtures/ceilometer/ceilometer_client.py b/fixtures/ceilometer/ceilometer_client.py
@@ -1,7 +1,7 @@
 import os
-from keystoneclient.auth.identity import v2
-from keystoneclient import session
-from ceilometerclient import client
+from common.openstack_libs import ks_auth_identity_v2 as v2
+from common.openstack_libs import ks_session as session
+from common.openstack_libs import ceilo_client as client
 from common.structure import DynamicArgs
 
 VERSION = 2