unify pod keywork so api can easily used

JIRA: YARDSTICK-695

Change-Id: I826cb2ea07949b1eaae4df4cb77175ec8f5df89b
Signed-off-by: rexlee8776 <limingjiang@huawei.com>

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml
index 5d3057d..15bbdda 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml
@@ -12,7 +12,7 @@ schema: "yardstick:task:0.1"
 description: >
     Sample test case for the HA of controller node Openstack service.
 
-{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+{% set file = file or '/etc/yardstick/pod.yaml' %}
 
 scenarios:
 -

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml
index c4ee237..a831287 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml
@@ -16,7 +16,7 @@ description: >
     username, password are needed in pod file (There is a sample pod file in
     "etc/yardstick/nodes/pod.yaml.ipmi.sample").
 
-{% set file = file or 'etc/yardstick/nodes/fuel_virtual/pod.yaml' %}
+{% set file = file or '/etc/yardstick/pod.yaml' %}
 {% set jumphost = jumphost or 'node0' %}
 
 scenarios:

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc027.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc027.yaml
index 87846da..7646813 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc027.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc027.yaml
@@ -15,7 +15,7 @@ description: >
 
 {% set openrc = openrc or "/opt/admin-openrc.sh" %}
 {% set external_network = external_network or "ext-net" %}
-{% set pod_info = pod_info or "etc/yardstick/nodes/compass_sclab_physical/pod.yaml" %}
+{% set file = file or '/etc/yardstick/pod.yaml' %}
 scenarios:
 -
   type: Ping6
@@ -44,5 +44,5 @@ scenarios:
 context:
   type: Node
   name: IPV6
-  file: {{pod_info}}
+  file: {{file}}
 

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml
index a253e6d..b14fc45 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml
@@ -15,7 +15,7 @@ description: >
 
 {% set host = host or "node1.LF" %}
 {% set target = target or "node2.LF" %}
-{% set pod_info = pod_info or "etc/yardstick/nodes/compass_sclab_physical/pod.yaml" %}
+{% set file = file or '/etc/yardstick/pod.yaml' %}
 scenarios:
 -
   type: Ping
@@ -37,5 +37,5 @@ scenarios:
 context:
   type: Node
   name: LF
-  file: {{pod_info}}
+  file: {{file}}
 

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml
index d851d5a..fdaaa83 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml
@@ -12,7 +12,7 @@ schema: "yardstick:task:0.1"
 description: >
     Test case for TC045 :Control node Openstack service down - neutron server.
 
-{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+{% set file = file or '/etc/yardstick/pod.yaml' %}
 
 scenarios:
 -

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml
index ad81a14..fe16f38 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml
@@ -12,7 +12,7 @@ schema: "yardstick:task:0.1"
 description: >
     Test case for TC046 :Control node Openstack service down - keystone.
 
-{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+{% set file = file or '/etc/yardstick/pod.yaml' %}
 
 scenarios:
 -

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml
index cc99036..c888967 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml
@@ -12,7 +12,7 @@ schema: "yardstick:task:0.1"
 description: >
     Test case for TC047 :Control node Openstack service down - glance api.
 
-{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+{% set file = file or '/etc/yardstick/pod.yaml' %}
 
 scenarios:
 -

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml
index 237f845..4ad19f3 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml
@@ -12,7 +12,7 @@ schema: "yardstick:task:0.1"
 description: >
     Test case for TC048 :Control node Openstack service down - cinder api.
 
-{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+{% set file = file or '/etc/yardstick/pod.yaml' %}
 
 scenarios:
 -

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml
index ff3ac75..da17a59 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml
@@ -12,7 +12,7 @@ schema: "yardstick:task:0.1"
 description: >
     Test case for TC049 :Control node Openstack service down - swift proxy.
 
-{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+{% set file = file or '/etc/yardstick/pod.yaml' %}
 
 scenarios:
 -

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
index 0611fd2..303dd42 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
@@ -13,7 +13,7 @@ description: >
     Test case for TC050 :OpenStack Controller Node Network High Availability;
     This test case is written by new scenario-based HA testing framework.
 
-{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+{% set file = file or '/etc/yardstick/pod.yaml' %}
 {% set external_net = external_net or 'br-ex' %}
 {% set management_net = management_net or 'br-mgmt' %}
 {% set storage_net = storage_net or 'br-storage' %}

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml
index 3921140..98a08b7 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml
@@ -13,7 +13,7 @@ description: >
     Test case for TC051 :OpenStack Controller Node CPU Overload High Availability;
     This test case is written by new scenario-based HA testing framework.
 
-{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+{% set file = file or '/etc/yardstick/pod.yaml' %}
 
 scenarios:
   -

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml
index 5907eb2..75835eb 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml
@@ -13,7 +13,7 @@ description: >
     Test case for TC052 :OpenStack Controller Node Disk I/O Block High Availability;
     This test case is written by new scenario-based HA testing framework.
 
-{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+{% set file = file or '/etc/yardstick/pod.yaml' %}
 
 scenarios:
   -

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
index 9e05cc8..3ecbc30 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
@@ -13,7 +13,7 @@ description: >
     Test case for TC053 :Openstack Controller Load Balance Service High Availability;
     This test case is written by new scenario-based HA testing framework.
 
-{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+{% set file = file or '/etc/yardstick/pod.yaml' %}
 
 scenarios:
   -

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
index 6dd17f8..c229277 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
@@ -13,7 +13,7 @@ description: >
     Test case for TC054 :OpenStack VIP Master Node abnormally shutdown High Availability;
     This test case is written by new scenario-based HA testing framework.
 
-{% set file = file or 'etc/yardstick/nodes/fuel_baremetal/pod.yaml' %}
+{% set file = file or '/etc/yardstick/pod.yaml' %}
 {% set vip_management = vip_management or '192.168.0.2' %}
 {% set vip_public = vip_public or '172.16.0.3' %}
 {% set vip_router_management = vip_router_management or '192.168.0.1' %}

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml
index 3d733e7..7e33741 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml
@@ -20,7 +20,7 @@ description: >
     HT (Hyper-Thread) support status, 1 for open, 0 for close.
 
 {% set host = host or "node5.yardstick-TC055" %}
-{% set pod_info = pod_info or "etc/yardstick/nodes/compass_sclab_virtual/pod.yaml" %}
+{% set file = file or '/etc/yardstick/pod.yaml' %}
 scenarios:
 -
   type: ComputeCapacity
@@ -36,4 +36,4 @@ scenarios:
 context:
   type: Node
   name: yardstick-TC055
-  file: {{pod_info}}
+  file: {{file}}

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc063.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc063.yaml
index 6939c93..48288ef 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc063.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc063.yaml
@@ -14,7 +14,7 @@ description: >
     Measure disk size, block size and disk utilization using fdisk and iostat.
 
 {% set host = host or "node5.yardstick-TC063" %}
-{% set pod_info = pod_info or "etc/yardstick/nodes/compass_sclab_virtual/pod.yaml" %}
+{% set file = file or '/etc/yardstick/pod.yaml' %}
 
 scenarios:
 -
@@ -31,4 +31,4 @@ scenarios:
 context:
   type: Node
   name: yardstick-TC063
-  file: {{pod_info}}
+  file: {{file}}

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc073.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc073.yaml
index 9f4d3a0..fb40257 100755 (executable)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc073.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc073.yaml
@@ -20,7 +20,7 @@ description: >
 
 {% set host = host or "node1.LF" %}
 {% set target = target or "node2.LF" %}
-{% set pod_info = pod_info or "etc/yardstick/nodes/compass_sclab_physical/pod.yaml" %}
+{% set file = file or '/etc/yardstick/pod.yaml' %}
 scenarios:
 -
   type: NetperfNode
@@ -43,5 +43,5 @@ scenarios:
 context:
   type: Node
   name: LF
-  file: {{pod_info}}
+  file: {{file}}
 

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc075.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc075.yaml
index 07c2b80..d19b3c4 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc075.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc075.yaml
@@ -15,7 +15,7 @@ description: >
     Measure number of connections, number of frames received;
 
 {% set host = host or "node1.LF" %}
-{% set pod_info = pod_info or "etc/yardstick/nodes/compass_sclab_virtual/pod.yaml" %}
+{% set file = file or '/etc/yardstick/pod.yaml' %}
 
 scenarios:
 -
@@ -29,4 +29,4 @@ scenarios:
 context:
   type: Node
   name: LF
-  file: {{pod_info}}
+  file: {{file}}

diff --git a/tests/opnfv/test_suites/opnfv_features.yaml b/tests/opnfv/test_suites/opnfv_features.yaml
index abbb078..b017417 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_features.yaml
+++ b/tests/opnfv/test_suites/opnfv_features.yaml
@@ -20,41 +20,59 @@ test_cases:
         installer: compass,fuel
         pod: huawei-pod1,lf-pod2
     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"}'
+        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"}'
 -
     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"}'

diff --git a/tests/opnfv/test_suites/opnfv_k8-nosdn-nofeature-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_k8-nosdn-nofeature-noha_daily.yaml
index 6ac1a75..00dccab 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_k8-nosdn-nofeature-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_k8-nosdn-nofeature-noha_daily.yaml
@@ -34,7 +34,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -42,7 +42,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
@@ -58,5 +58,5 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node1.LF"}'

diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm-ha_daily.yaml
index 2f49f01..1be7d13 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm-ha_daily.yaml
@@ -34,7 +34,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -42,7 +42,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
@@ -58,5 +58,5 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node1.LF"}'

diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm-noha_daily.yaml
index ab94442..42bc651 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm-noha_daily.yaml
@@ -34,7 +34,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -42,7 +42,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml

diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs-ha_daily.yaml
index 0d43ac3..eb8d0f3 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs-ha_daily.yaml
@@ -34,7 +34,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -42,7 +42,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
@@ -58,5 +58,5 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node1.LF"}'

diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk-ha_daily.yaml
index 8736c4b..625fa6e 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk-ha_daily.yaml
@@ -39,7 +39,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -47,7 +47,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
@@ -63,5 +63,5 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node1.LF"}'

diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk-noha_daily.yaml
index 1b2f472..3a3ed37 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk-noha_daily.yaml
@@ -39,7 +39,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -47,7 +47,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml

diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk_bar-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk_bar-ha_daily.yaml
index 2387862..ef09f3c 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk_bar-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk_bar-ha_daily.yaml
@@ -39,7 +39,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -47,7 +47,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
@@ -63,5 +63,5 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node1.LF"}'

diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk_bar-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk_bar-noha_daily.yaml
index f07f790..a800c56 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk_bar-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs_dpdk_bar-noha_daily.yaml
@@ -39,7 +39,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -47,7 +47,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml

diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-ha_daily.yaml
index aa9d960..9de6ab2 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-ha_daily.yaml
@@ -40,7 +40,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -48,7 +48,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
@@ -64,5 +64,5 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node1.LF"}'

diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-noha_daily.yaml
index ba066f0..eed5da4 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-noha_daily.yaml
@@ -40,7 +40,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -48,7 +48,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
@@ -64,5 +64,5 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node1.LF"}'

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 d18a4e6..ba1a93c 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
@@ -34,7 +34,7 @@ test_cases:
         installer: compass
         pod: huawei-pod1
     task_args:
-        huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+        huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
         "host": "node4.LF","target": "node5.LF"}'
 -
     file_name: opnfv_yardstick_tc019.yaml
@@ -56,6 +56,8 @@ test_cases:
     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:
@@ -76,10 +78,14 @@ test_cases:
     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:
@@ -92,17 +98,21 @@ test_cases:
     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",
+        huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
         "host": "node5.yardstick-TC055"}'
 -
     file_name: opnfv_yardstick_tc063.yaml
@@ -110,7 +120,7 @@ test_cases:
         installer: compass
         pod: huawei-pod1
     task_args:
-        huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+        huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
         "host": "node5.yardstick-TC063"}'
 -
     file_name: opnfv_yardstick_tc069.yaml
@@ -134,7 +144,7 @@ test_cases:
         installer: compass
         pod: huawei-pod1
     task_args:
-        huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+        huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
         "host": "node1.LF"}'
 -
     file_name: opnfv_yardstick_tc027.yaml
@@ -142,8 +152,8 @@ test_cases:
         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"}'
 

diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-noha_daily.yaml
index db33247..6700db4 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-noha_daily.yaml
@@ -34,7 +34,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -42,7 +42,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
@@ -58,5 +58,5 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node1.LF"}'

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..9418e42 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,51 +34,69 @@ test_cases:
         installer: compass
         pod: huawei-pod1
     task_args:
-        huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+        huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
         "host": "node4.LF","target": "node5.LF"}'
 -
     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",
+        huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
         "host": "node5.yardstick-TC055"}'
 -
     file_name: opnfv_yardstick_tc063.yaml
@@ -86,7 +104,7 @@ test_cases:
         installer: compass
         pod: huawei-pod1
     task_args:
-        huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+        huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
         "host": "node5.yardstick-TC063"}'
 -
     file_name: opnfv_yardstick_tc069.yaml
@@ -102,7 +120,7 @@ test_cases:
         installer: compass
         pod: huawei-pod1
     task_args:
-        huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+        huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
         "host": "node1.LF"}'
 -
     file_name: opnfv_yardstick_tc027.yaml
@@ -110,7 +128,7 @@ test_cases:
         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"}'

diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-ovs-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-ovs-ha_daily.yaml
index d87abbe..3a540f2 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-ovs-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-ovs-ha_daily.yaml
@@ -34,7 +34,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -42,7 +42,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
@@ -58,5 +58,5 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node1.LF"}'

diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-ovs-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-ovs-noha_daily.yaml
index 9869d1b..abc3360 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-nosdn-ovs-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-nosdn-ovs-noha_daily.yaml
@@ -34,7 +34,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -42,7 +42,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml

diff --git a/tests/opnfv/test_suites/opnfv_os-ocl-nofeature-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-ocl-nofeature-ha_daily.yaml
index 47432d2..3f2fe18 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-ocl-nofeature-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-ocl-nofeature-ha_daily.yaml
@@ -34,7 +34,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -42,7 +42,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
@@ -58,5 +58,5 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node1.LF"}'

diff --git a/tests/opnfv/test_suites/opnfv_os-ocl-nofeature-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-ocl-nofeature-noha_daily.yaml
index 2a7bf77..fcc7a9b 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-ocl-nofeature-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-ocl-nofeature-noha_daily.yaml
@@ -34,7 +34,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -42,7 +42,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
@@ -58,5 +58,5 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node1.LF"}'

diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-ha_daily.yaml
index 7ce6f10..43aae71 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-ha_daily.yaml
@@ -20,7 +20,7 @@ test_cases:
       installer: fuel
       pod: ericsson-pod2
   task_args:
-      ericsson-pod2: '{"pod_info": "etc/yardstick/nodes/fuel_baremetal/pod.yaml",
+      ericsson-pod2: '{"file": "etc/yardstick/nodes/fuel_baremetal/pod.yaml",
       "host": "node1.LF","target": "node2.LF"}'
 -
   file_name: opnfv_yardstick_tc002.yaml

diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-noha_daily.yaml
index 24791e2..3720129 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-noha_daily.yaml
@@ -20,7 +20,7 @@ test_cases:
       installer: fuel
       pod: ericsson-pod2
   task_args:
-      ericsson-pod2: '{"pod_info": "etc/yardstick/nodes/fuel_baremetal/pod.yaml",
+      ericsson-pod2: '{"file": "etc/yardstick/nodes/fuel_baremetal/pod.yaml",
       "host": "node1.LF","target": "node2.LF"}'
 -
   file_name: opnfv_yardstick_tc002.yaml

diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-moon-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-moon-ha_daily.yaml
index 3d8074a..16c04de 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-odl_l2-moon-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-moon-ha_daily.yaml
@@ -34,7 +34,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -42,7 +42,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
@@ -58,5 +58,5 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node1.LF"}'

diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-nofeature-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-nofeature-ha_daily.yaml
index bc38f16..674c9a8 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-odl_l2-nofeature-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-nofeature-ha_daily.yaml
@@ -34,7 +34,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -42,7 +42,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
@@ -58,5 +58,5 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node1.LF"}'

diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-nofeature-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-nofeature-noha_daily.yaml
index 249da0e..0f00bd7 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-odl_l2-nofeature-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-nofeature-noha_daily.yaml
@@ -34,7 +34,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -42,7 +42,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
@@ -58,5 +58,5 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node1.LF"}'

diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-sfc-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-sfc-ha_daily.yaml
index a8172e4..1dde1cb 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-odl_l2-sfc-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-sfc-ha_daily.yaml
@@ -34,7 +34,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -42,7 +42,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
@@ -58,5 +58,5 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node1.LF"}'

diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-sfc-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-sfc-noha_daily.yaml
index 3504e9d..8d70981 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-odl_l2-sfc-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-sfc-noha_daily.yaml
@@ -34,7 +34,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -42,7 +42,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
@@ -58,5 +58,5 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node1.LF"}'

diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l3-nofeature-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l3-nofeature-ha_daily.yaml
index 14d6b6f..0459a13 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-odl_l3-nofeature-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl_l3-nofeature-ha_daily.yaml
@@ -34,7 +34,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -42,7 +42,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
@@ -58,5 +58,5 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node1.LF"}'

diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l3-nofeature-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l3-nofeature-noha_daily.yaml
index a7a2cfd..d7429b1 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-odl_l3-nofeature-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl_l3-nofeature-noha_daily.yaml
@@ -34,7 +34,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -42,7 +42,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml

diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l3-ovs-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l3-ovs-ha_daily.yaml
index 6d2bea5..4411b2c 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-odl_l3-ovs-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-odl_l3-ovs-ha_daily.yaml
@@ -34,7 +34,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -42,7 +42,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
@@ -58,5 +58,5 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node1.LF"}'

diff --git a/tests/opnfv/test_suites/opnfv_os-onos-nofeature-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-onos-nofeature-ha_daily.yaml
index 9c5d23c..ed8894c 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-onos-nofeature-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-onos-nofeature-ha_daily.yaml
@@ -34,7 +34,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -42,7 +42,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
@@ -58,5 +58,5 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node1.LF"}'

diff --git a/tests/opnfv/test_suites/opnfv_os-onos-nofeature-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-onos-nofeature-noha_daily.yaml
index 1e37e10..94390d5 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-onos-nofeature-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-onos-nofeature-noha_daily.yaml
@@ -34,7 +34,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -42,7 +42,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
@@ -58,5 +58,5 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node1.LF"}'

