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_cases/opnfv_yardstick_tc019.yaml | 2 +- tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml | 2 +- tests/opnfv/test_cases/opnfv_yardstick_tc027.yaml | 4 ++-- tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml | 4 ++-- tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml | 2 +- tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml | 2 +- tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml | 2 +- tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml | 2 +- tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml | 2 +- tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml | 2 +- tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml | 2 +- tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml | 2 +- tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml | 2 +- tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml | 2 +- tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml | 4 ++-- tests/opnfv/test_cases/opnfv_yardstick_tc063.yaml | 4 ++-- tests/opnfv/test_cases/opnfv_yardstick_tc073.yaml | 4 ++-- tests/opnfv/test_cases/opnfv_yardstick_tc075.yaml | 4 ++-- 18 files changed, 24 insertions(+), 24 deletions(-) (limited to 'tests/opnfv/test_cases') diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml index 5d3057dc3..15bbddaa6 100644 --- 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 c4ee237e5..a8312876f 100644 --- 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 87846daa7..7646813ec 100644 --- 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 a253e6dab..b14fc4554 100644 --- 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 d851d5a71..fdaaa838a 100644 --- 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 ad81a14ab..fe16f388c 100644 --- 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 cc990363f..c888967da 100644 --- 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 237f845be..4ad19f3bd 100644 --- 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 ff3ac7529..da17a59c1 100644 --- 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 0611fd2b3..303dd4216 100644 --- 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 3921140f5..98a08b7ca 100644 --- 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 5907eb2b3..75835ebf5 100644 --- 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 9e05cc895..3ecbc308c 100644 --- 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 6dd17f8b5..c229277f4 100644 --- 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 3d733e719..7e33741b1 100644 --- 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 6939c93ca..48288ef62 100644 --- 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 9f4d3a021..fb40257f3 100755 --- 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 07c2b8090..d19b3c4e7 100644 --- 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}} -- cgit 1.2.3-korg