Update RMR to v4.4.6

[ric-plt/o1.git] / agent / cmd / o1agent.go

diff --git a/agent/cmd/o1agent.go b/agent/cmd/o1agent.go
index 17a2685..38b7341 100755 (executable)
--- a/agent/cmd/o1agent.go
+++ b/agent/cmd/o1agent.go
@@ -20,10 +20,10 @@
 package main
 
 import (
+       "fmt"
        "os"
        "os/signal"
        "syscall"
-       "fmt"
 
        "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
        "gerrit.oran-osc.org/r/ric-plt/o1mediator/pkg/nbi"
@@ -33,6 +33,7 @@ import (
 
 var Version string
 var Hash string
+var osExit = os.Exit
 
 type O1Agent struct {
        rmrReady  bool
@@ -73,16 +74,15 @@ func (o *O1Agent) Sighandler() {
 
        <-o.sigChan
        o.nbiClient.Stop()
-       os.Exit(1)
+       osExit(1)
 }
 
 func NewO1Agent() *O1Agent {
-       host := viper.GetString("sbi.appmgrService")
-       baseUrl := viper.GetString("sbi.baseUrl")
-       prot := viper.GetString("sbi.proto")
+       appmgrAddr := viper.GetString("sbi.appmgrAddr")
+       alertmgrAddr := viper.GetString("sbi.alertmgrAddr")
        timeout := viper.GetInt("sbi.timeout")
 
-       sbiClient := sbi.NewSBIClient(host, baseUrl, []string{prot}, timeout)
+       sbiClient := sbi.NewSBIClient(appmgrAddr, alertmgrAddr, timeout)
 
        return &O1Agent{
                rmrReady:  false,