X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fonboard%2Fonboarder.go;h=42f5bab13c7ccca372281968b4fa53cc01596c2d;hb=b74d93d5ad6c2340e291529ce03bbed43daeb2a5;hp=64b15f6b879529f4c0a50147a98934a97f8081ec;hpb=d25ee8c6c3027e65def77176aa08f06ba5500fe9;p=ric-plt%2Fricdms.git diff --git a/pkg/onboard/onboarder.go b/pkg/onboard/onboarder.go index 64b15f6..42f5bab 100644 --- a/pkg/onboard/onboarder.go +++ b/pkg/onboard/onboarder.go @@ -23,6 +23,7 @@ package onboard import ( "bytes" "encoding/json" + "fmt" "io" "net/http" @@ -69,24 +70,33 @@ func (o *Onboarder) Onboard(descriptor *models.Descriptor) middleware.Responder } else { ricdms.Logger.Error("err : (%v)", err) } - return onboard.NewPostOnboardxAppsCreated() + return experiment.NewPostCustomOnboardOK() } // onboard provided helm chart func (o *Onboarder) CustomOnboard(reader io.Reader) middleware.Responder { ricdms.Logger.Debug("onboarder received req to onboard") - resp, err := http.Post("http://service-ricplt-xapp-onboarder-http.ricplt:8080/api/charts", "application/x-www-form-urlencoded", reader) + resp, err := http.Post(ricdms.Config.CustomOnboardURL, "application/x-www-form-urlencoded", reader) if err != nil { ricdms.Logger.Error("err received while onboarding chart to chartmuseum: %v", err) - // TODO: introcuce error in in swagger to handle the error cases. - return nil + errmsg := err.Error() + resp := experiment.NewPostCustomOnboardInternalServerError() + resp.SetPayload(&models.ErrorMessage{ + ErrorMessage: &errmsg, + }) + return resp } defer resp.Body.Close() if resp.StatusCode < 200 || resp.StatusCode >= 300 { // TODO: return error code in response ricdms.Logger.Error("chartmuseum returned bad status code(%d): %+v", resp.StatusCode, resp) - return nil + errmsg := fmt.Sprintf("chartmuseum returns status code :%d", resp.StatusCode) + resp := experiment.NewPostCustomOnboardInternalServerError() + resp.SetPayload(&models.ErrorMessage{ + ErrorMessage: &errmsg, + }) + return resp } return &experiment.PostCustomOnboardOK{} }