Add setup and cleanup for maintenance test

[doctor.git] / doctor_tests / os_clients.py

diff --git a/doctor_tests/os_clients.py b/doctor_tests/os_clients.py
index 44fa3aa..7ab4e9b 100644 (file)
--- a/doctor_tests/os_clients.py
+++ b/doctor_tests/os_clients.py
@@ -11,15 +11,20 @@ from oslo_config import cfg
 import aodhclient.client as aodhclient\r
 from congressclient.v1 import client as congressclient\r
 import glanceclient.client as glanceclient\r
-from keystoneclient.v2_0 import client as ks_client\r
+import heatclient.client as heatclient\r
+from keystoneclient import client as ks_client\r
 from neutronclient.v2_0 import client as neutronclient\r
 import novaclient.client as novaclient\r
+import vitrageclient.client as vitrageclient\r
 \r
 \r
 OPTS = [\r
     cfg.StrOpt('glance_version', default='2', help='glance version'),\r
     cfg.StrOpt('nova_version', default='2.34', help='Nova version'),\r
     cfg.StrOpt('aodh_version', default='2', help='aodh version'),\r
+    cfg.StrOpt('vitrage_version', default='1', help='vitrage version'),\r
+    cfg.StrOpt('keystone_version', default='v3', help='keystone version'),\r
+    cfg.StrOpt('heat_version', default='1', help='heat version'),\r
 ]\r
 \r
 \r
@@ -28,8 +33,14 @@ def glance_client(version, session):
                                session=session)\r
 \r
 \r
-def keystone_client(session):\r
-    return ks_client.Client(session=session)\r
+def heat_client(version, session):\r
+    return heatclient.Client(version=version,\r
+                             session=session)\r
+\r
+\r
+def keystone_client(version, session):\r
+    return ks_client.Client(version=version,\r
+                            session=session)\r
 \r
 \r
 def nova_client(version, session):\r
@@ -48,3 +59,8 @@ def aodh_client(version, session):
 def congress_client(session):\r
     return congressclient.Client(session=session,\r
                                  service_type='policy')\r
+\r
+\r
+def vitrage_client(version, session):\r
+    return vitrageclient.Client(version=version,\r
+                                session=session)\r