Update Openstack CLI Command for Scenario-based HA Testcases which have multiple...

JIRA: YARDSTICK-546

Change-Id: Id94b32f5e053f3f6a7c78980dce22b3aab7bbd13
Signed-off-by: tjuyinkanglin <14_ykl@tongji.edu.cn>

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml
index 0bbc5b8..78cc5cb 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml
@@ -14,16 +14,16 @@ scenarios:
 
     monitors:
     - monitor_type: "openstack-cmd"
-      command_name: "nova image-list"
+      command_name: "openstack image list"
       monitor_time: 10
     - monitor_type: "openstack-cmd"
-      command_name: "neutron router-list"
+      command_name: "openstack router list"
       monitor_time: 10
     - monitor_type: "openstack-cmd"
-      command_name: "heat stack-list"
+      command_name: "openstack stack list"
       monitor_time: 10
     - monitor_type: "openstack-cmd"
-      command_name: "cinder list"
+      command_name: "openstack volume list"
       monitor_time: 10
 
   nodes:
@@ -41,4 +41,4 @@ scenarios:
 context:
   type: Node
   name: LF
-  file: /root/yardstick/etc/yardstick/nodes/fuel_virtual/pod.yaml
+  file: etc/yardstick/nodes/fuel_virtual/pod.yaml

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
index a8cb920..88100aa 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
@@ -54,7 +54,7 @@ scenarios:
         -
           monitor_type: "openstack-cmd"
           key: "nova-image-list"
-          command_name: "nova image-list"
+          command_name: "openstack image list"
           monitor_time: 10
           sla:
             max_outage_time: 5
@@ -62,7 +62,7 @@ scenarios:
         -
           monitor_type: "openstack-cmd"
           key: "neutron-router-list"
-          command_name: "neutron router-list"
+          command_name: "openstack router list"
           monitor_time: 10
           sla:
             max_outage_time: 5
@@ -70,7 +70,7 @@ scenarios:
         -
           monitor_type: "openstack-cmd"
           key: "heat-stack-list"
-          command_name: "heat stack-list"
+          command_name: "openstack stack list"
           monitor_time: 10
           sla:
             max_outage_time: 5
@@ -78,7 +78,7 @@ scenarios:
         -
           monitor_type: "openstack-cmd"
           key: "cinder-list"
-          command_name: "cinder list"
+          command_name: "openstack volume list"
           monitor_time: 10
           sla:
             max_outage_time: 5

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml
index 1115b35..264f01b 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml
@@ -20,7 +20,7 @@ scenarios:
         -
           monitor_type: "openstack-cmd"
           key: "nova-image-list"
-          command_name: "nova image-list"
+          command_name: "openstack image list"
           monitor_time: 10
           sla:
             max_outage_time: 5
@@ -28,7 +28,7 @@ scenarios:
         -
           monitor_type: "openstack-cmd"
           key: "neutron-router-list"
-          command_name: "neutron router-list"
+          command_name: "openstack router list"
           monitor_time: 10
           sla:
             max_outage_time: 5
@@ -36,7 +36,7 @@ scenarios:
         -
           monitor_type: "openstack-cmd"
           key: "heat-stack-list"
-          command_name: "heat stack-list"
+          command_name: "openstack stack list"
           monitor_time: 10
           sla:
             max_outage_time: 5
@@ -44,7 +44,7 @@ scenarios:
         -
           monitor_type: "openstack-cmd"
           key: "cinder-list"
-          command_name: "cinder list"
+          command_name: "openstack volume list"
           monitor_time: 10
           sla:
             max_outage_time: 5

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
index 16a9711..19b406a 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
@@ -29,7 +29,7 @@ scenarios:
         -
           monitor_type: "openstack-cmd"
           key: "list-images"
-          command_name: "nova image-list"
+          command_name: "openstack image list"
           monitor_time: 10
           sla:
             max_outage_time: 5

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
index 93948d3..3f1b017 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
@@ -19,7 +19,7 @@ scenarios:
         -
           monitor_type: "openstack-cmd"
           key: "list-images"
-          command_name: "nova image-list"
+          command_name: "openstack image list"
           monitor_time: 10
           sla:
             max_outage_time: 5