X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=pkg%2Fnbi%2Fhttpgetter.go;h=be2577c757fab293f65c4221edd71ad84bcb18fa;hb=cb93dbf2fac19dd49332847327b364be27d8bb71;hp=0bf05bca3ce1ebebca8a2d1046a3c2c48f5d7093;hpb=761934a3d9f7a1426d1e14e34fb9a4c16599a237;p=ric-plt%2Frtmgr.git

diff --git a/pkg/nbi/httpgetter.go b/pkg/nbi/httpgetter.go
index 0bf05bc..be2577c 100644
--- a/pkg/nbi/httpgetter.go
+++ b/pkg/nbi/httpgetter.go
@@ -32,11 +32,13 @@ package nbi
 
 import (
 	"encoding/json"
+	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
 	"net/http"
 	"routing-manager/pkg/rpe"
 	"routing-manager/pkg/rtmgr"
 	"routing-manager/pkg/sdl"
 	"time"
+	"sync"
 )
 
 type HttpGetter struct {
@@ -53,7 +55,7 @@ func NewHttpGetter() *HttpGetter {
 var myClient = &http.Client{Timeout: 5 * time.Second}
 
 func fetchAllXApps(xmurl string) (*[]rtmgr.XApp, error) {
-	rtmgr.Logger.Info("Invoked httpGetter.fetchXappList: " + xmurl)
+	xapp.Logger.Info("Invoked httpGetter.fetchXappList: " + xmurl)
 	r, err := myClient.Get(xmurl)
 	if err != nil {
 		return nil, err
@@ -61,22 +63,22 @@ func fetchAllXApps(xmurl string) (*[]rtmgr.XApp, error) {
 	defer r.Body.Close()
 
 	if r.StatusCode == 200 {
-		rtmgr.Logger.Debug("http client raw response: %v", r)
+		xapp.Logger.Debug("http client raw response: %v", r)
 		var xApps []rtmgr.XApp
 		err = json.NewDecoder(r.Body).Decode(&xApps)
 		if err != nil {
-			rtmgr.Logger.Warn("Json decode failed: " + err.Error())
+			xapp.Logger.Warn("Json decode failed: " + err.Error())
 		}
-		rtmgr.Logger.Info("HTTP GET: OK")
-		rtmgr.Logger.Debug("httpGetter.fetchXappList returns: %v", xApps)
+		xapp.Logger.Info("HTTP GET: OK")
+		xapp.Logger.Debug("httpGetter.fetchXappList returns: %v", xApps)
 		return &xApps, err
 	}
-	rtmgr.Logger.Warn("httpGetter got an unexpected http status code: %v", r.StatusCode)
+	xapp.Logger.Warn("httpGetter got an unexpected http status code: %v", r.StatusCode)
 	return nil, nil
 }
 
-func (g *HttpGetter) Initialize(xmurl string, nbiif string, fileName string, configfile string,
-	sdlEngine sdl.Engine, rpeEngine rpe.Engine, triggerSBI chan<- bool) error {
+func (g *HttpGetter) Initialize(xmurl string, nbiif string, fileName string, configfile string, e2murl string,
+	sdlEngine sdl.Engine, rpeEngine rpe.Engine, triggerSBI chan<- bool, m *sync.Mutex) error {
 	return nil
 }