X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC1.sh;h=50c1870344c82f8373714ebf15c19e97f7227cf7;hb=refs%2Fchanges%2F33%2F9733%2F1;hp=00d37581084d98127a9d72eef8b1b215282e3495;hpb=542d2dbfd8df1fcb011fea3d69d539c5c5fe3667;p=nonrtric.git diff --git a/test/auto-test/FTC1.sh b/test/auto-test/FTC1.sh index 00d37581..50c18703 100755 --- a/test/auto-test/FTC1.sh +++ b/test/auto-test/FTC1.sh @@ -18,13 +18,13 @@ # -TC_ONELINE_DESCR="Sanity test, create service and then create,update and delete a policy using http/https and Agent REST/DMAAP with/without SDNC controller" +TC_ONELINE_DESCR="Sanity test, create service and then create,update and delete a policy using http/https and A1PMS REST/DMAAP with/without SDNC controller" #App names to include in the test when running docker, space separated list -DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR DMAAPMR PA RICSIM SDNC NGW KUBEPROXY" +DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR DMAAPMR A1PMS RICSIM SDNC NGW KUBEPROXY" #App names to include in the test when running kubernetes, space separated list -KUBE_INCLUDED_IMAGES="CP CR MR DMAAPMR PA RICSIM SDNC NGW KUBEPROXY " +KUBE_INCLUDED_IMAGES="CP CR MR DMAAPMR A1PMS RICSIM SDNC NGW KUBEPROXY " #Prestarted app (not started by script) to include in the test when running kubernetes, space separated list KUBE_PRESTARTED_IMAGES="" @@ -34,7 +34,7 @@ KUBE_PRESTARTED_IMAGES="" CONDITIONALLY_IGNORED_IMAGES="NGW CBS CONSUL" #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-GUILIN ONAP-HONOLULU ONAP-ISTANBUL ONAP-JAKARTA ONAP-KOHN ONAP-LONDON ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE ORAN-F-RELEASE ORAN-G-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" @@ -48,14 +48,14 @@ generate_policy_uuid # Tested variants of REST/DMAAP/SDNC config TESTED_VARIANTS="REST DMAAP REST+SDNC DMAAP+SDNC" -#Test agent and simulator protocol versions (others are http only) +#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 agent: $interface using $__httpx" + echo "### Testing a1pms: $interface using $__httpx" echo "#####################################################################" echo "#####################################################################" @@ -64,18 +64,18 @@ for __httpx in $TESTED_PROTOCOLS ; do start_kube_proxy if [ $__httpx == "HTTPS" ]; then - use_agent_rest_https + use_a1pms_rest_https else - use_agent_rest_http + use_a1pms_rest_http fi - 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 - set_agent_trace + set_a1pms_trace # 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" if [ $__httpx == "HTTPS" ]; then use_cr_https @@ -85,9 +85,9 @@ for __httpx in $TESTED_PROTOCOLS ; do use_sdnc_https fi if [[ $interface = *"DMAAP"* ]]; then - use_agent_dmaap_https + use_a1pms_dmaap_https else - use_agent_rest_https + use_a1pms_rest_https fi else use_cr_http @@ -97,15 +97,15 @@ for __httpx in $TESTED_PROTOCOLS ; do use_sdnc_http fi if [[ $interface = *"DMAAP"* ]]; then - use_agent_dmaap_http + use_a1pms_dmaap_http else - use_agent_rest_http + use_a1pms_rest_http fi fi 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 + if [ "$A1PMS_VERSION" == "V2" ]; then start_ric_simulators ricsim_g3 1 STD_2.0.0 fi @@ -120,35 +120,43 @@ for __httpx in $TESTED_PROTOCOLS ; do start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE fi + __CONFIG_HEADER="NOHEADER" + if [ $RUNMODE == "KUBE" ]; then + __CONFIG_HEADER="HEADER" + else + if [[ "$A1PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then + __CONFIG_HEADER="HEADER" + fi + fi if [[ $interface = *"SDNC"* ]]; then start_sdnc - prepare_consul_config SDNC ".consul_config.json" + prepare_consul_config SDNC ".consul_config.json" $__CONFIG_HEADER else - prepare_consul_config NOSDNC ".consul_config.json" + prepare_consul_config NOSDNC ".consul_config.json" $__CONFIG_HEADER fi if [ $RUNMODE == "KUBE" ]; then - agent_load_config ".consul_config.json" + a1pms_load_config ".consul_config.json" else - if [[ "$PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then + if [[ "$A1PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then #Temporary switch to http/https if dmaap use. Otherwise it is not possibble to push config if [ $__httpx == "HTTPS" ]; then - use_agent_rest_https + use_a1pms_rest_https else - use_agent_rest_http + use_a1pms_rest_http fi - api_put_configuration 200 ".consul_config.json" + a1pms_api_put_configuration 200 ".consul_config.json" if [ $__httpx == "HTTPS" ]; then if [[ $interface = *"DMAAP"* ]]; then - use_agent_dmaap_https + use_a1pms_dmaap_https else - use_agent_rest_https + use_a1pms_rest_https fi else if [[ $interface = *"DMAAP"* ]]; then - use_agent_dmaap_http + use_a1pms_dmaap_http else - use_agent_rest_http + use_a1pms_rest_http fi fi else @@ -161,113 +169,115 @@ for __httpx in $TESTED_PROTOCOLS ; do sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json - if [ "$PMS_VERSION" == "V2" ]; then + if [ "$A1PMS_VERSION" == "V2" ]; then sim_put_policy_type 201 ricsim_g3_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json - api_equal json:rics 3 300 + a1pms_equal json:rics 3 300 - api_equal json:policy-types 3 120 + a1pms_equal json:policy-types 3 120 - api_equal json:policies 0 + a1pms_equal json:policies 0 - api_equal json:policy-instances 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 else - api_equal json:rics 2 300 + a1pms_equal json:rics 2 300 - api_equal json:policy_schemas 2 120 + a1pms_equal json:policy_schemas 2 120 - api_equal json:policy_types 2 + a1pms_equal json:policy_types 2 - api_equal json:policies 0 + a1pms_equal json:policies 0 - api_equal json:policy_ids 0 + a1pms_equal json:policy_ids 0 fi echo "############################################" echo "############## Health check ################" echo "############################################" - api_get_status 200 + sleep_wait 120 "Let A1PMS cofiguration take effect" + + a1pms_api_get_status 200 echo "############################################" echo "##### Service registry and supervision #####" echo "############################################" - api_put_service 201 "serv1" 1000 "$CR_SERVICE_APP_PATH_0/1" + a1pms_api_put_service 201 "serv1" 1000 "$CR_SERVICE_APP_PATH_0/1" - api_get_service_ids 200 "serv1" "ric-registration" + a1pms_api_get_service_ids 200 "serv1" "ric-registration" - api_put_services_keepalive 200 "serv1" + a1pms_api_put_services_keepalive 200 "serv1" echo "############################################" echo "############## RIC Repository ##############" echo "############################################" - if [ "$PMS_VERSION" == "V2" ]; then - 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" + if [ "$A1PMS_VERSION" == "V2" ]; then + 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" else - 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" + 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" fi echo "############################################" echo "########### A1 Policy Management ###########" echo "############################################" - if [ "$PMS_VERSION" == "V2" ]; then + if [ "$A1PMS_VERSION" == "V2" ]; then notificationurl=$CR_SERVICE_APP_PATH_0"/test" else notificationurl="" fi - api_put_policy 201 "serv1" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json - api_put_policy 200 "serv1" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json - if [ "$PMS_VERSION" == "V2" ]; then - api_put_policy 201 "serv1" ricsim_g3_1 STD_QOS_0_2_0 5200 true $notificationurl testdata/STD2/pi_qos_template.json - 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_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 + if [ "$A1PMS_VERSION" == "V2" ]; then + 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 fi - api_put_policy 201 "serv1" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json - api_put_policy 200 "serv1" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_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 - if [ "$PMS_VERSION" == "V2" ]; then - api_equal json:policies 3 + if [ "$A1PMS_VERSION" == "V2" ]; then + a1pms_equal json:policies 3 else - api_equal json:policies 2 + a1pms_equal json:policies 2 fi - api_delete_policy 204 5000 + a1pms_api_delete_policy 204 5000 - api_delete_policy 204 5100 + a1pms_api_delete_policy 204 5100 - if [ "$PMS_VERSION" == "V2" ]; then - api_delete_policy 204 5200 + if [ "$A1PMS_VERSION" == "V2" ]; then + a1pms_api_delete_policy 204 5200 fi - if [ "$PMS_VERSION" == "V2" ]; then - api_equal json:policies 0 + if [ "$A1PMS_VERSION" == "V2" ]; then + a1pms_equal json:policies 0 - api_equal json:policy-instances 0 + a1pms_equal json:policy-instances 0 else - api_equal json:policies 0 + a1pms_equal json:policies 0 - api_equal json:policy_ids 0 + a1pms_equal json:policy_ids 0 fi - if [ "$PMS_VERSION" == "V2" ]; then + if [ "$A1PMS_VERSION" == "V2" ]; then cr_equal 0 received_callbacks 3 fi if [[ $interface = *"DMAAP"* ]]; then - if [ "$PMS_VERSION" == "V2" ]; then - VAL=14 # Number of Agent API calls over DMAAP + if [ "$A1PMS_VERSION" == "V2" ]; then + VAL=14 # Number of a1pms API calls over DMAAP else - VAL=11 # Number of Agent API calls over DMAAP + VAL=11 # Number of a1pms API calls over DMAAP fi mr_equal requests_fetched $VAL mr_equal responses_submitted $VAL @@ -281,18 +291,18 @@ for __httpx in $TESTED_PROTOCOLS ; do 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 + if [ "$A1PMS_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_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 + sim_contains_str ricsim_g1_1 remote_hosts $A1PMS_APP_NAME + sim_contains_str ricsim_g2_1 remote_hosts $A1PMS_APP_NAME + if [ "$A1PMS_VERSION" == "V2" ]; then + sim_contains_str ricsim_g3_1 remote_hosts $A1PMS_APP_NAME fi fi - check_policy_agent_logs + check_a1pms_logs if [[ $interface = *"SDNC"* ]]; then