X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC150.sh;h=f011a21760979692eb47d1c9e1a74c89e07be18f;hb=6fc58fd020514c2afce1fc240828bf23f53d8fb6;hp=1d80a8c336864946837b879b5179b9d7faf0445e;hpb=fec823bee9dfc96dcb625e1d538e3bec131f6ed0;p=nonrtric.git diff --git a/test/auto-test/FTC150.sh b/test/auto-test/FTC150.sh index 1d80a8c3..f011a217 100755 --- a/test/auto-test/FTC150.sh +++ b/test/auto-test/FTC150.sh @@ -21,7 +21,7 @@ TC_ONELINE_DESCR="Sample tests of the SDNC A1 controller restconf API using http/https (no agent)" #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 KUBEPROXY" #Prestarted app (not started by script) to include in the test when running kubernetes, space separated list @@ -60,9 +60,7 @@ for __nb_httpx in $NB_TESTED_PROTOCOLS ; do # Clean container and start all needed containers # clean_environment - if [ $RUNMODE == "KUBE" ]; then - start_kube_proxy - fi + start_kube_proxy start_ric_simulators ricsim_g1 1 OSC_2.1.0 start_ric_simulators ricsim_g2 1 STD_1.1.3 @@ -103,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 @@ -126,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