summaryrefslogtreecommitdiffstats
path: root/api/utils/influx.py
diff options
context:
space:
mode:
authorchenjiankun <chenjiankun1@huawei.com>2017-04-01 01:19:16 +0000
committerchenjiankun <chenjiankun1@huawei.com>2017-04-01 06:24:12 +0000
commitb74d875134b988a26441d559a9e700aaa68d6a0c (patch)
tree5e367401e8b5f16f2c2fe1d52d91203d2dd20424 /api/utils/influx.py
parent66aa1cc17bcc3643c2852df7df4a355897ba0b57 (diff)
Yardstick virtualenv support
JIRA: YARDSTICK-620 Currently we recommend using docker to run yardstick. And it is hard to use virtualenv to install yardstick. So I modify install.sh in yardstick root path. It will support using virtualenv to install yardstick(including API) in linux. In this patch, I make yardstick support read yardstick configuration have priority over constants. Change-Id: I9ea1241b228532a6497451e6c8f232173ddb783e Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
Diffstat (limited to 'api/utils/influx.py')
-rw-r--r--api/utils/influx.py8
1 files changed, 4 insertions, 4 deletions
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):