X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FPM_DEMO.sh;h=f4adcd66063e0642f6d3e9eb6071a18fbaba3438;hb=f83c362e67d25a464b80faf6d8363ccacacc5ebb;hp=ac19879ec365c001265581fff245a0487fe471f2;hpb=f4a7e420842aa8cde747aa71180f7b47bb1010dc;p=nonrtric.git diff --git a/test/auto-test/PM_DEMO.sh b/test/auto-test/PM_DEMO.sh index ac19879e..f4adcd66 100755 --- a/test/auto-test/PM_DEMO.sh +++ b/test/auto-test/PM_DEMO.sh @@ -20,7 +20,7 @@ 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" @@ -30,10 +30,10 @@ 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 ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE ORAN-F-RELEASE ORAN-G-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" @@ -51,11 +51,7 @@ use_a1pms_rest_https use_sdnc_https use_simulator_https -if [ "$A1PMS_VERSION" == "V2" ]; then - notificationurl=$CR_SERVICE_APP_PATH_0"/test" -else - notificationurl="" -fi +notificationurl=$CR_SERVICE_APP_PATH_0"/test" clean_environment @@ -68,9 +64,7 @@ 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... @@ -86,26 +80,14 @@ 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" @@ -125,13 +107,11 @@ 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 @@ -143,71 +123,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 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 - #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 @@ -237,12 +191,10 @@ for ((i=1; i<=$STD_NUM_RICS; i++)) do 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 + 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 done @@ -250,9 +202,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