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
Added config and logger module from xapp-fwk. Added Routes related to A1Mediator...
[ric-plt/rtmgr.git]
/
pkg
/
sbi
/
sbi.go
diff --git
a/pkg/sbi/sbi.go
b/pkg/sbi/sbi.go
index
7d07160
..
ae63034
100644
(file)
--- a/
pkg/sbi/sbi.go
+++ b/
pkg/sbi/sbi.go
@@
-31,6
+31,7
@@
package sbi
import (
"errors"
import (
"errors"
+ "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
"routing-manager/pkg/rtmgr"
"strconv"
)
"routing-manager/pkg/rtmgr"
"strconv"
)
@@
-64,9
+65,10
@@
type Sbi struct {
}
func (s *Sbi) pruneEndpointList(sbi Engine) {
}
func (s *Sbi) pruneEndpointList(sbi Engine) {
+ xapp.Logger.Debug("pruneEndpointList invoked.")
for _, ep := range rtmgr.Eps {
if !ep.Keepalive {
for _, ep := range rtmgr.Eps {
if !ep.Keepalive {
-
rtmgr
.Logger.Debug("deleting %v", ep)
+
xapp
.Logger.Debug("deleting %v", ep)
sbi.DeleteEndpoint(ep)
delete(rtmgr.Eps, ep.Uuid)
} else {
sbi.DeleteEndpoint(ep)
delete(rtmgr.Eps, ep.Uuid)
} else {
@@
-76,8
+78,8
@@
func (s *Sbi) pruneEndpointList(sbi Engine) {
}
func (s *Sbi) updateEndpoints(rcs *rtmgr.RicComponents, sbi Engine) {
}
func (s *Sbi) updateEndpoints(rcs *rtmgr.RicComponents, sbi Engine) {
- for _, xapp := range (*rcs).XApps {
- for _, instance := range xapp.Instances {
+ for _, xapp
s
:= range (*rcs).XApps {
+ for _, instance := range xapp
s
.Instances {
uuid := instance.Ip + ":" + strconv.Itoa(int(instance.Port))
if _, ok := rtmgr.Eps[uuid]; ok {
rtmgr.Eps[uuid].Keepalive = true
uuid := instance.Ip + ":" + strconv.Itoa(int(instance.Port))
if _, ok := rtmgr.Eps[uuid]; ok {
rtmgr.Eps[uuid].Keepalive = true
@@
-85,17
+87,18
@@
func (s *Sbi) updateEndpoints(rcs *rtmgr.RicComponents, sbi Engine) {
ep := &rtmgr.Endpoint{
Uuid: uuid,
Name: instance.Name,
ep := &rtmgr.Endpoint{
Uuid: uuid,
Name: instance.Name,
- XAppType: xapp.Name,
+ XAppType: xapp
s
.Name,
Ip: instance.Ip,
Port: instance.Port,
TxMessages: instance.TxMessages,
RxMessages: instance.RxMessages,
Ip: instance.Ip,
Port: instance.Port,
TxMessages: instance.TxMessages,
RxMessages: instance.RxMessages,
+ Policies: instance.Policies,
Socket: nil,
IsReady: false,
Keepalive: true,
}
if err := sbi.AddEndpoint(ep); err != nil {
Socket: nil,
IsReady: false,
Keepalive: true,
}
if err := sbi.AddEndpoint(ep); err != nil {
-
rtmgr
.Logger.Error("can't create socket for endpoint: " + ep.Name + " due to:" + err.Error())
+
xapp
.Logger.Error("can't create socket for endpoint: " + ep.Name + " due to:" + err.Error())
continue
}
rtmgr.Eps[uuid] = ep
continue
}
rtmgr.Eps[uuid] = ep
@@
-107,7
+110,7
@@
func (s *Sbi) updateEndpoints(rcs *rtmgr.RicComponents, sbi Engine) {
}
func (s *Sbi) updatePlatformEndpoints(pcs *rtmgr.PlatformComponents, sbi Engine) {
}
func (s *Sbi) updatePlatformEndpoints(pcs *rtmgr.PlatformComponents, sbi Engine) {
-
rtmgr
.Logger.Debug("updatePlatformEndpoints invoked. PCS: %v", *pcs)
+
xapp
.Logger.Debug("updatePlatformEndpoints invoked. PCS: %v", *pcs)
for _, pc := range *pcs {
uuid := pc.Fqdn + ":" + strconv.Itoa(int(pc.Port))
if _, ok := rtmgr.Eps[uuid]; ok {
for _, pc := range *pcs {
uuid := pc.Fqdn + ":" + strconv.Itoa(int(pc.Port))
if _, ok := rtmgr.Eps[uuid]; ok {
@@
-125,9
+128,9
@@
func (s *Sbi) updatePlatformEndpoints(pcs *rtmgr.PlatformComponents, sbi Engine)
IsReady: false,
Keepalive: true,
}
IsReady: false,
Keepalive: true,
}
-
rtmgr
.Logger.Debug("ep created: %v", ep)
+
xapp
.Logger.Debug("ep created: %v", ep)
if err := sbi.AddEndpoint(ep); err != nil {
if err := sbi.AddEndpoint(ep); err != nil {
-
rtmgr
.Logger.Error("can't create socket for endpoint: " + ep.Name + " due to:" + err.Error())
+
xapp
.Logger.Error("can't create socket for endpoint: " + ep.Name + " due to:" + err.Error())
continue
}
rtmgr.Eps[uuid] = ep
continue
}
rtmgr.Eps[uuid] = ep