Fix demo-k8

[oom.git] / kubernetes / robot / demo-k8s.sh

diff --git a/kubernetes/robot/demo-k8s.sh b/kubernetes/robot/demo-k8s.sh
index 2836fca..de33627 100755 (executable)
--- a/kubernetes/robot/demo-k8s.sh
+++ b/kubernetes/robot/demo-k8s.sh
@@ -1,48 +1,61 @@
-#!/bin/bash
+#!/bin/bash -x
 
 #
 # Execute tags built to support the hands on demo,
 #
 function usage
 {
-       echo "Usage: demo.sh <command> [<parameters>]"
+       echo "Usage: demo.sh namespace <command> [<parameters>]"
        echo " "
-       echo "       demo.sh init"
+       echo "       demo.sh <namespace> init"
        echo "               - Execute both init_customer + distribute"
        echo " "
-       echo "       demo.sh init_customer"
+       echo "       demo.sh <namespace> init_customer"
        echo "               - Create demo customer (Demonstration) and services, etc."
        echo " "
-       echo "       demo.sh distribute  [<prefix>]"
+       echo "       demo.sh <namespace> distribute  [<prefix>]"
        echo "               - Distribute demo models (demoVFW and demoVLB)"
        echo " "
-       echo "       demo.sh preload <vnf_name> <module_name>"
+       echo "       demo.sh <namespace> preload <vnf_name> <module_name>"
        echo "               - Preload data for VNF for the <module_name>"
        echo " "
-       echo "       demo.sh appc <module_name>"
+       echo "       demo.sh <namespace> appc <module_name>"
     echo "               - provide APPC with vFW module mount point for closed loop"
        echo " "
-       echo "       demo.sh init_robot"
+       echo "       demo.sh <namespace> init_robot [ <etc_hosts_prefix> ]"
     echo "               - Initialize robot after all ONAP VMs have started"
        echo " "
-       echo "       demo.sh instantiateVFW"
+       echo "       demo.sh <namespace> instantiateVFW"
     echo "               - Instantiate vFW module for the a demo customer (DemoCust<uuid>)"
        echo " "
-       echo "       demo.sh deleteVNF <module_name from instantiateVFW>"
+       echo "       demo.sh <namespace> deleteVNF <module_name from instantiateVFW>"
     echo "               - Delete the module created by instantiateVFW"
+       echo " "
+       echo "       demo.sh <namespace> heatbridge <stack_name> <service_instance_id> <service>"
+    echo "               - Run heatbridge against the stack for the given service instance and service"
 }
 
 # Set the defaults
-if [ $# -eq 0 ];then
+
+echo "Number of parameters:" 
+echo $#
+
+if [ $# -lt 2 ];then
        usage
        exit
 fi
+
+NAMESPACE=$1
+shift
+
 ##
 ## if more than 1 tag is supplied, the must be provided with -i or -e
 ##
 while [ $# -gt 0 ]
 do
        key="$1"
+        echo "KEY:"
+        echo $key
 
        case $key in
        init_robot)
@@ -55,6 +68,10 @@ do
                        fi
                        VARIABLES="$VARIABLES -v WEB_PASSWORD:$WEB_PASSWORD"
                        shift
+                       if [ $# -eq 2 ];then
+                               VARIABLES="$VARIABLES -v HOSTS_PREFIX:$2"
+                       fi
+                       shift
                        ;;
        init)
                        TAG="InitDemo"
@@ -68,7 +85,7 @@ do
                        TAG="InitDistribution"
                        shift
                        if [ $# -eq 1 ];then
-                               VARIABLES="$VARIABLES -v DEMO_PREFIX:$1"
+                               VARIABLES="$VARIABLES -v DEMO_PREFIX:$2"
                        fi
                        shift
                        ;;
@@ -79,9 +96,9 @@ do
                                echo "Usage: demo.sh preload <vnf_name> <module_name>"
                                exit
                        fi
-                       VARIABLES="$VARIABLES -v VNF_NAME:$1"
+                       VARIABLES="$VARIABLES -v VNF_NAME:$2"
                        shift
-                       VARIABLES="$VARIABLES -v MODULE_NAME:$1"
+                       VARIABLES="$VARIABLES -v MODULE_NAME:$2"
                        shift
                        ;;
        appc)
@@ -91,7 +108,7 @@ do
                        echo "Usage: demo.sh appc <module_name>"
                        exit
                fi
-       VARIABLES="$VARIABLES -v MODULE_NAME:$1"
+       VARIABLES="$VARIABLES -v MODULE_NAME:$2"
        shift
        ;;
        instantiateVFW)
@@ -106,7 +123,7 @@ do
                                echo "Usage: demo.sh deleteVNF <module_name from instantiateVFW>"
                                exit
                        fi
-                       VARFILE=$1.py
+                       VARFILE=$2.py
                        if [ -e /opt/eteshare/${VARFILE} ]; then
                                VARIABLES="$VARIABLES -V /share/${VARFILE}"
                        else
@@ -115,6 +132,20 @@ do
                        fi
                        shift
                        ;;
+       heatbridge)
+                       TAG="heatbridge"
+                       shift
+                       if [ $# -ne 3 ];then
+                               echo "Usage: demo.sh heatbridge <stack_name> <service_instance_id> <service>"
+                               exit
+                       fi
+                       VARIABLES="$VARIABLES -v HB_STACK:$2"
+                       shift
+                       VARIABLES="$VARIABLES -v HB_SERVICE_INSTANCE_ID:$2"
+                       shift
+                       VARIABLES="$VARIABLES -v HB_SERVICE:$2"
+                       shift
+                       ;;
        *)
                        usage
                        exit
@@ -123,5 +154,5 @@ done
 
 ETEHOME=/var/opt/OpenECOMP_ETE
 VARIABLEFILES="-V /share/config/vm_properties.py -V /share/config/integration_robot_properties.py -V /share/config/integration_preload_parameters.py"
-POD=$(kubectl --namespace onap-robot get pods | sed 's/ .*//'| grep robot)
-kubectl --namespace onap-robot exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/demo/${TAG} -i ${TAG} --display 89 2> ${TAG}.out
+POD=$(kubectl --namespace $NAMESPACE get pods | sed 's/ .*//'| grep robot)
+kubectl --namespace $NAMESPACE exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/demo/${TAG} -i ${TAG} --display 89 2> ${TAG}.out