X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=api%2Futils%2Finflux.py;h=9bc6e9abebcffc8691a5c9152561879b0c6ba93e;hb=15d807c22f33fab8e1f9b61e1d0c041a8144ee89;hp=d4b070fb46453bafc778d2c2ca269a6940107a94;hpb=ceebb672c85c5dbce6df17f0c263375d17adcc05;p=yardstick.git

diff --git a/api/utils/influx.py b/api/utils/influx.py
index d4b070fb4..9bc6e9abe 100644
--- a/api/utils/influx.py
+++ b/api/utils/influx.py
@@ -6,13 +6,15 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
+from __future__ import absolute_import
+
 import logging
-import ConfigParser
-from urlparse import urlsplit
 
+import six.moves.configparser as ConfigParser
+from six.moves.urllib.parse import urlsplit
 from influxdb import InfluxDBClient
 
-from api import conf
+from yardstick.common import constants as consts
 
 logger = logging.getLogger(__name__)
 
@@ -20,9 +22,9 @@ logger = logging.getLogger(__name__)
 def get_data_db_client():
     parser = ConfigParser.ConfigParser()
     try:
-        parser.read(conf.OUTPUT_CONFIG_FILE_PATH)
+        parser.read(consts.CONF_FILE)
 
-        if 'influxdb' != parser.get('DEFAULT', 'dispatcher'):
+        if parser.get('DEFAULT', 'dispatcher') != 'influxdb':
             raise RuntimeError
 
         return _get_client(parser)
@@ -33,10 +35,10 @@ def get_data_db_client():
 
 def _get_client(parser):
     ip = _get_ip(parser.get('dispatcher_influxdb', 'target'))
-    username = parser.get('dispatcher_influxdb', 'username')
+    user = parser.get('dispatcher_influxdb', 'username')
     password = parser.get('dispatcher_influxdb', 'password')
     db_name = parser.get('dispatcher_influxdb', 'db_name')
-    return InfluxDBClient(ip, conf.PORT, username, password, db_name)
+    return InfluxDBClient(ip, consts.INFLUXDB_PORT, user, password, db_name)
 
 
 def _get_ip(url):