X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fsdl%2Ffile.go;fp=pkg%2Fsdl%2Ffile.go;h=841e406ad6fe4acc99a2c574388985a023bc3ade;hb=a8596ec6db91b8a45a1a21421a726b9b05ce7d48;hp=90b1ed0c7cf0c370b94a3d675089c1c16d63fab7;hpb=b47d12de30e72b6e1017c93ca487279b09038e00;p=ric-plt%2Frtmgr.git diff --git a/pkg/sdl/file.go b/pkg/sdl/file.go index 90b1ed0..841e406 100644 --- a/pkg/sdl/file.go +++ b/pkg/sdl/file.go @@ -31,6 +31,7 @@ package sdl import ( "encoding/json" "errors" + "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp" "io/ioutil" "os" "routing-manager/pkg/rtmgr" @@ -52,7 +53,7 @@ func NewFile() *File { } func (f *File) ReadAll(file string) (*rtmgr.RicComponents, error) { - rtmgr.Logger.Debug("Invoked sdl.ReadAll(" + file + ")") + xapp.Logger.Debug("Invoked sdl.ReadAll(" + file + ")") var rcs *rtmgr.RicComponents jsonFile, err := os.Open(file) if err != nil { @@ -68,14 +69,14 @@ func (f *File) ReadAll(file string) (*rtmgr.RicComponents, error) { if err != nil { return nil, errors.New("cannot parse data due to: " + err.Error()) } - rtmgr.Logger.Debug("file.fileReadAll returns: %v", rcs) + xapp.Logger.Debug("file.fileReadAll returns: %v", rcs) return rcs, nil } func (f *File) WriteAll(file string, rcs *rtmgr.RicComponents) error { - rtmgr.Logger.Debug("Invoked sdl.WriteAll") - rtmgr.Logger.Debug("file.fileWriteAll writes into file: " + file) - rtmgr.Logger.Debug("file.fileWriteAll writes data: %v", *rcs) + xapp.Logger.Debug("Invoked sdl.WriteAll") + xapp.Logger.Debug("file.fileWriteAll writes into file: " + file) + xapp.Logger.Debug("file.fileWriteAll writes data: %v", *rcs) byteValue, err := json.Marshal(rcs) if err != nil { return errors.New("cannot convert data due to: " + err.Error()) @@ -88,13 +89,13 @@ func (f *File) WriteAll(file string, rcs *rtmgr.RicComponents) error { } func (f *File) WriteXApps(file string, xApps *[]rtmgr.XApp) error { - rtmgr.Logger.Debug("Invoked sdl.WriteXApps") - rtmgr.Logger.Debug("file.fileWriteXApps writes into file: " + file) - rtmgr.Logger.Debug("file.fileWriteXApps writes data: %v", *xApps) + xapp.Logger.Debug("Invoked sdl.WriteXApps") + xapp.Logger.Debug("file.fileWriteXApps writes into file: " + file) + xapp.Logger.Debug("file.fileWriteXApps writes data: %v", *xApps) ricData, err := NewFile().ReadAll(file) if err != nil { - rtmgr.Logger.Error("cannot get data from sdl interface due to: " + err.Error()) + xapp.Logger.Error("cannot get data from sdl interface due to: " + err.Error()) return errors.New("cannot read full ric data to modify xApps data, due to: " + err.Error()) } ricData.XApps = *xApps