X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=pkg%2Frpe%2Frmr.go;h=87c0e2bfe873ffd6ded20e6d7824c20d9b5aa31a;hb=refs%2Fchanges%2F91%2F10491%2F3;hp=17c977b42d66cd7b7332b20af0dd88763d370e60;hpb=505e2497ce651c1127ffbcefe396b3f8c0d0f9dd;p=ric-plt%2Frtmgr.git

diff --git a/pkg/rpe/rmr.go b/pkg/rpe/rmr.go
index 17c977b..87c0e2b 100644
--- a/pkg/rpe/rmr.go
+++ b/pkg/rpe/rmr.go
@@ -35,7 +35,7 @@ import (
 	"routing-manager/pkg/models"
 	"routing-manager/pkg/rtmgr"
 	"strconv"
-	//"strings"
+	"strings"
 )
 
 type Rmr struct {
@@ -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")
@@ -94,22 +95,38 @@ func (r *Rmr) generateRMRPolicies(eps rtmgr.Endpoints, rcs *rtmgr.RicComponents,
 	rawrt = append(rawrt, key+"newrt|end\n")
 	count := 0
 
-	//meidrt := key + "meid_map|start\n"
-	//meidrt := []string{key + "meid_map|start\n"}
 	rawrt = append(rawrt, key+"meid_map|start\n")
+	
+	keys := make(map[string]MeidEntry)
+	MEID := ""
+	E2TIP := ""
+	RECTYP := ""
 	for _, value := range rcs.MeidMap {
-		//meidrt += key + value + "\n"
-		rawrt = append(rawrt, key+value+"\n")
-		count++
+		if strings.Contains(value, "mme_ar") {
+			tmpstr := strings.Split(value, "|")
+			//MEID entry for mme_ar must always contain 3 strings speartred by | i.e "mme_ar|<string1>|<string2>"
+			MEID = strings.TrimSuffix(tmpstr[2], "\n")
+			E2TIP = strings.TrimSuffix(tmpstr[1], "\n")
+			RECTYP = "mme_ar"
+		} else if strings.Contains(value, "mme_del") {
+			tmpstr := strings.Split(value, "|")
+			MEID = strings.TrimSuffix(tmpstr[1], "\n")
+			E2TIP = ""
+			RECTYP = "mme_del"
+		}
+		keys[MEID] = MeidEntry{RECTYP, E2TIP}
+	}
+
+	for k, v := range keys {
+		if v.recordtype == "mme_ar" {
+			rawrt = append(rawrt, key+v.recordtype+"|"+v.e2tip+"|"+k+"\n")
+		    count++
+		}
 	}
-	rawrt = append(rawrt, key+"meid_map|end|"+strconv.Itoa(count)+"\n")
-	//meidrt += key+"meid_map|end|" + strconv.Itoa(count) +"\n"
 
-	/*for _, value := range meidrt {
-		rawrt = append(meidrt, value)
-	}*/
+	rawrt = removeEmptyStrings(rawrt)
+	rawrt = append(rawrt, 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
@@ -143,10 +160,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")
@@ -168,6 +186,16 @@ func (r *RmrPush) GenerateRouteTable(eps rtmgr.Endpoints) *rtmgr.RouteTable {
 }
 
 func (r *RmrPush) GeneratePartialPolicies(eps rtmgr.Endpoints, xappSubData *models.XappSubscriptionData, updatetype rtmgr.RMRUpdateType) *[]string {
-	xapp.Logger.Debug("Invoked rmr.GeneratePartialRMR, args: %v: ", eps)
+	xapp.Logger.Debug("Invoked rmr.GeneratePartialPolicies, args: %v: ", eps)
 	return r.generatePartialRMRPolicies(eps, xappSubData, "", updatetype)
 }
+
+func removeEmptyStrings(s []string) []string {
+	var r []string
+	for _, str := range s {
+		if str != "" {
+			r = append(r, str)
+		}
+	}
+	return r
+}