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
Adding Unit Test cases for rtmgr
[ric-plt/rtmgr.git]
/
pkg
/
rpe
/
rmr.go
diff --git
a/pkg/rpe/rmr.go
b/pkg/rpe/rmr.go
index
ca16772
..
6fc8c9f
100644
(file)
--- 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.
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,24
+31,36
@@
package rpe
import (
package rpe
import (
- "rtmgr"
+ "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
+ "routing-manager/pkg/rtmgr"
"strconv"
)
"strconv"
)
+type Rmr struct {
+ Rpe
+}
+
+type RmrPush struct {
+ Rmr
+}
+
+func NewRmrPush() *RmrPush {
+ instance := new(RmrPush)
+ return instance
+}
+
/*
Produces the raw route message consumable by RMR
*/
/*
Produces the raw route message consumable by RMR
*/
-func generateRMRPolicies(eps rtmgr.Endpoints, key string) *[]string {
- rtmgr.Logger.Debug("Invoked rmr.generateRMRPolicies")
- rtmgr.Logger.Debug("args: %v", eps)
+func (r *Rmr) generateRMRPolicies(eps rtmgr.Endpoints, key string) *[]string {
rawrt := []string{key + "newrt|start\n"}
rawrt := []string{key + "newrt|start\n"}
- rt :=
get
RouteTable(eps)
+ rt :=
r.generate
RouteTable(eps)
for _, rte := range *rt {
for _, rte := range *rt {
- rawrte := key + "
rt
e|" + rte.MessageType
+ rawrte := key + "
ms
e|" + rte.MessageType
for _, tx := range rte.TxList {
rawrte += "," + tx.Ip + ":" + strconv.Itoa(int(tx.Port))
}
for _, tx := range rte.TxList {
rawrte += "," + tx.Ip + ":" + strconv.Itoa(int(tx.Port))
}
- rawrte += "|"
+ rawrte += "|"
+ strconv.Itoa(int(rte.SubID)) + "|"
group := ""
for _, rxg := range rte.RxGroups {
member := ""
group := ""
for _, rxg := range rte.RxGroups {
member := ""
@@
-61,17
+78,28
@@
func generateRMRPolicies(eps rtmgr.Endpoints, key string) *[]string {
}
}
rawrte += group
}
}
rawrte += group
+
+ if (rte.RouteType == "%meid") {
+ rawrte += group + rte.RouteType
+ }
+
rawrt = append(rawrt, rawrte+"\n")
}
rawrt = append(rawrt, key+"newrt|end\n")
rawrt = append(rawrt, rawrte+"\n")
}
rawrt = append(rawrt, key+"newrt|end\n")
- rtmgr.Logger.Debug("rmr.generateRMRPolicies returns: %v", rawrt)
+
+ count := 0
+ rawrt = append(rawrt, key+"meid_map|start\n")
+ rawrt = append(rawrt, key+"meid_map|end|" + strconv.Itoa(count) +"\n")
+
+ xapp.Logger.Debug("rmr.GeneratePolicies returns: %v", rawrt)
return &rawrt
}
return &rawrt
}
-func generateRMRPubPolicies(eps rtmgr.Endpoints) *[]string {
- return generateRMRPolicies(eps, "00000 ")
+func (r *RmrPush) GeneratePolicies(eps rtmgr.Endpoints) *[]string {
+ xapp.Logger.Debug("Invoked rmr.GeneratePolicies, args: %v: ", eps)
+ return r.generateRMRPolicies(eps, "")
}
}
-func
generateRMRPushPolicies(eps rtmgr.Endpoints) *[]string
{
- return
generateRMRPolicies(eps, ""
)
+func
(r *RmrPush) GenerateRouteTable(eps rtmgr.Endpoints) *rtmgr.RouteTable
{
+ return
r.generateRouteTable(eps
)
}
}