Merge "Add/clean up options in demo and ete scripts"

2 files changed, 14 insertions, 5 deletions

diff --git a/demo-k8s.sh b/demo-k8s.sh
index 8f74139..11d41a3 100755
--- a/demo-k8s.sh
+++ b/demo-k8s.sh
@@ -1,4 +1,5 @@
-# Copyright © 2018 Amdocs, Bell Canada
+#!/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.
@@ -11,9 +12,6 @@
 # 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,
 #
@@ -47,6 +45,11 @@ function usage
 	echo " "
 	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
@@ -170,6 +173,12 @@ do
                         TAG="distributeVFWNG"
                         shift
                         ;;
+        vfwclosedloop)
+                        TAG="vfwclosedloop"
+                        shift
+                        VARIABLES="$VARIABLES -v pkg_host:$1"
+                        shift
+                        ;;
     	*)
 			usage
 			exit
diff --git a/ete-k8s.sh b/ete-k8s.sh
index 7726c12..c4059b9 100755
--- a/ete-k8s.sh
+++ b/ete-k8s.sh
@@ -20,7 +20,7 @@
 # Note: Do not run multiple concurrent ete.sh as the --display is not parameterized and tests will collide
 #
 if [ "$1" == "" ] || [ "$2" == "" ]; then
-   echo "Usage: ete-k8s.sh [namespace] [ health | ete | closedloop | instantiate | distribute | portal ]"
+   echo "Usage: ete-k8s.sh [namespace] [ health | healthdist | distribute | instantiate | instantiateVFWCL | instantiateDemoVFWCL |  | portal ]"
    exit
 fi