Code Review / nonrtric.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Merge "Add code formatting to rAPP Catalogue"
[nonrtric.git] / test / auto-test / FTC1.sh
diff --git a/test/auto-test/FTC1.sh b/test/auto-test/FTC1.sh
index 4d05b9b..9c0254f 100755 (executable)
--- a/test/auto-test/FTC1.sh
+++ b/test/auto-test/FTC1.sh
@@ -23,9 +23,13 @@ TC_ONELINE_DESCR="Sanity test, create service and then create,update and delete
 #App names to include in the test, space separated list
 INCLUDED_IMAGES="CBS CONSUL CP CR MR PA RICSIM SDNC"
 
+#SUPPORTED TEST ENV FILE
+SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU  ORAN-CHERRY ORAN-DAWN"
+
 . ../common/testcase_common.sh  $@
 . ../common/agent_api_functions.sh
 . ../common/ricsimulator_api_functions.sh
+. ../common/cr_api_functions.sh
 
 #### TEST BEGIN ####
 
@@ -45,9 +49,24 @@ for __httpx in $TESTED_PROTOCOLS ; do
         echo "#####################################################################"
         echo "#####################################################################"
 
+        # Clean container and start all needed containers #
+        clean_containers
+
+        if [ $__httpx == "HTTPS" ]; then
+            use_agent_rest_https
+        else
+            use_agent_rest_http
+        fi
+
+        start_policy_agent
+
+        set_agent_trace
+
+        # 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_PATH/ric-registration"
 
         if [ $__httpx == "HTTPS" ]; then
-            CR_PATH="https://$CR_APP_NAME:$CR_EXTERNAL_SECURE_PORT/callbacks"
             use_cr_https
             use_simulator_https
             use_mr_https
@@ -60,7 +79,6 @@ for __httpx in $TESTED_PROTOCOLS ; do
                 use_agent_rest_https
             fi
         else
-            CR_PATH="http://$CR_APP_NAME:$CR_EXTERNAL_PORT/callbacks"
             use_cr_http
             use_simulator_http
             use_mr_http
@@ -74,9 +92,6 @@ for __httpx in $TESTED_PROTOCOLS ; do
             fi
         fi
 
-        # Clean container and start all needed containers #
-        clean_containers
-
         start_ric_simulators ricsim_g1 1  OSC_2.1.0
         start_ric_simulators ricsim_g2 1  STD_1.1.3
         if [ "$PMS_VERSION" == "V2" ]; then
@@ -87,6 +102,8 @@ for __httpx in $TESTED_PROTOCOLS ; do
 
         start_cr
 
+        start_control_panel
+
         start_consul_cbs
 
         if [[ $interface = *"SDNC"* ]]; then
@@ -98,28 +115,26 @@ for __httpx in $TESTED_PROTOCOLS ; do
 
         consul_config_app                      ".consul_config.json"
 
-        start_control_panel
-
-        start_policy_agent
-
-        set_agent_debug
-        set_agent_trace
-
-        cr_equal received_callbacks 0
         mr_equal requests_submitted 0
 
         sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json
 
         if [ "$PMS_VERSION" == "V2" ]; then
-            api_equal json:rics 3 60
 
-            #api_equal json:policy_schemas 2 120
+            sim_put_policy_type 201 ricsim_g3_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json
 
-            api_equal json:policy-types 2 120
+            api_equal json:rics 3 60
+
+            api_equal json:policy-types 3 120
 
             api_equal json:policies 0
 
-            api_equal json:policy_instances 0
+            api_equal json:policy-instances 0
+
+            cr_equal received_callbacks 3 120
+
+            cr_api_check_all_sync_events 200 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1
+
         else
             api_equal json:rics 2 60
 
@@ -144,7 +159,7 @@ for __httpx in $TESTED_PROTOCOLS ; do
 
         api_put_service 201 "serv1" 1000 "$CR_PATH/1"
 
-        api_get_service_ids 200 "serv1"
+        api_get_service_ids 200 "serv1" "ric-registration"
 
         api_put_services_keepalive 200 "serv1"
 
@@ -153,7 +168,7 @@ for __httpx in $TESTED_PROTOCOLS ; do
         echo "############################################"
 
         if [ "$PMS_VERSION" == "V2" ]; then
-            api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:AVAILABLE  ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:NOTYPE:AVAILABLE"
+            api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:AVAILABLE  ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0:AVAILABLE"
         else
             api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:AVAILABLE  ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE"
         fi
@@ -163,34 +178,55 @@ for __httpx in $TESTED_PROTOCOLS ; do
         echo "############################################"
 
         if [ "$PMS_VERSION" == "V2" ]; then
-            notificationurl="http://localhost:80"
+            notificationurl=$CR_PATH"/test"
         else
             notificationurl=""
         fi
         api_put_policy 201 "serv1" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
         api_put_policy 200 "serv1" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
+        if [ "$PMS_VERSION" == "V2" ]; then
+            api_put_policy 201 "serv1" ricsim_g3_1 STD_QOS_0_2_0 5200 true $notificationurl testdata/STD2/pi_qos_template.json
+            api_put_policy 200 "serv1" ricsim_g3_1 STD_QOS_0_2_0 5200 true $notificationurl testdata/STD2/pi_qos_template.json
+        fi
 
         api_put_policy 201 "serv1" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json
         api_put_policy 200 "serv1" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json
 
+        if [ "$PMS_VERSION" == "V2" ]; then
+            api_equal json:policies 3
+        else
+            api_equal json:policies 2
+        fi
+
         api_delete_policy 204 5000
 
         api_delete_policy 204 5100
 
+        if [ "$PMS_VERSION" == "V2" ]; then
+            api_delete_policy 204 5200
+        fi
+
         if [ "$PMS_VERSION" == "V2" ]; then
             api_equal json:policies 0
 
-            api_equal json:policy_instances 0
+            api_equal json:policy-instances 0
         else
             api_equal json:policies 0
 
             api_equal json:policy_ids 0
         fi
 
-        cr_equal received_callbacks 0
+        if [ "$PMS_VERSION" == "V2" ]; then
+            cr_equal received_callbacks 3
+        fi
 
         if [[ $interface = *"DMAAP"* ]]; then
-            VAL=11 # Number of Agent API calls over DMAAP
+
+            if [ "$PMS_VERSION" == "V2" ]; then
+                VAL=14 # Number of Agent API calls over DMAAP
+            else
+                VAL=11 # Number of Agent API calls over DMAAP
+            fi
             mr_equal requests_fetched $VAL
             mr_equal responses_submitted $VAL
             mr_equal responses_fetched $VAL
@@ -217,6 +253,10 @@ for __httpx in $TESTED_PROTOCOLS ; do
         check_policy_agent_logs
         check_control_panel_logs
 
+        if [[ $interface = *"SDNC"* ]]; then
+            check_sdnc_logs
+        fi
+
         store_logs          "${__httpx}__${interface}"
 
     done
Parent repository for the O-RAN SC Non Real-Time RIC (NONRTRIC) project.