X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FONAP_UC.sh;h=f6f5ae0d7047ffd9253b9846068a7db3b7ad0794;hb=b8ae6c467edee10ef39f1b43097fd1ec426e86b7;hp=cce699382765b1b199b11f08e52cc5d3ed6b4be6;hpb=1b732d17463fad74721391b3a87a2a12172da63c;p=nonrtric.git diff --git a/test/auto-test/ONAP_UC.sh b/test/auto-test/ONAP_UC.sh index cce69938..f6f5ae0d 100755 --- a/test/auto-test/ONAP_UC.sh +++ b/test/auto-test/ONAP_UC.sh @@ -20,20 +20,20 @@ TC_ONELINE_DESCR="ONAP Use case REQ-626" #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 KUBEPROXY NGW" +KUBE_INCLUDED_IMAGES="CP CR MR DMAAPMR A1PMS RICSIM SDNC 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="NGW" +CONDITIONALLY_IGNORED_IMAGES="CBS CONSUL NGW" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-HONOLULU ONAP-ISTANBUL ONAP-JAKARTA" +SUPPORTED_PROFILES="ONAP-HONOLULU ONAP-ISTANBUL ONAP-JAKARTA ONAP-KOHN ONAP-LONDON " #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" @@ -47,15 +47,15 @@ setup_testenvironment ########################## use_cr_https -use_agent_rest_https +use_a1pms_rest_https use_sdnc_https use_simulator_https use_mr_https - -if [ "$PMS_VERSION" == "V2" ]; then +__httpx="HTTPS" +if [ "$A1PMS_VERSION" == "V2" ]; then notificationurl=$CR_SERVICE_APP_PATH_0"/test" else - echo "Version V2 of PMS is needed, exiting..." + echo "Version V2 of A1PMS is needed, exiting..." exit 1 fi @@ -67,7 +67,7 @@ for interface in $TESTED_VARIANTS ; do echo "#####################################################################" echo "#####################################################################" - echo "### Testing agent: $interface using https" + echo "### Testing a1pms: $interface using https" echo "#####################################################################" echo "#####################################################################" @@ -76,9 +76,9 @@ for interface in $TESTED_VARIANTS ; do start_kube_proxy if [[ $interface = *"DMAAP"* ]]; then - use_agent_dmaap_https + use_a1pms_dmaap_https else - use_agent_rest_https + use_a1pms_rest_https fi OSC_NUM_RICS=1 @@ -99,31 +99,60 @@ for interface in $TESTED_VARIANTS ; 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 - start_policy_agent NORPOXY $SIM_GROUP/$POLICY_AGENT_COMPOSE_DIR/$POLICY_AGENT_CONFIG_FILE - - set_agent_trace + start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE - if [ $RUNMODE == "DOCKER" ]; then - start_consul_cbs - fi + set_a1pms_trace if [ $RUNMODE == "KUBE" ]; then - agent_load_config ".consul_config.json" + a1pms_load_config ".consul_config.json" else - consul_config_app ".consul_config.json" + 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_a1pms_rest_https + else + use_a1pms_rest_http + fi + a1pms_api_put_configuration 200 ".consul_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 + else + start_consul_cbs + consul_config_app ".consul_config.json" + fi fi # Check that all rics are synced in - api_equal json:rics 3 300 + a1pms_equal json:rics 3 300 - api_get_status 200 + a1pms_api_get_status 200 # Print the A1 version for OSC for ((i=1; i<=$OSC_NUM_RICS; i++)) @@ -156,18 +185,18 @@ for interface in $TESTED_VARIANTS ; do done #Check the number of schemas and the individual schemas in OSC - api_equal json:policy-types 3 300 + a1pms_equal json:policy-types 3 300 for ((i=1; i<=$OSC_NUM_RICS; i++)) do - api_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g1_"$i 2 120 + 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 - api_get_policy_type 200 100 demo-testdata/OSC/qos-agent-modified.json - api_get_policy_type 200 20008 demo-testdata/OSC/tsa-agent-modified.json + 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 @@ -179,37 +208,37 @@ for interface in $TESTED_VARIANTS ; do done #Check the number of schemas and the individual schemas in STD - api_equal json:policy-types 5 120 + a1pms_equal json:policy-types 5 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 5 120 + a1pms_equal json:policy-types 5 120 ################################################################# ## REQ: A1 Policy Type / Instance Operations ################################################################# # Create policies - use_agent_rest_http + use_a1pms_rest_http - 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 OSC for ((i=1; i<=$OSC_NUM_RICS; i++)) do - api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 100 $((3000+$i)) NOTRANSIENT $notificationurl demo-testdata/OSC/piqos_template.json 1 - api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g1_"$i 20008 $((4000+$i)) NOTRANSIENT $notificationurl demo-testdata/OSC/pitsa_template.json 1 + 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 + 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 @@ -223,9 +252,9 @@ for interface in $TESTED_VARIANTS ; do # Create policies in STD for ((i=1; i<=$STD_NUM_RICS; i++)) do - api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g2_"$i NOTYPE $((2100+$i)) NOTRANSIENT $notificationurl demo-testdata/STD/pi1_template.json 1 - 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 - 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"_g2_"$i NOTYPE $((2100+$i)) NOTRANSIENT $notificationurl demo-testdata/STD/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 + 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 @@ -243,24 +272,24 @@ for interface in $TESTED_VARIANTS ; do # Check status STD for ((i=1; i<=$STD_NUM_RICS; i++)) do - api_get_policy_status 200 $((2100+$i)) STD "UNDEFINED" - api_get_policy_status 200 $((2300+$i)) STD2 EMPTY EMPTY - api_get_policy_status 200 $((2400+$i)) STD2 EMPTY EMPTY + a1pms_api_get_policy_status 200 $((2100+$i)) STD "UNDEFINED" + a1pms_api_get_policy_status 200 $((2300+$i)) STD2 EMPTY EMPTY + a1pms_api_get_policy_status 200 $((2400+$i)) STD2 EMPTY EMPTY done # Check status OSC VAL='NOT IN EFFECT' for ((i=1; i<=$OSC_NUM_RICS; i++)) do - api_get_policy_status 200 $((3000+$i)) OSC "$VAL" "false" - api_get_policy_status 200 $((4000+$i)) OSC "$VAL" "false" + a1pms_api_get_policy_status 200 $((3000+$i)) OSC "$VAL" "false" + a1pms_api_get_policy_status 200 $((4000+$i)) OSC "$VAL" "false" done # Note: Status callback is not tested since this callback (http POST) is made from the # ricsim directly to the receiver of the status, i.e. the status does NOT - # pass through PMS + # pass through A1PMS - check_policy_agent_logs + check_a1pms_logs if [[ $interface = *"SDNC"* ]]; then check_sdnc_logs