Bugfix: change monitor command in tc019

JIRA: YARDSTICK-655

The original openstack command used for monitoring high availability openstack
nova-api service in tc019 is "nova image-list", the "openstack image list" command
used in tc019 now may not correctly show the nova-api service status.
This is patch swtich the monitor command to "openstack server list".

Change-Id: I8810f28b4328ceb4d911a3041a24774ae9cae8f0
Signed-off-by: JingLu5 <lvjing5@huawei.com>
(cherry picked from commit a5e13df9381c531716b1e41e7a9dedb130fc6e35)

diff --git a/docs/testing/user/userguide/opnfv_yardstick_tc019.rst b/docs/testing/user/userguide/opnfv_yardstick_tc019.rst
index 1af5022..57e8ddf 100644 (file)
--- a/docs/testing/user/userguide/opnfv_yardstick_tc019.rst
+++ b/docs/testing/user/userguide/opnfv_yardstick_tc019.rst
@@ -21,8 +21,8 @@ Yardstick Test Case Description TC019
 +--------------+--------------------------------------------------------------+
 |test method   | This test case kills the processes of a specific Openstack   |
 |              | service on a selected control node, then checks whether the  |
-|              | request of the related Openstack command is OK and the killed|
-|              | processes are recovered.                                     |
+|              | request of the related Openstack command is OK and the       |
+|              | killed processes are recovered.                              |
 |              |                                                              |
 +--------------+--------------------------------------------------------------+
 |attackers     | In this test case, an attacker called "kill-process" is      |
@@ -52,8 +52,8 @@ Yardstick Test Case Description TC019
 |              |                                                              |
 |              | 2. the "process" monitor check whether a process is running  |
 |              |    on a specific node, which needs three parameters:         |
-|              | 1) monitor_type: which used for finding the monitor class and|
-|              | related scritps. It should be always set to "process"        |
+|              | 1) monitor_type: which used for finding the monitor class    |
+|              | and related scritps. It should be always set to "process"    |
 |              | for this monitor.                                            |
 |              | 2) process_name: which is the process name for monitor       |
 |              | 3) host: which is the name of the node runing the process    |
@@ -61,7 +61,7 @@ Yardstick Test Case Description TC019
 |              | e.g.                                                         |
 |              | monitor1:                                                    |
 |              | -monitor_type: "openstack-cmd"                               |
-|              | -command_name: "nova image-list"                             |
+|              | -command_name: "openstack server list"                       |
 |              | monitor2:                                                    |
 |              | -monitor_type: "process"                                     |
 |              | -process_name: "nova-api"                                    |
@@ -123,9 +123,9 @@ Yardstick Test Case Description TC019
 |              | Result: The test case is passed or not.                      |
 |              |                                                              |
 +--------------+--------------------------------------------------------------+
-|post-action   | It is the action when the test cases exist. It will check the|
-|              | status of the specified process on the host, and restart the |
-|              | process if it is not running for next test cases             |
+|post-action   | It is the action when the test cases exist. It will check    |
+|              | the status of the specified process on the host, and restart |
+|              | the process if it is not running for next test cases         |
 |              |                                                              |
 +--------------+--------------------------------------------------------------+
 |test verdict  | Fails only if SLA is not passed, or if there is a test case  |

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml
index 9b720e1..78fa7ab 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml
@@ -26,7 +26,7 @@ scenarios:
     wait_time: 10
     monitors:
     - monitor_type: "openstack-cmd"
-      command_name: "openstack image list"
+      command_name: "openstack server list"
       monitor_time: 10
       sla:
         max_outage_time: 5