X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC2002.sh;h=547492cadd878f53265f794e31b14df433c2bb4e;hb=refs%2Fchanges%2F88%2F12388%2F5;hp=3774b695eaa2168b35e95b842cd24a9bf54b2315;hpb=4a0fe5040891a2b1e64ff952e81c828dda6e20a6;p=nonrtric.git

diff --git a/test/auto-test/FTC2002.sh b/test/auto-test/FTC2002.sh
index 3774b695..547492ca 100755
--- a/test/auto-test/FTC2002.sh
+++ b/test/auto-test/FTC2002.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.
@@ -23,7 +24,7 @@ TC_ONELINE_DESCR="Testing southbound proxy for SDNC - docker only"
 DOCKER_INCLUDED_IMAGES="RICSIM SDNC HTTPPROXY KUBEPROXY"
 #App names to include in the test when running kubernetes, space separated list
 KUBE_INCLUDED_IMAGES=""
-#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
@@ -32,7 +33,7 @@ KUBE_PRESTARTED_IMAGES=" "
 CONDITIONALLY_IGNORED_IMAGES=""
 
 #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"
 
@@ -42,7 +43,7 @@ setup_testenvironment
 
 #### TEST BEGIN ####
 
-generate_policy_uuid
+sim_generate_policy_uuid
 
 #Test a1pms and simulator protocol versions (others are http only)
 NB_TESTED_PROTOCOLS="HTTP HTTPS"
@@ -75,10 +76,16 @@ for __nb_httpx in $NB_TESTED_PROTOCOLS ; do
         start_ric_simulators ricsim_g3 1  STD_2.0.0
 
         start_sdnc
+        controller_api_wait_for_status_ok 200 ricsim_g1_1
 
         if [ $__nb_httpx == "HTTPS" ]; then
             # "Using secure ports towards SDNC"
-            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
         else
             #"Using non-secure ports towards SDNC"
             use_sdnc_http