Fix heat_stack_owner bug

[parser.git] / tests / functest_run.sh

diff --git a/tests/functest_run.sh b/tests/functest_run.sh
index c3ce601..a582d76 100755 (executable)
--- a/tests/functest_run.sh
+++ b/tests/functest_run.sh
@@ -9,6 +9,8 @@
 ##############################################################################
 
 PARSER_CI_DEBUG=${CI_DEBUG:-false}
+PRASER_WORK_DIR=$(cd $(dirname $0) && pwd)
+
 [[ "${PARSER_CI_DEBUG}" == "true" ]] && {
     set -x
     debug="--debug"
@@ -16,12 +18,23 @@ PARSER_CI_DEBUG=${CI_DEBUG:-false}
     set +x
     debug=""
 }
+LOCAL_IMAGE_FILE=${1:-""}
+
+if [ -e "${LOCAL_IMAGE_FILE}" ]; then
+    echo "Input local image file: ${LOCAL_IMAGE_FILE}"
+    PARSER_IMAGE_URL_FILE=${LOCAL_IMAGE_FILE}
+else
+    echo "No local image file or the file(${LOCAL_IMAGE_FILE}) doesn't exsit!"
+
+    PARSER_IMAGE_URL_FILE=cirros-0.3.5-x86_64-disk.img
+    PARSER_IMAGE_VERSION=$(echo ${PARSER_IMAGE_URL_FILE} | awk -F- '{print $2}')
+    # PARSER_IMAGE_URL=https://launchpad.net/cirros/trunk/0.3.0/+download/${PARSER_IMAGE_URL_FILE}
+    PARSER_IMAGE_URL=http://download.cirros-cloud.net/${PARSER_IMAGE_VERSION}/${PARSER_IMAGE_URL_FILE}
+    echo "so will download image(${PARSER_IMAGE_URL_FILE}) from ${PARSER_IMAGE_URL}."
+fi
 
-# PARSER_IMAGE_URL_FILE=cirros-0.3.0-x86_64-disk.img
-PARSER_IMAGE_URL_FILE=cirros-0.3.2-x86_64-disk.img
-# PARSER_IMAGE_URL=https://launchpad.net/cirros/trunk/0.3.0/+download/${PARSER_IMAGE_URL_FILE}
-PARSER_IMAGE_URL=http://download.cirros-cloud.net/0.3.2/${PARSER_IMAGE_URL_FILE}
 # PARSER_IMAGE_NAME=rhel-6.5-test-image
+# fiexd image name according to the translator default vlaue of images
 PARSER_IMAGE_NAME=cirros-0.3.2-x86_64-uec
 PARSER_IMAGE_FILE="${PARSER_IMAGE_NAME}.img"
 PARSER_IMAGE_FORMAT=qcow2
@@ -91,13 +104,18 @@ create_parser_user_and_project() {
     }
 
     # 3. grant role for parser user
-    openstack ${debug} user role list ${PARSER_USER} --project ${PARSER_PROJECT} \
+    openstack ${debug} role list ${PARSER_USER} --project ${PARSER_PROJECT} \
     | grep -qow ${PARSER_ROLE} && {
         echo "  User ${PARSER_USER} has role ${PARSER_ROLE} in project ${PARSER_PROJECT}, doesn't create."
     } || {
         openstack ${debug} role add ${PARSER_ROLE} --user ${PARSER_USER} \
                            --project ${PARSER_PROJECT}
         echo "  Grant user ${PARSER_USER} the role ${PARSER_ROLE} in project ${PARSER_PROJECT} successful."
+        openstack ${debug} role list | grep -qow heat_stack_owner && {
+            openstack ${debug} role add heat_stack_owner --user ${PARSER_USER} \
+                               --project ${PARSER_PROJECT}
+            echo "  Grant user ${PARSER_USER} the role heat_stack_owner in project ${PARSER_PROJECT} successful."
+        }
     }
 
 }
@@ -109,6 +127,9 @@ change_env_to_parser_user_project() {
     export OS_PROJECT_NAME=${PARSER_PROJECT}
     export OS_TENANT_NAME=${PARSER_TENANT}
 
+    export OS_PROJECT_DOMAIN_NAME=${OS_PROJECT_DOMAIN_NAME:-'Default'}
+    export OS_USER_DOMAIN_NAME=${OS_USER_DOMAIN_NAME:-'Default'}
+
 }
 
 
@@ -142,7 +163,7 @@ make_patch_for_translated_file() {
     # Replace the signal_transport
     echo "    Patch yaml file: ${VRNC_OUTPUT_TEMPLATE_FILE}"
     echo ""
-    echo "    Patching compute:signal_transport:"
+    echo "    Patching compute:signal_transport"
     sed -i '1,$s/HEAT_SIGNAL/NO_SIGNAL/g' ${VRNC_OUTPUT_TEMPLATE_FILE}
 
 }
@@ -290,7 +311,7 @@ echo ""
 trap reset_parser_test EXIT
 
 # start syslog for loghander
-service rsyslog restart
+which service > /dev/null  && service rsyslog restart || true
 
 echo "|========= 1/4. Preparing VM image for parser...     =========|"
 download_parser_image