X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fnbi%2Fhttprestful.go;h=25be854501839d3e236a7c2010130a20e4d0b6ff;hb=refs%2Fchanges%2F05%2F3305%2F1;hp=f47034ea683df7266b501595fb2eddfcce050d77;hpb=bf0ea182799efa98c5e1b9c894891752848a86ce;p=ric-plt%2Frtmgr.git diff --git a/pkg/nbi/httprestful.go b/pkg/nbi/httprestful.go index f47034e..25be854 100644 --- a/pkg/nbi/httprestful.go +++ b/pkg/nbi/httprestful.go @@ -581,24 +581,25 @@ func PopulateE2TMap(e2tDataList *[]rtmgr.E2tIdentity, e2ts map[string]rtmgr.E2TI func retrieveStartupData(xmurl string, nbiif string, fileName string, configfile string, e2murl string, sdlEngine sdl.Engine) error { xapp.Logger.Info("Invoked retrieveStartupData ") var readErr error - var maxRetries = 10 + var err error + var maxRetries = 10 var xappData *[]rtmgr.XApp xappData = new([]rtmgr.XApp) xapp.Logger.Info("Trying to fetch XApps data from XAPP manager") - for i := 1; i <= maxRetries; i++ { - time.Sleep(2 * time.Second) + for i := 1; i <= maxRetries; i++ { + time.Sleep(2 * time.Second) - readErr = nil - xappData, err := httpGetXApps(xmurl) - if xappData != nil && err == nil { + readErr = nil + xappData, err = httpGetXApps(xmurl) + if xappData != nil && err == nil { break - } else if err == nil { - readErr = errors.New("unexpected HTTP status code") - } else { - xapp.Logger.Warn("cannot get xapp data due to: " + err.Error()) - readErr = err - } - } + } else if err == nil { + readErr = errors.New("unexpected HTTP status code") + } else { + xapp.Logger.Warn("cannot get xapp data due to: " + err.Error()) + readErr = err + } + } if ( readErr != nil) { return readErr @@ -640,7 +641,7 @@ func retrieveStartupData(xmurl string, nbiif string, fileName string, configfile xapp.Logger.Error(writeErr.Error()) } - xapp.Logger.Info("Trying to fetch Subscriptions data from Subscription manager") + xapp.Logger.Info("Trying to fetch Subscriptions data from Subscription manager") for i := 1; i <= maxRetries; i++ { readErr = nil sub_list, err := xapp.Subscription.QuerySubscriptions() @@ -664,6 +665,7 @@ func retrieveStartupData(xmurl string, nbiif string, fileName string, configfile if readErr == nil { return nil } + return readErr }