X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FONAP_UC.sh;h=6c699d12ec42da4c04274e785ded153efb61e4b6;hb=d14ce4bf82cf83574bac13b11242b48c58e82874;hp=7d7c9353991a86fc50f3a7290fdbbd77d314181f;hpb=d49bea61eb78af0058136cb8e16af0acd467f1f3;p=nonrtric.git

diff --git a/test/auto-test/ONAP_UC.sh b/test/auto-test/ONAP_UC.sh
index 7d7c9353..6c699d12 100755
--- a/test/auto-test/ONAP_UC.sh
+++ b/test/auto-test/ONAP_UC.sh
@@ -1,7 +1,8 @@
 #!/usr/bin/env 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.
@@ -24,7 +25,7 @@ DOCKER_INCLUDED_IMAGES="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 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 "
+SUPPORTED_PROFILES="ONAP-KOHN ONAP-LONDON ONAP-MONTREAL"
 #Supported run modes
 SUPPORTED_RUNMODES="DOCKER KUBE"
 
@@ -48,16 +49,32 @@ setup_testenvironment
 
 use_cr_https
 use_a1pms_rest_https
-use_sdnc_https
+if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then
+    deviation "SDNC does not support NB https"
+    use_sdnc_http
+else
+    use_sdnc_https
+fi
 use_simulator_https
-use_mr_https
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+    :
+else
+    use_mr_https
+fi
 __httpx="HTTPS"
 notificationurl=$CR_SERVICE_APP_PATH_0"/test"
 
-generate_policy_uuid
+sim_generate_policy_uuid
 
 # Tested variants of REST/DMAAP/SDNC config
-TESTED_VARIANTS="REST   DMAAP   REST+SDNC   DMAAP+SDNC"
+
+
+if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+    TESTED_VARIANTS="REST   REST+SDNC"
+else
+    TESTED_VARIANTS="REST   DMAAP   REST+SDNC   DMAAP+SDNC"
+fi
+
 for interface in $TESTED_VARIANTS ; do
 
     echo "#####################################################################"
@@ -85,8 +102,12 @@ for interface in $TESTED_VARIANTS ; do
 
     start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0
 
-    start_mr    "$MR_READ_TOPIC"  "/events" "users/policy-agent" \
-                "$MR_WRITE_TOPIC" "/events" "users/mr-stub"
+    if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+        :
+    else
+        start_mr    "$MR_READ_TOPIC"  "/events" "users/policy-agent" \
+                    "$MR_WRITE_TOPIC" "/events" "users/mr-stub"
+    fi
 
     start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
 
@@ -98,6 +119,7 @@ for interface in $TESTED_VARIANTS ; 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"
@@ -110,7 +132,7 @@ for interface in $TESTED_VARIANTS ; do
     if [ $RUNMODE == "KUBE" ]; then
         a1pms_load_config                       ".a1pms_config.json"
     else
-        #Temporary switch to http/https if dmaap use. Otherwise it is not possibble to push config
+        #Temporary switch to http/https if dmaap use. Otherwise it is not possible to push config
         if [ $__httpx == "HTTPS" ]; then
             use_a1pms_rest_https
         else
@@ -160,7 +182,7 @@ for interface in $TESTED_VARIANTS ; do
     ## REQ: Synchronize A1 Policy Information in RAN
     #################################################################
 
-    # Load the polictypes in osc
+    # Load the policytypes in osc
     for ((i=1; i<=$OSC_NUM_RICS; i++))
     do
         sim_put_policy_type 201 $RIC_SIM_PREFIX"_g1_"$i 100 demo-testdata/OSC/sim_qos.json
@@ -183,7 +205,7 @@ for interface in $TESTED_VARIANTS ; do
     done
 
 
-    # Load the polictypes in std
+    # Load the policytypes in std
     for ((i=1; i<=$STD_NUM_RICS; i++))
     do
         sim_put_policy_type 201 $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 demo-testdata/STD2/sim_qos.json