X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC1.sh;h=2eaf0f392608953629ca3df82f72eb19996b734c;hb=7757d0392fb23cc807567431aa433a5c6736d02a;hp=306683b4513816a5b7b11b4793a412bdea229f9e;hpb=70e878f1b5a558baaaa5ab5885a039ed96c9f8d5;p=nonrtric.git diff --git a/test/auto-test/FTC1.sh b/test/auto-test/FTC1.sh index 306683b4..2eaf0f39 100755 --- a/test/auto-test/FTC1.sh +++ b/test/auto-test/FTC1.sh @@ -20,6 +20,9 @@ TC_ONELINE_DESCR="Sanity test, create service and then create,update and delete a policy using http/https and Agent REST/DMAAP with/without SDNC controller" +#App names to exclude checking pulling images for, space separated list +EXCLUDED_IMAGES="SDNC_ONAP" + . ../common/testcase_common.sh $@ . ../common/agent_api_functions.sh . ../common/ricsimulator_api_functions.sh @@ -32,6 +35,8 @@ TC_ONELINE_DESCR="Sanity test, create service and then create,update and delete # Path to callback receiver CR_PATH="http://$CR_APP_NAME:$CR_EXTERNAL_PORT/callbacks" +generate_uuid + # Tested variants of REST/DMAAP/SDNC config TESTED_VARIANTS="REST DMAAP REST+SDNC DMAAP+SDNC" #Test agent and simulator protocol versions (others are http only) @@ -63,15 +68,8 @@ for __httpx in $TESTED_PROTOCOLS ; do start_mr if [ $__httpx == "HTTPS" ]; then - - deviation "TR17 - agent cannot use https towards MR - test combo $interface and $__httpx" - #This is the intention #echo "Using secure ports between agent and MR" - #use_mr_https - - #Work around until it is fixed - #"Using non-secure ports between agent and MR" - use_mr_http + use_mr_https else #"Using non-secure ports between agent and MR" use_mr_http @@ -166,11 +164,11 @@ for __httpx in $TESTED_PROTOCOLS ; do echo "########### A1 Policy Management ###########" echo "############################################" - api_put_policy 201 "serv1" ricsim_g1_1 1 5000 testdata/OSC/pi1_template.json - api_put_policy 200 "serv1" ricsim_g1_1 1 5000 testdata/OSC/pi1_template.json + api_put_policy 201 "serv1" ricsim_g1_1 1 5000 NOTRANSIENT testdata/OSC/pi1_template.json + api_put_policy 200 "serv1" ricsim_g1_1 1 5000 NOTRANSIENT testdata/OSC/pi1_template.json - api_put_policy 201 "serv1" ricsim_g2_1 NOTYPE 5100 testdata/STD/pi1_template.json - api_put_policy 200 "serv1" ricsim_g2_1 NOTYPE 5100 testdata/STD/pi1_template.json + api_put_policy 201 "serv1" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT testdata/STD/pi1_template.json + api_put_policy 200 "serv1" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT testdata/STD/pi1_template.json api_delete_policy 204 5000