diff --git a/tests/opnfv/test_suites/opnfv_os-onos-sfc-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-onos-sfc-ha_daily.yaml
index 57cab23..18e27d6 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-onos-sfc-ha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-onos-sfc-ha_daily.yaml
@@ -34,7 +34,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -42,7 +42,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
@@ -58,5 +58,5 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node1.LF"}'

diff --git a/tests/opnfv/test_suites/opnfv_os-onos-sfc-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-onos-sfc-noha_daily.yaml
index 77a370a..d56be61 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-onos-sfc-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-onos-sfc-noha_daily.yaml
@@ -34,7 +34,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -42,7 +42,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml

diff --git a/tests/opnfv/test_suites/opnfv_os-ovn-nofeature-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-ovn-nofeature-noha_daily.yaml
index 9e20186..567642e 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_os-ovn-nofeature-noha_daily.yaml
+++ b/tests/opnfv/test_suites/opnfv_os-ovn-nofeature-noha_daily.yaml
@@ -34,7 +34,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC055"}'
 -
   file_name: opnfv_yardstick_tc063.yaml
@@ -42,7 +42,7 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node5.yardstick-TC063"}'
 -
   file_name: opnfv_yardstick_tc069.yaml
@@ -58,5 +58,5 @@ test_cases:
       installer: compass
       pod: huawei-pod1
   task_args:
