Nonrtric image versions update

Updated to latest released image version for f rel.

Issue-ID: NONRTRIC-803
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
Change-Id: I7940446f23a82792c505954370cd8984d94d9e15

diff --git a/solution/integration/smo/non-rt-ric/.env b/solution/integration/smo/non-rt-ric/.env
index f9e6b2d..6cf3a12 100644 (file)
--- a/solution/integration/smo/non-rt-ric/.env
+++ b/solution/integration/smo/non-rt-ric/.env
@@ -16,16 +16,16 @@
 #
 
 #PMS
-PMS_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-a1-policy-management-service"
-PMS_IMAGE_TAG="2.3.1"
+PMS_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-plt-a1policymanagementservice"
+PMS_IMAGE_TAG="2.4.1"
 
 #A1_SIM
 A1_SIM_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/a1-simulator"
-A1_SIM_IMAGE_TAG="2.2.0"
+A1_SIM_IMAGE_TAG="2.3.1"
 
 #RAPP
-RAPP_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-r-app-catalogue"
-RAPP_IMAGE_TAG="1.0.2"
+RAPP_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-plt-rappcatalogue"
+RAPP_IMAGE_TAG="1.1.0"
 
 #CONTROL_PANEL
 CONTROL_PANEL_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-controlpanel"
@@ -36,20 +36,20 @@ NONRTRIC_GATEWAY_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-gateway
 NONRTRIC_GATEWAY_IMAGE_TAG="1.0.0"
 
 #ICS
-ICS_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-information-coordinator-service"
-ICS_IMAGE_TAG="1.2.1"
+ICS_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-plt-informationcoordinatorservice"
+ICS_IMAGE_TAG="1.3.1"
 
 #PRODUCER
 PRODUCER_IMAGE_BASE="eexit/mirror-http-server"
 PRODUCER_IMAGE_TAG="latest"
 
 #ORU
-ORU_APP_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-o-ru-closed-loop-recovery"
-ORU_APP_IMAGE_TAG="1.0.1"
+ORU_APP_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-rapp-orufhrecovery"
+ORU_APP_IMAGE_TAG="1.1.0"
 
 #ODU
-ODU_APP_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-o-du-slice-assurance"
-ODU_APP_IMAGE_TAG="1.0.1"
+ODU_APP_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-rapp-ransliceassurance"
+ODU_APP_IMAGE_TAG="1.1.1"
 
 #DB
 DB_IMAGE_BASE="mariadb"
@@ -57,4 +57,4 @@ DB_IMAGE_TAG="10.5"
 
 #A1CONTROLLER
 A1CONTROLLER_IMAGE_BASE="nexus3.onap.org:10002/onap/sdnc-image"
-A1CONTROLLER_IMAGE_TAG="2.1.6"
\ No newline at end of file
+A1CONTROLLER_IMAGE_TAG="2.3.2"
\ No newline at end of file

diff --git a/solution/integration/smo/non-rt-ric/data/prepareDmaapMsg.sh b/solution/integration/smo/non-rt-ric/data/prepareDmaapMsg.sh
index eebaf01..0a65a2e 100755 (executable)
--- a/solution/integration/smo/non-rt-ric/data/prepareDmaapMsg.sh
+++ b/solution/integration/smo/non-rt-ric/data/prepareDmaapMsg.sh
@@ -79,10 +79,10 @@ echo -e "\n"
 
 for i in {1..12}; do
        echo "policy types from policy agent:"
-    curlString="curl -skw %{http_code} $httpx://localhost:8091/policy_types"
+    curlString="curl -skw %{http_code} $httpx://localhost:8091/a1-policy/v2/policy-types"
     res=$($curlString)
     echo "$res"
-    expect="[\"1\",\"2\"]200"
+    expect="{\"policytype_ids\":[\"1\",\"2\"]}200"
     if [ "$res" == "$expect" ]; then
         echo -e "\n"
         break;