Merge "subprocess.call para stdout=PIPE is risky"

[yardstick.git] / tests / opnfv / test_suites / opnfv_os-nosdn-nofeature-ha_daily.yaml

diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml
index f53ef09..44c8494 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml
@@ -1,5 +1,5 @@
 ---
-# Huawei US bare daily task suite
+# os-nosdn-nofeature-ha daily task suite
 
 schema: "yardstick:suite:0.1"
 
@@ -18,13 +18,6 @@ test_cases:
     file_name: opnfv_yardstick_tc012.yaml
 -
     file_name: opnfv_yardstick_tc014.yaml
--
-    file_name: opnfv_yardstick_tc027.yaml
-    constraint:
-        installer: compass
-        pod: huawei-pod1
-    task_args:
-        huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml"}'
 -
     file_name: opnfv_yardstick_tc037.yaml
 -
@@ -102,4 +95,23 @@ test_cases:
         pod: huawei-pod1
     task_args:
         huawei-pod1: '{"public_network": "ext-net",
-        "StorPerf_ip": "192.168.200.2"}'
+        "StorPerf_ip": "192.168.200.1"}'
+-
+    file_name: opnfv_yardstick_tc075.yaml
+    constraint:
+        installer: compass
+        pod: huawei-pod1
+    task_args:
+        huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+        "host": "node1.LF"}'
+-
+    file_name: opnfv_yardstick_tc027.yaml
+    constraint:
+        installer: compass,fuel
+        pod: huawei-pod1,lf-pod2,ericsson-pod3,ericsson-pod4
+    task_args:
+        huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml"}'
+        lf-pod2: '{"pod_info": "etc/yardstick/nodes/fuel_baremetal/pod.yaml", "openrc":"/root/openrc", "external_network":"admin_floating_net"}'
+        ericsson-pod3: '{"pod_info": "etc/yardstick/nodes/fuel_baremetal/pod.yaml", "openrc":"/root/openrc", "external_network":"admin_floating_net"}'
+        ericsson-pod4: '{"pod_info": "etc/yardstick/nodes/fuel_baremetal/pod.yaml", "openrc":"/root/openrc", "external_network":"admin_floating_net"}'
+