Merge "Fix vCGNAPT name in ansible constants"

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

diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-openo-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-openo-ha_daily.yaml
index 49cae7b..0375abc 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-openo-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-openo-ha_daily.yaml
@@ -34,60 +34,78 @@ test_cases:
         installer: compass
         pod: huawei-pod1
     task_args:
-        huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-        "host": "node4.LF","target": "node5.LF"}'
+        huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+        "host": "node4","target": "node5"}'
 -
     file_name: opnfv_yardstick_tc045.yaml
     constraint:
         installer: fuel
+    task_args:
+        default: '{"file": "etc/yardstick/nodes/fuel_baremetal/pod.yaml"}'
 -
     file_name: opnfv_yardstick_tc046.yaml
     constraint:
         installer: fuel
+    task_args:
+        default: '{"file": "etc/yardstick/nodes/fuel_baremetal/pod.yaml"}'
 -
     file_name: opnfv_yardstick_tc047.yaml
     constraint:
         installer: fuel
+    task_args:
+        default: '{"file": "etc/yardstick/nodes/fuel_baremetal/pod.yaml"}'
 -
     file_name: opnfv_yardstick_tc048.yaml
     constraint:
         installer: fuel
+    task_args:
+        default: '{"file": "etc/yardstick/nodes/fuel_baremetal/pod.yaml"}'
 -
     file_name: opnfv_yardstick_tc049.yaml
     constraint:
         installer: fuel
+    task_args:
+        default: '{"file": "etc/yardstick/nodes/fuel_baremetal/pod.yaml"}'
 -
     file_name: opnfv_yardstick_tc050.yaml
     constraint:
         installer: fuel
+    task_args:
+        default: '{"file": "etc/yardstick/nodes/fuel_baremetal/pod.yaml"}'
 -
     file_name: opnfv_yardstick_tc051.yaml
     constraint:
         installer: fuel
+    task_args:
+        default: '{"file": "etc/yardstick/nodes/fuel_baremetal/pod.yaml"}'
 -
     file_name: opnfv_yardstick_tc052.yaml
     constraint:
         installer: fuel
+    task_args:
+        default: '{"file": "etc/yardstick/nodes/fuel_baremetal/pod.yaml"}'
 -
     file_name: opnfv_yardstick_tc053.yaml
     constraint:
         installer: fuel
+    task_args:
+        default: '{"file": "etc/yardstick/nodes/fuel_baremetal/pod.yaml"}'
 -
     file_name: opnfv_yardstick_tc055.yaml
     constraint:
         installer: compass
         pod: huawei-pod1
     task_args:
-        huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-        "host": "node5.yardstick-TC055"}'
+        huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+        "host": "node5"}'
 -
     file_name: opnfv_yardstick_tc063.yaml
     constraint:
         installer: compass
         pod: huawei-pod1
     task_args:
-        huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-        "host": "node5.yardstick-TC063"}'
+        huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+        "host": "node5"}'
 -
     file_name: opnfv_yardstick_tc069.yaml
 -
@@ -102,15 +120,15 @@ test_cases:
         installer: compass
         pod: huawei-pod1
     task_args:
-        huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
-        "host": "node1.LF"}'
+        huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+        "host": "node1"}'
 -
     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"}'
+        huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml"}'
+        lf-pod2: '{"file": "etc/yardstick/nodes/fuel_baremetal/pod.yaml", "openrc":"/root/openrc", "external_network":"admin_floating_net"}'
+        ericsson-pod3: '{"file": "etc/yardstick/nodes/fuel_baremetal/pod.yaml", "openrc":"/root/openrc", "external_network":"admin_floating_net"}'
+        ericsson-pod4: '{"file": "etc/yardstick/nodes/fuel_baremetal/pod.yaml", "openrc":"/root/openrc", "external_network":"admin_floating_net"}'