X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmodels%2Fadd_enb_request.go;h=c2fa520db4bf8e907fb1c5849f868e4bdc6dbfab;hb=refs%2Fchanges%2F09%2F4409%2F1;hp=a15c94b3857264bb4afca738dd67fd739707c6d1;hpb=14eb5132c3dca8cdad98e7e5420701b04f452046;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/models/add_enb_request.go b/E2Manager/models/add_enb_request.go index a15c94b..c2fa520 100644 --- a/E2Manager/models/add_enb_request.go +++ b/E2Manager/models/add_enb_request.go @@ -53,22 +53,27 @@ func (r *AddEnbRequest) UnmarshalJSON(data []byte) error { r.Ip = addEnbRawRequest.Ip r.Port = addEnbRawRequest.Port - globalNbId := entities.GlobalNbId{} - err = jsonpb.UnmarshalString(string(addEnbRawRequest.GlobalNbId), &globalNbId) + if addEnbRawRequest.GlobalNbId != nil { + globalNbId := entities.GlobalNbId{} + err = jsonpb.UnmarshalString(string(addEnbRawRequest.GlobalNbId), &globalNbId) - if err != nil { - return err + if err != nil { + return err + } + + r.GlobalNbId = &globalNbId } - r.GlobalNbId = &globalNbId + if addEnbRawRequest.Enb != nil { + enb := entities.Enb{} + err = jsonpb.UnmarshalString(string(addEnbRawRequest.Enb), &enb) - enb := entities.Enb{} - err = jsonpb.UnmarshalString(string(addEnbRawRequest.Enb), &enb) + if err != nil { + return err + } - if err != nil { - return err + r.Enb = &enb } - r.Enb = &enb return nil } \ No newline at end of file