Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Open storperf testcase to huawei-pod2"
[yardstick.git]
/
api
/
utils
/
influx.py
diff --git
a/api/utils/influx.py
b/api/utils/influx.py
index
08996b9
..
9bc6e9a
100644
(file)
--- 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 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__)
logger = logging.getLogger(__name__)
@@
-22,7
+22,7
@@
logger = logging.getLogger(__name__)
def get_data_db_client():
parser = ConfigParser.ConfigParser()
try:
def get_data_db_client():
parser = ConfigParser.ConfigParser()
try:
- parser.read(con
f.OUTPUT_CONFIG_FILE_PATH
)
+ parser.read(con
sts.CONF_FILE
)
if parser.get('DEFAULT', 'dispatcher') != 'influxdb':
raise RuntimeError
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'))
def _get_client(parser):
ip = _get_ip(parser.get('dispatcher_influxdb', 'target'))
- user
name
= 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')
password = parser.get('dispatcher_influxdb', 'password')
db_name = parser.get('dispatcher_influxdb', 'db_name')
- return InfluxDBClient(ip, con
f.PORT, username
, password, db_name)
+ return InfluxDBClient(ip, con
sts.INFLUXDB_PORT, user
, password, db_name)
def _get_ip(url):
def _get_ip(url):