X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC800.sh;h=a6914b4b0fd38d1b9a56b2326e88c75cf618fbed;hb=HEAD;hp=1ecd5ffba6f1ef2bc31bf7cf49df35fc6ebe6152;hpb=2b362b57251e5d685f4262ba532022295ddb8d0e;p=nonrtric.git

diff --git a/test/auto-test/FTC800.sh b/test/auto-test/FTC800.sh
index 1ecd5ffb..a6914b4b 100755
--- a/test/auto-test/FTC800.sh
+++ b/test/auto-test/FTC800.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 #  ============LICENSE_START===============================================
-#  Copyright (C) 2020 Nordix Foundation. All rights reserved.
+#  Copyright (C) 2020-2023 Nordix Foundation. All rights reserved.
+#  Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved.
 #  ========================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -17,14 +18,14 @@
 #  ============LICENSE_END=================================================
 #
 
-TC_ONELINE_DESCR="Create 10000 policies in sequence using http/https and a1pms REST/DMAAP with/without SDNC controller"
+TC_ONELINE_DESCR="Create 10000 policies in sequence using http/https and a1pms REST with/without SDNC controller"
 
 #App names to include in the test when running docker, space separated list
 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"
-#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list
+#Pre-started 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
@@ -33,7 +34,7 @@ KUBE_PRESTARTED_IMAGES=""
 CONDITIONALLY_IGNORED_IMAGES="NGW"
 
 #Supported test environment profiles
-SUPPORTED_PROFILES="ONAP-JAKARTA ONAP-KOHN ONAP-LONDON  ORAN-F-RELEASE ORAN-G-RELEASE ORAN-H-RELEASE"
+SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL  ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE"
 #Supported run modes
 SUPPORTED_RUNMODES="DOCKER KUBE"
 
@@ -43,14 +44,14 @@ setup_testenvironment
 
 #### TEST BEGIN ####
 
-generate_policy_uuid
+sim_generate_policy_uuid
 
 #Local vars in test script
 ##########################
 # Number of policies in each sequence
 NUM_POLICIES=10000
 
-# Tested variants of REST/DMAAP/SDNC config
+# Tested variants of SDNC config
 TESTED_VARIANTS="NOSDNC   SDNC"
 
 #Test a1pms and simulator protocol versions (others are http only)
@@ -88,7 +89,11 @@ for __httpx in $TESTED_PROTOCOLS ; do
         start_ric_simulators ricsim_g2 1 STD_1.1.3
         start_ric_simulators ricsim_g3 1  STD_2.0.0
 
-        start_mr
+        if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+            :
+        else
+            start_mr
+        fi
 
         start_cr 1
 
@@ -102,7 +107,11 @@ for __httpx in $TESTED_PROTOCOLS ; do
 
         set_a1pms_debug
 
-        mr_equal requests_submitted 0
+        if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+            :
+        else
+            mr_equal requests_submitted 0
+        fi
 
         sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json
         sim_put_policy_type 201 ricsim_g3_1 STD_QOS2_0.1.0 testdata/STD2/sim_qos2.json
@@ -110,6 +119,7 @@ for __httpx in $TESTED_PROTOCOLS ; do
 
         if [[ $interface == "SDNC" ]]; then
             start_sdnc
+            controller_api_wait_for_status_ok 200 ricsim_g1_1
             prepare_a1pms_config      SDNC    ".a1pms_config.json"
         else
             prepare_a1pms_config      NOSDNC  ".a1pms_config.json"
@@ -121,7 +131,7 @@ for __httpx in $TESTED_PROTOCOLS ; do
             a1pms_api_put_configuration 200 ".a1pms_config.json"
         fi
 
-        sleep_wait 120 "Let A1PMS cofiguration take effect"
+        sleep_wait 120 "Let A1PMS configuration take effect"
 
         a1pms_api_get_status 200
 
@@ -160,65 +170,77 @@ for __httpx in $TESTED_PROTOCOLS ; do
         sim_equal ricsim_g3_1 num_instances $NUM_POLICIES
 
 
-        if [ $__httpx == "HTTPS" ]; then
-            echo "Using secure ports towards dmaap"
-            use_a1pms_dmaap_https
+        INTERFACE_VARIANT=
+        if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+            INTERFACE_VARIANT=REST
+            if [ $__httpx == "HTTPS" ]; then
+                use_a1pms_rest_https
+            else
+                use_a1pms_rest_http
+            fi
         else
-            echo "Using non-secure ports towards dmaap"
-            use_a1pms_dmaap_http
+            INTERFACE_VARIANT=DMAAP
+            if [ $__httpx == "HTTPS" ]; then
+                echo "Using secure ports towards dmaap"
+                use_a1pms_dmaap_https
+            else
+                echo "Using non-secure ports towards dmaap"
+                use_a1pms_dmaap_http
+            fi
         fi
 
         START_ID=$(($START_ID+$NUM_POLICIES))
 
-        start_timer "Create polices in OSC via a1pms DMAAP, one by one, and $interface using "$__httpx
+        start_timer "Create polices in OSC via a1pms $INTERFACE_VARIANT, one by one, and $interface using "$__httpx
         a1pms_api_put_policy 201 "serv1" ricsim_g1_1 1 $START_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_POLICIES
