summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRex Lee <limingjiang@huawei.com>2017-02-16 02:40:17 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-16 02:40:17 +0000
commit2c07b32c372594e5d0a936e76baca80ff87993c7 (patch)
treebfd9bf34a8747e2594545e7c5cd48a442669d3b4
parent0c5e1909e7752422a3964d3ce47559dea60fe61c (diff)
parentaae626530de3ec4eab4053665c332b4d0815d998 (diff)
Merge "Update Openstack CLI Command in yardstick ha test framework configuration files and TC052"
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml2
-rw-r--r--yardstick/benchmark/scenarios/availability/ha_tools/nova/create_flavor.bash2
-rw-r--r--yardstick/benchmark/scenarios/availability/ha_tools/nova/delete_flavor.bash2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml
index 67619d3d0..4d3ae93f5 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml
@@ -20,7 +20,7 @@ scenarios:
-
monitor_type: "openstack-cmd"
key: "nova-flavor-list"
- command_name: "nova flavor-list"
+ command_name: "openstack flavor list"
monitor_time: 10
sla:
max_outage_time: 5
diff --git a/yardstick/benchmark/scenarios/availability/ha_tools/nova/create_flavor.bash b/yardstick/benchmark/scenarios/availability/ha_tools/nova/create_flavor.bash
index 5c2d6d70e..38dbe0cee 100644
--- a/yardstick/benchmark/scenarios/availability/ha_tools/nova/create_flavor.bash
+++ b/yardstick/benchmark/scenarios/availability/ha_tools/nova/create_flavor.bash
@@ -16,4 +16,4 @@ set -e
source /root/openrc
-nova flavor-create $1 $2 $3 $4 $5
+openstack flavor create $1 --id $2 --ram $3 --disk $4 --vcpus $5
diff --git a/yardstick/benchmark/scenarios/availability/ha_tools/nova/delete_flavor.bash b/yardstick/benchmark/scenarios/availability/ha_tools/nova/delete_flavor.bash
index 67d0c902e..37d2cf6c0 100644
--- a/yardstick/benchmark/scenarios/availability/ha_tools/nova/delete_flavor.bash
+++ b/yardstick/benchmark/scenarios/availability/ha_tools/nova/delete_flavor.bash
@@ -16,4 +16,4 @@ set -e
source /root/openrc
-nova flavor-delete $1 \ No newline at end of file
+openstack flavor delete $1