summaryrefslogtreecommitdiffstats
path: root/utils/test/reporting/yardstick/scenarios.py
diff options
context:
space:
mode:
Diffstat (limited to 'utils/test/reporting/yardstick/scenarios.py')
-rw-r--r--utils/test/reporting/yardstick/scenarios.py19
1 files changed, 13 insertions, 6 deletions
diff --git a/utils/test/reporting/yardstick/scenarios.py b/utils/test/reporting/yardstick/scenarios.py
index 590fea2a4..26e8c8bb0 100644
--- a/utils/test/reporting/yardstick/scenarios.py
+++ b/utils/test/reporting/yardstick/scenarios.py
@@ -1,11 +1,18 @@
-import yaml
-import os
+#!/usr/bin/python
+#
+# This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
import requests
+import yaml
-import reportingConf as conf
-
+import utils.reporting_utils as rp_utils
-response = requests.get(conf.TEST_CONF)
+yardstick_conf = rp_utils.get_config('yardstick.test_conf')
+response = requests.get(yardstick_conf)
yaml_file = yaml.safe_load(response.text)
reporting = yaml_file.get('reporting')
@@ -15,6 +22,6 @@ for element in reporting:
name = element['name']
scenarios = element['scenario']
for s in scenarios:
- if not config.has_key(name):
+ if name not in config:
config[name] = {}
config[name][s] = True