From: raviteja.karumuri Date: Wed, 12 Jun 2024 12:46:45 +0000 (+0100) Subject: Updating FTC 2001, 10, 1 series tests to support a1pms V3 image X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=HEAD;p=nonrtric.git Updating FTC 2001, 10, 1 series tests to support a1pms V3 image Issue-ID: NONRTRIC-1014 Change-Id: Icd7ef01e9806e3495b02ea5760bb94c6d88fee0d Signed-off-by: Raviteja Karumuri --- diff --git a/test/auto-test/FTC1.sh b/test/auto-test/FTC1.sh index dbdde6aa..8401bfde 100755 --- a/test/auto-test/FTC1.sh +++ b/test/auto-test/FTC1.sh @@ -46,246 +46,278 @@ setup_testenvironment #### TEST BEGIN #### sim_generate_policy_uuid +VERSIONS_TO_RUN=2 -# Tested variants of REST/DMAAP/SDNC config -TESTED_VARIANTS="REST DMAAP REST+SDNC DMAAP+SDNC" - -if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then - TESTED_VARIANTS="REST REST+SDNC" +if [ -n "$A1PMS_V3_FLAG" ] && [ "${A1PMS_V3_FLAG,,}" == "true" ]; then + VERSIONS_TO_RUN=3 fi -#Test a1pms and simulator protocol versions (others are http only) -TESTED_PROTOCOLS="HTTP HTTPS" -for __httpx in $TESTED_PROTOCOLS ; do - for interface in $TESTED_VARIANTS ; do - - echo "#####################################################################" - echo "#####################################################################" - echo "### Testing a1pms: $interface using $__httpx" - echo "#####################################################################" - echo "#####################################################################" - - clean_environment - - start_kube_proxy - - if [ $__httpx == "HTTPS" ]; then - use_a1pms_rest_https - else - use_a1pms_rest_http - fi - - start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE - - set_a1pms_trace - - # Create service to be able to receive events when rics becomes available - # 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" - - if [ $__httpx == "HTTPS" ]; then - use_cr_https - use_simulator_https - if [[ $interface = *"SDNC"* ]]; then - if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then - deviation "SDNC does not support NB https" - use_sdnc_http - else - use_sdnc_https - fi - fi - if [[ $interface = *"DMAAP"* ]]; then - use_a1pms_dmaap_https - else - use_a1pms_rest_https - fi - else - use_cr_http - use_simulator_http - if [[ $interface = *"SDNC"* ]]; then - use_sdnc_http - fi - if [[ $interface = *"DMAAP"* ]]; then - use_a1pms_dmaap_http - else - use_a1pms_rest_http - fi - fi - if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then - : - else - if [ $__httpx == "HTTPS" ]; then - use_mr_https - else - use_mr_http - fi - fi - - start_ric_simulators ricsim_g1 1 OSC_2.1.0 - start_ric_simulators ricsim_g2 1 STD_1.1.3 - start_ric_simulators ricsim_g3 1 STD_2.0.0 - - if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then - : - else - start_mr "$MR_READ_TOPIC" "/events" "users/policy-agent" \ - "$MR_WRITE_TOPIC" "/events" "users/mr-stub" - fi - - start_cr 1 - - start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE - - if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then - start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE - fi - - - if [[ $interface = *"SDNC"* ]]; then - start_sdnc - controller_api_wait_for_status_ok 200 ricsim_g1_1 - prepare_a1pms_config SDNC ".a1pms_config.json" - else - prepare_a1pms_config NOSDNC ".a1pms_config.json" - fi - - if [ $RUNMODE == "KUBE" ]; then - a1pms_load_config ".a1pms_config.json" - else - #Temporary switch to http/https if dmaap use. Otherwise it is not possible to push config - if [ $__httpx == "HTTPS" ]; then - use_a1pms_rest_https - else - use_a1pms_rest_http - fi - a1pms_api_put_configuration 200 ".a1pms_config.json" - if [ $__httpx == "HTTPS" ]; then - if [[ $interface = *"DMAAP"* ]]; then - use_a1pms_dmaap_https - else - use_a1pms_rest_https - fi - else - if [[ $interface = *"DMAAP"* ]]; then - use_a1pms_dmaap_http - else - use_a1pms_rest_http - fi - fi - fi - - if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then - : - else - mr_equal requests_submitted 0 - fi - - sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json - - sim_put_policy_type 201 ricsim_g3_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json - - a1pms_equal json:rics 3 300 - - a1pms_equal json:policy-types 3 120 - - a1pms_equal json:policies 0 - - a1pms_equal json:policy-instances 0 - - cr_equal 0 received_callbacks 3 120 - - cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1 - - echo "############################################" - echo "############## Health check ################" - echo "############################################" - - sleep_wait 120 "Let A1PMS configuration take effect" - - a1pms_api_get_status 200 - - echo "############################################" - echo "##### Service registry and supervision #####" - echo "############################################" - - a1pms_api_put_service 201 "serv1" 1000 "$CR_SERVICE_APP_PATH_0/1" - - a1pms_api_get_service_ids 200 "serv1" "ric-registration" +for version in $(seq 2 $VERSIONS_TO_RUN); do + + if [ "$version" == "3" ]; then + if [ -n "$A1PMS_V3" ] && [ -n "$A1PMS_API_PREFIX_V3" ] && [ -n "$A1PMS_ALIVE_URL_V3" ]; then + export A1PMS_VERSION="$A1PMS_V3" + export A1PMS_API_PREFIX="$A1PMS_API_PREFIX_V3" + export A1PMS_ALIVE_URL="$A1PMS_API_PREFIX$A1PMS_ALIVE_URL_V3" + else + echo "One/All parameters not set in env file (, , )" + break + fi + fi + # Tested variants of REST/DMAAP/SDNC config + TESTED_VARIANTS="REST DMAAP REST+SDNC DMAAP+SDNC" + + if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then + TESTED_VARIANTS="REST REST+SDNC" + fi + + #Test a1pms and simulator protocol versions (others are http only) + TESTED_PROTOCOLS="HTTP HTTPS" + for __httpx in $TESTED_PROTOCOLS ; do + for interface in $TESTED_VARIANTS ; do + + echo "#####################################################################" + echo "#####################################################################" + echo "### Testing a1pms: $interface using $__httpx with a1pms V${version}" + echo "#####################################################################" + echo "#####################################################################" + + clean_environment + + start_kube_proxy + + if [ $__httpx == "HTTPS" ]; then + use_a1pms_rest_https + else + use_a1pms_rest_http + fi + + start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE + + set_a1pms_trace + + # Create service to be able to receive events when rics becomes available + # 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" + + if [ $__httpx == "HTTPS" ]; then + use_cr_https + use_simulator_https + if [[ $interface = *"SDNC"* ]]; then + if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then + deviation "SDNC does not support NB https" + use_sdnc_http + else + use_sdnc_https + fi + fi + if [[ $interface = *"DMAAP"* ]]; then + use_a1pms_dmaap_https + else + use_a1pms_rest_https + fi + else + use_cr_http + use_simulator_http + if [[ $interface = *"SDNC"* ]]; then + use_sdnc_http + fi + if [[ $interface = *"DMAAP"* ]]; then + use_a1pms_dmaap_http + else + use_a1pms_rest_http + fi + fi + if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then + : + else + if [ $__httpx == "HTTPS" ]; then + use_mr_https + else + use_mr_http + fi + fi + + start_ric_simulators ricsim_g1 1 OSC_2.1.0 + start_ric_simulators ricsim_g2 1 STD_1.1.3 + start_ric_simulators ricsim_g3 1 STD_2.0.0 + + if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then + : + else + start_mr "$MR_READ_TOPIC" "/events" "users/policy-agent" \ + "$MR_WRITE_TOPIC" "/events" "users/mr-stub" + fi + + start_cr 1 + + start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE + + if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then + start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE + fi + + + if [[ $interface = *"SDNC"* ]]; then + start_sdnc + controller_api_wait_for_status_ok 200 ricsim_g1_1 + prepare_a1pms_config SDNC ".a1pms_config.json" + else + prepare_a1pms_config NOSDNC ".a1pms_config.json" + fi + + if [ $RUNMODE == "KUBE" ]; then + a1pms_load_config ".a1pms_config.json" + else + #Temporary switch to http/https if dmaap use. Otherwise it is not possible to push config + if [ $__httpx == "HTTPS" ]; then + use_a1pms_rest_https + else + use_a1pms_rest_http + fi + a1pms_api_put_configuration 200 ".a1pms_config.json" + if [ $__httpx == "HTTPS" ]; then + if [[ $interface = *"DMAAP"* ]]; then + use_a1pms_dmaap_https + else + use_a1pms_rest_https + fi + else + if [[ $interface = *"DMAAP"* ]]; then + use_a1pms_dmaap_http + else + use_a1pms_rest_http + fi + fi + fi + + if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then + : + else + mr_equal requests_submitted 0 + fi + + sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json + + sim_put_policy_type 201 ricsim_g3_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json + + a1pms_equal json:rics 3 300 + + if [ "$A1PMS_VERSION" == "V3" ]; then + a1pms_equal json:policytypes 3 120 + else + a1pms_equal json:policy-types 3 120 + a1pms_equal json:policy-instances 0 + fi + + a1pms_equal json:policies 0 + + cr_equal 0 received_callbacks 3 120 + + cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1 + + echo "############################################" + echo "############## Health check ################" + echo "############################################" + + sleep_wait 120 "Let A1PMS configuration take effect" + + a1pms_api_get_status 200 + + echo "############################################" + echo "##### Service registry and supervision #####" + echo "############################################" + + a1pms_api_put_service 201 "serv1" 1000 "$CR_SERVICE_APP_PATH_0/1" + + a1pms_api_get_service_ids 200 "serv1" "ric-registration" + + a1pms_api_put_services_keepalive 200 "serv1" + + echo "############################################" + echo "############## RIC Repository ##############" + echo "############################################" - a1pms_api_put_services_keepalive 200 "serv1" + a1pms_api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1: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:AVAILABLE" - echo "############################################" - echo "############## RIC Repository ##############" - echo "############################################" + echo "############################################" + echo "########### A1 Policy Management ###########" + echo "############################################" - a1pms_api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1: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:AVAILABLE" + notificationurl=$CR_SERVICE_APP_PATH_0"/test" + if [ "$A1PMS_VERSION" == "V3" ]; then + a1pms_api_post_policy_v3 201 "serv1" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json + a1pms_api_put_policy_v3 200 5000 testdata/OSC/pi1_template.json + a1pms_api_post_policy_v3 201 "serv1" ricsim_g3_1 STD_QOS_0_2_0 5200 true $notificationurl testdata/STD2/pi_qos_template.json + a1pms_api_put_policy_v3 200 5200 testdata/STD2/pi_qos_template.json + a1pms_api_post_policy_v3 201 "serv1" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json + a1pms_api_put_policy_v3 200 5100 testdata/STD/pi1_template.json + else + a1pms_api_put_policy 201 "serv1" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json + a1pms_api_put_policy 200 "serv1" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json + a1pms_api_put_policy 201 "serv1" ricsim_g3_1 STD_QOS_0_2_0 5200 true $notificationurl testdata/STD2/pi_qos_template.json + a1pms_api_put_policy 200 "serv1" ricsim_g3_1 STD_QOS_0_2_0 5200 true $notificationurl testdata/STD2/pi_qos_template.json + + a1pms_api_put_policy 201 "serv1" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json + a1pms_api_put_policy 200 "serv1" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json + fi + + a1pms_equal json:policies 3 - echo "############################################" - echo "########### A1 Policy Management ###########" - echo "############################################" + a1pms_api_delete_policy 204 5000 - notificationurl=$CR_SERVICE_APP_PATH_0"/test" - a1pms_api_put_policy 201 "serv1" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json - a1pms_api_put_policy 200 "serv1" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json - a1pms_api_put_policy 201 "serv1" ricsim_g3_1 STD_QOS_0_2_0 5200 true $notificationurl testdata/STD2/pi_qos_template.json - a1pms_api_put_policy 200 "serv1" ricsim_g3_1 STD_QOS_0_2_0 5200 true $notificationurl testdata/STD2/pi_qos_template.json + a1pms_api_delete_policy 204 5100 - a1pms_api_put_policy 201 "serv1" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json - a1pms_api_put_policy 200 "serv1" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json + a1pms_api_delete_policy 204 5200 - a1pms_equal json:policies 3 + a1pms_equal json:policies 0 - a1pms_api_delete_policy 204 5000 + if [ "$A1PMS_VERSION" != "V3" ]; then + a1pms_equal json:policy-instances 0 + fi - a1pms_api_delete_policy 204 5100 + cr_equal 0 received_callbacks 3 - a1pms_api_delete_policy 204 5200 + if [[ $interface = *"DMAAP"* ]]; then - a1pms_equal json:policies 0 + VAL=14 # Number of a1pms API calls over DMAAP + mr_equal requests_fetched $VAL + mr_equal responses_submitted $VAL + mr_equal responses_fetched $VAL + mr_equal current_requests 0 + mr_equal current_responses 0 + else + if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then + : + else + mr_equal requests_submitted 0 + fi + fi - a1pms_equal json:policy-instances 0 + 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 + sim_contains_str ricsim_g3_1 remote_hosts $SDNC_APP_NAME + else + sim_contains_str ricsim_g1_1 remote_hosts $A1PMS_APP_NAME + sim_contains_str ricsim_g2_1 remote_hosts $A1PMS_APP_NAME + sim_contains_str ricsim_g3_1 remote_hosts $A1PMS_APP_NAME + fi - cr_equal 0 received_callbacks 3 + check_a1pms_logs - if [[ $interface = *"DMAAP"* ]]; then - VAL=14 # Number of a1pms API calls over DMAAP - mr_equal requests_fetched $VAL - mr_equal responses_submitted $VAL - mr_equal responses_fetched $VAL - mr_equal current_requests 0 - mr_equal current_responses 0 - else - if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then - : - else - mr_equal requests_submitted 0 - fi - fi + if [[ $interface = *"SDNC"* ]]; then + check_sdnc_logs + fi - 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 - sim_contains_str ricsim_g3_1 remote_hosts $SDNC_APP_NAME - else - sim_contains_str ricsim_g1_1 remote_hosts $A1PMS_APP_NAME - sim_contains_str ricsim_g2_1 remote_hosts $A1PMS_APP_NAME - sim_contains_str ricsim_g3_1 remote_hosts $A1PMS_APP_NAME - fi + store_logs "${__httpx}__${interface}" - check_a1pms_logs + done - - if [[ $interface = *"SDNC"* ]]; then - check_sdnc_logs - fi - - store_logs "${__httpx}__${interface}" - - done + done done - #### TEST COMPLETE #### diff --git a/test/auto-test/FTC10.sh b/test/auto-test/FTC10.sh index bc391d64..a302cc37 100755 --- a/test/auto-test/FTC10.sh +++ b/test/auto-test/FTC10.sh @@ -43,258 +43,344 @@ SUPPORTED_RUNMODES="DOCKER KUBE" setup_testenvironment #### TEST BEGIN #### +VERSIONS_TO_RUN=2 -sim_generate_policy_uuid - -use_simulator_http -use_mr_http -use_a1pms_rest_http - - -clean_environment - -start_kube_proxy - -start_ric_simulators ricsim_g1 3 OSC_2.1.0 - -start_ric_simulators ricsim_g2 5 STD_1.1.3 - -start_ric_simulators ricsim_g3 1 STD_2.0.0 - -if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then - : -else - start_mr +if [ -n "$A1PMS_V3_FLAG" ] && [ "${A1PMS_V3_FLAG,,}" == "true" ]; then + VERSIONS_TO_RUN=3 fi -start_cr 1 +for version in $(seq 2 $VERSIONS_TO_RUN); do + echo "#####################################################################" + echo "#####################################################################" + echo "### Testing a1pms: V${version}" + echo "#####################################################################" + echo "#####################################################################" -start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE + if [ "$version" == "3" ]; then + if [ -n "$A1PMS_V3" ] && [ -n "$A1PMS_API_PREFIX_V3" ] && [ -n "$A1PMS_ALIVE_URL_V3" ]; then + export A1PMS_VERSION="$A1PMS_V3" + export A1PMS_API_PREFIX="$A1PMS_API_PREFIX_V3" + export A1PMS_ALIVE_URL="$A1PMS_API_PREFIX$A1PMS_ALIVE_URL_V3" + else + echo "One/All parameters not set in env file (, , )" + break + fi + fi + sim_generate_policy_uuid -if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then - start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE -fi + use_simulator_http + use_mr_http + use_a1pms_rest_http -start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE -set_a1pms_debug + clean_environment -use_a1pms_rest_http + start_kube_proxy + start_ric_simulators ricsim_g1 3 OSC_2.1.0 -prepare_a1pms_config NOSDNC ".a1pms_config.json" + start_ric_simulators ricsim_g2 5 STD_1.1.3 -if [ $RUNMODE == "KUBE" ]; then - a1pms_load_config ".a1pms_config.json" -else - a1pms_api_put_configuration 200 ".a1pms_config.json" -fi + start_ric_simulators ricsim_g3 1 STD_2.0.0 -sleep_wait 120 "Let A1PMS configuration take effect" + if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then + : + else + start_mr + fi -a1pms_api_get_status 200 + start_cr 1 -sim_print ricsim_g1_1 interface -sim_print ricsim_g2_1 interface + start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE -sim_print ricsim_g3_1 interface + if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then + start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE + fi -sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json + start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE -sim_put_policy_type 201 ricsim_g3_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json -a1pms_equal json:policy-types 3 300 + set_a1pms_debug -# Create policies + use_a1pms_rest_http -notificationurl=$CR_SERVICE_APP_PATH_0"/test" -use_a1pms_rest_http + prepare_a1pms_config NOSDNC ".a1pms_config.json" -a1pms_api_put_service 201 "service1" 3600 "$CR_SERVICE_APP_PATH_0/1" + if [ $RUNMODE == "KUBE" ]; then + a1pms_load_config ".a1pms_config.json" + else + a1pms_api_put_configuration 200 ".a1pms_config.json" + fi -a1pms_api_put_policy 201 "service1" ricsim_g1_1 1 2000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1 + sleep_wait 120 "Let A1PMS configuration take effect" -sim_equal ricsim_g1_1 num_instances 1 + a1pms_api_get_status 200 -if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then - use_a1pms_rest_http -else - use_a1pms_dmaap_http -fi + sim_print ricsim_g1_1 interface -a1pms_api_put_policy 201 "service1" ricsim_g1_1 1 3000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1 + sim_print ricsim_g2_1 interface -sim_equal ricsim_g1_1 num_instances 2 + sim_print ricsim_g3_1 interface + sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json -use_a1pms_rest_http + sim_put_policy_type 201 ricsim_g3_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json + if [ "$A1PMS_VERSION" == "V3" ]; then + a1pms_equal json:policytypes 7 300 + else + a1pms_equal json:policy-types 3 300 + fi -a1pms_api_put_policy 201 "service1" ricsim_g2_1 NOTYPE 2100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1 + # Create policies -sim_equal ricsim_g2_1 num_instances 1 + notificationurl=$CR_SERVICE_APP_PATH_0"/test" + use_a1pms_rest_http -if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then - use_a1pms_rest_http -else - use_a1pms_dmaap_http -fi - -a1pms_api_put_policy 201 "service1" ricsim_g2_1 NOTYPE 3100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1 - -sim_equal ricsim_g2_1 num_instances 2 - -use_a1pms_rest_http - -a1pms_api_put_policy 201 "service1" ricsim_g3_1 STD_QOS_0_2_0 2200 true $notificationurl testdata/STD2/pi_qos_template.json 1 + a1pms_api_put_service 201 "service1" 3600 "$CR_SERVICE_APP_PATH_0/1" -sim_equal ricsim_g3_1 num_instances 1 + if [ "$A1PMS_VERSION" == "V3" ]; then + a1pms_api_post_policy_v3 201 "service1" ricsim_g1_1 1 2000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1 + else + a1pms_api_put_policy 201 "service1" ricsim_g1_1 1 2000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1 + fi -if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then - use_a1pms_rest_http -else - use_a1pms_dmaap_http -fi - -a1pms_api_put_policy 201 "service1" ricsim_g3_1 STD_QOS_0_2_0 3200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos_template.json 1 + sim_equal ricsim_g1_1 num_instances 1 -sim_equal ricsim_g3_1 num_instances 2 + if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then + use_a1pms_rest_http + else + use_a1pms_dmaap_http + fi -#Update policies -use_a1pms_rest_http + if [ "$A1PMS_VERSION" == "V3" ]; then + a1pms_api_post_policy_v3 201 "service1" ricsim_g1_1 1 3000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1 + else + a1pms_api_put_policy 201 "service1" ricsim_g1_1 1 3000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1 + fi -a1pms_api_put_service 200 "service1" 3600 "$CR_SERVICE_APP_PATH_0/1" + sim_equal ricsim_g1_1 num_instances 2 -a1pms_api_put_policy 200 "service1" ricsim_g1_1 1 2000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1 -sim_equal ricsim_g1_1 num_instances 2 + use_a1pms_rest_http + if [ "$A1PMS_VERSION" == "V3" ]; then + a1pms_api_post_policy_v3 201 "service1" ricsim_g2_1 NOTYPE 2100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1 + else + a1pms_api_put_policy 201 "service1" ricsim_g2_1 NOTYPE 2100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1 + fi -if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then - use_a1pms_rest_http -else - use_a1pms_dmaap_http -fi + sim_equal ricsim_g2_1 num_instances 1 -a1pms_api_put_policy 200 "service1" ricsim_g1_1 1 3000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1 -sim_equal ricsim_g1_1 num_instances 2 + if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then + use_a1pms_rest_http + else + use_a1pms_dmaap_http + fi + if [ "$A1PMS_VERSION" == "V3" ]; then + a1pms_api_post_policy_v3 201 "service1" ricsim_g2_1 NOTYPE 3100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1 + else + a1pms_api_put_policy 201 "service1" ricsim_g2_1 NOTYPE 3100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1 + fi -use_a1pms_rest_http + sim_equal ricsim_g2_1 num_instances 2 + use_a1pms_rest_http -a1pms_api_put_policy 200 "service1" ricsim_g2_1 NOTYPE 2100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1 + if [ "$A1PMS_VERSION" == "V3" ]; then + a1pms_api_post_policy_v3 201 "service1" ricsim_g3_1 STD_QOS_0_2_0 2200 true $notificationurl testdata/STD2/pi_qos_template.json 1 + else + a1pms_api_put_policy 201 "service1" ricsim_g3_1 STD_QOS_0_2_0 2200 true $notificationurl testdata/STD2/pi_qos_template.json 1 + fi -sim_equal ricsim_g2_1 num_instances 2 + sim_equal ricsim_g3_1 num_instances 1 + if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then + use_a1pms_rest_http + else + use_a1pms_dmaap_http + fi -if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then - use_a1pms_rest_http -else - use_a1pms_dmaap_http -fi - -a1pms_api_put_policy 200 "service1" ricsim_g2_1 NOTYPE 3100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1 + if [ "$A1PMS_VERSION" == "V3" ]; then + a1pms_api_post_policy_v3 201 "service1" ricsim_g3_1 STD_QOS_0_2_0 3200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos_template.json 1 + else + a1pms_api_put_policy 201 "service1" ricsim_g3_1 STD_QOS_0_2_0 3200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos_template.json 1 + fi -sim_equal ricsim_g2_1 num_instances 2 + sim_equal ricsim_g3_1 num_instances 2 -use_a1pms_rest_http + if [ "$A1PMS_VERSION" == "V3" ]; then + # Check policies + a1pms_api_get_policy 200 2000 testdata/OSC/pi1_template.json "service1" ricsim_g1_1 1 false $notificationurl + a1pms_api_get_policy 200 3000 testdata/OSC/pi1_template.json "service1" ricsim_g1_1 1 false $notificationurl + a1pms_api_get_policy 200 2100 testdata/STD/pi1_template.json "service1" ricsim_g2_1 NOTYPE false $notificationurl + a1pms_api_get_policy 200 3100 testdata/STD/pi1_template.json "service1" ricsim_g2_1 NOTYPE false $notificationurl + a1pms_api_get_policy 200 2200 testdata/STD2/pi_qos_template.json "service1" ricsim_g3_1 STD_QOS_0_2_0 true $notificationurl + a1pms_api_get_policy 200 3200 testdata/STD2/pi_qos_template.json "service1" ricsim_g3_1 STD_QOS_0_2_0 true $notificationurl + fi -a1pms_api_put_policy 200 "service1" ricsim_g3_1 STD_QOS_0_2_0 2200 true $notificationurl testdata/STD2/pi_qos_template.json 1 + #Update policies + use_a1pms_rest_http -sim_equal ricsim_g3_1 num_instances 2 + a1pms_api_put_service 200 "service1" 3600 "$CR_SERVICE_APP_PATH_0/1" + if [ "$A1PMS_VERSION" == "V3" ]; then + a1pms_api_put_policy_v3 200 2000 testdata/OSC/pi1_template.json 1 + else + a1pms_api_put_policy 200 "service1" ricsim_g1_1 1 2000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1 + fi -if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then - use_a1pms_rest_http -else - use_a1pms_dmaap_http -fi - -a1pms_api_put_policy 200 "service1" ricsim_g3_1 STD_QOS_0_2_0 3200 true $notificationurl testdata/STD2/pi_qos_template.json 1 - -sim_equal ricsim_g3_1 num_instances 2 - -# Check policies -a1pms_api_get_policy 200 2000 testdata/OSC/pi1_template.json "service1" ricsim_g1_1 1 false $notificationurl -a1pms_api_get_policy 200 3000 testdata/OSC/pi1_template.json "service1" ricsim_g1_1 1 false $notificationurl -a1pms_api_get_policy 200 2100 testdata/STD/pi1_template.json "service1" ricsim_g2_1 NOTYPE false $notificationurl -a1pms_api_get_policy 200 3100 testdata/STD/pi1_template.json "service1" ricsim_g2_1 NOTYPE false $notificationurl -a1pms_api_get_policy 200 2200 testdata/STD2/pi_qos_template.json "service1" ricsim_g3_1 STD_QOS_0_2_0 true $notificationurl -a1pms_api_get_policy 200 3200 testdata/STD2/pi_qos_template.json "service1" ricsim_g3_1 STD_QOS_0_2_0 true $notificationurl - -sim_equal ricsim_g1_1 num_instances 2 -sim_equal ricsim_g2_1 num_instances 2 - -sim_equal ricsim_g3_1 num_instances 2 - -# Remove policies - -if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then - use_a1pms_rest_http -else - use_a1pms_dmaap_http -fi -a1pms_api_delete_policy 204 2000 -use_a1pms_rest_http -a1pms_api_delete_policy 204 3000 -if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then - use_a1pms_rest_http -else - use_a1pms_dmaap_http -fi -a1pms_api_delete_policy 204 2100 -use_a1pms_rest_http -a1pms_api_delete_policy 204 3100 -if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then - use_a1pms_rest_http -else - use_a1pms_dmaap_http -fi -a1pms_api_delete_policy 204 2200 -use_a1pms_rest_http -a1pms_api_delete_policy 204 3200 - -sim_equal ricsim_g1_1 num_instances 0 -sim_equal ricsim_g2_1 num_instances 0 - -sim_equal ricsim_g3_1 num_instances 0 - -# Check remote host access to simulator - -sim_contains_str ricsim_g1_1 remote_hosts $A1PMS_APP_NAME -sim_contains_str ricsim_g2_1 remote_hosts $A1PMS_APP_NAME -sim_contains_str ricsim_g3_1 remote_hosts $A1PMS_APP_NAME - -# Check policy removal -use_a1pms_rest_http -a1pms_api_get_policy 404 2000 -a1pms_api_get_policy 404 3000 -a1pms_api_get_policy 404 2100 -a1pms_api_get_policy 404 3100 - -a1pms_api_get_policy 404 2200 -a1pms_api_get_policy 404 3200 - -# Remove the service -if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then - use_a1pms_rest_http -else - use_a1pms_dmaap_http -fi -a1pms_api_delete_services 204 "service1" - -a1pms_api_get_services 404 "service1" + sim_equal ricsim_g1_1 num_instances 2 -check_a1pms_logs -#### TEST COMPLETE #### + if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then + use_a1pms_rest_http + else + use_a1pms_dmaap_http + fi + + if [ "$A1PMS_VERSION" == "V3" ]; then + a1pms_api_put_policy_v3 200 3000 testdata/OSC/pi1_template.json 1 + else + a1pms_api_put_policy 200 "service1" ricsim_g1_1 1 3000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1 + fi + + sim_equal ricsim_g1_1 num_instances 2 + + + use_a1pms_rest_http + + if [ "$A1PMS_VERSION" == "V3" ]; then + a1pms_api_put_policy_v3 200 2100 testdata/STD/pi1_template.json 1 + else + a1pms_api_put_policy 200 "service1" ricsim_g2_1 NOTYPE 2100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1 + fi + + sim_equal ricsim_g2_1 num_instances 2 + + + if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then + use_a1pms_rest_http + else + use_a1pms_dmaap_http + fi + + if [ "$A1PMS_VERSION" == "V3" ]; then + a1pms_api_put_policy_v3 200 3100 testdata/STD/pi1_template.json 1 + else + a1pms_api_put_policy 200 "service1" ricsim_g2_1 NOTYPE 3100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1 + fi + + sim_equal ricsim_g2_1 num_instances 2 + + use_a1pms_rest_http + + if [ "$A1PMS_VERSION" == "V3" ]; then + a1pms_api_put_policy_v3 200 2200 testdata/STD2/pi_qos_template.json 1 + else + a1pms_api_put_policy 200 "service1" ricsim_g3_1 STD_QOS_0_2_0 2200 true $notificationurl testdata/STD2/pi_qos_template.json 1 + fi + + sim_equal ricsim_g3_1 num_instances 2 + + + if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then + use_a1pms_rest_http + else + use_a1pms_dmaap_http + fi + + if [ "$A1PMS_VERSION" == "V3" ]; then + a1pms_api_put_policy_v3 200 3200 testdata/STD2/pi_qos_template.json 1 + else + a1pms_api_put_policy 200 "service1" ricsim_g3_1 STD_QOS_0_2_0 3200 true $notificationurl testdata/STD2/pi_qos_template.json 1 + fi + + sim_equal ricsim_g3_1 num_instances 2 + + if [ "$A1PMS_VERSION" != "V3" ]; then + # Check policies + a1pms_api_get_policy 200 2000 testdata/OSC/pi1_template.json "service1" ricsim_g1_1 1 false $notificationurl + a1pms_api_get_policy 200 3000 testdata/OSC/pi1_template.json "service1" ricsim_g1_1 1 false $notificationurl + a1pms_api_get_policy 200 2100 testdata/STD/pi1_template.json "service1" ricsim_g2_1 NOTYPE false $notificationurl + a1pms_api_get_policy 200 3100 testdata/STD/pi1_template.json "service1" ricsim_g2_1 NOTYPE false $notificationurl + a1pms_api_get_policy 200 2200 testdata/STD2/pi_qos_template.json "service1" ricsim_g3_1 STD_QOS_0_2_0 true $notificationurl + a1pms_api_get_policy 200 3200 testdata/STD2/pi_qos_template.json "service1" ricsim_g3_1 STD_QOS_0_2_0 true $notificationurl + fi + + sim_equal ricsim_g1_1 num_instances 2 + sim_equal ricsim_g2_1 num_instances 2 + + sim_equal ricsim_g3_1 num_instances 2 + + # Remove policies + + if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then + use_a1pms_rest_http + else + use_a1pms_dmaap_http + fi + a1pms_api_delete_policy 204 2000 + use_a1pms_rest_http + a1pms_api_delete_policy 204 3000 + if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then + use_a1pms_rest_http + else + use_a1pms_dmaap_http + fi + a1pms_api_delete_policy 204 2100 + use_a1pms_rest_http + a1pms_api_delete_policy 204 3100 + if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then + use_a1pms_rest_http + else + use_a1pms_dmaap_http + fi + a1pms_api_delete_policy 204 2200 + use_a1pms_rest_http + a1pms_api_delete_policy 204 3200 + + sim_equal ricsim_g1_1 num_instances 0 + sim_equal ricsim_g2_1 num_instances 0 + + sim_equal ricsim_g3_1 num_instances 0 + + # Check remote host access to simulator + + sim_contains_str ricsim_g1_1 remote_hosts $A1PMS_APP_NAME + sim_contains_str ricsim_g2_1 remote_hosts $A1PMS_APP_NAME + sim_contains_str ricsim_g3_1 remote_hosts $A1PMS_APP_NAME + + # Check policy removal + use_a1pms_rest_http + a1pms_api_get_policy 404 2000 + a1pms_api_get_policy 404 3000 + a1pms_api_get_policy 404 2100 + a1pms_api_get_policy 404 3100 + + a1pms_api_get_policy 404 2200 + a1pms_api_get_policy 404 3200 + + # Remove the service + if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then + use_a1pms_rest_http + else + use_a1pms_dmaap_http + fi + a1pms_api_delete_services 204 "service1" + + a1pms_api_get_services 404 "service1" + + check_a1pms_logs +done + #### TEST COMPLETE #### store_logs END print_result -auto_clean_environment \ No newline at end of file +auto_clean_environment diff --git a/test/auto-test/FTC2001.sh b/test/auto-test/FTC2001.sh index f63e5d1d..f39eb022 100755 --- a/test/auto-test/FTC2001.sh +++ b/test/auto-test/FTC2001.sh @@ -43,205 +43,249 @@ SUPPORTED_RUNMODES="DOCKER KUBE" setup_testenvironment #### TEST BEGIN #### +VERSIONS_TO_RUN=2 -#Local vars in test script -########################## - -use_cr_https -use_a1pms_rest_https -use_simulator_https -use_ics_rest_https -use_prod_stub_https - -notificationurl=$CR_SERVICE_APP_PATH_0"/test" - -clean_environment - -start_kube_proxy - -STD_NUM_RICS=2 - -start_http_proxy - -start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0 - -if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then - : -else - start_mr #Just to prevent errors in the a1pms log... -fi - -start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE - -if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then - start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE -fi - -start_a1pms PROXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE - - - -prepare_a1pms_config NOSDNC ".a1pms_config.json" - -if [ $RUNMODE == "KUBE" ]; then - a1pms_load_config ".a1pms_config.json" -else - a1pms_api_put_configuration 200 ".a1pms_config.json" +if [ -n "$A1PMS_V3_FLAG" ] && [ "${A1PMS_V3_FLAG,,}" == "true" ]; then + VERSIONS_TO_RUN=3 fi -start_cr 1 +for version in $(seq 2 $VERSIONS_TO_RUN); do -start_prod_stub + echo "#####################################################################" + echo "#####################################################################" + echo "### Testing a1pms: V${version}" + echo "#####################################################################" + echo "#####################################################################" -start_ics PROXY $SIM_GROUP/$ICS_COMPOSE_DIR/$ICS_CONFIG_FILE + if [ "$version" == "3" ]; then + if [ -n "$A1PMS_V3" ] && [ -n "$A1PMS_API_PREFIX_V3" ] && [ -n "$A1PMS_ALIVE_URL_V3" ]; then + export A1PMS_VERSION="$A1PMS_V3" + export A1PMS_API_PREFIX="$A1PMS_API_PREFIX_V3" + export A1PMS_ALIVE_URL="$A1PMS_API_PREFIX$A1PMS_ALIVE_URL_V3" + else + echo "One/All parameters not set in env file (, , )" + break + fi + fi + #Local vars in test script + ########################## -set_a1pms_trace + use_cr_https + use_a1pms_rest_https + use_simulator_https + use_ics_rest_https + use_prod_stub_https -set_ics_debug + notificationurl=$CR_SERVICE_APP_PATH_0"/test" -sleep_wait 120 "Let A1PMS configuration take effect" + clean_environment + + start_kube_proxy + + STD_NUM_RICS=2 + + start_http_proxy + + start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0 + + if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then + : + else + start_mr #Just to prevent errors in the a1pms log... + fi + + start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE + + if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then + start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE + fi + + start_a1pms PROXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE + + + + prepare_a1pms_config NOSDNC ".a1pms_config.json" + + if [ $RUNMODE == "KUBE" ]; then + a1pms_load_config ".a1pms_config.json" + else + a1pms_api_put_configuration 200 ".a1pms_config.json" + fi + + start_cr 1 + + start_prod_stub + + start_ics PROXY $SIM_GROUP/$ICS_COMPOSE_DIR/$ICS_CONFIG_FILE + + set_a1pms_trace + + set_ics_debug + + sleep_wait 120 "Let A1PMS configuration take effect" + + a1pms_api_get_status 200 + + # Print the A1 version for STD 2.X + for ((i=1; i<=$STD_NUM_RICS; i++)) + do + sim_print $RIC_SIM_PREFIX"_g3_"$i interface + done + total_policy_types=2 + # Load the policytypes in std + for ((i=1; i<=$STD_NUM_RICS; i++)) + do + sim_put_policy_type 201 $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 demo-testdata/STD2/sim_qos.json + sim_put_policy_type 201 $RIC_SIM_PREFIX"_g3_"$i STD_QOS2_0.1.0 demo-testdata/STD2/sim_qos2.json + done + + #Check the number of schemas and the individual schemas in STD + if [ "$A1PMS_VERSION" == "V3" ]; then + total_policy_type_entries=$((STD_NUM_RICS * total_policy_types)) + a1pms_equal json:policytypes ${total_policy_type_entries} 120 + else + a1pms_equal json:policy-types ${total_policy_types} 120 + fi -a1pms_api_get_status 200 + for ((i=1; i<=$STD_NUM_RICS; i++)) + do + if [ "$A1PMS_VERSION" == "V3" ]; then + a1pms_equal json:policytypes?nearRtRicId=$RIC_SIM_PREFIX"_g3_"$i ${total_policy_types} 120 + else + a1pms_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g3_"$i ${total_policy_types} 120 + fi + done -# Print the A1 version for STD 2.X -for ((i=1; i<=$STD_NUM_RICS; i++)) -do - sim_print $RIC_SIM_PREFIX"_g3_"$i interface -done -# Load the policytypes in std -for ((i=1; i<=$STD_NUM_RICS; i++)) -do - sim_put_policy_type 201 $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 demo-testdata/STD2/sim_qos.json - sim_put_policy_type 201 $RIC_SIM_PREFIX"_g3_"$i STD_QOS2_0.1.0 demo-testdata/STD2/sim_qos2.json -done + # Check the schemas in STD + for ((i=1; i<=$STD_NUM_RICS; i++)) + do + a1pms_api_get_policy_type 200 STD_QOS_0_2_0 demo-testdata/STD2/qos-a1pms-modified.json + a1pms_api_get_policy_type 200 'STD_QOS2_0.1.0' demo-testdata/STD2/qos2-a1pms-modified.json + done -#Check the number of schemas and the individual schemas in STD -a1pms_equal json:policy-types 2 120 + #Check the number of types + if [ "$A1PMS_VERSION" == "V3" ]; then + total_policy_type_entries=$((STD_NUM_RICS * total_policy_types)) + a1pms_equal json:policytypes ${total_policy_type_entries} 300 + else + a1pms_equal json:policy-types ${total_policy_types} 300 + fi -for ((i=1; i<=$STD_NUM_RICS; i++)) -do - a1pms_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g3_"$i 2 120 -done + a1pms_api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_APP_PATH_0/1" -# Check the schemas in STD -for ((i=1; i<=$STD_NUM_RICS; i++)) -do - a1pms_api_get_policy_type 200 STD_QOS_0_2_0 demo-testdata/STD2/qos-a1pms-modified.json - a1pms_api_get_policy_type 200 'STD_QOS2_0.1.0' demo-testdata/STD2/qos2-a1pms-modified.json -done - -#Check the number of types -a1pms_equal json:policy-types 2 300 - -a1pms_api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_APP_PATH_0/1" + # Create policies in STD + for ((i=1; i<=$STD_NUM_RICS; i++)) + do + sim_generate_policy_uuid + if [ "$A1PMS_VERSION" == "V3" ]; then + a1pms_api_post_policy_v3 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 $((2300+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1 + sim_generate_policy_uuid + a1pms_api_post_policy_v3 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i 'STD_QOS2_0.1.0' $((2400+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1 + else + a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 $((2300+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1 + sim_generate_policy_uuid + a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i 'STD_QOS2_0.1.0' $((2400+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1 + fi + done -# Create policies in STD -for ((i=1; i<=$STD_NUM_RICS; i++)) -do - sim_generate_policy_uuid - a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 $((2300+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1 - sim_generate_policy_uuid - a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i 'STD_QOS2_0.1.0' $((2400+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1 -done + # Check the number of policies in STD + for ((i=1; i<=$STD_NUM_RICS; i++)) + do + sim_equal $RIC_SIM_PREFIX"_g3_"$i num_instances 2 + done + + # Print calling hosts STD 2.X + for ((i=1; i<=$STD_NUM_RICS; i++)) + do + sim_print $RIC_SIM_PREFIX"_g3_"$i remote_hosts + sim_contains_str $RIC_SIM_PREFIX"_g3_"$i remote_hosts proxy + done + + + CB_JOB="$PROD_STUB_SERVICE_PATH$PROD_STUB_JOB_CALLBACK" + CB_SV="$PROD_STUB_SERVICE_PATH$PROD_STUB_SUPERVISION_CALLBACK" + RIC_G1_1=$RIC_SIM_PREFIX"_g3_1" + RIC_G1_2=$RIC_SIM_PREFIX"_g3_2" + if [ $RUNMODE == "KUBE" ]; then + RIC_G1_1=$(get_kube_sim_host $RIC_G1_1) + RIC_G1_2=$(get_kube_sim_host $RIC_G1_2) + fi + TARGET1="$RIC_SIM_HTTPX://$RIC_G1_1:$RIC_SIM_PORT/datadelivery" + TARGET2="$RIC_SIM_HTTPX://$RIC_G1_1:$RIC_SIM_PORT/datadelivery" + + STATUS1="$CR_SERVICE_APP_PATH_0/job1-status" + STATUS2="$CR_SERVICE_APP_PATH_0/job2-status" + + prodstub_arm_producer 200 prod-a + prodstub_arm_type 200 prod-a type1 + prodstub_arm_job_create 200 prod-a job1 + prodstub_arm_job_create 200 prod-a job2 + + ### ics status + ics_api_service_status 200 + + if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then + #Type registration status callbacks + TYPESTATUS1="$CR_SERVICE_APP_PATH_0/type-status1" + + ics_api_idc_put_subscription 201 subscription-id-1 owner1 $TYPESTATUS1 + + ics_api_idc_get_subscription_ids 200 owner1 subscription-id-1 + fi + + ## Setup prod-a + ics_api_edp_put_type_2 201 type1 testdata/ics/ei-type-1.json + + ics_api_edp_put_producer_2 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 + + ics_api_edp_get_producer_2 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 + + ics_api_edp_get_producer_status 200 prod-a ENABLED + + + ## Create a job for prod-a + ## job1 - prod-a + ics_api_a1_put_job 201 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ics/job-template.json + + # Check the job data in the producer + prodstub_check_jobdata_3 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json + + ## Create a second job for prod-a + ## job2 - prod-a + ics_api_a1_put_job 201 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ics/job-template.json + + # Check the job data in the producer + prodstub_check_jobdata_3 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json + + # Arm producer prod-a for supervision failure + prodstub_arm_producer 200 prod-a 400 + + # Wait for producer prod-a to go disabled + ics_api_edp_get_producer_status 200 prod-a DISABLED 360 + + ics_equal json:data-producer/v1/info-producers 0 1000 + + if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then + cr_equal 0 received_callbacks 3 30 + cr_api_check_all_ics_subscription_events 200 0 type-status1 type1 testdata/ics/ei-type-1.json REGISTERED + cr_api_check_all_ics_events 200 0 job1-status DISABLED + cr_api_check_all_ics_events 200 0 job2-status DISABLED + else + cr_equal 0 received_callbacks 2 30 + cr_api_check_all_ics_events 200 0 job1-status DISABLED + cr_api_check_all_ics_events 200 0 job2-status DISABLED + fi -# Check the number of policies in STD -for ((i=1; i<=$STD_NUM_RICS; i++)) -do - sim_equal $RIC_SIM_PREFIX"_g3_"$i num_instances 2 -done + cr_contains_str 0 remote_hosts $HTTP_PROXY_APP_NAME -# Print calling hosts STD 2.X -for ((i=1; i<=$STD_NUM_RICS; i++)) -do - sim_print $RIC_SIM_PREFIX"_g3_"$i remote_hosts - sim_contains_str $RIC_SIM_PREFIX"_g3_"$i remote_hosts proxy + check_a1pms_logs + check_ics_logs done - - -CB_JOB="$PROD_STUB_SERVICE_PATH$PROD_STUB_JOB_CALLBACK" -CB_SV="$PROD_STUB_SERVICE_PATH$PROD_STUB_SUPERVISION_CALLBACK" -RIC_G1_1=$RIC_SIM_PREFIX"_g3_1" -RIC_G1_2=$RIC_SIM_PREFIX"_g3_2" -if [ $RUNMODE == "KUBE" ]; then - RIC_G1_1=$(get_kube_sim_host $RIC_G1_1) - RIC_G1_2=$(get_kube_sim_host $RIC_G1_2) -fi -TARGET1="$RIC_SIM_HTTPX://$RIC_G1_1:$RIC_SIM_PORT/datadelivery" -TARGET2="$RIC_SIM_HTTPX://$RIC_G1_1:$RIC_SIM_PORT/datadelivery" - -STATUS1="$CR_SERVICE_APP_PATH_0/job1-status" -STATUS2="$CR_SERVICE_APP_PATH_0/job2-status" - -prodstub_arm_producer 200 prod-a -prodstub_arm_type 200 prod-a type1 -prodstub_arm_job_create 200 prod-a job1 -prodstub_arm_job_create 200 prod-a job2 - -### ics status -ics_api_service_status 200 - -if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then - #Type registration status callbacks - TYPESTATUS1="$CR_SERVICE_APP_PATH_0/type-status1" - - ics_api_idc_put_subscription 201 subscription-id-1 owner1 $TYPESTATUS1 - - ics_api_idc_get_subscription_ids 200 owner1 subscription-id-1 -fi - -## Setup prod-a -ics_api_edp_put_type_2 201 type1 testdata/ics/ei-type-1.json - -ics_api_edp_put_producer_2 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 - -ics_api_edp_get_producer_2 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1 - -ics_api_edp_get_producer_status 200 prod-a ENABLED - - -## Create a job for prod-a -## job1 - prod-a -ics_api_a1_put_job 201 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ics/job-template.json - -# Check the job data in the producer -prodstub_check_jobdata_3 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json - -## Create a second job for prod-a -## job2 - prod-a -ics_api_a1_put_job 201 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ics/job-template.json - -# Check the job data in the producer -prodstub_check_jobdata_3 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json - -# Arm producer prod-a for supervision failure -prodstub_arm_producer 200 prod-a 400 - -# Wait for producer prod-a to go disabled -ics_api_edp_get_producer_status 200 prod-a DISABLED 360 - -ics_equal json:data-producer/v1/info-producers 0 1000 - -if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then - cr_equal 0 received_callbacks 3 30 - cr_api_check_all_ics_subscription_events 200 0 type-status1 type1 testdata/ics/ei-type-1.json REGISTERED - cr_api_check_all_ics_events 200 0 job1-status DISABLED - cr_api_check_all_ics_events 200 0 job2-status DISABLED -else - cr_equal 0 received_callbacks 2 30 - cr_api_check_all_ics_events 200 0 job1-status DISABLED - cr_api_check_all_ics_events 200 0 job2-status DISABLED -fi - -cr_contains_str 0 remote_hosts $HTTP_PROXY_APP_NAME - -check_a1pms_logs -check_ics_logs - -#### TEST COMPLETE #### + #### TEST COMPLETE #### store_logs END print_result -auto_clean_environment \ No newline at end of file +auto_clean_environment diff --git a/test/common/a1pms_api_functions.sh b/test/common/a1pms_api_functions.sh index b9f5ddb2..5fb6e256 100644 --- a/test/common/a1pms_api_functions.sh +++ b/test/common/a1pms_api_functions.sh @@ -1594,7 +1594,7 @@ a1pms_api_update_policy_parallel() { return 1 } -# API Test function: DELETE /policy and V2 DELETE /v2/policies/{policy_id} +# API Test function: DELETE /policy, V2 DELETE /v2/policies/{policy_id} and V3 DELETE a1policymanagement/v1/policies/{policy_id} # args: [count] # (Function for test scripts) a1pms_api_delete_policy() { @@ -2823,7 +2823,7 @@ a1pms_api_get_rics() { #### API Test case functions Service registry and supervision #### ################################################################## -# API test function: PUT /service and V2 PUT /service +# API test function: PUT /service, V2 PUT /service and V3 PUT a1policymanagement/v1/services # args: # (Function for test scripts) a1pms_api_put_service() { @@ -3091,7 +3091,7 @@ a1pms_api_put_services_keepalive() { #### API Test case functions Configuration #### ################################################################## -# API Test function: PUT "/v2/configuration" or "/v1/configuration" +# API Test function: PUT "/v2/configuration" or V3 PUT "a1policymanagement/v1/configuration" # args: # (Function for test scripts) a1pms_api_put_configuration() { @@ -3135,7 +3135,7 @@ a1pms_api_put_configuration() { return 0 } -# API Test function: GET /v2/configuration +# API Test function: GET /v2/configuration and V3 GET a1policymanagement/v1/configuration # args: [] # (Function for test scripts) a1pms_api_get_configuration() {