summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authortjuyinkanglin <14_ykl@tongji.edu.cn>2017-02-14 03:12:41 -0500
committertjuyinkanglin <14_ykl@tongji.edu.cn>2017-02-14 03:12:41 -0500
commitad5e0d5adefd9698e31000855f34284aa56912f9 (patch)
tree20880afd7a45d7d9ea3d415eadbfc7fd44b6f184 /tests
parent5420dd71763226d78fb1ff486b78918432c73e49 (diff)
Update Openstack CLI Command for Scenario-based HA Testcases which have multiple commands: yardstick tc025, tc050 ,tc051, tc053, tc054
JIRA: YARDSTICK-546 Change-Id: Id94b32f5e053f3f6a7c78980dce22b3aab7bbd13 Signed-off-by: tjuyinkanglin <14_ykl@tongji.edu.cn>
Diffstat (limited to 'tests')
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml10
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml8
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml8
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml2
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml2
5 files changed, 15 insertions, 15 deletions
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml
index 0bbc5b8a6..78cc5cb27 100644
--- 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 a8cb920ea..88100aa21 100644
--- 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 1115b35f6..264f01b3c 100644
--- 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 16a971124..19b406aa6 100644
--- 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 93948d3b1..3f1b0171c 100644
--- 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