summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJing Lu <lvjing5@huawei.com>2017-03-27 04:47:33 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-27 04:47:33 +0000
commitfd51e9fe3f4c31be2cfd541f23c3bb5a7ba08291 (patch)
treeff36a5d78dd25cd7a851c6e552b9d2b550c033a0
parent53cae3915f9b49ada2095f3bd43c34d14c09e385 (diff)
parent22face53226f3b3dc3d0f7825edb1d86352149af (diff)
Merge "Bugfix:HA test cases rely on dynamic ip addresses in fuel pods" into stable/danube
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml4
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml4
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml4
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml4
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml4
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml4
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml4
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml4
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml4
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml4
10 files changed, 30 insertions, 10 deletions
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml
index 246967541..cad6c591c 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml
@@ -12,6 +12,8 @@ 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' %}
+
scenarios:
-
type: ServiceHA
@@ -48,5 +50,5 @@ scenarios:
context:
type: Node
name: LF
- file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+ file: {{file}}
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml
index 397d05133..38b475451 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml
@@ -12,6 +12,8 @@ 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' %}
+
scenarios:
-
type: ServiceHA
@@ -48,4 +50,4 @@ scenarios:
context:
type: Node
name: LF
- file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+ file: {{file}}
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml
index ffae96b88..53df7c64b 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml
@@ -12,6 +12,8 @@ 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' %}
+
scenarios:
-
type: ServiceHA
@@ -48,4 +50,4 @@ scenarios:
context:
type: Node
name: LF
- file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+ file: {{file}}
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml
index 7ebca4d99..7457f9392 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml
@@ -12,6 +12,8 @@ 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' %}
+
scenarios:
-
type: ServiceHA
@@ -48,5 +50,5 @@ scenarios:
context:
type: Node
name: LF
- file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+ file: {{file}}
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml
index 679e78265..e55345ae2 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml
@@ -12,6 +12,8 @@ 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' %}
+
scenarios:
-
type: ServiceHA
@@ -48,4 +50,4 @@ scenarios:
context:
type: Node
name: LF
- file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+ file: {{file}}
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
index 4bb995036..b1dc31e90 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
@@ -13,6 +13,8 @@ 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' %}
+
scenarios:
-
type: "GeneralHA"
@@ -146,4 +148,4 @@ scenarios:
context:
type: Node
name: LF
- file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+ file: {{file}}
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml
index e8cc81745..cf2b51548 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml
@@ -13,6 +13,8 @@ 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' %}
+
scenarios:
-
type: "GeneralHA"
@@ -97,4 +99,4 @@ scenarios:
context:
type: Node
name: LF
- file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+ file: {{file}}
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml
index a95e5415b..6e060b15d 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml
@@ -13,6 +13,8 @@ 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' %}
+
scenarios:
-
type: "GeneralHA"
@@ -86,4 +88,4 @@ scenarios:
context:
type: Node
name: LF
- file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+ file: {{file}}
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
index ff479f9e1..b6bbb8966 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
@@ -13,6 +13,8 @@ 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' %}
+
scenarios:
-
type: "GeneralHA"
@@ -68,4 +70,4 @@ scenarios:
context:
type: Node
name: LF
- file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+ file: {{file}}
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
index c87d3b9fe..2d51a96cc 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
@@ -13,6 +13,8 @@ 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' %}
+
scenarios:
-
type: "GeneralHA"
@@ -120,4 +122,4 @@ scenarios:
context:
type: Node
name: LF
- file: etc/yardstick/nodes/fuel_virtual/pod.yaml
+ file: {{file}}