From b3c87ec90b519313530d6061aac03a09e8460e05 Mon Sep 17 00:00:00 2001 From: rexlee8776 Date: Fri, 30 Jun 2017 02:02:01 +0000 Subject: unify pod keywork so api can easily used JIRA: YARDSTICK-695 Change-Id: I826cb2ea07949b1eaae4df4cb77175ec8f5df89b Signed-off-by: rexlee8776 --- tests/opnfv/test_suites/opnfv_features.yaml | 22 ++++++++++++-- .../opnfv_k8-nosdn-nofeature-noha_daily.yaml | 6 ++-- .../test_suites/opnfv_os-nosdn-kvm-ha_daily.yaml | 6 ++-- .../test_suites/opnfv_os-nosdn-kvm-noha_daily.yaml | 4 +-- .../opnfv_os-nosdn-kvm_ovs-ha_daily.yaml | 6 ++-- .../opnfv_os-nosdn-kvm_ovs_dpdk-ha_daily.yaml | 6 ++-- .../opnfv_os-nosdn-kvm_ovs_dpdk-noha_daily.yaml | 4 +-- .../opnfv_os-nosdn-kvm_ovs_dpdk_bar-ha_daily.yaml | 6 ++-- ...opnfv_os-nosdn-kvm_ovs_dpdk_bar-noha_daily.yaml | 4 +-- .../test_suites/opnfv_os-nosdn-lxd-ha_daily.yaml | 6 ++-- .../test_suites/opnfv_os-nosdn-lxd-noha_daily.yaml | 6 ++-- .../opnfv_os-nosdn-nofeature-ha_daily.yaml | 26 ++++++++++++----- .../opnfv_os-nosdn-nofeature-noha_daily.yaml | 6 ++-- .../test_suites/opnfv_os-nosdn-openo-ha_daily.yaml | 34 +++++++++++++++++----- .../test_suites/opnfv_os-nosdn-ovs-ha_daily.yaml | 6 ++-- .../test_suites/opnfv_os-nosdn-ovs-noha_daily.yaml | 4 +-- .../opnfv_os-ocl-nofeature-ha_daily.yaml | 6 ++-- .../opnfv_os-ocl-nofeature-noha_daily.yaml | 6 ++-- .../opnfv_os-odl_l2-bgpvpn-ha_daily.yaml | 2 +- .../opnfv_os-odl_l2-bgpvpn-noha_daily.yaml | 2 +- .../test_suites/opnfv_os-odl_l2-moon-ha_daily.yaml | 6 ++-- .../opnfv_os-odl_l2-nofeature-ha_daily.yaml | 6 ++-- .../opnfv_os-odl_l2-nofeature-noha_daily.yaml | 6 ++-- .../test_suites/opnfv_os-odl_l2-sfc-ha_daily.yaml | 6 ++-- .../opnfv_os-odl_l2-sfc-noha_daily.yaml | 6 ++-- .../opnfv_os-odl_l3-nofeature-ha_daily.yaml | 6 ++-- .../opnfv_os-odl_l3-nofeature-noha_daily.yaml | 4 +-- .../test_suites/opnfv_os-odl_l3-ovs-ha_daily.yaml | 6 ++-- .../opnfv_os-onos-nofeature-ha_daily.yaml | 6 ++-- .../opnfv_os-onos-nofeature-noha_daily.yaml | 6 ++-- .../test_suites/opnfv_os-onos-sfc-ha_daily.yaml | 6 ++-- .../test_suites/opnfv_os-onos-sfc-noha_daily.yaml | 4 +-- .../opnfv_os-ovn-nofeature-noha_daily.yaml | 6 ++-- tests/opnfv/test_suites/opnfv_performance.yaml | 8 ++--- 34 files changed, 148 insertions(+), 102 deletions(-) (limited to 'tests/opnfv/test_suites') diff --git a/tests/opnfv/test_suites/opnfv_features.yaml b/tests/opnfv/test_suites/opnfv_features.yaml index abbb07884..b01741793 100644 --- 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 6ac1a7523..00dccab95 100644 --- 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 2f49f01fd..1be7d13af 100644 --- 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 ab94442b5..42bc651b2 100644 --- 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 0d43ac3f7..eb8d0f307 100644 --- 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 8736c4b47..625fa6ea0 100644 --- 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 1b2f47237..3a3ed3779 100644 --- 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 23878626b..ef09f3c8b 100644 --- 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 f07f79026..a800c5649 100644 --- 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 aa9d96091..9de6ab2bb 100644 --- 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 ba066f06b..eed5da44d 100644 --- 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 d18a4e6d5..ba1a93cec 100644 --- 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 db3324703..6700db406 100644 --- 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 49cae7b68..9418e42f4 100644 --- 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 d87abbea9..3a540f27a 100644 --- 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 9869d1bd5..abc336041 100644 --- 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 47432d2d2..3f2fe18a3 100644 --- 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 2a7bf77e0..fcc7a9bb2 100644 --- 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 7ce6f10cc..43aae7101 100644 --- 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 24791e23e..372012928 100644 --- 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 3d8074a42..16c04de37 100644 --- 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 bc38f1615..674c9a8be 100644 --- 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 249da0e7e..0f00bd7ea 100644 --- 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 a8172e405..1dde1cb25 100644 --- 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 3504e9da8..8d7098160 100644 --- 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 14d6b6f1b..0459a13a3 100644 --- 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 a7a2cfd9e..d7429b136 100644 --- 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 6d2bea5e8..4411b2cac 100644 --- 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 9c5d23c8c..ed8894ce1 100644 --- 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 1e37e1042..94390d525 100644 --- 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 57cab2311..18e27d6d6 100644 --- 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 77a370a4b..d56be6152 100644 --- 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 9e20186bb..567642eda 100644 --- 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 c35a52f9c..948d0633e 100644 --- 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"}' -- cgit 1.2.3-korg