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

diff --git a/test/auto-test/FTC805.sh b/test/auto-test/FTC805.sh
index e652757d..544d65fe 100755
--- a/test/auto-test/FTC805.sh
+++ b/test/auto-test/FTC805.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.
@@ -24,7 +25,7 @@ DOCKER_INCLUDED_IMAGES="CP CR A1PMS RICSIM SDNC NGW KUBEPROXY"
 
 #App names to include in the test when running kubernetes, space separated list
 KUBE_INCLUDED_IMAGES="CP CR 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"
 
@@ -56,7 +57,7 @@ NUM_RICS=5
 NUM_POLICIES_PER_RIC=2000
 
 
-generate_policy_uuid
+sim_generate_policy_uuid
 
 notificationurl=$CR_SERVICE_APP_PATH_0"/test"
 
@@ -73,7 +74,12 @@ for __httpx in $TESTED_PROTOCOLS ; do
             use_cr_https
             use_simulator_https
             if [[ $interface = *"SDNC"* ]]; then
-                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
             fi
             use_a1pms_rest_https
         else
@@ -106,6 +112,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"
@@ -119,7 +126,7 @@ for __httpx in $TESTED_PROTOCOLS ; do
 
         start_cr 1
 
-        sleep_wait 120 "Let A1PMS cofiguration take effect"
+        sleep_wait 120 "Let A1PMS configuration take effect"
 
         a1pms_api_get_status 200
 
@@ -164,6 +171,8 @@ for __httpx in $TESTED_PROTOCOLS ; do
 
         stop_a1pms
 
+        sleep_wait 60
+
         start_stopped_a1pms
 
         set_a1pms_debug
@@ -172,6 +181,8 @@ for __httpx in $TESTED_PROTOCOLS ; do
 
         stop_a1pms
 
+        sleep_wait 60
+
         for ((i=1; i<=$NUM_RICS; i++))
         do
             sim_post_delete_instances 200 ricsim_g1_$i
@@ -214,6 +225,8 @@ for __httpx in $TESTED_PROTOCOLS ; do
 
         stop_a1pms
 
+        sleep_wait 60
+
         start_stopped_a1pms
 
         set_a1pms_debug