X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Frobot%2Fdemo-k8s.sh;h=31b86436f0c59b2e3823769348cfa3306e637253;hb=78e7f39e3dbc23319d7dbab9f6e05004ece8e84c;hp=3fe511f478db117708504a32f2c365b9ffce15e1;hpb=e951fd2f3cefa51a456aecd32de2c9b80450859a;p=oom.git

diff --git a/kubernetes/robot/demo-k8s.sh b/kubernetes/robot/demo-k8s.sh
index 3fe511f478..31b86436f0 100755
--- a/kubernetes/robot/demo-k8s.sh
+++ b/kubernetes/robot/demo-k8s.sh
@@ -1,4 +1,6 @@
-# Copyright © 2018 Amdocs, Bell Canada
+#!/bin/bash
+# Copyright (C) 2018 Amdocs, Bell Canada
+# Modifications Copyright (C) 2019 Samsung
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,42 +13,44 @@
 # 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.
-
-#!/bin/bash
-
 #
-# Execute tags built to support the hands on demo,
+# Execute tags built to support the hands-on demo
 #
 function usage
 {
-	echo "Usage: demo.sh namespace <command> [<parameters>]"
+	echo "Usage: demo-k8s.sh <namespace> <command> [<parameters>]"
 	echo " "
-	echo "       demo.sh <namespace> init"
+	echo "       demo-k8s.sh <namespace> init"
 	echo "               - Execute both init_customer + distribute"
 	echo " "
-	echo "       demo.sh <namespace> init_customer"
+	echo "       demo-k8s.sh <namespace> init_customer"
 	echo "               - Create demo customer (Demonstration) and services, etc."
 	echo " "
-	echo "       demo.sh <namespace> distribute  [<prefix>]"
+	echo "       demo-k8s.sh <namespace> distribute  [<prefix>]"
 	echo "               - Distribute demo models (demoVFW and demoVLB)"
 	echo " "
-	echo "       demo.sh <namespace> preload <vnf_name> <module_name>"
+	echo "       demo-k8s.sh <namespace> preload <vnf_name> <module_name>"
 	echo "               - Preload data for VNF for the <module_name>"
 	echo " "
-	echo "       demo.sh <namespace> appc <module_name>"
-    echo "               - provide APPC with vFW module mount point for closed loop"
+	echo "       demo-k8s.sh <namespace> appc <module_name>"
+	echo "               - provide APPC with vFW module mount point for closed loop"
 	echo " "
-	echo "       demo.sh <namespace> init_robot [ <etc_hosts_prefix> ]"
-    echo "               - Initialize robot after all ONAP VMs have started"
+	echo "       demo-k8s.sh <namespace> init_robot [ <etc_hosts_prefix> ]"
+	echo "               - Initialize robot after all ONAP VMs have started"
 	echo " "
-	echo "       demo.sh <namespace> instantiateVFW"
-    echo "               - Instantiate vFW module for the a demo customer (DemoCust<uuid>)"
+	echo "       demo-k8s.sh <namespace> instantiateVFW"
+	echo "               - Instantiate vFW module for the demo customer (DemoCust<uuid>)"
 	echo " "
-	echo "       demo.sh <namespace> deleteVNF <module_name from instantiateVFW>"
-    echo "               - Delete the module created by instantiateVFW"
+	echo "       demo-k8s.sh <namespace> deleteVNF <module_name from instantiateVFW>"
+	echo "               - Delete the module created by instantiateVFW"
+	echo " "
+	echo "       demo-k8s.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-k8s.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 " "
-	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
@@ -107,7 +111,7 @@ do
 			TAG="PreloadDemo"
 			shift
 			if [ $# -ne 2 ];then
-				echo "Usage: demo.sh <namespace> preload <vnf_name> <module_name>"
+				echo "Usage: demo-k8s.sh <namespace> preload <vnf_name> <module_name>"
 				exit
 			fi
 			VARIABLES="$VARIABLES -v VNF_NAME:$1"
@@ -119,7 +123,7 @@ do
 			TAG="APPCMountPointDemo"
 			shift
 			if [ $# -ne 1 ];then
-					echo "Usage: demo.sh <namespace> appc <module_name>"
+					echo "Usage: demo-k8s.sh <namespace> appc <module_name>"
 					exit
 				fi
 			VARIABLES="$VARIABLES -v MODULE_NAME:$1"
@@ -134,7 +138,7 @@ do
 			TAG="deleteVNF"
 			shift
 			if [ $# -ne 1 ];then
-				echo "Usage: demo.sh <namespace> deleteVNF <module_name from instantiateVFW>"
+				echo "Usage: demo-k8s.sh <namespace> deleteVNF <module_name from instantiateVFW>"
 				exit
 			fi
 			VARFILE=$1.py
@@ -149,8 +153,8 @@ do
     	heatbridge)
 			TAG="heatbridge"
 			shift
-			if [ $# -ne 3 ];then
-				echo "Usage: demo.sh <namespace> heatbridge <stack_name> <service_instance_id> <service>"
+			if [ $# -ne 4 ];then
+				echo "Usage: demo-k8s.sh <namespace> heatbridge <stack_name> <service_instance_id> <service> <oam-ip-address>"
 				exit
 			fi
 			VARIABLES="$VARIABLES -v HB_STACK:$1"
@@ -159,11 +163,31 @@ do
 			shift
 			VARIABLES="$VARIABLES -v HB_SERVICE:$1"
 			shift
+			VARIABLES="$VARIABLES -v HB_IPV4_OAM_ADDRESS:$1"
+			shift
 			;;
     	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
@@ -172,7 +196,15 @@ done
 
 set -x
 
-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 $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
+