Merge "RIC:1060: Change in PTL"

[ric-plt/e2mgr.git] / E2Manager / models / add_enb_request.go

diff --git a/E2Manager/models/add_enb_request.go b/E2Manager/models/add_enb_request.go
index a15c94b..c2fa520 100644 (file)
--- 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