Merge "[RICPLT-1423] Big Red button API - Implementation - Disconnect status"
authorShuky Har-Noy <shuky.har-noy@intl.att.com>
Sun, 18 Aug 2019 07:40:39 +0000 (07:40 +0000)
committerGerrit Code Review <gerrit@o-ran-sc.org>
Sun, 18 Aug 2019 07:40:39 +0000 (07:40 +0000)
1  2 
E2Manager/controllers/controller.go
E2Manager/handlers/x2_reset_request_handler.go
E2Manager/main/http_server.go

Simple merge
@@@ -134,18 -134,8 +134,18 @@@ func NewX2ResetRequestHandler(rmrServic
        }
  }
  
- func (handler *X2ResetRequestHandler) Handle(logger *logger.Logger, request models.Request, rmrResponseChannel chan<- *models.NotificationResponse) error {
+ func (handler *X2ResetRequestHandler) Handle(logger *logger.Logger, request models.Request) error {
        resetRequest := request.(models.ResetRequest)
 +
 +      if len(resetRequest.Cause) == 0 {
 +              resetRequest.Cause = "misc:om-intervention"
 +      }
 +      cause, ok:= knownCauses[resetRequest.Cause]
 +      if !ok {
 +              logger.Errorf("#reset_request_handler.Handle - Unknown cause (%s)", resetRequest.Cause)
 +              return e2managererrors.NewRequestValidationError()
 +      }
 +
        nodeb, err  := handler.readerProvider().GetNodeb(resetRequest.RanName)
        if err != nil {
                logger.Errorf("#reset_request_handler.Handle - failed to get status of RAN: %s from RNIB. Error: %s", resetRequest.RanName,  err.Error())
Simple merge