Merge "Bugfix: ha test case criteria pass when sla not pass"

[yardstick.git] / api / resources / v1 / env.py

diff --git a/api/resources/v1/env.py b/api/resources/v1/env.py
index 8943db3..47ea916 100644 (file)
--- a/api/resources/v1/env.py
+++ b/api/resources/v1/env.py
@@ -31,7 +31,7 @@ from yardstick.common import utils
 from yardstick.common.utils import result_handler
 from yardstick.common import openstack_utils
 from yardstick.common.httpClient import HttpClient
-
+from yardstick.common.yaml_loader import yaml_load
 
 LOG = logging.getLogger(__name__)
 LOG.setLevel(logging.DEBUG)
@@ -88,13 +88,13 @@ class V1Env(ApiResource):
 
     def _create_dashboard(self, ip):
         url = 'http://admin:admin@{}:{}/api/dashboards/db'.format(ip, consts.GRAFANA_PORT)
-        path = os.path.join(consts.REPOS_DIR, 'dashboard', '*dashboard.json')
+        path = os.path.join(consts.REPOS_DIR, 'dashboard', 'opnfv_yardstick_tc*.json')
 
         for i in sorted(glob.iglob(path)):
             with open(i) as f:
                 data = jsonutils.load(f)
             try:
-                HttpClient().post(url, data)
+                HttpClient().post(url, {"dashboard": data})
             except Exception:
                 LOG.exception('Create dashboard %s failed', i)
                 raise
@@ -120,7 +120,7 @@ class V1Env(ApiResource):
             "basicAuth": True,
             "basicAuthUser": "admin",
             "basicAuthPassword": "admin",
-            "isDefault": False,
+            "isDefault": True,
         }
         try:
             HttpClient().post(url, data)
@@ -393,7 +393,7 @@ class V1Env(ApiResource):
             return result_handler(consts.API_ERROR, 'file must be provided')
 
         LOG.info('Checking file')
-        data = yaml.load(pod_file.read())
+        data = yaml_load(pod_file.read())
         if not isinstance(data, collections.Mapping):
             return result_handler(consts.API_ERROR, 'invalid yaml file')