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

diff --git a/test/auto-test/FTC150.sh b/test/auto-test/FTC150.sh
index 905d4f87..a0110d93 100755
--- a/test/auto-test/FTC150.sh
+++ b/test/auto-test/FTC150.sh
@@ -18,29 +18,34 @@
 #
 
 
-TC_ONELINE_DESCR="Sample tests of the SDNC A1 controller restconf API using http/https (no agent)"
+TC_ONELINE_DESCR="Sample tests of the SDNC A1 controller restconf API using http/https (no a1pms)"
 
 #App names to include in the test when running docker, space separated list
-DOCKER_INCLUDED_IMAGES="RICSIM SDNC"
+DOCKER_INCLUDED_IMAGES="RICSIM SDNC KUBEPROXY"
 #App names to include in the test when running kubernetes, space separated list
-KUBE_INCLUDED_IMAGES=" RICSIM SDNC "
+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=" "
 
+#Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if
+#the image is not configured in the supplied env_file
+#Used for images not applicable to all supported profile
+CONDITIONALLY_IGNORED_IMAGES=""
+
 #Supported test environment profiles
-SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU  ORAN-CHERRY ORAN-DAWN"
+SUPPORTED_PROFILES="ONAP-JAKARTA ONAP-KOHN ONAP-LONDON  ORAN-F-RELEASE ORAN-G-RELEASE ORAN-H-RELEASE"
 #Supported run modes
 SUPPORTED_RUNMODES="DOCKER KUBE"
 
-. ../common/testcase_common.sh  $@
-. ../common/controller_api_functions.sh
-. ../common/ricsimulator_api_functions.sh
+. ../common/testcase_common.sh $@
+
+setup_testenvironment
 
 #### TEST BEGIN ####
 
-generate_uuid
+generate_policy_uuid
 
-#Test agent and simulator protocol versions (others are http only)
+#Test a1pms and simulator protocol versions (others are http only)
 NB_TESTED_PROTOCOLS="HTTP HTTPS"
 SB_TESTED_PROTOCOLS="HTTP HTTPS"
 
@@ -57,11 +62,11 @@ for __nb_httpx in $NB_TESTED_PROTOCOLS ; do
         # Clean container and start all needed containers #
         clean_environment
 
+        start_kube_proxy
+
         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_ric_simulators ricsim_g3 1  STD_2.0.0
 
         start_sdnc
 
@@ -96,14 +101,16 @@ for __nb_httpx in $NB_TESTED_PROTOCOLS ; do
         controller_api_get_A1_policy_type 404 OSC ricsim_g1_1 99
 
         RESP=202
-        if [ $FLAVOUR == "ONAP" ]; then
+        if [ $FLAVOUR == "ONAP" ] && [[ "$SDNC_FEATURE_LEVEL" != *"TRANS_RESP_CODE"* ]]; then
+            deviation "SDNC does not return original response code from sim"
             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
 
         RESP=201
-        if [ $FLAVOUR == "ONAP" ]; then
+        if [ $FLAVOUR == "ONAP" ] && [[ "$SDNC_FEATURE_LEVEL" != *"TRANS_RESP_CODE"* ]]; then
+            deviation "SDNC does not return original response code from sim"
             RESP=200
         fi
         controller_api_put_A1_policy $RESP STD ricsim_g2_1   5000 testdata/STD/pi1_template.json
@@ -119,13 +126,15 @@ for __nb_httpx in $NB_TESTED_PROTOCOLS ; do
         controller_api_get_A1_policy_status 200 STD ricsim_g2_1 5000 "UNDEFINED"
 
         RESP=202
-        if [ $FLAVOUR == "ONAP" ]; then
+        if [ $FLAVOUR == "ONAP" ] && [[ "$SDNC_FEATURE_LEVEL" != *"TRANS_RESP_CODE"* ]]; then
+            deviation "SDNC does not return original response code from sim"
             RESP=200
         fi
         controller_api_delete_A1_policy $RESP OSC ricsim_g1_1 1 4000
 
         RESP=204
-        if [ $FLAVOUR == "ONAP" ]; then
+        if [ $FLAVOUR == "ONAP" ] && [[ "$SDNC_FEATURE_LEVEL" != *"TRANS_RESP_CODE"* ]]; then
+            deviation "SDNC does not return original response code from sim"
             RESP=200
         fi
         controller_api_delete_A1_policy $RESP STD ricsim_g2_1 5000