X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=doctor_tests%2Fos_clients.py;h=640281df9ff1245b82f6e40ea2c038eee25194ca;hb=6bd4e026fca92b281382a3f6b46f7ab7eeb31f45;hp=44fa3aad1d867f6c408ab6aaa8f361cc9a0dfb9f;hpb=079ac9a481fcc1baa53cb5ab2896bbe037585f3b;p=doctor.git diff --git a/doctor_tests/os_clients.py b/doctor_tests/os_clients.py index 44fa3aad..640281df 100644 --- a/doctor_tests/os_clients.py +++ b/doctor_tests/os_clients.py @@ -11,15 +11,18 @@ 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 OPTS = [ cfg.StrOpt('glance_version', default='2', help='glance version'), 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'), ] @@ -28,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): @@ -48,3 +52,8 @@ def aodh_client(version, session): def congress_client(session): return congressclient.Client(session=session, service_type='policy') + + +def vitrage_client(version, session): + return vitrageclient.Client(version=version, + session=session)