X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Frobot%2Fdemo-k8s.sh;h=d253ec7f4f6366dba6080eb24eeb41d11d7aa876;hb=2722343e49c2bc65e7e3ed7d2e524d17b869ea45;hp=d5e7a0384dbba347822166ac836418442dd651a2;hpb=b2e4ea650381d9e109c23a9fe51980655500fb29;p=oom.git

diff --git a/kubernetes/robot/demo-k8s.sh b/kubernetes/robot/demo-k8s.sh
index d5e7a0384d..d253ec7f4f 100755
--- a/kubernetes/robot/demo-k8s.sh
+++ b/kubernetes/robot/demo-k8s.sh
@@ -1,5 +1,17 @@
-#!/bin/bash -x
-
+#!/bin/bash
+# Copyright (C) 2018 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Execute tags built to support the hands on demo,
 #
@@ -31,12 +43,21 @@ function usage
 	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 "       demo.sh <namespace> heatbridge <stack_name> <service_instance_id> <service> <oam-ip-address>"
     echo "               - Run heatbridge against the stack for the given service instance and service"
+	echo " "
+	echo "       demo.sh <namespace> vfwclosedloop <pgn-ip-address>"
+        echo "           - vFWCL: Sets the packet generator to high and low rates, and checks whether the policy "
+        echo "             kicks in to modulate the rates back to medium"
+	echo " "
 }
 
 # Set the defaults
-if [ $# -le 2 ];then
+
+echo "Number of parameters:" 
+echo $#
+
+if [ $# -lt 2 ];then
 	usage
 	exit
 fi
@@ -47,9 +68,11 @@ shift
 ##
 ## if more than 1 tag is supplied, the must be provided with -i or -e
 ##
-while [ $# -gt 1 ]
+while [ $# -gt 0 ]
 do
-	key="$2"
+	key="$1"
+        echo "KEY:"
+        echo $key
 
 	case $key in
     	init_robot)
@@ -63,7 +86,7 @@ do
 			VARIABLES="$VARIABLES -v WEB_PASSWORD:$WEB_PASSWORD"
 			shift
 			if [ $# -eq 2 ];then
-				VARIABLES="$VARIABLES -v HOSTS_PREFIX:$2"
+				VARIABLES="$VARIABLES -v HOSTS_PREFIX:$1"
 			fi
 			shift
 			;;
@@ -79,7 +102,7 @@ do
 			TAG="InitDistribution"
 			shift
 			if [ $# -eq 1 ];then
-				VARIABLES="$VARIABLES -v DEMO_PREFIX:$2"
+				VARIABLES="$VARIABLES -v DEMO_PREFIX:$1"
 			fi
 			shift
 			;;
@@ -87,24 +110,24 @@ do
 			TAG="PreloadDemo"
 			shift
 			if [ $# -ne 2 ];then
-				echo "Usage: demo.sh preload <vnf_name> <module_name>"
+				echo "Usage: demo.sh <namespace> preload <vnf_name> <module_name>"
 				exit
 			fi
-			VARIABLES="$VARIABLES -v VNF_NAME:$2"
+			VARIABLES="$VARIABLES -v VNF_NAME:$1"
 			shift
-			VARIABLES="$VARIABLES -v MODULE_NAME:$2"
+			VARIABLES="$VARIABLES -v MODULE_NAME:$1"
 			shift
 			;;
     	appc)
-    	TAG="APPCMountPointDemo"
-    	shift
-    	if [ $# -ne 1 ];then
-			echo "Usage: demo.sh appc <module_name>"
-			exit
-		fi
-    	VARIABLES="$VARIABLES -v MODULE_NAME:$2"
-    	shift
-    	;;
+			TAG="APPCMountPointDemo"
+			shift
+			if [ $# -ne 1 ];then
+					echo "Usage: demo.sh <namespace> appc <module_name>"
+					exit
+				fi
+			VARIABLES="$VARIABLES -v MODULE_NAME:$1"
+			shift
+			;;
     	instantiateVFW)
 			TAG="instantiateVFW"
 			VARIABLES="$VARIABLES -v GLOBAL_BUILD_NUMBER:$$"
@@ -114,10 +137,10 @@ do
 			TAG="deleteVNF"
 			shift
 			if [ $# -ne 1 ];then
-				echo "Usage: demo.sh deleteVNF <module_name from instantiateVFW>"
+				echo "Usage: demo.sh <namespace> deleteVNF <module_name from instantiateVFW>"
 				exit
 			fi
-			VARFILE=$2.py
+			VARFILE=$1.py
 			if [ -e /opt/eteshare/${VARFILE} ]; then
 				VARIABLES="$VARIABLES -V /share/${VARFILE}"
 			else
@@ -129,24 +152,58 @@ do
     	heatbridge)
 			TAG="heatbridge"
 			shift
-			if [ $# -ne 3 ];then
-				echo "Usage: demo.sh heatbridge <stack_name> <service_instance_id> <service>"
+			if [ $# -ne 4 ];then
+				echo "Usage: demo.sh <namespace> heatbridge <stack_name> <service_instance_id> <service> <oam-ip-address>"
 				exit
 			fi
-			VARIABLES="$VARIABLES -v HB_STACK:$2"
+			VARIABLES="$VARIABLES -v HB_STACK:$1"
+			shift
+			VARIABLES="$VARIABLES -v HB_SERVICE_INSTANCE_ID:$1"
+			shift
+			VARIABLES="$VARIABLES -v HB_SERVICE:$1"
 			shift
-			VARIABLES="$VARIABLES -v HB_SERVICE_INSTANCE_ID:$2"
+			VARIABLES="$VARIABLES -v HB_IPV4_OAM_ADDRESS:$1"
 			shift
-			VARIABLES="$VARIABLES -v HB_SERVICE:$2"
+			;;
+    	cds)
+			TAG="cds"
 			shift
 			;;
+        distributeVFWNG)
+                        TAG="distributeVFWNG"
+                        shift
+                        ;;
+        distributeDemoVFWDT)
+                        TAG="DistributeDemoVFWDT"
+                        shift
+                        ;;
+        instantiateDemoVFWDT)
+                        TAG="instantiateVFWDT"
+                        shift
+                        ;;
+        vfwclosedloop)
+                        TAG="vfwclosedloop"
+                        shift
+                        VARIABLES="$VARIABLES -v pkg_host:$1"
+                        shift
+                        ;;
     	*)
 			usage
 			exit
 	esac
 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"
+set -x
+
 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
+
+ETEHOME=/var/opt/ONAP
+
+export GLOBAL_BUILD_NUMBER=$(kubectl --namespace $NAMESPACE exec  ${POD}  -- bash -c "ls -1q /share/logs/ | wc -l")
+OUTPUT_FOLDER=$(printf %04d $GLOBAL_BUILD_NUMBER)_demo_$key
+DISPLAY_NUM=$(($GLOBAL_BUILD_NUMBER + 90))
+
+VARIABLEFILES="-V /share/config/vm_properties.py -V /share/config/integration_robot_properties.py -V /share/config/integration_preload_parameters.py"
+
+kubectl --namespace $NAMESPACE exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} -i ${TAG} --display $DISPLAY_NUM 2> ${TAG}.out
+