Integrated gateway and updated kube support
Restructured the test env to decouple the test engine from the components
Issue-ID: NONRTRIC-441
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
Change-Id: I07c746741b1c5c964679545f0a12861e5e9f6292
diff --git a/test/auto-test/FTC_HELM-RECIPE.sh b/test/auto-test/FTC_HELM-RECIPE.sh
index 8c13e65..cbebf60 100755
--- a/test/auto-test/FTC_HELM-RECIPE.sh
+++ b/test/auto-test/FTC_HELM-RECIPE.sh
@@ -23,7 +23,7 @@
DOCKER_INCLUDED_IMAGES="" # Not used - KUBE only test script
#App names to include in the test when running kubernetes, space separated list
-KUBE_INCLUDED_IMAGES=" MR CR PRODSTUB"
+KUBE_INCLUDED_IMAGES=" MR CR PRODSTUB KUBEPROXY"
#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
KUBE_PRESTARTED_IMAGES=" PA RICSIM CP ECS RC SDNC"
@@ -42,6 +42,9 @@
. ../common/mr_api_functions.sh
. ../common/control_panel_api_functions.sh
. ../common/controller_api_functions.sh
+. ../common/kube_proxy_api_functions.sh
+
+setup_testenvironment
#### TEST BEGIN ####
@@ -69,6 +72,10 @@
clean_environment
+if [ $RUNMODE == "KUBE" ]; then
+ start_kube_proxy
+fi
+
STD_NUM_RICS=2
OSC_NUM_RICS=2
@@ -197,9 +204,9 @@
for ((i=0; i<$STD_NUM_RICS; i++))
do
ricid=$((3+$i))
- generate_uuid
+ generate_policy_uuid
api_put_policy 201 "Emergency-response-app" ric$ricid NOTYPE $((1100+$i)) NOTRANSIENT $CR_SERVICE_PATH/"std2" testdata/STD/pi1_template.json 1
- generate_uuid
+ generate_policy_uuid
api_put_policy 201 "Emergency-response-app" ric$ricid NOTYPE $((1200+$i)) NOTRANSIENT $CR_SERVICE_PATH/"std2" testdata/STD/pi1_template.json 1
done
@@ -207,9 +214,9 @@
for ((i=0; i<$STD_NUM_RICS; i++))
do
ricid=$((5+$i))
- generate_uuid
+ generate_policy_uuid
api_put_policy 201 "Emergency-response-app" ric$ricid STD_QOS_0_2_0 $((2100+$i)) NOTRANSIENT $CR_SERVICE_PATH/"std2" testdata/STD2/pi_qos_template.json 1
- generate_uuid
+ generate_policy_uuid
api_put_policy 201 "Emergency-response-app" ric$ricid STD_QOS2_0.1.0 $((2200+$i)) NOTRANSIENT $CR_SERVICE_PATH/"std2" testdata/STD2/pi_qos2_template.json 1
done
@@ -217,9 +224,9 @@
for ((i=0; i<$OSC_NUM_RICS; i++))
do
ricid=$((1+$i))
- generate_uuid
+ generate_policy_uuid
api_put_policy 201 "Emergency-response-app" ric$ricid 1 $((3100+$i)) NOTRANSIENT $CR_SERVICE_PATH/"osc" testdata/OSC/pi1_template.json 1
- generate_uuid
+ generate_policy_uuid
api_put_policy 201 "Emergency-response-app" ric$ricid 2 $((3200+$i)) NOTRANSIENT $CR_SERVICE_PATH/"osc" testdata/OSC/pi2_template.json 1
done