Code Review
/
ric-plt
/
rtmgr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Reverting the code after releasing the image
[ric-plt/rtmgr.git]
/
pkg
/
rpe
/
rmr.go
diff --git
a/pkg/rpe/rmr.go
b/pkg/rpe/rmr.go
index
6fc8c9f
..
346644c
100644
(file)
--- 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"
"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
"routing-manager/pkg/rtmgr"
"strconv"
+ //"strings"
)
type Rmr struct {
)
type Rmr struct {
@@
-52,7
+53,7
@@
func NewRmrPush() *RmrPush {
/*
Produces the raw route message consumable by RMR
*/
/*
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 {
rawrt := []string{key + "newrt|start\n"}
rt := r.generateRouteTable(eps)
for _, rte := range *rt {
@@
-86,18
+87,24
@@
func (r *Rmr) generateRMRPolicies(eps rtmgr.Endpoints, key string) *[]string {
rawrt = append(rawrt, rawrte+"\n")
}
rawrt = append(rawrt, key+"newrt|end\n")
rawrt = append(rawrt, rawrte+"\n")
}
rawrt = append(rawrt, key+"newrt|end\n")
-
count := 0
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", rawrt)
+ xapp.Logger.Debug("rmr.GeneratePolicies returns: %v", rcs)
return &rawrt
}
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)
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 {
}
func (r *RmrPush) GenerateRouteTable(eps rtmgr.Endpoints) *rtmgr.RouteTable {