X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=doctor_tests%2Fos_clients.py;h=7ab4e9b441e9efb9d39e0a840ddfd2e3779f3e04;hb=b54cbc5dd2d32fcb27238680b4657ed384d021c5;hp=44fa3aad1d867f6c408ab6aaa8f361cc9a0dfb9f;hpb=25759e0a0204765a7a9454d7586df66592e943c2;p=doctor.git diff --git a/doctor_tests/os_clients.py b/doctor_tests/os_clients.py index 44fa3aad..7ab4e9b4 100644 --- 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 from congressclient.v1 import client as congressclient import glanceclient.client as glanceclient -from keystoneclient.v2_0 import client as ks_client +import heatclient.client as heatclient +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'), + cfg.StrOpt('heat_version', default='1', help='heat version'), ] @@ -28,8 +33,14 @@ def glance_client(version, session): session=session) -def keystone_client(session): - return ks_client.Client(session=session) +def heat_client(version, session): + return heatclient.Client(version=version, + session=session) + + +def keystone_client(version, session): + return ks_client.Client(version=version, + session=session) def nova_client(version, session): @@ -48,3 +59,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)