Merge "Yardstick virtualenv support" into stable/danube

3 files changed, 7 insertions, 7 deletions

diff --git a/api/utils/common.py b/api/utils/common.py
index 3e9bf8f8b..f8b0d40ba 100644
--- a/api/utils/common.py
+++ b/api/utils/common.py
@@ -11,10 +11,10 @@ import collections
 import logging
 
 from flask import jsonify
+import six
 
 from api.utils.daemonthread import DaemonThread
 from yardstick.cmd.cli import YardstickCLI
-import six
 
 logger = logging.getLogger(__name__)
 
diff --git a/api/utils/daemonthread.py b/api/utils/daemonthread.py
index 0049834eb..3d5625547 100644
--- a/api/utils/daemonthread.py
+++ b/api/utils/daemonthread.py
@@ -11,7 +11,7 @@ import threading
 import os
 import errno
 
-from api import conf
+from yardstick.common import constants as consts
 from api.database.handlers import TasksHandler
 
 
@@ -43,7 +43,7 @@ class DaemonThread(threading.Thread):
 
 def _handle_testsuite_file(task_id):
     try:
-        os.remove(os.path.join(conf.TEST_SUITE_PATH, task_id + '.yaml'))
+        os.remove(os.path.join(consts.TESTSUITE_DIR, task_id + '.yaml'))
     except OSError as e:
         if e.errno != errno.ENOENT:
             raise
diff --git a/api/utils/influx.py b/api/utils/influx.py
index 08996b9c9..9bc6e9abe 100644
--- a/api/utils/influx.py
+++ b/api/utils/influx.py
@@ -14,7 +14,7 @@ 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__)
 
@@ -22,7 +22,7 @@ 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 parser.get('DEFAULT', 'dispatcher') != 'influxdb':
             raise RuntimeError
@@ -35,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):