Merge "Removed heatbridge"

2 files changed, 2 insertions, 26 deletions

diff --git a/demo-k8s.sh b/demo-k8s.sh
index b3f717c..5d8fed8 100755
--- a/demo-k8s.sh
+++ b/demo-k8s.sh
@@ -52,9 +52,6 @@ function usage
 	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> <vnf_type> <service_type> <oam-ip-address_env_parameter>"
-	echo "               - Run heatbridge against the stack for the given vnf type and service type"
-	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"
@@ -183,28 +180,7 @@ do
 				exit
 			fi
 			VARFILE=$1.py
-			if [ -e /opt/eteshare/${VARFILE} ]; then
-				VARIABLES="$VARIABLES -V /share/${VARFILE}"
-			else
-				echo "Cache file ${VARFILE} is not found"
-				exit
-			fi
-			shift
-			;;
-    	heatbridge)
-			TAG="heatbridge"
-			shift
-			if [ $# -ne 4 ];then
-				echo "Usage: demo-k8s.sh <namespace> heatbridge <stack_name> <vnf_type> <service_type> <oam-ip-address_env_parameter>"
-				exit
-			fi
-			VARIABLES="$VARIABLES -v HB_STACK:$1"
-			shift
-			VARIABLES="$VARIABLES -v HB_VNF:$1"
-			shift
-			VARIABLES="$VARIABLES -v HB_VNF:$1 -v HB_SERVICE:$1"
-			shift
-			VARIABLES="$VARIABLES -v HB_IPV4_OAM_ADDRESS:$1"
+			VARIABLES="$VARIABLES -V /share/${VARFILE}"
 			shift
 			;;
     	cds)
diff --git a/ete-k8s.sh b/ete-k8s.sh
index 8b9ee72..e3d05df 100755
--- a/ete-k8s.sh
+++ b/ete-k8s.sh
@@ -28,7 +28,7 @@ if [ "$1" == "" ] || [ "$2" == "" ]; then
    echo "  clamp.robot: clamp"
    echo ""
    echo "  demo.robot: InitDemo, InitCustomer, APPCCDTPreloadDemo, APPCMountPointDemo, DistributeDemoVFWDT, DistributeVFWNG,"
-   echo "              InitDistribution, PreloadDemo, deleteVNF, heatbridge, instantiateDemoVFWCL, instantiateVFW,    "
+   echo "              InitDistribution, PreloadDemo, deleteVNF, instantiateDemoVFWCL, instantiateVFW,    "
    echo "              instantiateVFWCL, instantiateVFWDT, instantiateVFWCLDN"
    echo ""
    echo "  health-check.robot: health, core, small, medium, 3rdparty, api, datarouter, externalapi, health-aaf, health-aai, health-appc,"