From 2f9126f350bff38eec2ff452866e5a2ca3d0bdd7 Mon Sep 17 00:00:00 2001
From: JingLu5 <lvjing5@huawei.com>
Date: Mon, 26 Jun 2017 03:18:56 +0000
Subject: Bugfix: remove double quote around SECURE variable

JIRA: YARDSTICK-689

This patch remove the double quote around the SECURE varibale as it may cause the fowllowing error:
$ openstack "${SECURE}" image list
openstack: ' image list' is not an openstack command. See 'openstack --help'.
Did you mean one of these?
  access token create
  address scope create
  address scope delete
  address scope list
  address scope set
  address scope show
  aggregate add host
  aggregate create
  ...

Change-Id: Ibb22e85b3dd89b0e3b62821bd5ebe4f155886ffc
Signed-off-by: JingLu5 <lvjing5@huawei.com>
(cherry picked from commit b04755b5148daf36db436dc066e1bef2c93f1879)
---
 tests/ci/clean_images.sh | 10 +++++-----
 tests/ci/load_images.sh  | 24 ++++++++++++------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/tests/ci/clean_images.sh b/tests/ci/clean_images.sh
index cb5410ab2..f25006487 100755
--- a/tests/ci/clean_images.sh
+++ b/tests/ci/clean_images.sh
@@ -21,18 +21,18 @@ cleanup()
         SECURE=""
     fi
 
-    if ! openstack "${SECURE}" image list; then
+    if ! openstack ${SECURE} image list; then
         return
     fi
 
-    for image in $(openstack "${SECURE}" image list | grep -e cirros-0.3.5 -e yardstick-image -e Ubuntu-16.04 \
+    for image in $(openstack ${SECURE} image list | grep -e cirros-0.3.5 -e yardstick-image -e Ubuntu-16.04 \
         | awk '{print $2}'); do
         echo "Deleting image $image..."
-        openstack "${SECURE}" image delete $image || true
+        openstack ${SECURE} image delete $image || true
     done
 
-    openstack "${SECURE}" flavor delete yardstick-flavor &> /dev/null || true
-    openstack "${SECURE}" flavor delete storperf &> /dev/null || true
+    openstack ${SECURE} flavor delete yardstick-flavor &> /dev/null || true
+    openstack ${SECURE} flavor delete storperf &> /dev/null || true
 }
 
 main()
diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh
index a5114f419..2ae80ea8e 100755
--- a/tests/ci/load_images.sh
+++ b/tests/ci/load_images.sh
@@ -88,7 +88,7 @@ load_yardstick_image()
         if [ ! -f "${CLOUD_KERNEL}" ]; then
             tar xf "${CLOUD_IMAGE}" "${CLOUD_KERNEL##**/}"
         fi
-        create_kernel=$(openstack "${SECURE}" image create \
+        create_kernel=$(openstack ${SECURE} image create \
                 --public \
                 --disk-format qcow2 \
                 --container-format bare \
@@ -119,7 +119,7 @@ load_yardstick_image()
     fi
 
     if [[ "$DEPLOY_SCENARIO" == *"-lxd-"* ]]; then
-        output=$(eval openstack "${SECURE}" image create \
+        output=$(eval openstack ${SECURE} image create \
             --public \
             --disk-format raw \
             --container-format bare \
@@ -127,7 +127,7 @@ load_yardstick_image()
             --file ${RAW_IMAGE} \
             yardstick-image)
     else
-        output=$(eval openstack "${SECURE}" image create \
+        output=$(eval openstack ${SECURE} image create \
             --public \
             --disk-format qcow2 \
             --container-format bare \
@@ -156,7 +156,7 @@ load_yardstick_image()
 
 load_cirros_image()
 {
-    if [[ -n $(openstack "${SECURE}" image list | grep -e Cirros-0.3.5) ]]; then
+    if [[ -n $(openstack ${SECURE} image list | grep -e Cirros-0.3.5) ]]; then
         echo "Cirros-0.3.5 image already exist, skip loading cirros image"
     else
         echo
@@ -170,7 +170,7 @@ load_cirros_image()
             EXTRA_PARAMS=$EXTRA_PARAMS" --property hw_mem_page_size=large"
         fi
 
-        output=$(openstack "${SECURE}" image create \
+        output=$(openstack ${SECURE} image create \
             --disk-format qcow2 \
             --container-format bare \
             ${EXTRA_PARAMS} \
@@ -201,7 +201,7 @@ load_ubuntu_image()
         EXTRA_PARAMS=$EXTRA_PARAMS" --property hw_mem_page_size=large"
     fi
 
-    output=$(openstack "${SECURE}" image create \
+    output=$(openstack ${SECURE} image create \
         --disk-format qcow2 \
         --container-format bare \
         $EXTRA_PARAMS \
@@ -221,26 +221,26 @@ load_ubuntu_image()
 
 create_nova_flavor()
 {
-    if ! openstack "${SECURE}" flavor list | grep -q yardstick-flavor; then
+    if ! openstack ${SECURE} flavor list | grep -q yardstick-flavor; then
         echo
         echo "========== Creating yardstick-flavor =========="
         # Create the nova flavor used by some sample test cases
-        openstack "${SECURE}" flavor create --id 100 --ram 1024 --disk 3 --vcpus 1 yardstick-flavor
+        openstack ${SECURE} flavor create --id 100 --ram 1024 --disk 3 --vcpus 1 yardstick-flavor
         # DPDK-enabled OVS requires guest memory to be backed by large pages
         if [[ $DEPLOY_SCENARIO == *[_-]ovs[_-]* ]]; then
-            openstack "${SECURE}" flavor set --property hw:mem_page_size=large yardstick-flavor
+            openstack ${SECURE} flavor set --property hw:mem_page_size=large yardstick-flavor
         fi
         # VPP requires guest memory to be backed by large pages
         if [[ "$DEPLOY_SCENARIO" == *"-fdio-"* ]]; then
-            openstack "${SECURE}" flavor set --property hw:mem_page_size=large yardstick-flavor
+            openstack ${SECURE} flavor set --property hw:mem_page_size=large yardstick-flavor
         fi
     fi
 
-    if ! openstack "${SECURE}" flavor list | grep -q storperf; then
+    if ! openstack ${SECURE} flavor list | grep -q storperf; then
         echo
         echo "========== Creating storperf flavor =========="
         # Create the nova flavor used by storperf test case
-        openstack "${SECURE}" flavor create --id auto --ram 8192 --disk 4 --vcpus 2 storperf
+        openstack ${SECURE} flavor create --id auto --ram 8192 --disk 4 --vcpus 2 storperf
     fi
 }
 
-- 
cgit 1.2.3-korg