RIC-398 - Fix all critical issues from static code analysis scan

[ric-plt/e2mgr.git] / E2Manager / handlers / rmrmsghandlers / x2_reset_request_notification_handler.go

diff --git a/E2Manager/handlers/rmrmsghandlers/x2_reset_request_notification_handler.go b/E2Manager/handlers/rmrmsghandlers/x2_reset_request_notification_handler.go
index 0c5848f..1da8758 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/x2_reset_request_notification_handler.go
+++ b/E2Manager/handlers/rmrmsghandlers/x2_reset_request_notification_handler.go
@@ -13,12 +13,15 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-//
+
+//  This source code is part of the near-RT RIC (RAN Intelligent Controller)
+//  platform project (RICP).
+
 
 package rmrmsghandlers
 
-// #cgo CFLAGS: -I../../asn1codec/inc/  -I../../asn1codec/e2ap_engine/
-// #cgo LDFLAGS: -L ../../asn1codec/lib/ -L../../asn1codec/e2ap_engine/ -le2ap_codec -lasncodec
+// #cgo CFLAGS: -I../../3rdparty/asn1codec/inc/  -I../../3rdparty/asn1codec/e2ap_engine/
+// #cgo LDFLAGS: -L ../../3rdparty/asn1codec/lib/ -L../../3rdparty/asn1codec/e2ap_engine/ -le2ap_codec -lasncodec
 // #include <asn1codec_utils.h>
 // #include <x2reset_response_wrapper.h>
 import "C"
@@ -32,11 +35,11 @@ import (
        "e2mgr/services"
        "e2mgr/services/rmrsender"
        "e2mgr/utils"
-       "fmt"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
-       "unsafe"
 )
 
+const ResetRequesLogInfoElapsedTime = "#X2ResetRequestNotificationHandler.Handle - Summary: elapsed time for receiving and handling reset request message from E2 terminator: %f ms"
+
 type X2ResetRequestNotificationHandler struct {
        logger                 *logger.Logger
        rnibDataService        services.RNibDataService
@@ -60,7 +63,7 @@ func (h X2ResetRequestNotificationHandler) Handle(request *models.NotificationRe
        nb, rNibErr := h.rnibDataService.GetNodeb(request.RanName)
        if rNibErr != nil {
                h.logger.Errorf("#X2ResetRequestNotificationHandler.Handle - failed to retrieve nodeB entity. RanName: %s. Error: %s", request.RanName, rNibErr.Error())
-               h.logger.Infof("#X2ResetRequestNotificationHandler.Handle - Summary: elapsed time for receiving and handling reset request message from E2 terminator: %f ms", utils.ElapsedTime(request.StartTime))
+               h.logger.Infof(ResetRequesLogInfoElapsedTime, utils.ElapsedTime(request.StartTime))
                return
        }
 
@@ -68,37 +71,19 @@ func (h X2ResetRequestNotificationHandler) Handle(request *models.NotificationRe
 
        if nb.ConnectionStatus == entities.ConnectionStatus_SHUTTING_DOWN {
                h.logger.Warnf("#X2ResetRequestNotificationHandler.Handle - nodeB entity in incorrect state. RanName %s, ConnectionStatus %s", nb.RanName, nb.ConnectionStatus)
-               h.logger.Infof("#X2ResetRequestNotificationHandler.Handle - Summary: elapsed time for receiving and handling reset request message from E2 terminator: %f ms", utils.ElapsedTime(request.StartTime))
+               h.logger.Infof(ResetRequesLogInfoElapsedTime, utils.ElapsedTime(request.StartTime))
                return
        }
 
        if nb.ConnectionStatus != entities.ConnectionStatus_CONNECTED {
                h.logger.Errorf("#X2ResetRequestNotificationHandler.Handle - nodeB entity in incorrect state. RanName %s, ConnectionStatus %s", nb.RanName, nb.ConnectionStatus)
-               h.logger.Infof("#X2ResetRequestNotificationHandler.Handle - Summary: elapsed time for receiving and handling reset request message from E2 terminator: %f ms", utils.ElapsedTime(request.StartTime))
+               h.logger.Infof(ResetRequesLogInfoElapsedTime, utils.ElapsedTime(request.StartTime))
                return
        }
 
-       msg, err := createX2ResetResponseNotification(request)
-       if err != nil {
-               h.logger.Errorf("#X2ResetRequestNotificationHandler.Handle - %s", err)
-               return
-       }
+       msg := models.NewRmrMessage(rmrCgo.RIC_X2_RESET_RESP, request.RanName, e2pdus.PackedX2ResetResponse, request.TransactionId, request.GetMsgSrc())
 
        _ = h.rmrSender.Send(msg)
-       h.logger.Infof("#X2ResetRequestNotificationHandler.Handle - Summary: elapsed time for receiving and handling reset request message from E2 terminator: %f ms", utils.ElapsedTime(request.StartTime))
+       h.logger.Infof(ResetRequesLogInfoElapsedTime, utils.ElapsedTime(request.StartTime))
        _ = h.ranStatusChangeManager.Execute(rmrCgo.RAN_RESTARTED, enums.RAN_TO_RIC, nb)
 }
-
-func createX2ResetResponseNotification(request *models.NotificationRequest) (*models.RmrMessage, error) {
-
-       packedBuffer := make([]C.uchar, e2pdus.MaxAsn1PackedBufferSize)
-       errorBuffer := make([]C.char, e2pdus.MaxAsn1CodecMessageBufferSize)
-       var payloadSize = C.ulong(e2pdus.MaxAsn1PackedBufferSize)
-
-       if status := C.build_pack_x2reset_response(&payloadSize, &packedBuffer[0], C.ulong(e2pdus.MaxAsn1CodecMessageBufferSize), &errorBuffer[0]); !status {
-               return nil, fmt.Errorf("failed to build and pack the reset response message %s ", C.GoString(&errorBuffer[0]))
-       }
-       payload := C.GoBytes(unsafe.Pointer(&packedBuffer[0]), C.int(payloadSize))
-       msg := models.NewRmrMessage(rmrCgo.RIC_X2_RESET_RESP, request.RanName, payload)
-       return msg, nil
-}