updating CLI for bind fix

Author: rjminsha

_init.sh

@@ -62,7 +62,7 @@ if [ "${TEST}" == "inventory" ]; then
         fi
     fi
     IDS_RESOURCE=$CF_SPACE_ID
-    IDS_STATUS="66260806-6a93-42a7-9bdb-794ee8e021fe"
+    IDS_STATUS="8ff04768-215e-4ca5-936d-295bf3acf4f8"
     echo "bash ids-inv -a insert -d $IDS_DEPLOYER -q $IDS_REQUEST -r $IDS_RESOURCE -s $IDS_STATUS -t ibm_containers -u $IDS_INV_URL -v $IDS_VERSION"
     bash ids-inv -a insert -d $IDS_DEPLOYER -q $IDS_REQUEST -r $IDS_RESOURCE -s $IDS_STATUS -t ibm_containers -u $IDS_INV_URL -v $IDS_VERSION
     exit 0

_sample_deploy_group_script.sh

@@ -184,15 +184,17 @@ deploy_group() {
     RESULT=$?
     if [ $RESULT -eq 0 ]; then 
         if [[ ( -n "${ROUTE_DOMAIN}" ) && ( -n "${ROUTE_HOSTNAME}" ) ]]; then 
-            ice route bind $ROUTE_HOSTNAME $ROUTE_DOMAIN $MY_GROUP_NAME
+            ice route map --hostname $ROUTE_HOSTNAME --domain $ROUTE_DOMAIN $MY_GROUP_NAME
             RESULT=$?
             if [ $RESULT -eq 0 ]; then 
                 insert_inventory "containergroup" ${MY_GROUP_NAME}
             else
                 echo -e "${red}Failed to map $ROUTE_HOSTNAME $ROUTE_DOMAIN to $MY_GROUP_NAME ${no_color}"
+                echo -e "${label_color}Not stopping execution due to failing in mapping${no_color}"
+                RESULT=0 
             fi 
         else 
-            echo "No route defined, so not bind it to ${MY_GROUP_NAME}"
+            echo "No route defined, so not map it to ${MY_GROUP_NAME}"
         fi 
     else 
         echo -e "${red}Failed to deploy group${no_color}"
@@ -236,12 +238,18 @@ deploy_red_black () {
                 #statements
                 # remove this group 
                 echo "removing route $ROUTE_HOSTNAME $ROUTE_DOMAIN from ${MY_GROUP_NAME}_${COUNTER}" 
-                ice route unmap $ROUTE_HOSTNAME $ROUTE_DOMAIN $MY_GROUP_NAME
+                ice route unmap --hostname $ROUTE_HOSTNAME --domain $ROUTE_DOMAIN $MY_GROUP_NAME
                 echo "removing group ${MY_GROUP_NAME}_${COUNTER}"
                 ice group rm ${MY_GROUP_NAME}_${COUNTER}
-                delete_inventory "group" ${MY_GROUP_NAME}_${COUNTER}
+                RESULT=$?
+                if [ $FOUND -eq 0 ]; then 
+                    delete_inventory "group" ${MY_GROUP_NAME}_${COUNTER}
+                else    
+                    echo -e "${label_color}Failed to remove previous group ${MY_GROUP_NAME}_${COUNTER} ${no_color}"
+                    ice group inspect ${MY_GROUP_NAME}_${COUNTER}
+                fi 
             else 
-                echo "No route defined, so not unbinding it from ${MY_GROUP_NAME}_${COUNTER}"
+                echo "No route defined, so not unmapping it from ${MY_GROUP_NAME}_${COUNTER}"
             fi 
         fi 
         let COUNTER-=1
@@ -266,10 +274,12 @@ if [ -z "$GROUP_DESIRED" ]; then
 fi 
 
 if [ -z "$ROUTE_HOSTNAME" ]; then 
-    echo -e "${label_color}ROUTE_HOSTNAME not set${no_color}"
+    echo -e "${red}ROUTE_HOSTNAME not set.  Please set the desired or existing route hostname as an environment proeprties on the stage.${no_color}"
+    exit 1 
 fi 
 if [ -z "$ROUTE_DOMAIN" ]; then 
-    echo -e "${label_color}ROUTE_DOMAIN not set${no_color}"
+    echo -e "${label_color}ROUTE_DOMAIN not set, defaulting to mybluemix.net${no_color}"
+    export ROUTE_DOMAIN="mybluemix.net"
 fi 
 
 if [ "${DEPLOY_TYPE}" == "simple" ]; then
@@ -283,6 +293,6 @@ else
     usage
     deploy_red_black
 fi 
-ice groups list 
+ice group list 
 ice ps 
 dump_info

_sample_deploy_script.sh

@@ -165,7 +165,7 @@ wait_for (){
 deploy_container() {
     local MY_CONTAINER_NAME=$1 
     echo "deploying container ${MY_CONTAINER_NAME}"
-
+ 
     if [ -z MY_CONTAINER_NAME ];then 
         echo "${red}No container name was provided${no_color}"
         return 1 
@@ -265,10 +265,14 @@ deploy_red_black () {
         RESULT=$?
         if [ $RESULT -ne 0 ]; then
             echo -e "${red}Failed to bind ${FLOATING_IP} to ${CONTAINER_NAME}_${BUILD_NUMBER} ${no_color}" 
+            echo "Unsetting TEST_URL"
+            export TEST_URL=""
             exit 1 
         fi 
+        echo "Exporting TEST_URL:${TEST_URL}"
+        export TEST_URL="${URL_PROTOCOL}${FLOATING_IP}${URL_PORT}"
     fi 
-    echo -e "${green}Public IP address of ${CONTAINER_NAME}_${BUILD_NUMBER} is ${FLOATING_IP} ${no_color}"
+    echo -e "${green}Public IP address of ${CONTAINER_NAME}_${BUILD_NUMBER} is ${FLOATING_IP} and the TEST_URL is ${TEST_URL} ${no_color}"
 }
 
 ##################
@@ -277,6 +281,14 @@ deploy_red_black () {
 # Check to see what deployment type: 
 #   simple: simply deploy a container and set the inventory 
 #   red_black: deploy new container, assign floating IP address, keep original container 
+if [ -z "$URL_PROTOCOL" ]; then 
+ export URL_PROTOCOL="http://" 
+fi 
+if [ -z "$URL_PORT" ]; then 
+ export $URL_PORT=":80" 
+fi 
+ 
+ 
 echo "Deploying using ${DEPLOY_TYPE} strategy, for ${CONTAINER_NAME}, deploy number ${BUILD_NUMBER}"
 if [ "${DEPLOY_TYPE}" == "simple" ]; then
     deploy_simple

extension.json

@@ -60,6 +60,7 @@ git clone https://gist.github.com/rjminsha/56d409c0c33d2e7cbf04 scripts/containe
 cd scripts/containerdeploy
 chmod +x ice_container_deploy.sh  
 ./ice_container_deploy.sh 
+RESULT=$?
 
 #############################
 # Deploy using Groups 
@@ -69,10 +70,13 @@ git clone https://gist.github.com/ee3666e33865dcd10e21.git scripts/containergrou
 cd scripts/containergroupdeploy
 chmod +x ice_container_group_deploy.sh  
 ./ice_container_group_deploy.sh 
+RESULT=$?
 
-# run some tests 
+# check the results were good 
+if [ $RESULT -ne 0 ]; then
+    echo -e \"${red}Executed failed${no_color}\"
+fi 
 
-# adjust the deployment 
 
 echo -e \"${green}Execution complete${no_label}\"