X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Frobot%2Fdemo-k8s.sh;h=23fc555dc5be134667c2d222f7807e42888b920f;hb=8bfc6cf8c3d338c84c48201f7a4f274958e721a9;hp=251388b26eaa840e836c5eceb44a55609fe6cf1e;hpb=f0a34e22011b4323bbd6a51ad313d6e547808101;p=oom.git

diff --git a/kubernetes/robot/demo-k8s.sh b/kubernetes/robot/demo-k8s.sh
index 251388b26e..23fc555dc5 100755
--- a/kubernetes/robot/demo-k8s.sh
+++ b/kubernetes/robot/demo-k8s.sh
@@ -1,45 +1,49 @@
-#!/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"
     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 heatbridge <stack_name> <service_instance_id> <service>"
+	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
+if [ $# -le 1 ];then
 	usage
 	exit
 fi
+
+NAMESPACE=$1
+shift
+
 ##
 ## if more than 1 tag is supplied, the must be provided with -i or -e
 ##
@@ -140,5 +144,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