diff options
| author |   chenjiankun <chenjiankun1@huawei.com> | 2017-07-12 03:58:58 +0000 |
|---|---|---|
| committer | chenjiankun <chenjiankun1@huawei.com> | 2017-07-19 06:35:17 +0000 |
| commit | f49a1f22f8ba1bfa7a9942f7a9f084d2c9c81378 (patch) | |
| tree | 8ece32fa9f73547ed3c520ce9d47be755993a281 /yardstick | |
| parent | 0832b64daeeae389db660d87c139e82c1c6593f8 (diff) | |
yardstick env influxdb/grafana cmd support centos
JIRA: YARDSTICK-714
Currently yardstick env influxdb/grafana command do not support centos.
Because we use the gateway ip to get the service of influxdb and grafana.
But in centos, we can not access influxdb/grafana service via gateway ip.
In this patch, I use docker inspect to get the ip of influxdb and grafana.
So these command can support centos.
Change-Id: Ie4abcb8048b92d61bc62777dfc362bb29f354b2b
Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
Diffstat (limited to 'yardstick')
| -rw-r--r-- | yardstick/benchmark/core/task.py | 7 | ||||
| -rw-r--r-- | yardstick/common/constants.py | 2 | ||||
| -rw-r--r-- | yardstick/common/utils.py | 10 |
3 files changed, 17 insertions, 2 deletions
diff --git a/yardstick/benchmark/core/task.py b/yardstick/benchmark/core/task.py index 0e85e6316..fe098951a 100644 --- a/yardstick/benchmark/core/task.py +++ b/yardstick/benchmark/core/task.py @@ -58,7 +58,12 @@ class Task(object): # pragma: no cover check_environment() - output_config = utils.parse_ini_file(config_file) + try: + output_config = utils.parse_ini_file(config_file) + except Exception: + # all error will be ignore, the default value is {} + output_config = {} + self._init_output_config(output_config) self._set_output_config(output_config, args.output_file) LOG.debug('Output configuration is: %s', output_config) diff --git a/yardstick/common/constants.py b/yardstick/common/constants.py index d251341fc..e478c170e 100644 --- a/yardstick/common/constants.py +++ b/yardstick/common/constants.py @@ -66,6 +66,7 @@ INFLUXDB_PASS = get_param('influxdb.password', 'root') INFLUXDB_DB_NAME = get_param('influxdb.db_name', 'yardstick') INFLUXDB_IMAGE = get_param('influxdb.image', 'tutum/influxdb') INFLUXDB_TAG = get_param('influxdb.tag', '0.13') +INFLUXDB_DASHBOARD_PORT = 8083 # grafana GRAFANA_IP = get_param('grafana.ip', SERVER_IP) @@ -74,6 +75,7 @@ GRAFANA_USER = get_param('grafana.username', 'admin') GRAFANA_PASS = get_param('grafana.password', 'admin') GRAFANA_IMAGE = get_param('grafana.image', 'grafana/grafana') GRAFANA_TAG = get_param('grafana.tag', '3.1.1') +GRAFANA_MAPPING_PORT = 1948 # api DOCKER_URL = 'unix://var/run/docker.sock' diff --git a/yardstick/common/utils.py b/yardstick/common/utils.py index 1faba4d9e..7e0172239 100644 --- a/yardstick/common/utils.py +++ b/yardstick/common/utils.py @@ -161,7 +161,15 @@ def write_file(path, data, mode='w'): def parse_ini_file(path): parser = configparser.ConfigParser() - parser.read(path) + + try: + files = parser.read(path) + except configparser.MissingSectionHeaderError: + logger.exception('invalid file type') + raise + else: + if not files: + raise RuntimeError('file not exist') try: default = {k: v for k, v in parser.items('DEFAULT')} |