From: wahidw <abdulwahid.w@nokia.com>
Date: Thu, 10 Jun 2021 14:32:11 +0000 (+0000)
Subject: Taking xapp-fwk 0.8.3-1
X-Git-Tag: 0.7.8~3
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=e68558eb09d9387539f99a8d936b04989025cfe7;p=ric-plt%2Frtmgr.git

Taking xapp-fwk 0.8.3-1

Signed-off-by: wahidw <abdulwahid.w@nokia.com>
Change-Id: I0f05511deec2f0a3258c43a43da8ecf69e5f7b8e
---

diff --git a/go.mod b/go.mod
index eac767f..f9c714f 100644
--- a/go.mod
+++ b/go.mod
@@ -19,6 +19,6 @@ require (
 
 replace gerrit.o-ran-sc.org/r/ric-plt/sdlgo => gerrit.o-ran-sc.org/r/ric-plt/sdlgo.git v0.5.2
 
-replace gerrit.o-ran-sc.org/r/ric-plt/xapp-frame => gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.8.2
+replace gerrit.o-ran-sc.org/r/ric-plt/xapp-frame => gerrit.o-ran-sc.org/r/ric-plt/xapp-frame.git v0.8.3-1
 
 replace gerrit.o-ran-sc.org/r/com/golog => gerrit.o-ran-sc.org/r/com/golog.git v0.0.2
diff --git a/pkg/rpe/rmr.go b/pkg/rpe/rmr.go
index c1f126c..8279e17 100644
--- a/pkg/rpe/rmr.go
+++ b/pkg/rpe/rmr.go
@@ -79,10 +79,11 @@ func (r *Rmr) generateRMRPolicies(eps rtmgr.Endpoints, rcs *rtmgr.RicComponents,
 				group += ";" + member
 			}
 		}
-		rawrte += group
 
 		if rte.RouteType == "%meid" {
-			rawrte += group + rte.RouteType
+			rawrte += "%" + "meid"
+		} else {
+			rawrte += group
 		}
 
 		rawrt = append(rawrt, rawrte+"\n")
@@ -155,10 +156,11 @@ func (r *Rmr) generatePartialRMRPolicies(eps rtmgr.Endpoints, xappSubData *model
 				group += ";" + member
 			}
 		}
-		rawrte += group
 
 		if rte.RouteType == "%meid" {
-			rawrte += group + rte.RouteType
+			rawrte += "%" + "meid"
+		} else {
+			rawrte += group
 		}
 
 		rawrt = append(rawrt, rawrte+"\n")