X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC1_A1PMS_ADAPTER.sh;h=d5723f0db757aa922d7fc1963149be4c4aa00bbe;hb=refs%2Fchanges%2F90%2F12790%2F1;hp=9228ee73ec6555010322a8246404d4f4df110977;hpb=d03286355ba8f11aacabbee178fe5cb084be7b51;p=nonrtric.git

diff --git a/test/auto-test/FTC1_A1PMS_ADAPTER.sh b/test/auto-test/FTC1_A1PMS_ADAPTER.sh
index 9228ee73..d5723f0d 100755
--- a/test/auto-test/FTC1_A1PMS_ADAPTER.sh
+++ b/test/auto-test/FTC1_A1PMS_ADAPTER.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-2024 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.
@@ -25,7 +26,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 NGW 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
@@ -34,7 +35,7 @@ KUBE_PRESTARTED_IMAGES=""
 CONDITIONALLY_IGNORED_IMAGES="NGW "
 
 #Supported test environment profiles
-SUPPORTED_PROFILES="ORAN-H-RELEASE ONAP-LONDON"
+SUPPORTED_PROFILES="ORAN-I-RELEASE ONAP-MONTREAL"
 #Supported run modes
 SUPPORTED_RUNMODES="DOCKER KUBE"
 
@@ -100,7 +101,7 @@ for __httpx in $TESTED_PROTOCOLS ; do
         fi
 
         start_ric_simulators ricsim_g1 1  STD_2.0.0
-        start_ric_simulators ricsim_g2 1  STD_2.0.0  #APMS will use adapter class towards this sim
+        start_ric_simulators ricsim_g2 1  STD_2.0.0  #A1PMS will use adapter class towards this sim
 
         start_cr 1
 
@@ -125,7 +126,7 @@ for __httpx in $TESTED_PROTOCOLS ; 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
@@ -140,7 +141,7 @@ for __httpx in $TESTED_PROTOCOLS ; do
         fi
 
         sim_put_policy_type 201 ricsim_g1_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json
-        sim_put_policy_type 201 ricsim_g2_1 $A1PMS_ADAPTER_POLICY_NAME testdata/STD2/sim_qos.json
+        sim_put_policy_type 201 ricsim_g2_1 $A1PMS_ADAPTER_POLICY_TYPE testdata/STD2/sim_qos.json
 
         a1pms_equal json:rics 2 300
 
@@ -158,7 +159,7 @@ for __httpx in $TESTED_PROTOCOLS ; do
         echo "############## Health check ################"
         echo "############################################"
 
-        sleep_wait 120 "Let A1PMS cofiguration take effect"
+        sleep_wait 120 "Let A1PMS configuration take effect"
 
         a1pms_api_get_status 200
 
@@ -176,7 +177,7 @@ for __httpx in $TESTED_PROTOCOLS ; do
         echo "############## RIC Repository ##############"
         echo "############################################"
 
-        a1pms_api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:STD_QOS_0_2_0:AVAILABLE ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:$A1PMS_ADAPTER_POLICY_NAME:AVAILABLE"
+        a1pms_api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:STD_QOS_0_2_0:AVAILABLE ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:$A1PMS_ADAPTER_POLICY_TYPE:AVAILABLE"
 
         echo "############################################"
         echo "########### A1 Policy Management ###########"
@@ -187,8 +188,8 @@ for __httpx in $TESTED_PROTOCOLS ; do
         a1pms_api_put_policy 201 "serv1" ricsim_g1_1 STD_QOS_0_2_0 5000 true $notificationurl testdata/STD2/pi_qos_template.json
         a1pms_api_put_policy 200 "serv1" ricsim_g1_1 STD_QOS_0_2_0 5000 true $notificationurl testdata/STD2/pi_qos_template.json
 
-        a1pms_api_put_policy 201 "serv1" ricsim_g2_1 $A1PMS_ADAPTER_POLICY_NAME 5100 true $notificationurl testdata/STD2/pi_qos_template.json
-        a1pms_api_put_policy 200 "serv1" ricsim_g2_1 $A1PMS_ADAPTER_POLICY_NAME 5100 true $notificationurl testdata/STD2/pi_qos_template.json
+        a1pms_api_put_policy 201 "serv1" ricsim_g2_1 $A1PMS_ADAPTER_POLICY_TYPE 5100 true $notificationurl testdata/STD2/pi_qos_template.json
+        a1pms_api_put_policy 200 "serv1" ricsim_g2_1 $A1PMS_ADAPTER_POLICY_TYPE 5100 true $notificationurl testdata/STD2/pi_qos_template.json
 
         a1pms_equal json:policies 2
 
@@ -205,7 +206,7 @@ for __httpx in $TESTED_PROTOCOLS ; do
 
         if [[ $interface = *"SDNC"* ]]; then
             sim_contains_str ricsim_g1_1 remote_hosts $SDNC_APP_NAME
-            # Adatper does not go through SDNC
+            # Adapter does not go through SDNC
             sim_contains_str ricsim_g2_1 remote_hosts $A1PMS_APP_NAME
         else
             sim_contains_str ricsim_g1_1 remote_hosts $A1PMS_APP_NAME