X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FPM_DEMO.sh;h=a180b63b2de9b8d290daf5a7ca97d378294c6ddd;hb=refs%2Fchanges%2F88%2F12388%2F5;hp=804ddb0ca0de5913a050cb411c23da39ab3b8864;hpb=a27463f3bb2fbe454586a871bba9b08367e9ad77;p=nonrtric.git diff --git a/test/auto-test/PM_DEMO.sh b/test/auto-test/PM_DEMO.sh index 804ddb0c..a180b63b 100755 --- a/test/auto-test/PM_DEMO.sh +++ b/test/auto-test/PM_DEMO.sh @@ -1,7 +1,8 @@ #!/usr/bin/env bash # ============LICENSE_START=============================================== -# Copyright (C) 2020 Nordix Foundation. All rights reserved. +# Copyright (C) 2020-2023 Nordix Foundation. All rights reserved. +# Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved. # ======================================================================== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,20 +21,20 @@ TC_ONELINE_DESCR="Preparation demo setup - populating a number of ric simulators with types and instances" #App names to include in the test when running docker, space separated list -DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR A1PMS RICSIM SDNC NGW KUBEPROXY" +DOCKER_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM SDNC NGW KUBEPROXY" #App names to include in the test when running kubernetes, space separated list KUBE_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM SDNC KUBEPROXY NGW" -#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list +#Pre-started 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-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_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" @@ -48,14 +49,15 @@ setup_testenvironment use_cr_https use_a1pms_rest_https -use_sdnc_https -use_simulator_https - -if [ "$A1PMS_VERSION" == "V2" ]; then - notificationurl=$CR_SERVICE_APP_PATH_0"/test" +if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then + deviation "SDNC does not support NB https" + use_sdnc_http else - notificationurl="" + use_sdnc_https fi +use_simulator_https + +notificationurl=$CR_SERVICE_APP_PATH_0"/test" clean_environment @@ -68,11 +70,13 @@ start_ric_simulators $RIC_SIM_PREFIX"_g1" $OSC_NUM_RICS OSC_2.1.0 start_ric_simulators $RIC_SIM_PREFIX"_g2" $STD_NUM_RICS STD_1.1.3 -if [ "$A1PMS_VERSION" == "V2" ]; then - start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0 -fi +start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0 -start_mr #Just to prevent errors in the a1pms log... +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 @@ -81,34 +85,23 @@ if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then fi start_sdnc +controller_api_wait_for_status_ok 200 ricsim_g1_1 start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE set_a1pms_trace -__CONFIG_HEADER="NOHEADER" -if [ $RUNMODE == "KUBE" ]; then - __CONFIG_HEADER="HEADER" -else - if [[ "$A1PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then - __CONFIG_HEADER="HEADER" - fi - fi -prepare_consul_config SDNC ".consul_config.json" $__CONFIG_HEADER + +prepare_a1pms_config SDNC ".a1pms_config.json" if [ $RUNMODE == "KUBE" ]; then - a1pms_load_config ".consul_config.json" + a1pms_load_config ".a1pms_config.json" else - if [[ "$A1PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then - a1pms_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 -sleep_wait 120 "Let A1PMS cofiguration take effect" +sleep_wait 120 "Let A1PMS configuration take effect" a1pms_api_get_status 200 @@ -125,16 +118,14 @@ do sim_print $RIC_SIM_PREFIX"_g2_"$i interface done -if [ "$A1PMS_VERSION" == "V2" ]; then - # 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 -fi +# 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 polictypes in osc +# Load the policytypes in osc for ((i=1; i<=$OSC_NUM_RICS; i++)) do sim_put_policy_type 201 $RIC_SIM_PREFIX"_g1_"$i 100 demo-testdata/OSC/sim_qos.json @@ -143,71 +134,45 @@ done #Check the number of schemas and the individual schemas in OSC -if [ "$A1PMS_VERSION" == "V2" ]; then - - a1pms_equal json:policy-types 3 300 - - for ((i=1; i<=$OSC_NUM_RICS; i++)) - do - a1pms_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g1_"$i 2 120 - done - - # Check the schemas in OSC - for ((i=1; i<=$OSC_NUM_RICS; i++)) - do - a1pms_api_get_policy_type 200 100 demo-testdata/OSC/qos-a1pms-modified.json - a1pms_api_get_policy_type 200 20008 demo-testdata/OSC/tsa-a1pms-modified.json - done -else - a1pms_equal json:policy_types 3 300 - - for ((i=1; i<=$OSC_NUM_RICS; i++)) - do - a1pms_equal json:policy_types?ric=$RIC_SIM_PREFIX"_g1_"$i 2 120 - done - - # Check the schemas in OSC - for ((i=1; i<=$OSC_NUM_RICS; i++)) - do - a1pms_api_get_policy_schema 200 100 demo-testdata/OSC/qos-a1pms-modified.json - a1pms_api_get_policy_schema 200 20008 demo-testdata/OSC/tsa-a1pms-modified.json - done -fi - +a1pms_equal json:policy-types 3 300 +for ((i=1; i<=$OSC_NUM_RICS; i++)) +do + a1pms_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g1_"$i 2 120 +done +# Check the schemas in OSC +for ((i=1; i<=$OSC_NUM_RICS; i++)) +do + a1pms_api_get_policy_type 200 100 demo-testdata/OSC/qos-a1pms-modified.json + a1pms_api_get_policy_type 200 20008 demo-testdata/OSC/tsa-a1pms-modified.json +done -if [ "$A1PMS_VERSION" == "V2" ]; then - # Load the polictypes 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 +# 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 - a1pms_equal json:policy-types 5 120 +#Check the number of schemas and the individual schemas in STD +a1pms_equal json:policy-types 5 120 - for ((i=1; i<=$STD_NUM_RICS; i++)) - do - a1pms_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g3_"$i 2 120 - done +for ((i=1; i<=$STD_NUM_RICS; i++)) +do + 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 - 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 -fi +# 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 -if [ "$A1PMS_VERSION" == "V2" ]; then - a1pms_equal json:policy-types 5 120 -else - a1pms_equal json:policy_types 3 120 -fi +a1pms_equal json:policy-types 5 120 # Create policies @@ -218,9 +183,9 @@ a1pms_api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_APP_PATH_0/1" # Create policies in OSC for ((i=1; i<=$OSC_NUM_RICS; i++)) do - generate_policy_uuid + sim_generate_policy_uuid a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 100 $((3000+$i)) NOTRANSIENT $notificationurl demo-testdata/OSC/piqos_template.json 1 - generate_policy_uuid + sim_generate_policy_uuid a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 20008 $((4000+$i)) NOTRANSIENT $notificationurl demo-testdata/OSC/pitsa_template.json 1 done @@ -235,14 +200,12 @@ done # Create policies in STD for ((i=1; i<=$STD_NUM_RICS; i++)) do - generate_policy_uuid + sim_generate_policy_uuid a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g2_"$i NOTYPE $((2100+$i)) NOTRANSIENT $notificationurl demo-testdata/STD/pi1_template.json 1 - if [ "$A1PMS_VERSION" == "V2" ]; then - 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 - 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 + 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 @@ -250,9 +213,7 @@ done for ((i=1; i<=$STD_NUM_RICS; i++)) do sim_equal $RIC_SIM_PREFIX"_g2_"$i num_instances 1 - if [ "$A1PMS_VERSION" == "V2" ]; then - sim_equal $RIC_SIM_PREFIX"_g3_"$i num_instances 2 - fi + sim_equal $RIC_SIM_PREFIX"_g3_"$i num_instances 2 done check_a1pms_logs