X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC350.sh;h=2b677d086f79007ff05cfe504af514f4303d2c27;hb=f83c362e67d25a464b80faf6d8363ccacacc5ebb;hp=c7222457f0327a427b32e94923e9f0856934197a;hpb=237a4da4b9419171f774bd6a02f61bef81f1b60f;p=nonrtric.git diff --git a/test/auto-test/FTC350.sh b/test/auto-test/FTC350.sh index c7222457..2b677d08 100755 --- a/test/auto-test/FTC350.sh +++ b/test/auto-test/FTC350.sh @@ -20,20 +20,20 @@ TC_ONELINE_DESCR="Change supported policy types and reconfigure rics" #App names to include in the test when running docker, space separated list -DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC KUBEPROXY" +DOCKER_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM SDNC KUBEPROXY" #App names to include in the test when running kubernetes, space separated list -KUBE_INCLUDED_IMAGES="CP CR MR PA RICSIM SDNC KUBEPROXY" +KUBE_INCLUDED_IMAGES="CP CR MR A1PMS 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="CBS CONSUL" +CONDITIONALLY_IGNORED_IMAGES="" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ONAP-ISTANBUL ONAP-JAKARTA ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE ORAN-F-RELEASE" +SUPPORTED_PROFILES="ONAP-JAKARTA ONAP-KOHN ONAP-LONDON ORAN-F-RELEASE ORAN-G-RELEASE ORAN-H-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" @@ -57,7 +57,7 @@ for interface in $TESTED_VARIANTS ; do echo "#####################################################################" echo "#####################################################################" - echo "### Testing agent: "$interface + echo "### Testing a1pms: "$interface echo "#####################################################################" echo "#####################################################################" @@ -75,59 +75,44 @@ for interface in $TESTED_VARIANTS ; do start_mr - if [ $RUNMODE == "DOCKER" ]; then - if [[ "$PMS_FEATURE_LEVEL" != *"NOCONSUL"* ]]; then - start_consul_cbs - fi - fi + # Create first config if [[ $interface = *"SDNC"* ]]; then start_sdnc - prepare_consul_config SDNC ".consul_config_initial.json" + prepare_a1pms_config SDNC ".a1pms_config_initial.json" else - prepare_consul_config NOSDNC ".consul_config_initial.json" + prepare_a1pms_config NOSDNC ".a1pms_config_initial.json" fi # Create 2nd config and save for later start_ric_simulators ricsim_g1 $NUM_RICS OSC_2.1.0 if [[ $interface = *"SDNC"* ]]; then - prepare_consul_config SDNC ".consul_config_all.json" + prepare_a1pms_config SDNC ".a1pms_config_all.json" else - prepare_consul_config NOSDNC ".consul_config_all.json" + prepare_a1pms_config NOSDNC ".a1pms_config_all.json" fi - if [ $RUNMODE == "KUBE" ] && [[ "$PMS_FEATURE_LEVEL" == *"INITIALCONFIGMAP"* ]]; then - start_policy_agent NORPOXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/application2.yaml + if [ $RUNMODE == "KUBE" ]; then + start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/application2.yaml else - start_policy_agent NORPOXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/$POLICY_AGENT_CONFIG_FILE + start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE fi - set_agent_trace + set_a1pms_trace + + sleep_wait 120 "Let A1PMS cofiguration take effect" - api_get_status 200 + a1pms_api_get_status 200 # 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_APP_PATH_0/ric-registration" + # Must use rest towards the a1pms since dmaap is not configured yet + a1pms_api_put_service 201 "ric-registration" 0 "$CR_SERVICE_APP_PATH_0/ric-registration" #Load first config - if [ $RUNMODE == "KUBE" ]; then - if [[ "$PMS_FEATURE_LEVEL" == *"INITIALCONFIGMAP"* ]]; then - api_put_configuration 200 ".consul_config_initial.json" - api_get_configuration 200 ".consul_config_initial.json" - else - agent_load_config ".consul_config_initial.json" - fi - else - if [[ "$PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then - api_put_configuration 200 ".consul_config_initial.json" - api_get_configuration 200 ".consul_config_initial.json" - else - consul_config_app ".consul_config_initial.json" - fi - fi + a1pms_api_put_configuration 200 ".a1pms_config_initial.json" + a1pms_api_get_configuration 200 ".a1pms_config_initial.json" for ((i=1; i<=${NUM_RICS}; i++)) do @@ -135,14 +120,12 @@ for interface in $TESTED_VARIANTS ; do done # All sims running but 2 are not configured in consul - api_equal json:rics 8 300 + a1pms_equal json:rics 8 300 - if [ "$PMS_VERSION" == "V2" ]; then - cr_equal 0 received_callbacks?id=ric-registration 8 120 - cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_1 ricsim_g1_2 ricsim_g1_3 ricsim_g1_4 ricsim_g1_5 ricsim_g1_6 ricsim_g1_7 ricsim_g1_8 - fi + cr_equal 0 received_callbacks?id=ric-registration 8 120 + cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_1 ricsim_g1_2 ricsim_g1_3 ricsim_g1_4 ricsim_g1_5 ricsim_g1_6 ricsim_g1_7 ricsim_g1_8 - api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:NOTYPE:???? \ + a1pms_api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:NOTYPE:???? \ ricsim_g1_2:me1_ricsim_g1_2,me2_ricsim_g1_2:NOTYPE:???? \ ricsim_g1_3:me1_ricsim_g1_3,me2_ricsim_g1_3:NOTYPE:???? \ ricsim_g1_4:me1_ricsim_g1_4,me2_ricsim_g1_4:NOTYPE:???? \ @@ -181,33 +164,19 @@ for interface in $TESTED_VARIANTS ; do sim_put_policy_type 201 ricsim_g1_7 5 testdata/OSC/sim_5.json sim_put_policy_type 201 ricsim_g1_8 5 testdata/OSC/sim_5.json - if [ "$PMS_VERSION" == "V2" ]; then - api_equal json:policy-types 5 120 - - echo "Check the number of types in the agent for each ric" - api_equal json:policy-types?ric_id=ricsim_g1_1 1 120 - api_equal json:policy-types?ric_id=ricsim_g1_2 2 120 - api_equal json:policy-types?ric_id=ricsim_g1_3 3 120 - api_equal json:policy-types?ric_id=ricsim_g1_4 4 120 - api_equal json:policy-types?ric_id=ricsim_g1_5 5 120 - api_equal json:policy-types?ric_id=ricsim_g1_6 4 120 - api_equal json:policy-types?ric_id=ricsim_g1_7 3 120 - api_equal json:policy-types?ric_id=ricsim_g1_8 2 120 - else - api_equal json:policy_types 5 120 - - echo "Check the number of types in the agent for each ric" - api_equal json:policy_types?ric=ricsim_g1_1 1 120 - api_equal json:policy_types?ric=ricsim_g1_2 2 120 - api_equal json:policy_types?ric=ricsim_g1_3 3 120 - api_equal json:policy_types?ric=ricsim_g1_4 4 120 - api_equal json:policy_types?ric=ricsim_g1_5 5 120 - api_equal json:policy_types?ric=ricsim_g1_6 4 120 - api_equal json:policy_types?ric=ricsim_g1_7 3 120 - api_equal json:policy_types?ric=ricsim_g1_8 2 120 - fi + a1pms_equal json:policy-types 5 120 + + echo "Check the number of types in the a1pms for each ric" + a1pms_equal json:policy-types?ric_id=ricsim_g1_1 1 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_2 2 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_3 3 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_4 4 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_5 5 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_6 4 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_7 3 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_8 2 120 - api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:???? \ + a1pms_api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:???? \ ricsim_g1_2:me1_ricsim_g1_2,me2_ricsim_g1_2:1,2:???? \ ricsim_g1_3:me1_ricsim_g1_3,me2_ricsim_g1_3:1,2,3:???? \ ricsim_g1_4:me1_ricsim_g1_4,me2_ricsim_g1_4:1,2,3,4:???? \ @@ -216,70 +185,35 @@ for interface in $TESTED_VARIANTS ; do ricsim_g1_7:me1_ricsim_g1_7,me2_ricsim_g1_7:3,4,5:???? \ ricsim_g1_8:me1_ricsim_g1_8,me2_ricsim_g1_8:4,5:???? " - if [ "$PMS_VERSION" == "V2" ]; then - cr_equal 0 received_callbacks?id=ric-registration 16 120 - cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_1 ricsim_g1_2 ricsim_g1_3 ricsim_g1_4 ricsim_g1_5 ricsim_g1_6 ricsim_g1_7 ricsim_g1_8 - fi + cr_equal 0 received_callbacks?id=ric-registration 16 120 + cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_1 ricsim_g1_2 ricsim_g1_3 ricsim_g1_4 ricsim_g1_5 ricsim_g1_6 ricsim_g1_7 ricsim_g1_8 #Load config with all rics - if [ $RUNMODE == "KUBE" ]; then - if [[ "$PMS_FEATURE_LEVEL" == *"INITIALCONFIGMAP"* ]]; then - api_put_configuration 200 ".consul_config_all.json" - api_get_configuration 200 ".consul_config_all.json" - else - agent_load_config ".consul_config_all.json" - fi - else - if [[ "$PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then - api_put_configuration 200 ".consul_config_all.json" - api_get_configuration 200 ".consul_config_all.json" - else - consul_config_app ".consul_config_all.json" - fi - fi + a1pms_api_put_configuration 200 ".a1pms_config_all.json" + a1pms_api_get_configuration 200 ".a1pms_config_all.json" - api_equal json:rics 10 120 + a1pms_equal json:rics 10 120 - if [ "$PMS_VERSION" == "V2" ]; then - cr_equal 0 received_callbacks?id=ric-registration 18 120 - cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_9 ricsim_g1_10 - fi + cr_equal 0 received_callbacks?id=ric-registration 18 120 + cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_9 ricsim_g1_10 sim_put_policy_type 201 ricsim_g1_9 5 testdata/OSC/sim_5.json - if [ "$PMS_VERSION" == "V2" ]; then - - api_equal json:policy-types 5 120 - - echo "Check the number of types in the agent for each ric" - api_equal json:policy-types?ric_id=ricsim_g1_1 1 120 - api_equal json:policy-types?ric_id=ricsim_g1_2 2 120 - api_equal json:policy-types?ric_id=ricsim_g1_3 3 120 - api_equal json:policy-types?ric_id=ricsim_g1_4 4 120 - api_equal json:policy-types?ric_id=ricsim_g1_5 5 120 - api_equal json:policy-types?ric_id=ricsim_g1_6 4 120 - api_equal json:policy-types?ric_id=ricsim_g1_7 3 120 - api_equal json:policy-types?ric_id=ricsim_g1_8 2 120 - api_equal json:policy-types?ric_id=ricsim_g1_9 1 120 - api_equal json:policy-types?ric_id=ricsim_g1_10 0 120 - else - - api_equal json:policy_types 5 120 - - echo "Check the number of types in the agent for each ric" - api_equal json:policy_types?ric=ricsim_g1_1 1 120 - api_equal json:policy_types?ric=ricsim_g1_2 2 120 - api_equal json:policy_types?ric=ricsim_g1_3 3 120 - api_equal json:policy_types?ric=ricsim_g1_4 4 120 - api_equal json:policy_types?ric=ricsim_g1_5 5 120 - api_equal json:policy_types?ric=ricsim_g1_6 4 120 - api_equal json:policy_types?ric=ricsim_g1_7 3 120 - api_equal json:policy_types?ric=ricsim_g1_8 2 120 - api_equal json:policy_types?ric=ricsim_g1_9 1 120 - api_equal json:policy_types?ric=ricsim_g1_10 0 120 - fi - - api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:???? \ + a1pms_equal json:policy-types 5 120 + + echo "Check the number of types in the a1pms for each ric" + a1pms_equal json:policy-types?ric_id=ricsim_g1_1 1 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_2 2 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_3 3 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_4 4 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_5 5 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_6 4 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_7 3 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_8 2 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_9 1 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_10 0 120 + + a1pms_api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:???? \ ricsim_g1_2:me1_ricsim_g1_2,me2_ricsim_g1_2:1,2:???? \ ricsim_g1_3:me1_ricsim_g1_3,me2_ricsim_g1_3:1,2,3:???? \ ricsim_g1_4:me1_ricsim_g1_4,me2_ricsim_g1_4:1,2,3,4:???? \ @@ -290,82 +224,41 @@ for interface in $TESTED_VARIANTS ; do ricsim_g1_9:me1_ricsim_g1_9,me2_ricsim_g1_9:5:???? \ ricsim_g1_10:me1_ricsim_g1_10,me2_ricsim_g1_10:NOTYPE:???? " - if [ "$PMS_VERSION" == "V2" ]; then - cr_equal 0 received_callbacks?id=ric-registration 19 120 - cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_9 - fi + cr_equal 0 received_callbacks?id=ric-registration 19 120 + cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_9 #No policy type in sim #10 - if [ "$PMS_VERSION" == "V2" ]; then - api_equal json:policy-types 5 - else - api_equal json:policy_types 5 - fi + a1pms_equal json:policy-types 5 - api_put_service 201 "serv1" 3600 "$CR_SERVICE_APP_PATH_0/serv1" + a1pms_api_put_service 201 "serv1" 3600 "$CR_SERVICE_APP_PATH_0/serv1" - if [ "$PMS_VERSION" == "V2" ]; then - notificationurl=$CR_SERVICE_APP_PATH_0"/test" - else - notificationurl="" - fi + notificationurl=$CR_SERVICE_APP_PATH_0"/test" sleep_wait 120 # Load config with reduced number of rics - if [ $RUNMODE == "KUBE" ]; then - if [[ "$PMS_FEATURE_LEVEL" == *"INITIALCONFIGMAP"* ]]; then - api_put_configuration 200 ".consul_config_initial.json" - api_get_configuration 200 ".consul_config_initial.json" - else - agent_load_config ".consul_config_initial.json" - fi - else - if [[ "$PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then - api_put_configuration 200 ".consul_config_initial.json" - api_get_configuration 200 ".consul_config_initial.json" - else - consul_config_app ".consul_config_initial.json" - fi - fi - - api_equal json:rics 8 120 + a1pms_api_put_configuration 200 ".a1pms_config_initial.json" + a1pms_api_get_configuration 200 ".a1pms_config_initial.json" - if [ "$PMS_VERSION" == "V2" ]; then - cr_equal 0 received_callbacks?id=ric-registration 19 120 - cr_api_check_all_sync_events 200 0 ric-registration EMPTY - fi + a1pms_equal json:rics 8 120 - if [ "$PMS_VERSION" == "V2" ]; then + cr_equal 0 received_callbacks?id=ric-registration 19 120 + cr_api_check_all_sync_events 200 0 ric-registration EMPTY - api_equal json:policy-types 5 120 + a1pms_equal json:policy-types 5 120 - echo "Check the number of types in the agent for each ric" - api_equal json:policy-types?ric_id=ricsim_g1_1 1 120 - api_equal json:policy-types?ric_id=ricsim_g1_2 2 120 - api_equal json:policy-types?ric_id=ricsim_g1_3 3 120 - api_equal json:policy-types?ric_id=ricsim_g1_4 4 120 - api_equal json:policy-types?ric_id=ricsim_g1_5 5 120 - api_equal json:policy-types?ric_id=ricsim_g1_6 4 120 - api_equal json:policy-types?ric_id=ricsim_g1_7 3 120 - api_equal json:policy-types?ric_id=ricsim_g1_8 2 120 - else + echo "Check the number of types in the a1pms for each ric" + a1pms_equal json:policy-types?ric_id=ricsim_g1_1 1 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_2 2 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_3 3 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_4 4 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_5 5 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_6 4 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_7 3 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_8 2 120 - api_equal json:policy_types 5 120 - - echo "Check the number of types in the agent for each ric" - api_equal json:policy_types?ric=ricsim_g1_1 1 120 - api_equal json:policy_types?ric=ricsim_g1_2 2 120 - api_equal json:policy_types?ric=ricsim_g1_3 3 120 - api_equal json:policy_types?ric=ricsim_g1_4 4 120 - api_equal json:policy_types?ric=ricsim_g1_5 5 120 - api_equal json:policy_types?ric=ricsim_g1_6 4 120 - api_equal json:policy_types?ric=ricsim_g1_7 3 120 - api_equal json:policy_types?ric=ricsim_g1_8 2 120 - fi - - api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:???? \ + a1pms_api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:???? \ ricsim_g1_2:me1_ricsim_g1_2,me2_ricsim_g1_2:1,2:???? \ ricsim_g1_3:me1_ricsim_g1_3,me2_ricsim_g1_3:1,2,3:???? \ ricsim_g1_4:me1_ricsim_g1_4,me2_ricsim_g1_4:1,2,3,4:???? \ @@ -376,66 +269,31 @@ for interface in $TESTED_VARIANTS ; do sleep_wait 120 - if [ "$PMS_VERSION" == "V2" ]; then - api_equal json:policy-instances 0 - else - api_equal json:policy_ids 0 - fi + a1pms_equal json:policy-instances 0 - api_get_policy_types 404 ricsim_g1_9 + a1pms_api_get_policy_types 404 ricsim_g1_9 # Load config with all rics - if [ $RUNMODE == "KUBE" ]; then - if [[ "$PMS_FEATURE_LEVEL" == *"INITIALCONFIGMAP"* ]]; then - api_put_configuration 200 ".consul_config_all.json" - api_get_configuration 200 ".consul_config_all.json" - else - agent_load_config ".consul_config_all.json" - fi - else - if [[ "$PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then - api_put_configuration 200 ".consul_config_all.json" - api_get_configuration 200 ".consul_config_all.json" - else - consul_config_app ".consul_config_all.json" - fi - fi - - api_equal json:rics 10 120 - - if [ "$PMS_VERSION" == "V2" ]; then - - api_equal json:policy-types 5 120 - - echo "Check the number of types in the agent for each ric" - api_equal json:policy-types?ric_id=ricsim_g1_1 1 120 - api_equal json:policy-types?ric_id=ricsim_g1_2 2 120 - api_equal json:policy-types?ric_id=ricsim_g1_3 3 120 - api_equal json:policy-types?ric_id=ricsim_g1_4 4 120 - api_equal json:policy-types?ric_id=ricsim_g1_5 5 120 - api_equal json:policy-types?ric_id=ricsim_g1_6 4 120 - api_equal json:policy-types?ric_id=ricsim_g1_7 3 120 - api_equal json:policy-types?ric_id=ricsim_g1_8 2 120 - api_equal json:policy-types?ric_id=ricsim_g1_9 1 120 - api_equal json:policy-types?ric_id=ricsim_g1_10 0 120 - else - - api_equal json:policy_types 5 120 - - echo "Check the number of types in the agent for each ric" - api_equal json:policy_types?ric=ricsim_g1_1 1 120 - api_equal json:policy_types?ric=ricsim_g1_2 2 120 - api_equal json:policy_types?ric=ricsim_g1_3 3 120 - api_equal json:policy_types?ric=ricsim_g1_4 4 120 - api_equal json:policy_types?ric=ricsim_g1_5 5 120 - api_equal json:policy_types?ric=ricsim_g1_6 4 120 - api_equal json:policy_types?ric=ricsim_g1_7 3 120 - api_equal json:policy_types?ric=ricsim_g1_8 2 120 - api_equal json:policy_types?ric=ricsim_g1_9 1 120 - api_equal json:policy_types?ric=ricsim_g1_10 0 120 - fi - - api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:???? \ + a1pms_api_put_configuration 200 ".a1pms_config_all.json" + a1pms_api_get_configuration 200 ".a1pms_config_all.json" + + a1pms_equal json:rics 10 120 + + a1pms_equal json:policy-types 5 120 + + echo "Check the number of types in the a1pms for each ric" + a1pms_equal json:policy-types?ric_id=ricsim_g1_1 1 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_2 2 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_3 3 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_4 4 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_5 5 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_6 4 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_7 3 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_8 2 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_9 1 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_10 0 120 + + a1pms_api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:???? \ ricsim_g1_2:me1_ricsim_g1_2,me2_ricsim_g1_2:1,2:???? \ ricsim_g1_3:me1_ricsim_g1_3,me2_ricsim_g1_3:1,2,3:???? \ ricsim_g1_4:me1_ricsim_g1_4,me2_ricsim_g1_4:1,2,3,4:???? \ @@ -448,11 +306,7 @@ for interface in $TESTED_VARIANTS ; do sleep_wait 120 - if [ "$PMS_VERSION" == "V2" ]; then - api_equal json:policy-instances 0 - else - api_equal json:policy_ids 0 - fi + a1pms_equal json:policy-instances 0 sim_equal ricsim_g1_9 num_instances 0 @@ -464,37 +318,20 @@ for interface in $TESTED_VARIANTS ; do sleep_wait 120 - if [ "$PMS_VERSION" == "V2" ]; then + a1pms_equal json:policy-types 5 120 - api_equal json:policy-types 5 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_1 1 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_2 2 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_3 3 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_4 3 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_5 4 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_6 3 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_7 2 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_8 2 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_9 1 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_10 0 120 - api_equal json:policy-types?ric_id=ricsim_g1_1 1 120 - api_equal json:policy-types?ric_id=ricsim_g1_2 2 120 - api_equal json:policy-types?ric_id=ricsim_g1_3 3 120 - api_equal json:policy-types?ric_id=ricsim_g1_4 3 120 - api_equal json:policy-types?ric_id=ricsim_g1_5 4 120 - api_equal json:policy-types?ric_id=ricsim_g1_6 3 120 - api_equal json:policy-types?ric_id=ricsim_g1_7 2 120 - api_equal json:policy-types?ric_id=ricsim_g1_8 2 120 - api_equal json:policy-types?ric_id=ricsim_g1_9 1 120 - api_equal json:policy-types?ric_id=ricsim_g1_10 0 120 - else - - api_equal json:policy_types 5 120 - - api_equal json:policy_types?ric=ricsim_g1_1 1 120 - api_equal json:policy_types?ric=ricsim_g1_2 2 120 - api_equal json:policy_types?ric=ricsim_g1_3 3 120 - api_equal json:policy_types?ric=ricsim_g1_4 3 120 - api_equal json:policy_types?ric=ricsim_g1_5 4 120 - api_equal json:policy_types?ric=ricsim_g1_6 3 120 - api_equal json:policy_types?ric=ricsim_g1_7 2 120 - api_equal json:policy_types?ric=ricsim_g1_8 2 120 - api_equal json:policy_types?ric=ricsim_g1_9 1 120 - api_equal json:policy_types?ric=ricsim_g1_10 0 120 - fi - - api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:???? \ + a1pms_api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:???? \ ricsim_g1_2:me1_ricsim_g1_2,me2_ricsim_g1_2:1,2:???? \ ricsim_g1_3:me1_ricsim_g1_3,me2_ricsim_g1_3:1,2,3:???? \ ricsim_g1_4:me1_ricsim_g1_4,me2_ricsim_g1_4:1,2,3:???? \ @@ -507,15 +344,10 @@ for interface in $TESTED_VARIANTS ; do sim_delete_policy_type 204 ricsim_g1_8 4 - if [ "$PMS_VERSION" == "V2" ]; then - api_equal json:policy-types 5 120 - api_equal json:policy-types?ric_id=ricsim_g1_8 1 120 - else - api_equal json:policy_types 5 120 - api_equal json:policy_types?ric=ricsim_g1_8 1 120 - fi + a1pms_equal json:policy-types 5 120 + a1pms_equal json:policy-types?ric_id=ricsim_g1_8 1 120 - api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:???? \ + a1pms_api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:???? \ ricsim_g1_2:me1_ricsim_g1_2,me2_ricsim_g1_2:1,2:???? \ ricsim_g1_3:me1_ricsim_g1_3,me2_ricsim_g1_3:1,2,3:???? \ ricsim_g1_4:me1_ricsim_g1_4,me2_ricsim_g1_4:1,2,3:???? \ @@ -528,7 +360,7 @@ for interface in $TESTED_VARIANTS ; do - check_policy_agent_logs + check_a1pms_logs if [[ $interface = *"SDNC"* ]]; then check_sdnc_logs fi