-        print_timer "Create polices in OSC via a1pms DMAAP, one by one, and $interface using "$__httpx
+        print_timer "Create polices in OSC via a1pms $INTERFACE_VARIANT, one by one, and $interface using "$__httpx
 
         sim_equal ricsim_g1_1 num_instances $((2*$NUM_POLICIES))
 
         START_ID=$(($START_ID+$NUM_POLICIES))
 
-        start_timer "Create polices in STD via a1pms DMAAP, one by one, and $interface using "$__httpx
+        start_timer "Create polices in STD via a1pms $INTERFACE_VARIANT, one by one, and $interface using "$__httpx
         a1pms_api_put_policy 201 "serv1" ricsim_g2_1 NOTYPE $START_ID NOTRANSIENT $notificationurl testdata/STD/pi1_template.json $NUM_POLICIES
-        print_timer "Create polices in STD via a1pms DMAAP, one by one, and $interface using "$__httpx
+        print_timer "Create polices in STD via a1pms $INTERFACE_VARIANT, one by one, and $interface using "$__httpx
 
         sim_equal ricsim_g2_1 num_instances $((2*$NUM_POLICIES))
 
 
         START_ID=$(($START_ID+$NUM_POLICIES))
 
-        start_timer "Create polices in STD 2 via a1pms DMAAP, one by one, and $interface using "$__httpx
+        start_timer "Create polices in STD 2 via a1pms $INTERFACE_VARIANT, one by one, and $interface using "$__httpx
         a1pms_api_put_policy 201 "serv1" ricsim_g3_1 STD_QOS2_0.1.0 $START_ID NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json $NUM_POLICIES
-        print_timer "Create polices in STD via a1pms DMAAP, one by one, and $interface using "$__httpx
+        print_timer "Create polices in STD via a1pms $INTERFACE_VARIANT, one by one, and $interface using "$__httpx
 
         sim_equal ricsim_g3_1 num_instances $((2*$NUM_POLICIES))
 
+        if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+            :
+        else
+            START_ID=$(($START_ID+$NUM_POLICIES))
+            start_timer "Create polices in OSC via a1pms $INTERFACE_VARIANT in batch and $interface using "$__httpx
+            a1pms_api_put_policy_batch 201 "serv1" ricsim_g1_1 1 $START_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_POLICIES
+            print_timer "Create polices in OSC via a1pms $INTERFACE_VARIANT in batch and $interface using "$__httpx
 
-        START_ID=$(($START_ID+$NUM_POLICIES))
-
-        start_timer "Create polices in OSC via a1pms DMAAP in batch and $interface using "$__httpx
-        a1pms_api_put_policy_batch 201 "serv1" ricsim_g1_1 1 $START_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_POLICIES
-        print_timer "Create polices in OSC via a1pms DMAAP in batch and $interface using "$__httpx
-
-        sim_equal ricsim_g1_1 num_instances $((3*$NUM_POLICIES))
-
-        START_ID=$(($START_ID+$NUM_POLICIES))
+            sim_equal ricsim_g1_1 num_instances $((3*$NUM_POLICIES))
 
-        start_timer "Create polices in STD via a1pms DMAAP in batch and $interface using "$__httpx
-        a1pms_api_put_policy_batch 201 "serv1" ricsim_g2_1 NOTYPE $START_ID NOTRANSIENT $notificationurl testdata/STD/pi1_template.json $NUM_POLICIES
-        print_timer "Create polices in STD via a1pms DMAAP in batch and $interface using "$__httpx
+            START_ID=$(($START_ID+$NUM_POLICIES))
 
-        sim_equal ricsim_g2_1 num_instances $((3*$NUM_POLICIES))
+            start_timer "Create polices in STD via a1pms $INTERFACE_VARIANT in batch and $interface using "$__httpx
+            a1pms_api_put_policy_batch 201 "serv1" ricsim_g2_1 NOTYPE $START_ID NOTRANSIENT $notificationurl testdata/STD/pi1_template.json $NUM_POLICIES
+            print_timer "Create polices in STD via a1pms $INTERFACE_VARIANT in batch and $interface using "$__httpx
 
+            sim_equal ricsim_g2_1 num_instances $((3*$NUM_POLICIES))
 
-        START_ID=$(($START_ID+$NUM_POLICIES))
 
-        start_timer "Create polices in STD via a1pms DMAAP in batch and $interface using "$__httpx
-        a1pms_api_put_policy_batch 201 "serv1" ricsim_g3_1 STD_QOS2_0.1.0 $START_ID NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json $NUM_POLICIES
-        print_timer "Create polices in STD via a1pms DMAAP in batch and $interface using "$__httpx
+            START_ID=$(($START_ID+$NUM_POLICIES))
 
-        sim_equal ricsim_g3_1 num_instances $((3*$NUM_POLICIES))
+            start_timer "Create polices in STD via a1pms $INTERFACE_VARIANT in batch and $interface using "$__httpx
+            a1pms_api_put_policy_batch 201 "serv1" ricsim_g3_1 STD_QOS2_0.1.0 $START_ID NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json $NUM_POLICIES
+            print_timer "Create polices in STD via a1pms $INTERFACE_VARIANT in batch and $interface using "$__httpx
 
+            sim_equal ricsim_g3_1 num_instances $((3*$NUM_POLICIES))
+        fi
 
         if [ $interface == "SDNC" ]; then
             sim_contains_str ricsim_g1_1 remote_hosts $SDNC_APP_NAME