summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorxudan <xudan16@huawei.com>2018-03-09 03:27:14 -0500
committerGeorg Kunz <georg.kunz@ericsson.com>2018-03-14 16:01:41 +0000
commit66d20467c423505559bba2efa5aae2619903d647 (patch)
tree10d796efb2e5c7e679150d7a63ecc5842fd5ccd5 /etc
parent189f27b7a90b6ddc74f1c3ede806e87d7548c539 (diff)
Add process info to pod.yaml to specify the info of a special process
1. Many HA test cases try to kill special processes with their name. 2. Then they check corresponding openstack services and the status of processes' recovery. 3. For different SUTs, the names of the processes and the hosts' names may be different. 4. So there is a requirement for Dovetail tool to provide one way to allow users to specify all the infos about process name and its host name. 5. All process infos can be added into file DOVETAIL_HOME/user_config/pod.yaml 6. The infos include 'attack_process' and 'attack_host' for each HA test cases. 7. If not given in this file, will use Yardtsick default values. JIRA: DOVETAIL-627 Change-Id: I83cee991f72a8685080ed562597c70d73002623a Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'etc')
-rw-r--r--etc/conf/yardstick_config.yml10
-rw-r--r--etc/userconfig/pod.yaml.sample26
2 files changed, 35 insertions, 1 deletions
diff --git a/etc/conf/yardstick_config.yml b/etc/conf/yardstick_config.yml
index bbb2133e..1b924d85 100644
--- a/etc/conf/yardstick_config.yml
+++ b/etc/conf/yardstick_config.yml
@@ -1,4 +1,10 @@
---
+
+{% set attack_host = attack_host or '' %}
+{% set attack_process = attack_process or '' %}
+{% set validate_testcase = validate_testcase or '' %}
+{% set testcase = testcase or '' %}
+
yardstick:
image_name: opnfv/yardstick
docker_tag: opnfv-5.1.0
@@ -12,7 +18,9 @@ yardstick:
- "cd /home/opnfv/repos/yardstick && source /etc/yardstick/openstack.creds &&
yardstick task start tests/opnfv/test_cases/{{validate_testcase}}.yaml
--output-file /home/opnfv/yardstick/results/{{testcase}}.out
- --task-args '{'file': '/home/opnfv/userconfig/pre_config/pod.yaml'}'"
+ --task-args '{'file': '/home/opnfv/userconfig/pre_config/pod.yaml',
+ 'attack_host': {{attack_host}},
+ 'attack_process': {{attack_process}}}'"
post_condition:
- 'echo this is post_condition'
result:
diff --git a/etc/userconfig/pod.yaml.sample b/etc/userconfig/pod.yaml.sample
index 26636a6b..71b276a5 100644
--- a/etc/userconfig/pod.yaml.sample
+++ b/etc/userconfig/pod.yaml.sample
@@ -48,3 +48,29 @@ nodes:
ip: 10.1.0.54
user: root
key_filename: /root/.ssh/id_rsa
+
+# The options of this section include:
+# testcase_name: the name of test case
+# attack_process: the name of the process this test case attempt to kill
+# attack_host: one of the hosts given in section 'nodes' which is the primary host of attack_process
+#
+# if not set, it will use the default value of yardstick test case config
+# the default attack_host of all test cases is 'node1'
+# the default attack_process of all test cases are
+# dovetail.ha.tc001: nova-api
+# dovetail.ha.tc002: neutron-server
+# dovetail.ha.tc003: keystone
+# dovetail.ha.tc004: glance-api
+# dovetail.ha.tc005: cinder-api
+# dovetail.ha.tc008: haproxy
+# dovetail.ha.tc010: rabbitmq-server
+# dovetail.ha.tc011: neutron-l3-agent
+
+# process_info:
+# -
+# testcase_name: dovetail.ha.tc008
+# attack_host: node2
+#
+# -
+# testcase_name: dovetail.ha.tc010
+# attack_process: rabbitmq