[RICPLT-2157] Restructure handlers and converters.......

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

diff --git a/E2Manager/handlers/endc_configuration_update_handler.go b/E2Manager/handlers/rmrmsghandlers/endc_configuration_update_handler.go
similarity index 79%
rename from E2Manager/handlers/endc_configuration_update_handler.go
rename to E2Manager/handlers/rmrmsghandlers/endc_configuration_update_handler.go
index 1c3736f..a988d48 100644 (file)
--- a/E2Manager/handlers/endc_configuration_update_handler.go
+++ b/E2Manager/handlers/rmrmsghandlers/endc_configuration_update_handler.go
@@ -15,14 +15,16 @@
 // limitations under the License.
 //
 
-package handlers
+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../../asn1codec/inc/ -I../../asn1codec/e2ap_engine/
+// #cgo LDFLAGS: -L ../../asn1codec/lib/ -L../../asn1codec/e2ap_engine/ -le2ap_codec -lasncodec
 // #include <asn1codec_utils.h>
 // #include <configuration_update_wrapper.h>
 import "C"
 import (
+       "e2mgr/converters"
+       "e2mgr/e2pdus"
        "e2mgr/logger"
        "e2mgr/models"
        "e2mgr/rmrCgo"
@@ -36,12 +38,12 @@ func (src EndcConfigurationUpdateHandler) Handle(logger *logger.Logger, e2Sessio
        messageChannel chan<- *models.NotificationResponse) {
 
        var payloadSize C.ulong
-       payloadSize = MaxAsn1PackedBufferSize
-       packedBuffer := [MaxAsn1PackedBufferSize]C.uchar{}
-       errorBuffer := [MaxAsn1PackedBufferSize]C.char{}
-       refinedMessage, err := unpackX2apPduAndRefine(logger, MaxAsn1CodecAllocationBufferSize /*allocation buffer*/, request.Len, request.Payload, MaxAsn1CodecMessageBufferSize /*message buffer*/)
+       payloadSize = e2pdus.MaxAsn1PackedBufferSize
+       packedBuffer := [e2pdus.MaxAsn1PackedBufferSize]C.uchar{}
+       errorBuffer := [e2pdus.MaxAsn1PackedBufferSize]C.char{}
+       refinedMessage, err := converters.UnpackX2apPduAndRefine(logger, e2pdus.MaxAsn1CodecAllocationBufferSize /*allocation buffer*/, request.Len, request.Payload, e2pdus.MaxAsn1CodecMessageBufferSize /*message buffer*/)
        if err != nil {
-               status := C.build_pack_endc_configuration_update_failure(&payloadSize, &packedBuffer[0], MaxAsn1PackedBufferSize, &errorBuffer[0])
+               status := C.build_pack_endc_configuration_update_failure(&payloadSize, &packedBuffer[0], e2pdus.MaxAsn1PackedBufferSize, &errorBuffer[0])
                if status {
                        payload := (*[1 << 30]byte)(unsafe.Pointer(&packedBuffer))[:payloadSize:payloadSize]
                        logger.Debugf("#endc_configuration_update_handler.Handle - Endc configuration update negative ack message payload: (%d) %02x", len(payload), payload)
@@ -53,8 +55,8 @@ func (src EndcConfigurationUpdateHandler) Handle(logger *logger.Logger, e2Sessio
                logger.Errorf("#endc_configuration_update_handler.Handle - unpack failed. Error: %v", err)
        } else {
                logger.Infof("#endc_configuration_update_handler.Handle - Endc configuration update initiating message received")
-               logger.Debugf("#endc_configuration_update_handler.Handle - Endc configuration update initiating message payload: %s", refinedMessage.pduPrint)
-               status := C.build_pack_endc_configuration_update_ack(&payloadSize, &packedBuffer[0], MaxAsn1PackedBufferSize, &errorBuffer[0])
+               logger.Debugf("#endc_configuration_update_handler.Handle - Endc configuration update initiating message payload: %s", refinedMessage.PduPrint)
+               status := C.build_pack_endc_configuration_update_ack(&payloadSize, &packedBuffer[0], e2pdus.MaxAsn1PackedBufferSize, &errorBuffer[0])
                if status {
                        payload := (*[1 << 30]byte)(unsafe.Pointer(&packedBuffer))[:payloadSize:payloadSize]
                        logger.Debugf("#endc_configuration_update_handler.Handle - Endc configuration update positive ack message payload: (%d) %02x", len(payload), payload)