From: wahidw <abdulwahid.w@nokia.com>
Date: Wed, 10 Nov 2021 05:49:18 +0000 (+0000)
Subject: MEID table corruption due to index mismatch
X-Git-Tag: 0.8.2~3
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=e27ecb21e2be4644bfc0da5b1e8670f4dd1f9c81;p=ric-plt%2Frtmgr.git

MEID table corruption due to index mismatch

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

diff --git a/pkg/rpe/rmr.go b/pkg/rpe/rmr.go
index df7bb3f..5447693 100644
--- a/pkg/rpe/rmr.go
+++ b/pkg/rpe/rmr.go
@@ -113,14 +113,16 @@ func (r *Rmr) generateRMRPolicies(eps rtmgr.Endpoints, rcs *rtmgr.RicComponents,
 			mapindex := "mme_del|" + MEID + "\n"
 			i := keys[mapindex].index
 			if keys[mapindex].flag {
-				copy(rawrt[i:], rawrt[i+1:])
-				rawrt[len(rawrt)-1] = ""
-				rawrt = rawrt[:len(rawrt)-1]
+				//copy(rawrt[i:], rawrt[i+1:])
+				//rawrt[len(rawrt)-1] = ""
+				//rawrt = rawrt[:len(rawrt)-1]
+				rawrt[i] = ""
 				delete(keys, mapindex)
 				count--
 			}
 		}
 	}
+	rawrt = removeEmptyStrings(rawrt)
 	rawrt = append(rawrt, key+"meid_map|end|"+strconv.Itoa(count)+"\n")
 
 	xapp.Logger.Debug("rmr.GeneratePolicies returns: %v", rawrt)
@@ -185,3 +187,13 @@ func (r *RmrPush) GeneratePartialPolicies(eps rtmgr.Endpoints, xappSubData *mode
 	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
+}