X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Frpe%2Frmr.go;h=446d7ec4b5aa6ae9af515fcf8f9349e9ba38fe6b;hb=6a9ce4976c1fbbcb8d4a068f81e76515c99a9d3f;hp=6fc8c9f60751399b71199d151b02b956aa0697a4;hpb=749099bc00ec6cad5da19846e65bd5b4bd9b8de4;p=ric-plt%2Frtmgr.git

diff --git a/pkg/rpe/rmr.go b/pkg/rpe/rmr.go
index 6fc8c9f..446d7ec 100644
--- a/pkg/rpe/rmr.go
+++ b/pkg/rpe/rmr.go
@@ -34,6 +34,7 @@ import (
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
 	"routing-manager/pkg/rtmgr"
 	"strconv"
+	//"strings"
 )
 
 type Rmr struct {
@@ -52,7 +53,7 @@ func NewRmrPush() *RmrPush {
 /*
 Produces the raw route message consumable by RMR
 */
-func (r *Rmr) generateRMRPolicies(eps rtmgr.Endpoints, key string) *[]string {
+func (r *Rmr) generateRMRPolicies(eps rtmgr.Endpoints, rcs *rtmgr.RicComponents, key string) *[]string {
 	rawrt := []string{key + "newrt|start\n"}
 	rt := r.generateRouteTable(eps)
 	for _, rte := range *rt {
@@ -85,19 +86,29 @@ func (r *Rmr) generateRMRPolicies(eps rtmgr.Endpoints, key string) *[]string {
 
 		rawrt = append(rawrt, rawrte+"\n")
 	}
-	rawrt = append(rawrt, key+"newrt|end\n")
+	for _,val := range rtmgr.DynamicRouteList {
+		rawrt = append(rawrt,val)
+	}
 
+	rawrt = append(rawrt, key+"newrt|end\n")
         count := 0
-        rawrt = append(rawrt, key+"meid_map|start\n")
-        rawrt = append(rawrt, key+"meid_map|end|" + strconv.Itoa(count) +"\n")
 
+	meidrt := key +"meid_map|start\n"
+        for _, value := range rcs.MeidMap {
+            meidrt += key + value + "\n"
+            count++
+        }
+        meidrt += key+"meid_map|end|" + strconv.Itoa(count) +"\n"
+
+	rawrt = append(rawrt, meidrt)
 	xapp.Logger.Debug("rmr.GeneratePolicies returns: %v", rawrt)
+	xapp.Logger.Debug("rmr.GeneratePolicies returns: %v", rcs)
 	return &rawrt
 }
 
-func (r *RmrPush) GeneratePolicies(eps rtmgr.Endpoints) *[]string {
+func (r *RmrPush) GeneratePolicies(eps rtmgr.Endpoints, rcs *rtmgr.RicComponents) *[]string {
 	xapp.Logger.Debug("Invoked rmr.GeneratePolicies, args: %v: ", eps)
-	return r.generateRMRPolicies(eps, "")
+	return r.generateRMRPolicies(eps, rcs, "")
 }
 
 func (r *RmrPush) GenerateRouteTable(eps rtmgr.Endpoints) *rtmgr.RouteTable {