Doctor releasenotes Fraser 6.2

[doctor.git] / doctor_tests / os_clients.py

diff --git a/doctor_tests/os_clients.py b/doctor_tests/os_clients.py
index 5606d40..640281d 100644 (file)
--- a/doctor_tests/os_clients.py
+++ b/doctor_tests/os_clients.py
@@ -11,7 +11,7 @@ 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
 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
+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
 from neutronclient.v2_0 import client as neutronclient\r
 import novaclient.client as novaclient\r
 import vitrageclient.client as vitrageclient\r


@@ -22,6 +22,7 @@ OPTS = [
     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('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

 ]\r
 \r
 \r
 ]\r
 \r
 \r


@@ -30,8 +31,9 @@ def glance_client(version, session):
                                session=session)\r
 \r
 \r
                                session=session)\r
 \r
 \r

-def keystone_client(session):\r
-    return ks_client.Client(session=session)\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
 \r
 \r
 def nova_client(version, session):\r