X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC350.sh;h=25bdc4ce8662e88a460fa9c763dfea04735e8af7;hb=663566c28930429775ea9921f0e32ddf5253da28;hp=9d47caaa65564ef88e75b47c3fe179b00d0e41f0;hpb=edea18a8fda2e2201cb3ede7f7af13f610bf4acc;p=nonrtric.git diff --git a/test/auto-test/FTC350.sh b/test/auto-test/FTC350.sh index 9d47caaa..25bdc4ce 100755 --- a/test/auto-test/FTC350.sh +++ b/test/auto-test/FTC350.sh @@ -20,7 +20,7 @@ TC_ONELINE_DESCR="Change supported policy types and reconfigure rics" #App names to include in the test when running docker, space separated list -DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC NGW" +DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC NGW KUBEPROXY" #App names to include in the test when running kubernetes, space separated list KUBE_INCLUDED_IMAGES="CP CR MR PA RICSIM SDNC KUBEPROXY NGW" @@ -28,7 +28,7 @@ KUBE_INCLUDED_IMAGES="CP CR MR PA RICSIM SDNC KUBEPROXY NGW" KUBE_PRESTARTED_IMAGES="" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ORAN-CHERRY ORAN-DAWN" +SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ONAP-ISTANBUL ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" @@ -41,6 +41,7 @@ SUPPORTED_RUNMODES="DOCKER KUBE" . ../common/control_panel_api_functions.sh . ../common/controller_api_functions.sh . ../common/kube_proxy_api_functions.sh +. ../common/gateway_api_functions.sh setup_testenvironment @@ -68,9 +69,7 @@ for interface in $TESTED_VARIANTS ; do # Clean container and start all needed containers # clean_environment - if [ $RUNMODE == "KUBE" ]; then - start_kube_proxy - fi + start_kube_proxy #Start simulators and prepare two configs @@ -109,7 +108,7 @@ for interface in $TESTED_VARIANTS ; do # Create service to be able to receive events when rics becomes available # Must use rest towards the agent since dmaap is not configured yet - api_put_service 201 "ric-registration" 0 "$CR_SERVICE_PATH/ric-registration" + api_put_service 201 "ric-registration" 0 "$CR_SERVICE_APP_PATH/ric-registration" #Load first config if [ $RUNMODE == "KUBE" ]; then @@ -228,6 +227,8 @@ for interface in $TESTED_VARIANTS ; do if [ "$PMS_VERSION" == "V2" ]; then + api_equal json:policy-types 5 120 + echo "Check the number of types in the agent for each ric" api_equal json:policy-types?ric_id=ricsim_g1_1 1 120 api_equal json:policy-types?ric_id=ricsim_g1_2 2 120 @@ -241,6 +242,8 @@ for interface in $TESTED_VARIANTS ; do api_equal json:policy-types?ric_id=ricsim_g1_10 0 120 else + api_equal json:policy_types 5 120 + echo "Check the number of types in the agent for each ric" api_equal json:policy_types?ric=ricsim_g1_1 1 120 api_equal json:policy_types?ric=ricsim_g1_2 2 120 @@ -278,10 +281,10 @@ for interface in $TESTED_VARIANTS ; do api_equal json:policy_types 5 fi - api_put_service 201 "serv1" 3600 "$CR_SERVICE_PATH/serv1" + api_put_service 201 "serv1" 3600 "$CR_SERVICE_APP_PATH/serv1" if [ "$PMS_VERSION" == "V2" ]; then - notificationurl=$CR_SERVICE_PATH"/test" + notificationurl=$CR_SERVICE_APP_PATH"/test" else notificationurl="" fi @@ -303,6 +306,9 @@ for interface in $TESTED_VARIANTS ; do fi if [ "$PMS_VERSION" == "V2" ]; then + + api_equal json:policy-types 5 120 + echo "Check the number of types in the agent for each ric" api_equal json:policy-types?ric_id=ricsim_g1_1 1 120 api_equal json:policy-types?ric_id=ricsim_g1_2 2 120 @@ -313,6 +319,9 @@ for interface in $TESTED_VARIANTS ; do api_equal json:policy-types?ric_id=ricsim_g1_7 3 120 api_equal json:policy-types?ric_id=ricsim_g1_8 2 120 else + + api_equal json:policy_types 5 120 + echo "Check the number of types in the agent for each ric" api_equal json:policy_types?ric=ricsim_g1_1 1 120 api_equal json:policy_types?ric=ricsim_g1_2 2 120 @@ -353,6 +362,9 @@ for interface in $TESTED_VARIANTS ; do api_equal json:rics 10 120 if [ "$PMS_VERSION" == "V2" ]; then + + api_equal json:policy-types 5 120 + echo "Check the number of types in the agent for each ric" api_equal json:policy-types?ric_id=ricsim_g1_1 1 120 api_equal json:policy-types?ric_id=ricsim_g1_2 2 120 @@ -365,6 +377,9 @@ for interface in $TESTED_VARIANTS ; do api_equal json:policy-types?ric_id=ricsim_g1_9 1 120 api_equal json:policy-types?ric_id=ricsim_g1_10 0 120 else + + api_equal json:policy_types 5 120 + echo "Check the number of types in the agent for each ric" api_equal json:policy_types?ric=ricsim_g1_1 1 120 api_equal json:policy_types?ric=ricsim_g1_2 2 120 @@ -408,6 +423,9 @@ for interface in $TESTED_VARIANTS ; do sleep_wait 120 if [ "$PMS_VERSION" == "V2" ]; then + + api_equal json:policy-types 5 120 + api_equal json:policy-types?ric_id=ricsim_g1_1 1 120 api_equal json:policy-types?ric_id=ricsim_g1_2 2 120 api_equal json:policy-types?ric_id=ricsim_g1_3 3 120 @@ -419,6 +437,9 @@ for interface in $TESTED_VARIANTS ; do api_equal json:policy-types?ric_id=ricsim_g1_9 1 120 api_equal json:policy-types?ric_id=ricsim_g1_10 0 120 else + + api_equal json:policy_types 5 120 + api_equal json:policy_types?ric=ricsim_g1_1 1 120 api_equal json:policy_types?ric=ricsim_g1_2 2 120 api_equal json:policy_types?ric=ricsim_g1_3 3 120 @@ -445,8 +466,10 @@ for interface in $TESTED_VARIANTS ; do sim_delete_policy_type 204 ricsim_g1_8 4 if [ "$PMS_VERSION" == "V2" ]; then + api_equal json:policy-types 5 120 api_equal json:policy-types?ric_id=ricsim_g1_8 1 120 else + api_equal json:policy_types 5 120 api_equal json:policy_types?ric=ricsim_g1_8 1 120 fi