X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC150.sh;h=a3dfbe007acc75caa6d2d040f9130ae03bb8a84f;hb=674793d94f09873d24edd85f9eb2da2582d21673;hp=bd33bee4fe16c19221114074d5946616d0b5269b;hpb=49f0e5ab01b51aee8713a17aed86cd6d229b40cc;p=nonrtric.git

diff --git a/test/auto-test/FTC150.sh b/test/auto-test/FTC150.sh
index bd33bee4..a3dfbe00 100755
--- a/test/auto-test/FTC150.sh
+++ b/test/auto-test/FTC150.sh
@@ -20,24 +20,28 @@
 
 TC_ONELINE_DESCR="Sample tests of the SDNC A1 controller restconf API using http/https (no agent)"
 
-#App names to include in the test, space separated list
-INCLUDED_IMAGES="RICSIM SDNC"
-
-#SUPPORTED TEST ENV FILE
-SUPPORTED_PROFILES="ONAP-MASTER ONAP-GUILIN"
+#App names to include in the test when running docker, space separated list
+DOCKER_INCLUDED_IMAGES="RICSIM SDNC"
+#App names to include in the test when running kubernetes, space separated list
+KUBE_INCLUDED_IMAGES=" RICSIM SDNC KUBEPROXY"
+#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+KUBE_PRESTARTED_IMAGES=" "
+
+#Supported test environment profiles
+SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ONAP-ISTANBUL ORAN-CHERRY ORAN-D-RELEASE"
+#Supported run modes
+SUPPORTED_RUNMODES="DOCKER KUBE"
 
 . ../common/testcase_common.sh  $@
 . ../common/controller_api_functions.sh
 . ../common/ricsimulator_api_functions.sh
+. ../common/kube_proxy_api_functions.sh
 
-#### TEST BEGIN ####
+setup_testenvironment
 
-FLAVOUR="ORAN"
-if [[ $SDNC_A1_CONTROLLER_IMAGE == *"onap"* ]]; then
-    FLAVOUR="ONAP"
-fi
+#### TEST BEGIN ####
 
-generate_uuid
+generate_policy_uuid
 
 #Test agent and simulator protocol versions (others are http only)
 NB_TESTED_PROTOCOLS="HTTP HTTPS"
@@ -54,7 +58,11 @@ for __nb_httpx in $NB_TESTED_PROTOCOLS ; do
 
 
         # Clean container and start all needed containers #
-        clean_containers
+        clean_environment
+
+        if [ $RUNMODE == "KUBE" ]; then
+            start_kube_proxy
+        fi
 
         start_ric_simulators ricsim_g1 1  OSC_2.1.0
         start_ric_simulators ricsim_g2 1  STD_1.1.3
@@ -141,4 +149,4 @@ done
 
 print_result
 
-auto_clean_containers
\ No newline at end of file
+auto_clean_environment
\ No newline at end of file