X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC350.sh;h=a9faebc3551565a0dc896d8090139f9eaf84ff37;hb=6d39590f99e9ccc23ebf941314caf096841ce211;hp=2b677d086f79007ff05cfe504af514f4303d2c27;hpb=4a0fe5040891a2b1e64ff952e81c828dda6e20a6;p=nonrtric.git

diff --git a/test/auto-test/FTC350.sh b/test/auto-test/FTC350.sh
index 2b677d08..a9faebc3 100755
--- a/test/auto-test/FTC350.sh
+++ b/test/auto-test/FTC350.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #  ============LICENSE_START===============================================
-#  Copyright (C) 2020 Nordix Foundation. All rights reserved.
+#  Copyright (C) 2020-2023 Nordix Foundation. 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 +24,7 @@ DOCKER_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM SDNC KUBEPROXY"
 
 #App names to include in the test when running kubernetes, space separated list
 KUBE_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM SDNC KUBEPROXY"
-#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
@@ -43,7 +43,7 @@ setup_testenvironment
 
 #### TEST BEGIN ####
 
-generate_policy_uuid
+sim_generate_policy_uuid
 
 use_cr_http
 
@@ -73,13 +73,17 @@ for interface in $TESTED_VARIANTS ; do
 
     start_cr 1
 
-    start_mr
-
+    if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+        :
+    else
+        start_mr
+    fi
 
 
     # Create first config
     if [[ $interface = *"SDNC"* ]]; then
         start_sdnc
+        controller_api_wait_for_status_ok 200 ricsim_g1_1
         prepare_a1pms_config      SDNC  ".a1pms_config_initial.json"
     else
         prepare_a1pms_config      NOSDNC  ".a1pms_config_initial.json"
@@ -102,7 +106,7 @@ for interface in $TESTED_VARIANTS ; do
 
     set_a1pms_trace
 
-    sleep_wait 120 "Let A1PMS cofiguration take effect"
+    sleep_wait 120 "Let A1PMS configuration take effect"
 
     a1pms_api_get_status 200