X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC150.sh;h=905d4f871f80be449be38c8245ac0f4d2747e197;hb=4f7f0cda2f07f62dcbb2e371fc09764b2337a8e9;hp=ead424c327c195bb4b3db76b14b15d7f0bb32ab3;hpb=f38e1e8cb3652e73ea1e76b5a1a77a4aeb108577;p=nonrtric.git

diff --git a/test/auto-test/FTC150.sh b/test/auto-test/FTC150.sh
index ead424c3..905d4f87 100755
--- a/test/auto-test/FTC150.sh
+++ b/test/auto-test/FTC150.sh
@@ -20,8 +20,17 @@
 
 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"
+#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 "
+#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  ORAN-CHERRY ORAN-DAWN"
+#Supported run modes
+SUPPORTED_RUNMODES="DOCKER KUBE"
 
 . ../common/testcase_common.sh  $@
 . ../common/controller_api_functions.sh
@@ -46,10 +55,13 @@ for __nb_httpx in $NB_TESTED_PROTOCOLS ; do
 
 
         # Clean container and start all needed containers #
-        clean_containers
+        clean_environment
 
         start_ric_simulators ricsim_g1 1  OSC_2.1.0
         start_ric_simulators ricsim_g2 1  STD_1.1.3
+        if [ "$PMS_VERSION" == "V2" ]; then
+            start_ric_simulators ricsim_g3 1  STD_2.0.0
+        fi
 
         start_sdnc
 
@@ -83,9 +95,18 @@ for __nb_httpx in $NB_TESTED_PROTOCOLS ; do
         controller_api_get_A1_policy_type 200 OSC ricsim_g1_1 1 testdata/OSC/sim_1.json
         controller_api_get_A1_policy_type 404 OSC ricsim_g1_1 99
 
-        controller_api_put_A1_policy 202 OSC ricsim_g1_1 1 4000 testdata/OSC/pi1_template.json
+        RESP=202
+        if [ $FLAVOUR == "ONAP" ]; then
+            RESP=200
+        fi
+        controller_api_put_A1_policy $RESP OSC ricsim_g1_1 1 4000 testdata/OSC/pi1_template.json
         controller_api_put_A1_policy 404 OSC ricsim_g1_1 5 1001 testdata/OSC/pi1_template.json
-        controller_api_put_A1_policy 201 STD ricsim_g2_1   5000 testdata/STD/pi1_template.json
+
+        RESP=201
+        if [ $FLAVOUR == "ONAP" ]; then
+            RESP=200
+        fi
+        controller_api_put_A1_policy $RESP STD ricsim_g2_1   5000 testdata/STD/pi1_template.json
 
         controller_api_get_A1_policy_ids 200 OSC ricsim_g1_1 1 4000
         controller_api_get_A1_policy_ids 200 STD ricsim_g2_1 5000
@@ -97,8 +118,17 @@ for __nb_httpx in $NB_TESTED_PROTOCOLS ; do
         controller_api_get_A1_policy_status 200 OSC ricsim_g1_1 1 4000 "$VAL" "false"
         controller_api_get_A1_policy_status 200 STD ricsim_g2_1 5000 "UNDEFINED"
 
-        controller_api_delete_A1_policy 202 OSC ricsim_g1_1 1 4000
-        controller_api_delete_A1_policy 204 STD ricsim_g2_1 5000
+        RESP=202
+        if [ $FLAVOUR == "ONAP" ]; then
+            RESP=200
+        fi
+        controller_api_delete_A1_policy $RESP OSC ricsim_g1_1 1 4000
+
+        RESP=204
+        if [ $FLAVOUR == "ONAP" ]; then
+            RESP=200
+        fi
+        controller_api_delete_A1_policy $RESP STD ricsim_g2_1 5000
 
         check_sdnc_logs
 
@@ -112,4 +142,4 @@ done
 
 print_result
 
-auto_clean_containers
\ No newline at end of file
+auto_clean_environment
\ No newline at end of file