summaryrefslogtreecommitdiffstats
path: root/doctor_tests/os_clients.py
diff options
context:
space:
mode:
authordongwenjuan <dong.wenjuan@zte.com.cn>2017-12-01 14:28:31 +0800
committerdongwenjuan <dong.wenjuan@zte.com.cn>2017-12-21 11:09:02 +0800
commitbdbd22904733af311225a3315555bb39ea12ed55 (patch)
treefa057eb320b1656184b0ed822e903034ba1ab0d5 /doctor_tests/os_clients.py
parent9e36d918fef054b8d23692c0ec8c25d7b0640c07 (diff)
use keystone v3 API
Change-Id: Ia642279a99ad9bf014764337c8a5170e3c98e2f2 Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>
Diffstat (limited to 'doctor_tests/os_clients.py')
-rw-r--r--doctor_tests/os_clients.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/doctor_tests/os_clients.py b/doctor_tests/os_clients.py
index 5606d40a..640281df 100644
--- 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
from congressclient.v1 import client as congressclient
import glanceclient.client as glanceclient
-from keystoneclient.v2_0 import client as ks_client
+from keystoneclient import client as ks_client
from neutronclient.v2_0 import client as neutronclient
import novaclient.client as novaclient
import vitrageclient.client as vitrageclient
@@ -22,6 +22,7 @@ OPTS = [
cfg.StrOpt('nova_version', default='2.34', help='Nova version'),
cfg.StrOpt('aodh_version', default='2', help='aodh version'),
cfg.StrOpt('vitrage_version', default='1', help='vitrage version'),
+ cfg.StrOpt('keystone_version', default='v3', help='keystone version'),
]
@@ -30,8 +31,9 @@ def glance_client(version, session):
session=session)
-def keystone_client(session):
- return ks_client.Client(session=session)
+def keystone_client(version, session):
+ return ks_client.Client(version=version,
+ session=session)
def nova_client(version, session):