X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC2001.sh;h=3b53e8ef7a78e0cced0fe32927b93edd5167f84d;hb=f83c362e67d25a464b80faf6d8363ccacacc5ebb;hp=c09bbadf9511f993ee11fa14dae18831f45de588;hpb=542d2dbfd8df1fcb011fea3d69d539c5c5fe3667;p=nonrtric.git diff --git a/test/auto-test/FTC2001.sh b/test/auto-test/FTC2001.sh index c09bbadf..3b53e8ef 100755 --- a/test/auto-test/FTC2001.sh +++ b/test/auto-test/FTC2001.sh @@ -17,23 +17,23 @@ # ============LICENSE_END================================================= # -TC_ONELINE_DESCR="Testing southbound proxy for PMS and ICS" +TC_ONELINE_DESCR="Testing southbound proxy for A1PMS and ICS" #App names to include in the test when running docker, space separated list -DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM ICS PRODSTUB HTTPPROXY NGW KUBEPROXY" +DOCKER_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM ICS PRODSTUB HTTPPROXY NGW KUBEPROXY" #App names to include in the test when running kubernetes, space separated list -KUBE_INCLUDED_IMAGES=" MR CR PA PRODSTUB RICSIM CP ICS HTTPPROXY KUBEPROXY NGW" +KUBE_INCLUDED_IMAGES=" MR CR A1PMS PRODSTUB RICSIM CP ICS HTTPPROXY KUBEPROXY NGW" #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 NGW" +CONDITIONALLY_IGNORED_IMAGES="NGW" #Supported test environment profiles -SUPPORTED_PROFILES="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" @@ -47,17 +47,12 @@ setup_testenvironment ########################## use_cr_https -use_agent_rest_https +use_a1pms_rest_https use_simulator_https use_ics_rest_https use_prod_stub_https -if [ "$PMS_VERSION" == "V2" ]; then - notificationurl=$CR_SERVICE_APP_PATH_0"/test" -else - echo "PMS VERSION 2 (V2) is required" - exit 1 -fi +notificationurl=$CR_SERVICE_APP_PATH_0"/test" clean_environment @@ -69,7 +64,7 @@ start_http_proxy start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0 -start_mr #Just to prevent errors in the agent log... +start_mr #Just to prevent errors in the a1pms log... start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE @@ -77,19 +72,16 @@ if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE fi -start_policy_agent PROXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/$POLICY_AGENT_CONFIG_FILE +start_a1pms PROXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE + + -prepare_consul_config NOSDNC ".consul_config.json" +prepare_a1pms_config NOSDNC ".a1pms_config.json" if [ $RUNMODE == "KUBE" ]; then - agent_load_config ".consul_config.json" + a1pms_load_config ".a1pms_config.json" else - if [[ "$PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then - api_put_configuration 200 ".consul_config.json" - else - start_consul_cbs - consul_config_app ".consul_config.json" - fi + a1pms_api_put_configuration 200 ".a1pms_config.json" fi start_cr 1 @@ -98,11 +90,13 @@ start_prod_stub start_ics PROXY $SIM_GROUP/$ICS_COMPOSE_DIR/$ICS_CONFIG_FILE -set_agent_trace +set_a1pms_trace set_ics_debug -api_get_status 200 +sleep_wait 120 "Let A1PMS cofiguration take effect" + +a1pms_api_get_status 200 # Print the A1 version for STD 2.X for ((i=1; i<=$STD_NUM_RICS; i++)) @@ -117,32 +111,32 @@ do done #Check the number of schemas and the individual schemas in STD -api_equal json:policy-types 2 120 +a1pms_equal json:policy-types 2 120 for ((i=1; i<=$STD_NUM_RICS; i++)) do - api_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g3_"$i 2 120 + a1pms_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g3_"$i 2 120 done # Check the schemas in STD for ((i=1; i<=$STD_NUM_RICS; i++)) do - api_get_policy_type 200 STD_QOS_0_2_0 demo-testdata/STD2/qos-agent-modified.json - api_get_policy_type 200 'STD_QOS2_0.1.0' demo-testdata/STD2/qos2-agent-modified.json + 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 -api_equal json:policy-types 2 300 +a1pms_equal json:policy-types 2 300 -api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_APP_PATH_0/1" +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 generate_policy_uuid - 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 + 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 generate_policy_uuid - 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 + 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 @@ -272,7 +266,7 @@ fi cr_contains_str 0 remote_hosts $HTTP_PROXY_APP_NAME -check_policy_agent_logs +check_a1pms_logs check_ics_logs #### TEST COMPLETE ####