X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Frpe%2Frmr.go;h=544769362658fe34deea99a5f8d0bed95a8e2f58;hb=e27ecb21e2be4644bfc0da5b1e8670f4dd1f9c81;hp=41c1c4c19a7d67c1aec644a782f31b99f4df4d1b;hpb=92162653c9741f2417d1a36ec1c211d6863d0a68;p=ric-plt%2Frtmgr.git diff --git a/pkg/rpe/rmr.go b/pkg/rpe/rmr.go index 41c1c4c..5447693 100644 --- a/pkg/rpe/rmr.go +++ b/pkg/rpe/rmr.go @@ -14,6 +14,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + + This source code is part of the near-RT RIC (RAN Intelligent Controller) + platform project (RICP). + ================================================================================== */ /* @@ -26,27 +31,21 @@ package rpe import ( + "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp" + "routing-manager/pkg/models" "routing-manager/pkg/rtmgr" "strconv" + "strings" ) type Rmr struct { Rpe } -type RmrPub struct { - Rmr -} - type RmrPush struct { Rmr } -func NewRmrPub() *RmrPub { - instance := new(RmrPub) - return instance -} - func NewRmrPush() *RmrPush { instance := new(RmrPush) return instance @@ -55,17 +54,11 @@ 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.getRouteTable(eps) + rt := r.generateRouteTable(eps) for _, rte := range *rt { - rawrte := key //+ "rte|" + rte.MessageType - if rte.SubID == -1 { - rawrte += "rte|" - } else { - rawrte += "mse|" - } - rawrte += rte.MessageType + rawrte := key + "mse|" + rte.MessageType for _, tx := range rte.TxList { rawrte += "," + tx.Ip + ":" + strconv.Itoa(int(tx.Port)) } @@ -86,29 +79,121 @@ func (r *Rmr) generateRMRPolicies(eps rtmgr.Endpoints, key string) *[]string { group += ";" + member } } - rawrte += group + + if rte.RouteType == "%meid" { + rawrte += "%" + "meid" + } else { + rawrte += group + } + rawrt = append(rawrt, rawrte+"\n") } + for _, val := range rtmgr.DynamicRouteList { + rawrt = append(rawrt, val) + } + rawrt = append(rawrt, key+"newrt|end\n") - rtmgr.Logger.Debug("rmr.GeneratePolicies returns: %v", rawrt) + count := 0 + + rawrt = append(rawrt, key+"meid_map|start\n") + keys := make(map[string]RouteIndex) + for _, value := range rcs.MeidMap { + if _, v := keys[key+value+"\n"]; !v { + rawrt = append(rawrt, key+value+"\n") + appendedindex := uint16(len(rawrt) - 1) + keys[key+value+"\n"] = RouteIndex{true, appendedindex} + 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||" + MEID := strings.TrimSuffix(tmpstr[2], "\n") + + 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] + 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) + xapp.Logger.Debug("rmr.GeneratePolicies returns: %v", rcs) return &rawrt } -func (r *RmrPub) GeneratePolicies(eps rtmgr.Endpoints) *[]string { - rtmgr.Logger.Debug("Invoked rmr.GeneratePolicies, args: %v: ", eps) - return r.generateRMRPolicies(eps, "00000 ") -} +/* +Produces the raw route message consumable by RMR +*/ +func (r *Rmr) generatePartialRMRPolicies(eps rtmgr.Endpoints, xappSubData *models.XappSubscriptionData, key string, updatetype rtmgr.RMRUpdateType) *[]string { + rawrt := []string{key + "updatert|start\n"} + rt := r.generatePartialRouteTable(eps, xappSubData, updatetype) + for _, rte := range *rt { + rawrte := key + "mse|" + rte.MessageType + for _, tx := range rte.TxList { + rawrte += "," + tx.Ip + ":" + strconv.Itoa(int(tx.Port)) + } + rawrte += "|" + strconv.Itoa(int(rte.SubID)) + "|" + group := "" + for _, rxg := range rte.RxGroups { + member := "" + for _, rx := range rxg { + if member == "" { + member += rx.Ip + ":" + strconv.Itoa(int(rx.Port)) + } else { + member += "," + rx.Ip + ":" + strconv.Itoa(int(rx.Port)) + } + } + if group == "" { + group += member + } else { + group += ";" + member + } + } + + if rte.RouteType == "%meid" { + rawrte += "%" + "meid" + } else { + rawrte += group + } + + rawrt = append(rawrt, rawrte+"\n") + } + + rawrt = append(rawrt, key+"updatert|end\n") + //count := 0 -func (r *RmrPush) GeneratePolicies(eps rtmgr.Endpoints) *[]string { - rtmgr.Logger.Debug("Invoked rmr.GeneratePolicies, args: %v: ", eps) - return r.generateRMRPolicies(eps, "") + xapp.Logger.Debug("rmr.GeneratePolicies returns: %v", rawrt) + return &rawrt +} +func (r *RmrPush) GeneratePolicies(eps rtmgr.Endpoints, rcs *rtmgr.RicComponents) *[]string { + xapp.Logger.Debug("Invoked rmr.GeneratePolicies, args: %v: ", eps) + return r.generateRMRPolicies(eps, rcs, "") } -func (r *RmrPub) GetRouteTable(eps rtmgr.Endpoints) *rtmgr.RouteTable { - return r.getRouteTable(eps) +func (r *RmrPush) GenerateRouteTable(eps rtmgr.Endpoints) *rtmgr.RouteTable { + return r.generateRouteTable(eps) } -func (r *RmrPush) GetRouteTable(eps rtmgr.Endpoints) *rtmgr.RouteTable { - return r.getRouteTable(eps) +func (r *RmrPush) GeneratePartialPolicies(eps rtmgr.Endpoints, xappSubData *models.XappSubscriptionData, updatetype rtmgr.RMRUpdateType) *[]string { + 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 +}