Code Review
/
ric-plt
/
e2mgr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[RIC-434] Update Release version and Swagger
[ric-plt/e2mgr.git]
/
E2Manager
/
handlers
/
httpmsghandlers
/
add_enb_request_handler.go
diff --git
a/E2Manager/handlers/httpmsghandlers/add_enb_request_handler.go
b/E2Manager/handlers/httpmsghandlers/add_enb_request_handler.go
index
e620d3c
..
46cd802
100644
(file)
--- a/
E2Manager/handlers/httpmsghandlers/add_enb_request_handler.go
+++ b/
E2Manager/handlers/httpmsghandlers/add_enb_request_handler.go
@@
-34,13
+34,15
@@
type AddEnbRequestHandler struct {
logger *logger.Logger
nodebValidator *managers.NodebValidator
rNibDataService services.RNibDataService
logger *logger.Logger
nodebValidator *managers.NodebValidator
rNibDataService services.RNibDataService
+ ranListManager managers.RanListManager
}
}
-func NewAddEnbRequestHandler(logger *logger.Logger, rNibDataService services.RNibDataService, nodebValidator *managers.NodebValidator) *AddEnbRequestHandler {
+func NewAddEnbRequestHandler(logger *logger.Logger, rNibDataService services.RNibDataService, nodebValidator *managers.NodebValidator
, ranListManager managers.RanListManager
) *AddEnbRequestHandler {
return &AddEnbRequestHandler{
logger: logger,
nodebValidator: nodebValidator,
rNibDataService: rNibDataService,
return &AddEnbRequestHandler{
logger: logger,
nodebValidator: nodebValidator,
rNibDataService: rNibDataService,
+ ranListManager: ranListManager,
}
}
}
}
@@
-70,17
+72,22
@@
func (h *AddEnbRequestHandler) Handle(request models.Request) (models.IResponse,
return nil, e2managererrors.NewRnibDbError()
}
return nil, e2managererrors.NewRnibDbError()
}
- nbIdentity := h.createNbIdentity(addEnbRequest)
nodebInfo := h.createNodebInfo(addEnbRequest)
nodebInfo := h.createNodebInfo(addEnbRequest)
-
- err = h.rNibDataService.SaveNodeb(nbIdentity, nodebInfo)
+ err = h.rNibDataService.SaveNodeb(nodebInfo)
if err != nil {
h.logger.Errorf("#AddEnbRequestHandler.Handle - RAN name: %s - failed to save nodeb entity in RNIB. Error: %s", addEnbRequest.RanName, err)
return nil, e2managererrors.NewRnibDbError()
}
if err != nil {
h.logger.Errorf("#AddEnbRequestHandler.Handle - RAN name: %s - failed to save nodeb entity in RNIB. Error: %s", addEnbRequest.RanName, err)
return nil, e2managererrors.NewRnibDbError()
}
- return models.NewAddEnbResponse(nodebInfo), nil
+ nbIdentity := h.createNbIdentity(addEnbRequest)
+ err = h.ranListManager.AddNbIdentity(entities.Node_ENB, nbIdentity)
+
+ if err != nil {
+ return nil, e2managererrors.NewRnibDbError()
+ }
+
+ return models.NewNodebResponse(nodebInfo), nil
}
func (h *AddEnbRequestHandler) createNodebInfo(addEnbRequest *models.AddEnbRequest) *entities.NodebInfo {
}
func (h *AddEnbRequestHandler) createNodebInfo(addEnbRequest *models.AddEnbRequest) *entities.NodebInfo {
@@
-98,12
+105,11
@@
func (h *AddEnbRequestHandler) createNodebInfo(addEnbRequest *models.AddEnbReque
}
func (h *AddEnbRequestHandler) createNbIdentity(addEnbRequest *models.AddEnbRequest) *entities.NbIdentity {
}
func (h *AddEnbRequestHandler) createNbIdentity(addEnbRequest *models.AddEnbRequest) *entities.NbIdentity {
- nbIdentity := entities.NbIdentity{
- GlobalNbId: addEnbRequest.GlobalNbId,
- InventoryName: addEnbRequest.RanName,
+ return &entities.NbIdentity{
+ GlobalNbId: addEnbRequest.GlobalNbId,
+ InventoryName: addEnbRequest.RanName,
+ ConnectionStatus: entities.ConnectionStatus_DISCONNECTED,
}
}
-
- return &nbIdentity
}
func (h *AddEnbRequestHandler) validateRequestBody(addEnbRequest *models.AddEnbRequest) error {
}
func (h *AddEnbRequestHandler) validateRequestBody(addEnbRequest *models.AddEnbRequest) error {