fix

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

setup/bindir/cloud-sysvmadm.in

@@ -22,7 +22,7 @@
 
 usage() {
   usage_content="
-  The tool for stopping/starting running system vms and domain routers
+  The tool for stopping/starting running system vms and domain routers. It requires integration API port to be enabled.
 
   Usage: %s: [-d] [-u] [-p] [-m] [-s] [-r] [-a] [-n] [-t] [-l] [-z] [-v] [-i] [-j]
 
@@ -61,6 +61,7 @@ vmids=""
 vmidsclause=""
 withids=""
 vmtable="vm_instance"
+integrationport=0
 
 
 
@@ -102,6 +103,12 @@ do
 done
 
 
+integrationport=(`mysql -h $db --user=$user --password=$password --skip-column-names -U cloud -e "SELECT value FROM configuration WHERE name='integration.api.port'"`)
+if [ $integrationport -le 0 ]; then
+    echo "Integration port is not enabled!"
+    exit
+fi
+
 prepare_ids_clause() {
   if [[ ! -z "$vmidsclause" ]]; then
     return
@@ -243,7 +250,7 @@ stop_start_all() {
 }
 
 send_request(){
-    jobid=`curl -sS "http://$ms:8096/?command=$1&id=$2&response=json" | sed 's/\"//g' | sed 's/ //g' | sed 's/{//g' | sed 's/}//g' | awk -F: {'print $3'}`
+    jobid=`curl -sS "http://$ms:$integrationport/?command=$1&id=$2&response=json" | sed 's/\"//g' | sed 's/ //g' | sed 's/{//g' | sed 's/}//g' | awk -F: {'print $3'}`
     if [ "$jobid" == "" ]; then
         echo 2
         return
@@ -259,7 +266,7 @@ send_request(){
 
 reboot_router(){
     echo "[$(date "+%Y.%m.%d-%H.%M.%S")] INFO: Restarting router with id $1" >>$LOGFILE
-    jobid=`curl -sS "http://$ms:8096/?command=rebootRouter&id=$1&response=json" | sed 's/\"//g' | sed 's/ //g' | sed 's/{//g' | sed 's/}//g' | awk -F: {'print $3'}`
+    jobid=`curl -sS "http://$ms:$integrationport/?command=rebootRouter&id=$1&response=json" | sed 's/\"//g' | sed 's/ //g' | sed 's/{//g' | sed 's/}//g' | awk -F: {'print $3'}`
     if [ "$jobid" == "" ]; then
         echo "[$(date "+%Y.%m.%d-%H.%M.%S")] ERROR: Failed to restart domainRouter with id $1; unable to submit the job" >>$LOGFILE
         echo 2
@@ -343,7 +350,7 @@ restart_networks(){
 }
 
 restart_network(){
-    jobid=`curl -sS "http://$ms:8096/?command=restartNetwork&id=$1&response=json" | sed 's/\"//g' | sed 's/ //g' | sed 's/{//g' | sed 's/}//g' | awk -F: {'print $3'}`
+    jobid=`curl -sS "http://$ms:$integrationport/?command=restartNetwork&id=$1&response=json" | sed 's/\"//g' | sed 's/ //g' | sed 's/{//g' | sed 's/}//g' | awk -F: {'print $3'}`
     if [ "$jobid" == "" ]; then
         echo "[$(date "+%Y.%m.%d-%H.%M.%S")] ERROR: Failed to restart network with id $1; unable to submit the job" >>$LOGFILE
         echo 2
@@ -364,7 +371,7 @@ restart_network(){
 restart_vpc(){
     echo -e "INFO: Restarting vpc with id $1"
     echo "[$(date "+%Y.%m.%d-%H.%M.%S")] INFO: Restarting vpc with id $1" >>$LOGFILE
-    jobid=`curl -sS "http://$ms:8096/?command=restartVPC&id=$1&response=json" | sed 's/\"//g' | sed 's/ //g' | sed 's/{//g' | sed 's/}//g' | awk -F: {'print $3'}`
+    jobid=`curl -sS "http://$ms:$integrationport/?command=restartVPC&id=$1&response=json" | sed 's/\"//g' | sed 's/ //g' | sed 's/{//g' | sed 's/}//g' | awk -F: {'print $3'}`
     if [ "$jobid" == "" ]; then
         echo "[$(date "+%Y.%m.%d-%H.%M.%S")] ERROR: Failed to restart vpc with id $1; unable to submit the job" >>$LOGFILE
         echo 2
@@ -449,7 +456,7 @@ restart_vpcs(){
 query_async_job_result() {
     while [ 1 ]
     do
-        jobstatus=`curl -sS "http://$ms:8096/?command=queryAsyncJobResult&jobId=$1&response=json" | sed 's/\"//g' | sed 's/ //g' | sed 's/{//g' | sed 's/}//g' | awk -F, {'print $4'} | awk -F: {'print $2'}`
+        jobstatus=`curl -sS "http://$ms:$integrationport/?command=queryAsyncJobResult&jobId=$1&response=json" | sed 's/\"//g' | sed 's/ //g' | sed 's/{//g' | sed 's/}//g' | awk -F, {'print $4'} | awk -F: {'print $2'}`
         if [ "$jobstatus" != "0" ]; then
             echo $jobstatus
             break