summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2017-06-08 09:58:42 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-06-08 09:58:42 +0000
commitc591e10088dd42261f0ee6bc73ad657d0a797ef1 (patch)
tree42789896bafbb264c147636724c4f03afa62429f
parentec5467f1d2ff5fbf994018707de295fd5c02f7f9 (diff)
parentc076c8372f32a88059783fbc993ab2ebb8967e2e (diff)
Merge "Fix configuration error in TC025"
-rw-r--r--etc/yardstick/nodes/pod.yaml.ipmi.sample50
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml9
2 files changed, 58 insertions, 1 deletions
diff --git a/etc/yardstick/nodes/pod.yaml.ipmi.sample b/etc/yardstick/nodes/pod.yaml.ipmi.sample
new file mode 100644
index 000000000..6253c790f
--- /dev/null
+++ b/etc/yardstick/nodes/pod.yaml.ipmi.sample
@@ -0,0 +1,50 @@
+##############################################################################
+# Copyright (c) 2017 14_ykl@tongji.edu.cn and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+# sample config file about the POD information, including the
+# name/IP/user/ssh key of Bare Metal Controllers/Computes/Jumperserver
+# and the ipmi information of Controllers/Computes
+#
+# The options of this config file include:
+# name: the name of this node
+# role: node's role, support role: Master/Controller/Comupte/BareMetal
+# ip: the node's IP address
+# user: the username for login
+# password: the password for login
+# ipmi_ip: the node's IPMI IP address
+# ipmi_user: the username for ipmi control
+# ipmi_password: the password for ipmi control
+
+nodes:
+-
+ name: node0
+ role: Jumpserver
+ ip: 10.1.0.2
+ user: root
+ password: root
+
+-
+ name: node1
+ role: Controller
+ ip: 10.1.0.50
+ user: root
+ password: root
+ ipmi_ip: 192.168.10.10
+ ipmi_user: root
+ ipmi_password: root
+
+-
+ name: node2
+ role: Compute
+ ip: 10.1.0.51
+ user: root
+ password: root
+ ipmi_ip: 192.168.10.11
+ ipmi_user: root
+ ipmi_password: root \ No newline at end of file
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml
index 443395873..c4ee237e5 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml
@@ -11,16 +11,22 @@
schema: "yardstick:task:0.1"
description: >
Sample test case for the HA of OpenStack Controll Node abnormally shutdown.
+ In order to power on the shutdown node after testing, the jumphost is
+ required to install ipmitool. Ipmi jumphost info and each nodes' ipmi ip,
+ 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 jumphost = jumphost or 'node0' %}
scenarios:
-
type: ServiceHA
options:
attackers:
- - fault_type: "host-shutdown"
+ - fault_type: "bare-metal-down"
host: node1
+ jump_host: {{jumphost}}
monitors:
- monitor_type: "openstack-cmd"
@@ -42,6 +48,7 @@ scenarios:
nodes:
node1: node1.LF
+ node0: node0.LF
runner:
type: Iteration