X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC100.sh;h=3b9dcd740cb8aedb02ae14fa71ed2366b57fa412;hb=e0b665e3ff544bb78411bdc7f6b3ba2818fdeed4;hp=0c4af6bf2006aaa575664e5efc9fc9f714931729;hpb=71646b0f503b6c0a541f49423993ba93a9f5d8ca;p=nonrtric.git diff --git a/test/auto-test/FTC100.sh b/test/auto-test/FTC100.sh index 0c4af6bf..3b9dcd74 100755 --- a/test/auto-test/FTC100.sh +++ b/test/auto-test/FTC100.sh @@ -18,29 +18,41 @@ # -TC_ONELINE_DESCR="Full agent API walk through using agent REST/DMAAP and with/without SDNC A1 Controller" +TC_ONELINE_DESCR="Full agent API walkthrough using agent REST/DMAAP and with/without SDNC A1 Controller" -#App names to exclude checking pulling images for, space separated list -EXCLUDED_IMAGES="SDNC_ONAP" +#App names to include in the test when running docker, space separated list +DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC" + +#App names to include in the test when running kubernetes, space separated list +KUBE_INCLUDED_IMAGES="CP CR MR PA 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/agent_api_functions.sh +. ../common/consul_cbs_functions.sh +. ../common/control_panel_api_functions.sh +. ../common/controller_api_functions.sh +. ../common/cr_api_functions.sh +. ../common/mr_api_functions.sh . ../common/ricsimulator_api_functions.sh + #### TEST BEGIN #### generate_uuid -#Local vars in test script -########################## - -# Path to callback receiver -CR_PATH="http://$CR_APP_NAME:$CR_EXTERNAL_PORT/callbacks" - # 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) TESTED_PROTOCOLS="HTTP HTTPS" + for __httpx in $TESTED_PROTOCOLS ; do for interface in $TESTED_VARIANTS ; do @@ -50,92 +62,110 @@ for __httpx in $TESTED_PROTOCOLS ; do echo "#####################################################################" echo "#####################################################################" - # Clean container and start all needed containers # - clean_containers + clean_environment if [ $__httpx == "HTTPS" ]; then - #"Using secure ports towards simulators" - use_simulator_https + use_cr_https + use_agent_rest_https else - #"Using non-secure ports towards simulators" - use_simulator_http + use_agent_rest_http + use_cr_http fi - start_ric_simulators ricsim_g1 1 OSC_2.1.0 - start_ric_simulators ricsim_g2 1 STD_1.1.3 + start_policy_agent NORPOXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/application.yaml + + set_agent_debug + + # Create service to be able to receive events when rics becomes available + # Must use rest towards the agent since dmaap is not configured yet + api_put_service 201 "ric-registration" 0 "$CR_SERVICE_PATH/ric-registration" - start_mr if [ $__httpx == "HTTPS" ]; then - #echo "Using secure ports between agent and MR" + use_simulator_https use_mr_https + if [[ $interface = *"SDNC"* ]]; then + use_sdnc_https + fi + if [[ $interface = *"DMAAP"* ]]; then + use_agent_dmaap_https + else + use_agent_rest_https + fi else - #"Using non-secure ports between agent and MR" + use_simulator_http use_mr_http + if [[ $interface = *"SDNC"* ]]; then + use_sdnc_http + fi + if [[ $interface = *"DMAAP"* ]]; then + use_agent_dmaap_http + else + use_agent_rest_http + fi fi - start_cr + 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 - if [ $interface == "REST+SDNC" ] || [ $interface == "DMAAP+SDNC" ]; then + start_mr - start_sdnc + start_cr - if [ $__httpx == "HTTPS" ]; then - # "Using secure ports towards SDNC" - use_sdnc_https - else - #"Using non-secure ports towards SDNC" - use_sdnc_http - fi - fi + start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/application.properties - start_consul_cbs + if [ $RUNMODE == "DOCKER" ]; then + start_consul_cbs + fi - if [ $interface == "REST+SDNC" ] || [ $interface == "DMAAP+SDNC" ]; then + if [[ $interface = *"SDNC"* ]]; then + start_sdnc prepare_consul_config SDNC ".consul_config.json" else prepare_consul_config NOSDNC ".consul_config.json" fi - consul_config_app ".consul_config.json" - - start_control_panel - - start_policy_agent - - set_agent_debug - - if [ $interface == "DMAAP" ] || [ $interface == "DMAAP+SDNC" ]; then - use_agent_dmaap + if [ $RUNMODE == "KUBE" ]; then + agent_load_config ".consul_config.json" else - if [ $__httpx == "HTTPS" ]; then - #"Using secure ports towards the agent" - use_agent_rest_https - else - #"Using non-secure ports towards the agent" - use_agent_rest_http - fi + consul_config_app ".consul_config.json" fi - - cr_equal received_callbacks 0 - mr_equal requests_submitted 0 - sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json sim_put_policy_type 201 ricsim_g1_1 2 testdata/OSC/sim_2.json - api_equal json:rics 2 60 + if [ "$PMS_VERSION" == "V2" ]; then + sim_put_policy_type 201 ricsim_g3_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json + sim_put_policy_type 201 ricsim_g3_1 STD_QOS2_0.1.0 testdata/STD2/sim_qos2.json - api_equal json:policy_schemas 3 120 + api_equal json:rics 3 300 - api_equal json:policy_types 3 + api_equal json:policy-types 5 120 - api_equal json:policies 0 + api_equal json:policies 0 - api_equal json:policy_ids 0 + api_equal json:policy-instances 0 + else + api_equal json:rics 2 300 + api_equal json:policy_schemas 3 120 + api_equal json:policy_types 3 + + api_equal json:policies 0 + + api_equal json:policy_ids 0 + fi + + if [ "$PMS_VERSION" == "V2" ]; then + cr_equal received_callbacks 3 120 + cr_api_check_all_sync_events 200 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1 + fi + mr_equal requests_submitted 0 echo "############################################" @@ -150,14 +180,14 @@ for __httpx in $TESTED_PROTOCOLS ; do api_get_services 404 "service1" - api_put_service 201 "service1" 1000 "$CR_PATH/1" + api_put_service 201 "service1" 1000 "$CR_SERVICE_PATH/1" - api_put_service 200 "service1" 2000 "$CR_PATH/1" + api_put_service 200 "service1" 2000 "$CR_SERVICE_PATH/1" - api_put_service 400 "service2" -1 "$CR_PATH/2" + api_put_service 400 "service2" -1 "$CR_SERVICE_PATH/2" - api_put_service 400 "service2" "wrong" "$CR_PATH/2" + api_put_service 400 "service2" "wrong" "$CR_SERVICE_PATH/2" api_put_service 400 "service2" 100 "/test" @@ -165,20 +195,20 @@ for __httpx in $TESTED_PROTOCOLS ; do api_put_service 201 "service2" 300 "ftp://localhost:80/test" - api_get_services 200 "service1" "service1" 2000 "$CR_PATH/1" + api_get_services 200 "service1" "service1" 2000 "$CR_SERVICE_PATH/1" - api_get_service_ids 200 "service1" "service2" + api_get_service_ids 200 "service1" "service2" "ric-registration" - api_put_service 201 "service3" 5000 "$CR_PATH/3" + api_put_service 201 "service3" 5000 "$CR_SERVICE_PATH/3" - api_get_service_ids 200 "service1" "service2" "service3" + api_get_service_ids 200 "service1" "service2" "service3" "ric-registration" - api_get_services 200 "service1" "service1" 2000 "$CR_PATH/1" + api_get_services 200 "service1" "service1" 2000 "$CR_SERVICE_PATH/1" - api_get_services 200 NOSERVICE "service1" 2000 "$CR_PATH/1" "service2" 300 "ftp://localhost:80/test" "service3" 5000 "$CR_PATH/3" + api_get_services 200 NOSERVICE "service1" 2000 "$CR_SERVICE_PATH/1" "service2" 300 "ftp://localhost:80/test" "service3" 5000 "$CR_SERVICE_PATH/3" "ric-registration" 0 "$CR_SERVICE_PATH/ric-registration" api_get_services 200 @@ -200,159 +230,270 @@ for __httpx in $TESTED_PROTOCOLS ; do api_put_services_keepalive 404 "service5" - api_get_service_ids 200 "service1" "service2" "service3" + api_get_service_ids 200 "service1" "service2" "service3" "ric-registration" api_delete_services 204 "service1" - api_get_service_ids 200 "service2" "service3" + api_get_service_ids 200 "service2" "service3" "ric-registration" - api_put_service 201 "service1" 50 "$CR_PATH/1" + api_put_service 201 "service1" 50 "$CR_SERVICE_PATH/1" - api_get_service_ids 200 "service1" "service2" "service3" + api_get_service_ids 200 "service1" "service2" "service3" "ric-registration" api_delete_services 204 "service1" api_delete_services 204 "service3" - api_equal json:services 1 + api_equal json:services 2 api_delete_services 204 "service2" - api_equal json:services 0 + api_equal json:services 1 echo "############################################" echo "############## RIC Repository ##############" echo "############################################" - api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE" - + if [ "$PMS_VERSION" == "V2" ]; then + api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE" + else + api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE" + fi api_get_rics 200 1 "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE" api_get_rics 404 47 api_get_rics 404 "test" + if [ "$PMS_VERSION" == "V2" ]; then + api_get_ric 200 me1_ricsim_g1_1 NORIC "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE" + + api_get_ric 200 me2_ricsim_g1_1 NORIC "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE" + + api_get_ric 200 me1_ricsim_g2_1 NORIC "ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE" + + api_get_ric 200 me2_ricsim_g2_1 NORIC "ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE" + + api_get_ric 200 me1_ricsim_g3_1 NORIC "ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE" - api_get_ric 200 me1_ricsim_g1_1 ricsim_g1_1 + api_get_ric 200 me2_ricsim_g3_1 NORIC "ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE" - api_get_ric 200 me2_ricsim_g1_1 ricsim_g1_1 + api_get_ric 200 NOME ricsim_g1_1 "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE" - api_get_ric 200 me1_ricsim_g2_1 ricsim_g2_1 + api_get_ric 200 NOME ricsim_g2_1 "ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE" + + api_get_ric 200 NOME ricsim_g3_1 "ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE" + + api_get_ric 404 NOME test1 + + api_get_ric 404 test NORIC + + api_get_ric 400 me1_ricsim_g1_1 ricsim_g1_1 + + api_get_ric 400 me1_ricsim_g1_1 TESTRIC + + api_get_ric 400 TESTME ricsim_g1_1 + + else + api_get_ric 200 me1_ricsim_g1_1 ricsim_g1_1 - api_get_ric 200 me2_ricsim_g2_1 ricsim_g2_1 + api_get_ric 200 me2_ricsim_g1_1 ricsim_g1_1 - api_get_ric 404 test + api_get_ric 200 me1_ricsim_g2_1 ricsim_g2_1 + api_get_ric 200 me2_ricsim_g2_1 ricsim_g2_1 + + api_get_ric 404 test + fi echo "############################################" echo "########### A1 Policy Management ###########" echo "############################################" - deviation "TR9 - agent modify the type with type id - test combo $interface and $__httpx" - #Behaviour accepted for now - api_get_policy_schema 200 1 testdata/OSC/1-agent-modified.json - deviation "TR9 - agent modify the type with type id - test combo $interface and $__httpx" - #Behaviour accepted for now - api_get_policy_schema 200 2 testdata/OSC/2-agent-modified.json - api_get_policy_schema 404 3 - deviation "TR9 - agent modify the type with type id - test combo $interface and $__httpx" - #Behaviour accepted for now - api_get_policy_schemas 200 NORIC testdata/OSC/1-agent-modified.json testdata/OSC/2-agent-modified.json NOFILE - deviation "TR9 - agent modify the type with type id - test combo $interface and $__httpx" - #Behaviour accepted for now - api_get_policy_schemas 200 ricsim_g1_1 testdata/OSC/1-agent-modified.json testdata/OSC/2-agent-modified.json + if [ "$PMS_VERSION" == "V2" ]; then + deviation "TR9 - agent modify the type with type id - test combo $interface and $__httpx" + #Behaviour accepted for now + api_get_policy_type 200 1 testdata/OSC/1-agent-modified.json + deviation "TR9 - agent modify the type with type id - test combo $interface and $__httpx" + #Behaviour accepted for now + api_get_policy_type 200 2 testdata/OSC/2-agent-modified.json + deviation "TR9 - agent modify the type with type id - test combo $interface and $__httpx" + #Behaviour accepted for now + api_get_policy_type 200 STD_QOS_0_2_0 testdata/STD2/qos-agent-modified.json + deviation "TR9 - agent modify the type with type id - test combo $interface and $__httpx" + #Behaviour accepted for now + api_get_policy_type 200 STD_QOS2_0.1.0 testdata/STD2/qos2-agent-modified.json + + api_get_policy_type 404 3 + else + deviation "TR9 - agent modify the type with type id - test combo $interface and $__httpx" + #Behaviour accepted for now + api_get_policy_schema 200 1 testdata/OSC/1-agent-modified.json + deviation "TR9 - agent modify the type with type id - test combo $interface and $__httpx" + #Behaviour accepted for now + api_get_policy_schema 200 2 testdata/OSC/2-agent-modified.json + + api_get_policy_schema 404 3 + fi - api_get_policy_schemas 200 ricsim_g2_1 NOFILE + if [ "$PMS_VERSION" == "V2" ]; then + api_get_policy_schemas 404 + else + deviation "TR9 - agent modify the type with type id - test combo $interface and $__httpx" + #Behaviour accepted for now + api_get_policy_schemas 200 NORIC testdata/OSC/1-agent-modified.json testdata/OSC/2-agent-modified.json NOFILE + deviation "TR9 - agent modify the type with type id - test combo $interface and $__httpx" + #Behaviour accepted for now + api_get_policy_schemas 200 ricsim_g1_1 testdata/OSC/1-agent-modified.json testdata/OSC/2-agent-modified.json - api_get_policy_schemas 404 test + api_get_policy_schemas 200 ricsim_g2_1 NOFILE + api_get_policy_schemas 404 test + fi - api_get_policy_types 200 NORIC 1 2 EMPTY + if [ "$PMS_VERSION" == "V2" ]; then + api_get_policy_types 200 NORIC 1 2 EMPTY STD_QOS_0_2_0 STD_QOS2_0.1.0 + else + api_get_policy_types 200 NORIC 1 2 EMPTY + fi api_get_policy_types 200 ricsim_g1_1 1 2 api_get_policy_types 200 ricsim_g2_1 EMPTY + if [ "$PMS_VERSION" == "V2" ]; then + api_get_policy_types 200 ricsim_g3_1 STD_QOS_0_2_0 STD_QOS2_0.1.0 + fi + api_get_policy_types 404 dummy-ric - api_put_service 201 "service10" 3600 "$CR_PATH/1" + api_put_service 201 "service10" 3600 "$CR_SERVICE_PATH/1" + if [ "$PMS_VERSION" == "V2" ]; then + notificationurl=$CR_SERVICE_PATH"/test" + else + notificationurl="" + fi deviation "TR10 - agent allows policy creation on unregistered service (orig problem) - test combo $interface and $__httpx" #Kept until decison #api_put_policy 400 "unregistered-service" ricsim_g1_1 1 2000 NOTRANSIENT testdata/OSC/pi1_template.json #Allow 201 for now - api_put_policy 201 "unregistered-service" ricsim_g1_1 1 2000 NOTRANSIENT testdata/OSC/pi1_template.json + api_put_policy 201 "unregistered-service" ricsim_g1_1 1 2000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json - api_put_policy 201 "service10" ricsim_g1_1 1 5000 NOTRANSIENT testdata/OSC/pi1_template.json - api_put_policy 200 "service10" ricsim_g1_1 1 5000 NOTRANSIENT testdata/OSC/pi1_template.json + api_put_policy 201 "service10" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json + api_put_policy 200 "service10" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json - api_put_policy 200 "service10" ricsim_g1_1 1 5000 true testdata/OSC/pi1_template.json - api_put_policy 200 "service10" ricsim_g1_1 1 5000 false testdata/OSC/pi1_template.json + api_put_policy 200 "service10" ricsim_g1_1 1 5000 true $notificationurl testdata/OSC/pi1_template.json + api_put_policy 200 "service10" ricsim_g1_1 1 5000 false $notificationurl testdata/OSC/pi1_template.json - api_put_policy 201 "service10" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT testdata/STD/pi1_template.json - api_put_policy 200 "service10" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT testdata/STD/pi1_template.json + api_put_policy 201 "service10" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json + api_put_policy 200 "service10" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json - api_put_policy 200 "service10" ricsim_g2_1 NOTYPE 5100 true testdata/STD/pi1_template.json - api_put_policy 200 "service10" ricsim_g2_1 NOTYPE 5100 false testdata/STD/pi1_template.json + api_put_policy 200 "service10" ricsim_g2_1 NOTYPE 5100 true $notificationurl testdata/STD/pi1_template.json + api_put_policy 200 "service10" ricsim_g2_1 NOTYPE 5100 false $notificationurl testdata/STD/pi1_template.json + + if [ "$PMS_VERSION" == "V2" ]; then + api_put_policy 201 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json + api_put_policy 200 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json + + api_put_policy 200 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 true $notificationurl testdata/STD2/pi_qos2_template.json + api_put_policy 200 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 false $notificationurl testdata/STD2/pi_qos2_template.json + fi VAL='NOT IN EFFECT' api_get_policy_status 200 5000 OSC "$VAL" "false" api_get_policy_status 200 5100 STD "UNDEFINED" + if [ "$PMS_VERSION" == "V2" ]; then + api_get_policy_status 200 5200 STD2 EMPTY EMPTY + fi deviation "TR10 - agent allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx" #kept until decision #api_equal json:policies 2 #Allow 3 for now - api_equal json:policies 3 + if [ "$PMS_VERSION" == "V2" ]; then + api_equal json:policies 4 + else + api_equal json:policies 3 + fi deviation "TR10 - agent allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx" #kept until decision #api_equal json:policy_ids 2 #Allow 3 for now - api_equal json:policy_ids 3 + if [ "$PMS_VERSION" == "V2" ]; then + api_equal json:policy-instances 4 + else + api_equal json:policy_ids 3 + fi deviation "TR10 - agent allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx" #kept until decision #api_get_policy_ids 200 NORIC NOSERVICE NOTYPE 5000 5100 #Allow policy create with unregistered service for now - api_get_policy_ids 200 NORIC NOSERVICE NOTYPE 5000 5100 2000 - + if [ "$PMS_VERSION" == "V2" ]; then + api_get_policy_ids 200 NORIC NOSERVICE NOTYPE 5000 5100 2000 5200 + else + api_get_policy_ids 200 NORIC NOSERVICE NOTYPE 5000 5100 2000 + fi deviation "TR10 - agent allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx" #kept until decision #api_get_policy_ids 200 ricsim_g1_1 NOSERVICE NOTYPE 5000 #Allow policy create with unregistered service for now - api_get_policy_ids 200 ricsim_g1_1 NOSERVICE NOTYPE 5000 2000 + if [ "$PMS_VERSION" == "V2" ]; then + api_get_policy_ids 200 ricsim_g1_1 NOSERVICE NOTYPE 5000 2000 - api_get_policy_ids 200 ricsim_g2_1 NOSERVICE NOTYPE 5100 + api_get_policy_ids 200 ricsim_g2_1 NOSERVICE NOTYPE 5100 + api_get_policy_ids 200 ricsim_g3_1 NOSERVICE NOTYPE 5200 - api_get_policy_ids 200 NORIC "service10" NOTYPE 5000 5100 + api_get_policy_ids 200 NORIC "service10" NOTYPE 5000 5100 5200 + else + api_get_policy_ids 200 ricsim_g1_1 NOSERVICE NOTYPE 5000 2000 + + api_get_policy_ids 200 ricsim_g2_1 NOSERVICE NOTYPE 5100 + + + api_get_policy_ids 200 NORIC "service10" NOTYPE 5000 5100 + fi deviation "TR10 - agent allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx" #kept until decision #api_get_policy_ids 200 NORIC NOSERVICE 1 5000 #Allow policy create with unregistered service for now + api_get_policy_ids 200 NORIC NOSERVICE 1 5000 2000 api_get_policy_ids 200 NORIC NOSERVICE 2 NOID + if [ "$PMS_VERSION" == "V2" ]; then + api_get_policy_ids 200 NORIC NOSERVICE STD_QOS2_0.1.0 5200 + fi + api_get_policy_ids 200 ricsim_g2_1 NOSERVICE 1 NOID + if [ "$PMS_VERSION" == "V2" ]; then + api_get_policy 200 5000 testdata/OSC/pi1_template.json "service10" ricsim_g1_1 1 false $notificationurl - api_get_policy 200 5000 testdata/OSC/pi1_template.json + api_get_policy 200 5100 testdata/STD/pi1_template.json "service10" ricsim_g2_1 NOTYPE false $notificationurl - api_get_policy 200 5100 testdata/STD/pi1_template.json + api_get_policy 200 5200 testdata/STD2/pi_qos2_template.json "service10" ricsim_g3_1 STD_QOS2_0.1.0 false $notificationurl + api_get_policies 200 ricsim_g1_1 "service10" 1 5000 ricsim_g1_1 "service10" 1 false $notificationurl testdata/OSC/pi1_template.json + else + api_get_policy 200 5000 testdata/OSC/pi1_template.json - api_get_policies 200 ricsim_g1_1 "service10" 1 5000 ricsim_g1_1 "service10" 1 testdata/OSC/pi1_template.json + api_get_policy 200 5100 testdata/STD/pi1_template.json + api_get_policies 200 ricsim_g1_1 "service10" 1 5000 ricsim_g1_1 "service10" 1 testdata/OSC/pi1_template.json + fi deviation "TR10 - agent allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx" #kept until decision @@ -364,19 +505,35 @@ for __httpx in $TESTED_PROTOCOLS ; do api_delete_policy 204 5000 + if [ "$PMS_VERSION" == "V2" ]; then + + api_delete_policy 204 5200 + fi + api_equal json:policies 1 - api_equal json:policy_ids 1 + + if [ "$PMS_VERSION" == "V2" ]; then + api_equal json:policy-instances 1 + else + api_equal json:policy_ids 1 + fi api_delete_policy 204 5100 api_equal json:policies 0 - api_equal json:policy_ids 0 + if [ "$PMS_VERSION" == "V2" ]; then + api_equal json:policy-instances 0 + else + api_equal json:policy_ids 0 + fi - cr_equal received_callbacks 0 + if [ "$PMS_VERSION" == "V2" ]; then + cr_equal received_callbacks 3 + fi - if [ $interface == "DMAAP" ] || [ $interface == "DMAAP+SDNC" ]; then + if [[ $interface = *"DMAAP"* ]]; then mr_greater requests_submitted 0 VAL=$(mr_read requests_submitted) mr_equal requests_fetched $VAL @@ -388,17 +545,27 @@ for __httpx in $TESTED_PROTOCOLS ; do mr_equal requests_submitted 0 fi - if [ $interface == "REST+SDNC" ] || [ $interface == "DMAAP+SDNC" ]; then - sim_contains_str ricsim_g1_1 remote_hosts "a1-controller" - sim_contains_str ricsim_g2_1 remote_hosts "a1-controller" + if [[ $interface = *"SDNC"* ]]; then + sim_contains_str ricsim_g1_1 remote_hosts $SDNC_APP_NAME + sim_contains_str ricsim_g2_1 remote_hosts $SDNC_APP_NAME + if [ "$PMS_VERSION" == "V2" ]; then + sim_contains_str ricsim_g3_1 remote_hosts $SDNC_APP_NAME + fi else - sim_contains_str ricsim_g1_1 remote_hosts "policy-agent" - sim_contains_str ricsim_g2_1 remote_hosts "policy-agent" + sim_contains_str ricsim_g1_1 remote_hosts $POLICY_AGENT_APP_NAME + sim_contains_str ricsim_g2_1 remote_hosts $POLICY_AGENT_APP_NAME + if [ "$PMS_VERSION" == "V2" ]; then + sim_contains_str ricsim_g3_1 remote_hosts $POLICY_AGENT_APP_NAME + fi fi check_policy_agent_logs check_control_panel_logs + if [[ $interface = *"SDNC"* ]]; then + check_sdnc_logs + fi + store_logs "${__httpx}__${interface}" done @@ -410,4 +577,4 @@ done print_result -auto_clean_containers +auto_clean_environment