X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC10.sh;h=e0d6ecb176fe6c0475f3ad51fa559489a43d716b;hb=803d48989d7824309602393763142320cdbbc0d2;hp=58128b78b59e50fde877bcea060d885d61eaf294;hpb=72667f1d4b9e534b38b206f64f2ac67df01a2ed9;p=nonrtric.git diff --git a/test/auto-test/FTC10.sh b/test/auto-test/FTC10.sh index 58128b78..e0d6ecb1 100755 --- a/test/auto-test/FTC10.sh +++ b/test/auto-test/FTC10.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash # ============LICENSE_START=============================================== # Copyright (C) 2020 Nordix Foundation. All rights reserved. @@ -17,7 +17,13 @@ # ============LICENSE_END================================================= # -TC_ONELINE_DESCR="Basic use case, register rapp, create/update policy, delete policy, de-register rapp using both STD and OSC interface over REST and Dmaap" +TC_ONELINE_DESCR="Basic use case, register service, create/update policy, delete policy, de-register service using both STD and OSC interface while mixing REST and Dmaap" + +#App names to include in the test, space separated list +INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM" + +#SUPPORTED TEST ENV FILE +SUPPORTED_PROFILES="ONAP-MASTER ONAP-GUILIN ORAN-MASTER" . ../common/testcase_common.sh $@ . ../common/agent_api_functions.sh @@ -25,10 +31,12 @@ TC_ONELINE_DESCR="Basic use case, register rapp, create/update policy, delete po #### TEST BEGIN #### -#Local vars in test script -########################## -# Path to callback receiver -CR_PATH="http://$CR_APP_NAME:$CR_EXTERNAL_PORT/callbacks" +generate_uuid + +use_simulator_http +use_mr_http +use_agent_rest_http + clean_containers @@ -36,9 +44,11 @@ start_ric_simulators ricsim_g1 3 OSC_2.1.0 start_ric_simulators ricsim_g2 5 STD_1.1.3 -start_mr +if [ "$PMS_VERSION" == "V2" ]; then + start_ric_simulators ricsim_g3 1 STD_2.0.0 +fi -start_cr +start_mr start_consul_cbs @@ -59,55 +69,84 @@ sim_print ricsim_g1_1 interface sim_print ricsim_g2_1 interface -sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json +if [ "$PMS_VERSION" == "V2" ]; then + sim_print ricsim_g3_1 interface +fi -api_equal json:policy_types 2 60 +sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json +if [ "$PMS_VERSION" == "V2" ]; then + sim_put_policy_type 201 ricsim_g3_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json + api_equal json:policy-types 3 60 +else + api_equal json:policy_types 2 60 +fi # Create policies + +if [ "$PMS_VERSION" == "V2" ]; then + notificationurl=$CR_PATH"/test" +else + notificationurl="" +fi + use_agent_rest_http -api_put_service 201 "rapp1" 3600 "$CR_PATH/1" +api_put_service 201 "service1" 3600 "$CR_PATH/1" -api_put_policy 201 "rapp1" ricsim_g1_1 1 2000 testdata/OSC/pi1_template.json 1 +api_put_policy 201 "service1" ricsim_g1_1 1 2000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1 sim_equal ricsim_g1_1 num_instances 1 -use_agent_dmaap +use_agent_dmaap_http -api_put_policy 201 "rapp1" ricsim_g1_1 1 3000 testdata/OSC/pi1_template.json 1 +api_put_policy 201 "service1" ricsim_g1_1 1 3000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1 sim_equal ricsim_g1_1 num_instances 2 use_agent_rest_http -api_put_policy 201 "rapp1" ricsim_g2_1 NOTYPE 2100 testdata/STD/pi1_template.json 1 +api_put_policy 201 "service1" ricsim_g2_1 NOTYPE 2100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1 sim_equal ricsim_g2_1 num_instances 1 -use_agent_dmaap +use_agent_dmaap_http -api_put_policy 201 "rapp1" ricsim_g2_1 NOTYPE 3100 testdata/STD/pi1_template.json 1 +api_put_policy 201 "service1" ricsim_g2_1 NOTYPE 3100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1 sim_equal ricsim_g2_1 num_instances 2 +if [ "$PMS_VERSION" == "V2" ]; then + use_agent_rest_http + + api_put_policy 201 "service1" ricsim_g3_1 STD_QOS_0_2_0 2200 true $notificationurl testdata/STD2/pi_qos_template.json 1 + + sim_equal ricsim_g3_1 num_instances 1 + + use_agent_dmaap_http + + api_put_policy 201 "service1" ricsim_g3_1 STD_QOS_0_2_0 3200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos_template.json 1 + + sim_equal ricsim_g3_1 num_instances 2 + +fi #Update policies use_agent_rest_http -api_put_service 200 "rapp1" 3600 "$CR_PATH/callbacks/1" +api_put_service 200 "service1" 3600 "$CR_PATH/1" -api_put_policy 200 "rapp1" ricsim_g1_1 1 2000 testdata/OSC/pi1_template.json 1 +api_put_policy 200 "service1" ricsim_g1_1 1 2000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1 sim_equal ricsim_g1_1 num_instances 2 -use_agent_dmaap +use_agent_dmaap_http -api_put_policy 200 "rapp1" ricsim_g1_1 1 3000 testdata/OSC/pi1_template.json 1 +api_put_policy 200 "service1" ricsim_g1_1 1 3000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1 sim_equal ricsim_g1_1 num_instances 2 @@ -115,37 +154,86 @@ sim_equal ricsim_g1_1 num_instances 2 use_agent_rest_http -api_put_policy 200 "rapp1" ricsim_g2_1 NOTYPE 2100 testdata/STD/pi1_template.json 1 +api_put_policy 200 "service1" ricsim_g2_1 NOTYPE 2100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1 sim_equal ricsim_g2_1 num_instances 2 -use_agent_dmaap +use_agent_dmaap_http -api_put_policy 200 "rapp1" ricsim_g2_1 NOTYPE 3100 testdata/STD/pi1_template.json 1 +api_put_policy 200 "service1" ricsim_g2_1 NOTYPE 3100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1 sim_equal ricsim_g2_1 num_instances 2 +if [ "$PMS_VERSION" == "V2" ]; then + use_agent_rest_http + + api_put_policy 200 "service1" ricsim_g3_1 STD_QOS_0_2_0 2200 true $notificationurl testdata/STD2/pi_qos_template.json 1 + + sim_equal ricsim_g3_1 num_instances 2 + + + use_agent_dmaap_http + + api_put_policy 200 "service1" ricsim_g3_1 STD_QOS_0_2_0 3200 true $notificationurl testdata/STD2/pi_qos_template.json 1 + + sim_equal ricsim_g3_1 num_instances 2 +fi + # Check policies -api_get_policy 200 2000 testdata/OSC/pi1_template.json -api_get_policy 200 3000 testdata/OSC/pi1_template.json -api_get_policy 200 2100 testdata/STD/pi1_template.json -api_get_policy 200 3100 testdata/STD/pi1_template.json +if [ "$PMS_VERSION" == "V2" ]; then + api_get_policy 200 2000 testdata/OSC/pi1_template.json "service1" ricsim_g1_1 1 false $notificationurl + api_get_policy 200 3000 testdata/OSC/pi1_template.json "service1" ricsim_g1_1 1 false $notificationurl + api_get_policy 200 2100 testdata/STD/pi1_template.json "service1" ricsim_g2_1 NOTYPE false $notificationurl + api_get_policy 200 3100 testdata/STD/pi1_template.json "service1" ricsim_g2_1 NOTYPE false $notificationurl + api_get_policy 200 2200 testdata/STD2/pi_qos_template.json "service1" ricsim_g3_1 STD_QOS_0_2_0 true $notificationurl + api_get_policy 200 3200 testdata/STD2/pi_qos_template.json "service1" ricsim_g3_1 STD_QOS_0_2_0 true $notificationurl +else + api_get_policy 200 2000 testdata/OSC/pi1_template.json + api_get_policy 200 3000 testdata/OSC/pi1_template.json + api_get_policy 200 2100 testdata/STD/pi1_template.json + api_get_policy 200 3100 testdata/STD/pi1_template.json +fi + +sim_equal ricsim_g1_1 num_instances 2 +sim_equal ricsim_g2_1 num_instances 2 + +if [ "$PMS_VERSION" == "V2" ]; then + sim_equal ricsim_g3_1 num_instances 2 +fi # Remove policies -use_agent_dmaap +use_agent_dmaap_http api_delete_policy 204 2000 use_agent_rest_http api_delete_policy 204 3000 -use_agent_dmaap +use_agent_dmaap_http api_delete_policy 204 2100 use_agent_rest_http api_delete_policy 204 3100 +if [ "$PMS_VERSION" == "V2" ]; then + use_agent_dmaap_http + api_delete_policy 204 2200 + use_agent_rest_http + api_delete_policy 204 3200 +fi sim_equal ricsim_g1_1 num_instances 0 sim_equal ricsim_g2_1 num_instances 0 +if [ "$PMS_VERSION" == "V2" ]; then + sim_equal ricsim_g3_1 num_instances 0 +fi + +# Check remote host access to simulator + +sim_contains_str ricsim_g1_1 remote_hosts "policy-agent" +sim_contains_str ricsim_g2_1 remote_hosts "policy-agent" +if [ "$PMS_VERSION" == "V2" ]; then + sim_contains_str ricsim_g3_1 remote_hosts "policy-agent" +fi + # Check policy removal use_agent_rest_http api_get_policy 404 2000 @@ -153,13 +241,16 @@ api_get_policy 404 3000 api_get_policy 404 2100 api_get_policy 404 3100 -# Remove the service -use_agent_dmaap -api_delete_services 204 "rapp1" - -api_get_services 404 "rapp1" +if [ "$PMS_VERSION" == "V2" ]; then + api_get_policy 404 2200 + api_get_policy 404 3200 +fi +# Remove the service +use_agent_dmaap_http +api_delete_services 204 "service1" +api_get_services 404 "service1" check_policy_agent_logs @@ -167,4 +258,6 @@ check_policy_agent_logs store_logs END -print_result \ No newline at end of file +print_result + +auto_clean_containers \ No newline at end of file