-      huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+      huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
       "host": "node1.LF"}'

diff --git a/tests/opnfv/test_suites/opnfv_performance.yaml b/tests/opnfv/test_suites/opnfv_performance.yaml
index c35a52f..948d063 100644 (file)
--- a/tests/opnfv/test_suites/opnfv_performance.yaml
+++ b/tests/opnfv/test_suites/opnfv_performance.yaml
@@ -34,7 +34,7 @@ test_cases:
         installer: compass
         pod: huawei-pod1
     task_args:
-        huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+        huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
         "host": "node4.LF","target": "node5.LF"}'
 -
     file_name: opnfv_yardstick_tc055.yaml
@@ -42,7 +42,7 @@ test_cases:
         installer: compass
         pod: huawei-pod1
     task_args:
-        huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+        huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
         "host": "node5.yardstick-TC055"}'
 -
     file_name: opnfv_yardstick_tc063.yaml
@@ -50,7 +50,7 @@ test_cases:
         installer: compass
         pod: huawei-pod1
     task_args:
-        huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+        huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
         "host": "node5.yardstick-TC063"}'
 -
     file_name: opnfv_yardstick_tc069.yaml
@@ -66,5 +66,5 @@ test_cases:
         installer: compass
         pod: huawei-pod1
     task_args:
-        huawei-pod1: '{"pod_info": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
+        huawei-pod1: '{"file": "etc/yardstick/nodes/compass_sclab_physical/pod.yaml",
         "host": "node1.LF"}'

diff --git a/yardstick/benchmark/core/task.py b/yardstick/benchmark/core/task.py
index 9c6caf0..4ae7f82 100644 (file)
--- a/yardstick/benchmark/core/task.py
+++ b/yardstick/benchmark/core/task.py
@@ -383,7 +383,7 @@ class TaskParser(object):       # pragma: no cover
     def _get_task_para(self, task, cur_pod):
         task_args = task.get('task_args', None)
         if task_args is not None:
-            task_args = task_args.get(cur_pod, None)
+            task_args = task_args.get(cur_pod, task_args.get('default'))
         task_args_fnames = task.get('task_args_fnames', None)
         if task_args_fnames is not None:
             task_args_fnames = task_args_fnames.get(cur_pod, None)