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
Taking xapp-fwk 0.8.3-1
[ric-plt/rtmgr.git]
/
cmd
/
rtmgr.go
diff --git
a/cmd/rtmgr.go
b/cmd/rtmgr.go
index
af0aba1
..
834df26
100644
(file)
--- a/
cmd/rtmgr.go
+++ b/
cmd/rtmgr.go
@@
-32,17
+32,13
@@
*/
package main
*/
package main
-//TODO: change flag to pflag (won't need any argument parse)
-
import (
"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
"os"
"os/signal"
"routing-manager/pkg/nbi"
import (
"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
"os"
"os/signal"
"routing-manager/pkg/nbi"
-
//"routing-manager/pkg/rpe
"
+
"routing-manager/pkg/nbi/restful
"
"routing-manager/pkg/rtmgr"
"routing-manager/pkg/rtmgr"
- //"routing-manager/pkg/sbi"
- //"routing-manager/pkg/sdl"
"syscall"
"time"
)
"syscall"
"time"
)
@@
-67,20
+63,25
@@
func main() {
rtmgr.Eps = make(rtmgr.Endpoints)
rtmgr.Mtype = make(rtmgr.MessageTypeList)
rtmgr.Rtmgr_ready = false
rtmgr.Eps = make(rtmgr.Endpoints)
rtmgr.Mtype = make(rtmgr.MessageTypeList)
rtmgr.Rtmgr_ready = false
+ rtmgr.RMRConnStatus = make(map[string]bool)
-// RMR thread is starting port: 4560
+
// RMR thread is starting port: 4560
c := nbi.NewControl()
go c.Run()
c := nbi.NewControl()
go c.Run()
-// Waiting for RMR to be ready
+
// Waiting for RMR to be ready
time.Sleep(time.Duration(2) * time.Second)
for xapp.Rmr.IsReady() == false {
time.Sleep(time.Duration(2) * time.Second)
for xapp.Rmr.IsReady() == false {
- time.Sleep(time.Duration(2) * time.Second)
+ time.Sleep(time.Duration(2) * time.Second)
}
}
- dummy_whid := int(xapp.Rmr.Openwh("
localhost
:4560"))
+ dummy_whid := int(xapp.Rmr.Openwh("
rtmgr
:4560"))
xapp.Logger.Info("created dummy Wormhole ID for routingmanager and dummy_whid :%d", dummy_whid)
xapp.Logger.Info("created dummy Wormhole ID for routingmanager and dummy_whid :%d", dummy_whid)
+ go func() {
+ restful.LaunchRest(xapp.Config.GetString("nbiurl"))
+ }()
+
nbi.Serve()
os.Exit(0)
}
nbi.Serve()
os.Exit(0)
}