summaryrefslogtreecommitdiffstats
path: root/tests/opnfv
diff options
context:
space:
mode:
authorrexlee8776 <limingjiang@huawei.com>2017-10-13 02:25:04 +0000
committerrexlee8776 <limingjiang@huawei.com>2017-10-13 02:38:46 +0000
commit18b2c357c3d281fbdf5261958ef60abb98915486 (patch)
tree5a99bcfcac60e3347c3e594c13188d5009198589 /tests/opnfv
parentfd4a6ba9f80e2f96af189097ccd478389467ada3 (diff)
bugfix: remove pod_name in host and unify host parameter
for none-ha test case, use host to be parameter for ha test case, use attack_host as parameter Change-Id: I053df00adab17814dd54584a1ae081548163dc68 Signed-off-by: rexlee8776 <limingjiang@huawei.com>
Diffstat (limited to 'tests/opnfv')
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml7
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml8
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml7
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml7
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml7
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml7
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml7
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml11
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml5
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml5
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml7
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml4
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc063.yaml4
-rwxr-xr-xtests/opnfv/test_cases/opnfv_yardstick_tc073.yaml8
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc075.yaml4
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc078.yaml3
16 files changed, 56 insertions, 45 deletions
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml
index 046d51731..852424d8e 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml
@@ -13,6 +13,7 @@ description: >
Sample test case for the HA of controller node Openstack service.
{% set file = file or '/etc/yardstick/pod.yaml' %}
+{% set attack_host = attack_host or "node1" %}
scenarios:
-
@@ -21,7 +22,7 @@ scenarios:
attackers:
- fault_type: "kill-process"
process_name: "nova-api"
- host: node1
+ host: {{attack_host}}
wait_time: 10
monitors:
@@ -33,14 +34,14 @@ scenarios:
max_outage_time: 5
- monitor_type: "process"
process_name: "nova-api"
- host: node1
+ host: {{attack_host}}
monitor_time: 30
monitor_number: 3
sla:
max_recover_time: 30
nodes:
- node1: node1.LF
+ {{attack_host}}: {{attack_host}}.LF
runner:
type: Iteration
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml
index b14fc4554..ea4fc3b24 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml
@@ -13,16 +13,16 @@ description: >
Yardstick TC043 config file;
Measure latency between NFVI nodes using ping.
-{% set host = host or "node1.LF" %}
-{% set target = target or "node2.LF" %}
+{% set host = host or "node1" %}
+{% set target = target or "node2" %}
{% set file = file or '/etc/yardstick/pod.yaml' %}
scenarios:
-
type: Ping
options:
packetsize: 100
- host: {{host}}
- target: {{target}}
+ host: {{host}}.LF
+ target: {{target}}.LF
runner:
type: Duration
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml
index dfe44ed12..f9d9dde48 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml
@@ -13,6 +13,7 @@ description: >
Test case for TC045 :Control node Openstack service down - neutron server.
{% set file = file or '/etc/yardstick/pod.yaml' %}
+{% set attack_host = attack_host or "node1" %}
scenarios:
-
@@ -21,7 +22,7 @@ scenarios:
attackers:
- fault_type: "kill-process"
process_name: "neutron-server"
- host: node1
+ host: {{attack_host}}
monitors:
- monitor_type: "openstack-cmd"
@@ -32,14 +33,14 @@ scenarios:
max_outage_time: 5
- monitor_type: "process"
process_name: "neutron-server"
- host: node1
+ host: {{attack_host}}
monitor_time: 30
monitor_number: 3
sla:
max_recover_time: 30
nodes:
- node1: node1.LF
+ {{attack_host}}: {{attack_host}}.LF
runner:
type: Duration
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml
index 1d553268c..129489968 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml
@@ -13,6 +13,7 @@ description: >
Test case for TC046 :Control node Openstack service down - keystone.
{% set file = file or '/etc/yardstick/pod.yaml' %}
+{% set attack_host = attack_host or "node1" %}
scenarios:
-
@@ -21,7 +22,7 @@ scenarios:
attackers:
- fault_type: "kill-process"
process_name: "keystone"
- host: node1
+ host: {{attack_host}}
monitors:
- monitor_type: "openstack-cmd"
@@ -32,14 +33,14 @@ scenarios:
max_outage_time: 5
- monitor_type: "process"
process_name: "keystone"
- host: node1
+ host: {{attack_host}}
monitor_time: 30
monitor_number: 3
sla:
max_recover_time: 30
nodes:
- node1: node1.LF
+ {{attack_host}}: {{attack_host}}.LF
runner:
type: Duration
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml
index 33bc5cd5f..4a0b65b8d 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml
@@ -13,6 +13,7 @@ description: >
Test case for TC047 :Control node Openstack service down - glance api.
{% set file = file or '/etc/yardstick/pod.yaml' %}
+{% set attack_host = attack_host or "node1" %}
scenarios:
-
@@ -21,7 +22,7 @@ scenarios:
attackers:
- fault_type: "kill-process"
process_name: "glance-api"
- host: node1
+ host: {{attack_host}}
monitors:
- monitor_type: "openstack-cmd"
@@ -32,14 +33,14 @@ scenarios:
max_outage_time: 5
- monitor_type: "process"
process_name: "glance-api"
- host: node1
+ host: {{attack_host}}
monitor_time: 30
monitor_number: 3
sla:
max_recover_time: 30
nodes:
- node1: node1.LF
+ {{attack_host}}: {{attack_host}}.LF
runner:
type: Duration
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml
index a13afe3bf..a1629c6d0 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml
@@ -13,6 +13,7 @@ description: >
Test case for TC048 :Control node Openstack service down - cinder api.
{% set file = file or '/etc/yardstick/pod.yaml' %}
+{% set attack_host = attack_host or "node1" %}
scenarios:
-
@@ -21,7 +22,7 @@ scenarios:
attackers:
- fault_type: "kill-process"
process_name: "cinder-api"
- host: node1
+ host: {{attack_host}}
monitors:
- monitor_type: "openstack-cmd"
@@ -32,14 +33,14 @@ scenarios:
max_outage_time: 5
- monitor_type: "process"
process_name: "cinder-api"
- host: node1
+ host: {{attack_host}}
monitor_time: 30
monitor_number: 3
sla:
max_recover_time: 30
nodes:
- node1: node1.LF
+ {{attack_host}}: {{attack_host}}.LF
runner:
type: Duration
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml
index 394b98721..7b8383e4e 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml
@@ -13,6 +13,7 @@ description: >
Test case for TC049 :Control node Openstack service down - swift proxy.
{% set file = file or '/etc/yardstick/pod.yaml' %}
+{% set attack_host = attack_host or "node1" %}
scenarios:
-
@@ -21,7 +22,7 @@ scenarios:
attackers:
- fault_type: "kill-process"
process_name: "swift-proxy"
- host: node1
+ host: {{attack_host}}
monitors:
- monitor_type: "openstack-cmd"
@@ -32,14 +33,14 @@ scenarios:
max_outage_time: 5
- monitor_type: "process"
process_name: "swift-proxy"
- host: node1
+ host: {{attack_host}}
monitor_time: 30
monitor_number: 3
sla:
max_recover_time: 30
nodes:
- node1: node1.LF
+ {{attack_host}}: {{attack_host}}.LF
runner:
type: Duration
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
index 303dd4216..b765feb68 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
@@ -14,6 +14,7 @@ description: >
This test case is written by new scenario-based HA testing framework.
{% set file = file or '/etc/yardstick/pod.yaml' %}
+{% set attack_host = attack_host or "node1" %}
{% set external_net = external_net or 'br-ex' %}
{% set management_net = management_net or 'br-mgmt' %}
{% set storage_net = storage_net or 'br-storage' %}
@@ -26,7 +27,7 @@ scenarios:
attackers:
-
fault_type: "general-attacker"
- host: node1
+ host: {{attack_host}}
key: "close-br-public"
attack_key: "close-interface"
action_parameter:
@@ -36,7 +37,7 @@ scenarios:
-
fault_type: "general-attacker"
- host: node1
+ host: {{attack_host}}
key: "close-br-mgmt"
attack_key: "close-interface"
action_parameter:
@@ -46,7 +47,7 @@ scenarios:
-
fault_type: "general-attacker"
- host: node1
+ host: {{attack_host}}
key: "close-br-storage"
attack_key: "close-interface"
action_parameter:
@@ -56,7 +57,7 @@ scenarios:
-
fault_type: "general-attacker"
- host: node1
+ host: {{attack_host}}
key: "close-br-private"
attack_key: "close-interface"
action_parameter:
@@ -145,7 +146,7 @@ scenarios:
nodes:
- node1: node1.LF
+ {{attack_host}}: {{attack_host}}.LF
runner:
type: Duration
duration: 1
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml
index 98a08b7ca..aade1aed2 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml
@@ -14,6 +14,7 @@ description: >
This test case is written by new scenario-based HA testing framework.
{% set file = file or '/etc/yardstick/pod.yaml' %}
+{% set attack_host = attack_host or "node1" %}
scenarios:
-
@@ -22,7 +23,7 @@ scenarios:
attackers:
-
fault_type: "general-attacker"
- host: node1
+ host: {{attack_host}}
key: "stress-cpu"
attack_key: "stress-cpu"
@@ -92,7 +93,7 @@ scenarios:
nodes:
- node1: node1.LF
+ {{attack_host}}: {{attack_host}}.LF
runner:
type: Duration
duration: 1
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml
index 75835ebf5..62cabd1a2 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml
@@ -14,6 +14,7 @@ description: >
This test case is written by new scenario-based HA testing framework.
{% set file = file or '/etc/yardstick/pod.yaml' %}
+{% set attack_host = attack_host or "node1" %}
scenarios:
-
@@ -22,7 +23,7 @@ scenarios:
attackers:
-
fault_type: "general-attacker"
- host: node1
+ host: {{attack_host}}
key: "block-io"
attack_key: "block-io"
@@ -76,7 +77,7 @@ scenarios:
index: 4
nodes:
- node1: node1.LF
+ {{attack_host}}: {{attack_host}}.LF
runner:
type: Duration
duration: 1
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
index f987e2b45..64c67c0b3 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
@@ -14,6 +14,7 @@ description: >
This test case is written by new scenario-based HA testing framework.
{% set file = file or '/etc/yardstick/pod.yaml' %}
+{% set attack_host = attack_host or "node1" %}
scenarios:
-
@@ -22,7 +23,7 @@ scenarios:
attackers:
-
fault_type: "kill-process"
- host: node1
+ host: {{attack_host}}
key: "kill-process"
process_name: "haproxy"
@@ -31,7 +32,7 @@ scenarios:
monitor_type: "process"
key: "service-status"
process_name: "haproxy"
- host: node1
+ host: {{attack_host}}
monitor_time: 30
monitor_number: 3
sla:
@@ -61,7 +62,7 @@ scenarios:
index: 3
nodes:
- node1: node1.LF
+ {{attack_host}}: {{attack_host}}.LF
runner:
type: Duration
duration: 1
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml
index 10a7a7108..8905b9cdd 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml
@@ -19,14 +19,14 @@ description: >
cache size per CPU, total cache size;
HT (Hyper-Thread) support status, 1 for open, 0 for close.
-{% set host = host or "node5.yardstick-TC055" %}
{% set file = file or '/etc/yardstick/pod.yaml' %}
+{% set host = host or "node5" %}
scenarios:
-
type: ComputeCapacity
nodes:
- host: {{host}}
+ host: {{host}}.yardstick-TC055
runner:
type: Iteration
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc063.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc063.yaml
index 254c214d2..50d0c40e1 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 file = file or '/etc/yardstick/pod.yaml' %}
-{% set node = node or "node5" %}
+{% set host = host or "node5" %}
scenarios:
-
@@ -22,7 +22,7 @@ scenarios:
options:
test_type: "disk_size"
- host: {{node}}.yardstick-TC063
+ host: {{host}}.yardstick-TC063
runner:
type: Iteration
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc073.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc073.yaml
index fb40257f3..54282cbb1 100755
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc073.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc073.yaml
@@ -18,8 +18,8 @@ description: >
In req/rsp test, TCP_RR TCP_CRR UDP_RR can be used;
req_rsp_size is option of req/rsp test;
-{% set host = host or "node1.LF" %}
-{% set target = target or "node2.LF" %}
+{% set host = host or "node1" %}
+{% set target = target or "node2" %}
{% set file = file or '/etc/yardstick/pod.yaml' %}
scenarios:
-
@@ -29,8 +29,8 @@ scenarios:
send_msg_size: 1024
duration: 20
- host: {{host}}
- target: {{target}}
+ host: {{host}}.LF
+ target: {{target}}.LF
runner:
type: Iteration
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc075.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc075.yaml
index d19b3c4e7..4954249b3 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc075.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc075.yaml
@@ -14,13 +14,13 @@ description: >
Measure network capacity and scale.
Measure number of connections, number of frames received;
-{% set host = host or "node1.LF" %}
+{% set host = host or "node1" %}
{% set file = file or '/etc/yardstick/pod.yaml' %}
scenarios:
-
type: NetworkCapacity
- host: {{host}}
+ host: {{host}}.LF
runner:
type: Iteration
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc078.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc078.yaml
index 94256125f..d20045b25 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc078.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc078.yaml
@@ -14,6 +14,7 @@ description: >
Measure CPU performance using SPEC CPU2006;
{% set file = file or "/etc/yardstick/pod.yaml" %}
+{% set host = host or 'node1' %}
scenarios:
-
@@ -26,7 +27,7 @@ scenarios:
runspec_size: ref
runspec_rate: 1
- host: node1.yardstick-TC078
+ host: {{host}}.yardstick-TC078
runner:
type: Iteration