From 7c5a6396aaf939a5e566c7e86a96672251627af2 Mon Sep 17 00:00:00 2001
From: rexlee8776 <limingjiang@huawei.com>
Date: Thu, 3 Aug 2017 12:39:44 +0000
Subject: bugfix: tc025 and tc054 fail
also modify tc025 an tc054 to be able to pass paras
JIRA: YARDSTICK-772
Change-Id: Ibeba931804cccfd74fc70fcf4fdb6af9d5c8ab77
Signed-off-by: rexlee8776 <limingjiang@huawei.com>
---
tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml | 28 ++++++++++++++-------
tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml | 30 ++++++++++++++---------
2 files changed, 37 insertions(+), 21 deletions(-)
(limited to 'tests')
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml
index a8312876f..a37f83b83 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml
@@ -17,7 +17,9 @@ description: >
"etc/yardstick/nodes/pod.yaml.ipmi.sample").
{% set file = file or '/etc/yardstick/pod.yaml' %}
-{% set jumphost = jumphost or 'node0' %}
+{% set jump_host = jump_host or 'node0' %}
+{% set attack_host = attack_host or 'node1' %}
+{% set monitor_time = monitor_time or 180 %}
scenarios:
-
@@ -25,30 +27,38 @@ scenarios:
options:
attackers:
- fault_type: "bare-metal-down"
- host: node1
- jump_host: {{jumphost}}
+ host: {{attack_host}}
+ jump_host: {{jump_host}}
monitors:
- monitor_type: "openstack-cmd"
command_name: "openstack image list"
- monitor_time: 10
+ monitor_time: {{monitor_time}}
monitor_number: 3
+ sla:
+ max_outage_time: 5
- monitor_type: "openstack-cmd"
command_name: "openstack router list"
- monitor_time: 10
+ monitor_time: {{monitor_time}}
monitor_number: 3
+ sla:
+ max_outage_time: 5
- monitor_type: "openstack-cmd"
command_name: "openstack stack list"
- monitor_time: 10
+ monitor_time: {{monitor_time}}
monitor_number: 3
+ sla:
+ max_outage_time: 5
- monitor_type: "openstack-cmd"
command_name: "openstack volume list"
- monitor_time: 10
+ monitor_time: {{monitor_time}}
monitor_number: 3
+ sla:
+ max_outage_time: 5
nodes:
- node1: node1.LF
- node0: node0.LF
+ {{attack_host}}: {{attack_host}}.LF
+ {{jump_host}}: {{jump_host}}.LF
runner:
type: Iteration
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
index c229277f4..417327cb6 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
@@ -13,11 +13,15 @@ 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 attack_host = attack_host or 'node1' %}
+{% set check_host = check_host or 'node2' %}
+{% set jump_host = jump_host or 'node0' %}
{% 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' %}
{% set vip_router_public = vip_router_public or '172.16.0.2' %}
+{% set monitor_time = monitor_time or 180 %}
scenarios:
-
@@ -26,15 +30,16 @@ scenarios:
attackers:
-
fault_type: "bare-metal-down"
- host: node1
+ host: {{attack_host}}
key: "bare-metal-down"
+ jump_host: {{jump_host}}
monitors:
-
monitor_type: "openstack-cmd"
key: "list-images"
command_name: "openstack image list"
- monitor_time: 10
+ monitor_time: {{monitor_time}}
monitor_number: 3
sla:
max_outage_time: 5
@@ -43,8 +48,8 @@ scenarios:
monitor_type: "general-monitor"
monitor_key: "ip-status"
key: "vip-mgmt-status"
- host: node2
- monitor_time: 10
+ host: {{check_host}}
+ monitor_time: {{monitor_time}}
monitor_number: 3
sla:
max_outage_time: 5
@@ -55,8 +60,8 @@ scenarios:
monitor_type: "general-monitor"
monitor_key: "ip-status"
key: "vip-routerp-status"
- host: node2
- monitor_time: 10
+ host: {{check_host}}
+ monitor_time: {{monitor_time}}
monitor_number: 3
sla:
max_outage_time: 5
@@ -67,8 +72,8 @@ scenarios:
monitor_type: "general-monitor"
monitor_key: "ip-status"
key: "vip-router-status"
- host: node2
- monitor_time: 10
+ host: {{check_host}}
+ monitor_time: {{monitor_time}}
monitor_number: 3
sla:
max_outage_time: 5
@@ -79,8 +84,8 @@ scenarios:
monitor_type: "general-monitor"
monitor_key: "ip-status"
key: "vip-pub"
- host: node2
- monitor_time: 10
+ host: {{check_host}}
+ monitor_time: {{monitor_time}}
monitor_number: 3
sla:
max_outage_time: 5
@@ -119,8 +124,9 @@ scenarios:
index: 6
nodes:
- node1: node1.LF
- node2: node2.LF
+ {{jump_host}}: {{jump_host}}.LF
+ {{attack_host}}: {{attack_host}}.LF
+ {{check_host}}: {{check_host}}.LF
runner:
type: Duration
duration: 1
--
cgit