X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FONAP_UC.sh;h=3dc724d920fe39584e1b1335aa5d89b5e8858cb0;hb=f6dce2750fa0df4db8207b033250f28a75f7b76a;hp=c41c7250ec01fa28085f0573cfbd7999e967c00f;hpb=7d7cb5f4f6306db8193ebd4e6e110fa0060900fa;p=nonrtric.git

diff --git a/test/auto-test/ONAP_UC.sh b/test/auto-test/ONAP_UC.sh
index c41c7250..3dc724d9 100755
--- a/test/auto-test/ONAP_UC.sh
+++ b/test/auto-test/ONAP_UC.sh
@@ -2,6 +2,7 @@
 
 #  ============LICENSE_START===============================================
 #  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"
 
@@ -131,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
@@ -181,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
@@ -204,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
@@ -282,11 +283,17 @@ for interface in $TESTED_VARIANTS ; do
     done
 
     # Check status OSC
-    VAL='NOT IN EFFECT'
+    if [[ $TEST_ENV_PROFILE =~ ^ORAN-[A-H] ]] || [[ $TEST_ENV_PROFILE =~ ^ONAP-[A-L] ]]; then
+      VAL='NOT IN EFFECT'
+      VAL2="false"
+    else
+      VAL='NOT_ENFORCED'
+      VAL2="OTHER_REASON"
+    fi
     for ((i=1; i<=$OSC_NUM_RICS; i++))
     do
-        a1pms_api_get_policy_status 200 $((3000+$i)) OSC "$VAL" "false"
-        a1pms_api_get_policy_status 200 $((4000+$i)) OSC "$VAL" "false"
+        a1pms_api_get_policy_status 200 $((3000+$i)) OSC "$VAL" "$VAL2"
+        a1pms_api_get_policy_status 200 $((4000+$i)) OSC "$VAL" "$VAL2"
     done
 
     # Note: Status callback is not tested since this callback (http POST) is made from the