From 7c34d9ecbd17053ca9d14cc518b11e501b66cbeb Mon Sep 17 00:00:00 2001 From: Ryota MIBU Date: Sun, 5 Mar 2017 03:48:38 +0000 Subject: urgent bug fixes for danube (2) - use relevant identity version estimated from OS_AUTH_URL - (apex) unset OS_PROJECT_ID Change-Id: I7e51c7d5510baaa4d14b16600f9efa6fcfc011b9 Signed-off-by: Ryota MIBU --- tests/monitor.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'tests/monitor.py') diff --git a/tests/monitor.py b/tests/monitor.py index 8d29dceb..8e8aa7a5 100644 --- a/tests/monitor.py +++ b/tests/monitor.py @@ -18,8 +18,8 @@ import sys import time from congressclient.v1 import client -from keystoneclient import session as ksc_session -from keystoneclient.auth.identity import v2 + +import identity_auth # NOTE: icmp message with all zero data (checksum = 0xf7ff) # see https://tools.ietf.org/html/rfc792 @@ -29,6 +29,7 @@ SUPPORTED_INSPECTOR_TYPES = ['sample', 'congress'] LOG = doctor_log.Logger('doctor_monitor').getLogger() + class DoctorMonitorSample(object): interval = 0.1 # second @@ -46,13 +47,9 @@ class DoctorMonitorSample(object): if self.inspector_type == 'sample': self.inspector_url = 'http://127.0.0.1:12345/events' elif self.inspector_type == 'congress': - auth = v2.Password(auth_url=os.environ['OS_AUTH_URL'], - username=os.environ['OS_USERNAME'], - password=os.environ['OS_PASSWORD'], - tenant_name=os.environ['OS_TENANT_NAME']) - self.session = ksc_session.Session(auth=auth) - - congress = client.Client(session=self.session, service_type='policy') + auth=identity_auth.get_identity_auth() + sess=session.Session(auth=auth) + congress = client.Client(session=sess, service_type='policy') ds = congress.list_datasources()['results'] doctor_ds = next((item for item in ds if item['driver'] == 'doctor'), None) -- cgit 1.2.3-korg