Add missing mtypes

Change-Id: I38865d75a51a93b4f2d88c42920b9080e3e24da2
Signed-off-by: Mohamed Abukar <abukar.mohamed@nokia.com>

diff --git a/pkg/xapp/mtypes.go b/pkg/xapp/mtypes.go
index 0023776..ab4c85f 100755 (executable)
--- a/pkg/xapp/mtypes.go
+++ b/pkg/xapp/mtypes.go
@@ -66,8 +66,21 @@ var RICMessageTypes = map[string]int{
        "RIC_SGNB_ADDITION_REQ":        C.RIC_SGNB_ADDITION_REQ,
        "RIC_SGNB_ADDITION_ACK":        C.RIC_SGNB_ADDITION_ACK,
        "RIC_SGNB_ADDITION_REJECT":     C.RIC_SGNB_ADDITION_REJECT,
+       "RIC_SGNB_MOD_REQUEST":         C.RIC_SGNB_MOD_REQUEST,
+       "RIC_SGNB_MOD_REQUEST_ACK":     C.RIC_SGNB_MOD_REQUEST_ACK,
+       "RIC_SGNB_MOD_REQUEST_REJECT":  C.RIC_SGNB_MOD_REQUEST_REJ,
+       "RIC_SGNB_MOD_REQUIRED":        C.RIC_SGNB_MOD_REQUIRED,
+       "RIC_SGNB_MOD_CONFIRM":         C.RIC_SGNB_MOD_CONFIRM,
+       "RIC_SGNB_MOD_REFUSE":          C.RIC_SGNB_MOD_REFUSE,
+       "RIC_SGNB_RELEASE_REQUEST":     C.RIC_SGNB_RELEASE_REQUEST,
+       "RIC_SGNB_RELEASE_CONFIRM":     C.RIC_SGNB_RELEASE_CONFIRM,
+       "RIC_SGNB_RELEASE_REQUIRED":    C.RIC_SGNB_RELEASE_REQUIRED,
+       "RIC_SGNB_RELEASE_REQUEST_ACK": C.RIC_SGNB_RELEASE_REQUEST_ACK,
+       "RIC_SECONDARY_RAT_DATA_USAGE_REPORT": C.RIC_SECONDARY_RAT_DATA_USAGE_REPORT,
+       "RIC_SN_STATUS_TRANSFER":       C.RIC_SN_STATUS_TRANSFER,
        "RIC_SGNB_RECONF_COMPLETE":     C.RIC_SGNB_RECONF_COMPLETE,
-       "RIC_RRC_TRANSFER":             C.RIC_RRC_TRANSFER,
+       "RIC_RRC_TRANSFER":             C.RIC_RRC_TRANSFER,
+       "RIC_UE_CONTEXT_RELEASE":       C.RIC_UE_CONTEXT_RELEASE,
        "DC_ADM_INT_CONTROL":           C.DC_ADM_INT_CONTROL,
        "DC_ADM_INT_CONTROL_ACK":       C.DC_ADM_INT_CONTROL_ACK,
 }
@@ -114,8 +127,21 @@ const (
        RIC_SGNB_ADDITION_REQ        = C.RIC_SGNB_ADDITION_REQ
        RIC_SGNB_ADDITION_ACK        = C.RIC_SGNB_ADDITION_ACK
        RIC_SGNB_ADDITION_REJECT     = C.RIC_SGNB_ADDITION_REJECT
+       RIC_SGNB_MOD_REQUEST         = C.RIC_SGNB_MOD_REQUEST
+       RIC_SGNB_MOD_REQUEST_ACK     = C.RIC_SGNB_MOD_REQUEST_ACK
+       RIC_SGNB_MOD_REQUEST_REJECT  = C.RIC_SGNB_MOD_REQUEST_REJ
+       RIC_SGNB_MOD_REQUIRED        = C.RIC_SGNB_MOD_REQUIRED
+       RIC_SGNB_MOD_CONFIRM         = C.RIC_SGNB_MOD_CONFIRM
+       RIC_SGNB_MOD_REFUSE          = C.RIC_SGNB_MOD_REFUSE
+       RIC_SGNB_RELEASE_REQUEST     = C.RIC_SGNB_RELEASE_REQUEST
+       RIC_SGNB_RELEASE_CONFIRM     = C.RIC_SGNB_RELEASE_CONFIRM
+       RIC_SGNB_RELEASE_REQUIRED    = C.RIC_SGNB_RELEASE_REQUIRED
+       RIC_SGNB_RELEASE_REQUEST_ACK = C.RIC_SGNB_RELEASE_REQUEST_ACK
+       RIC_SECONDARY_RAT_DATA_USAGE_REPORT = C.RIC_SECONDARY_RAT_DATA_USAGE_REPORT
+       RIC_SN_STATUS_TRANSFER       = C.RIC_SN_STATUS_TRANSFER
        RIC_SGNB_RECONF_COMPLETE     = C.RIC_SGNB_RECONF_COMPLETE
-       RIC_RRC_TRANSFER                 = C.RIC_RRC_TRANSFER
+       RIC_RRC_TRANSFER             = C.RIC_RRC_TRANSFER
+       RIC_UE_CONTEXT_RELEASE       = C.RIC_UE_CONTEXT_RELEASE
        DC_ADM_INT_CONTROL           = C.DC_ADM_INT_CONTROL
        DC_ADM_INT_CONTROL_ACK       = C.DC_ADM_INT_CONTROL_ACK
 )
@@ -159,11 +185,24 @@ var RicMessageTypeToName = map[int]string{
        RIC_GNB_STATUS_INDICATION:    "RIC GNB STATUS INDICATION",
        RIC_RESOURCE_STATUS_UPDATE:   "RIC RESOURCE STATUS UPDATE",
        RIC_ERROR_INDICATION:         "RIC ERROR INDICATION",
-       RIC_SGNB_ADDITION_REQ:        "RIC_SGNB_ADDITION_REQ",
-       RIC_SGNB_ADDITION_ACK:        "RIC_SGNB_ADDITION_ACK",
-       RIC_SGNB_ADDITION_REJECT:     "RIC_SGNB_ADDITION_REJECT",
-       RIC_SGNB_RECONF_COMPLETE:     "RIC_SGNB_RECONF_COMPLETE",
-       RIC_RRC_TRANSFER:                 "RIC_RRC_TRANSFER",
+       RIC_SGNB_ADDITION_REQ:        "RIC SGNB ADDITION REQ",
+       RIC_SGNB_ADDITION_ACK:        "RIC SGNB ADDITION ACK",
+       RIC_SGNB_ADDITION_REJECT:     "RIC SGNB ADDITION REJECT",
+       RIC_SGNB_MOD_REQUEST:         "RIC SGNB MOD REQUEST REQ",
+       RIC_SGNB_MOD_REQUEST_ACK:     "RIC SGNB MOD REQUEST ACK",
+       RIC_SGNB_MOD_REQUEST_REJECT:  "RIC SGNB MOD REQUEST REJ",
+       RIC_SGNB_MOD_REQUIRED:        "RIC SGNB MOD REQUIRED",
+       RIC_SGNB_MOD_CONFIRM:         "RIC SGNB MOD CONFIRM",
+       RIC_SGNB_MOD_REFUSE:          "RIC SGNB MOD REFUSE",
+       RIC_SGNB_RELEASE_REQUEST:     "RIC SGNB RELEASE REQUEST",
+       RIC_SGNB_RELEASE_CONFIRM:     "RIC SGNB RELEASE CONFIRM",
+       RIC_SGNB_RELEASE_REQUIRED:    "RIC SGNB RELEASE REQUIRED",
+       RIC_SGNB_RELEASE_REQUEST_ACK: "RIC SGNB RELEASE REQUEST ACK",
+       RIC_SECONDARY_RAT_DATA_USAGE_REPORT: "RIC SECONDARY RAT DATA USAGE REPORT",
+       RIC_SN_STATUS_TRANSFER:       "RIC SN STATUS TRANSFER",
+       RIC_SGNB_RECONF_COMPLETE:     "RIC SGNB RECONF COMPLETE",
+       RIC_RRC_TRANSFER:             "RIC RRC TRANSFER",
+       RIC_UE_CONTEXT_RELEASE:       "RIC UE CONTEXT RELEASE",
        DC_ADM_INT_CONTROL:           "DC ADMISSION INTERVAL CONTROL",
        DC_ADM_INT_CONTROL_ACK:       "DC ADMISSION INTERVAL CONTROL ACK",
 }

diff --git a/pkg/xapp/rmr.go b/pkg/xapp/rmr.go
index 39813b5..8bbae7b 100755 (executable)
--- a/pkg/xapp/rmr.go
+++ b/pkg/xapp/rmr.go
@@ -52,14 +52,14 @@ var RMRCounterOpts = []CounterOpts{
 }
 
 type RMRParams struct {
-       Mtype           int
-       Payload         []byte
-       PayloadLen      int
-       Meid            *RMRMeid
-       Xid             string
-       SubId           int
-       Src             string
-       Mbuf            *C.rmr_mbuf_t
+       Mtype      int
+       Payload    []byte
+       PayloadLen int
+       Meid       *RMRMeid
+       Xid        string
+       SubId      int
+       Src        string
+       Mbuf       *C.rmr_mbuf_t
 }
 
 func NewRMRClient() *RMRClient {
@@ -135,8 +135,7 @@ func (m *RMRClient) parseMessage(rxBuffer *C.rmr_mbuf_t) {
 
        meidBuf := make([]byte, int(C.RMR_MAX_MEID))
        if meidCstr := C.rmr_get_meid(rxBuffer, (*C.uchar)(unsafe.Pointer(&meidBuf[0]))); meidCstr != nil {
-               params.Meid.PlmnID = strings.TrimRight(string(meidBuf[0:16]), "\000")
-               params.Meid.EnbID = strings.TrimRight(string(meidBuf[16:32]), "\000")
+               params.Meid.RanName = strings.TrimRight(string(meidBuf), "\000")
        }
 
        xidBuf := make([]byte, int(C.RMR_MAX_XID))
@@ -193,8 +192,7 @@ func (m *RMRClient) Send(params *RMRParams, isRts bool) bool {
        if params != nil {
                if params.Meid != nil {
                        b := make([]byte, int(C.RMR_MAX_MEID))
-                       copy(b, []byte(params.Meid.PlmnID))
-                       copy(b[16:], []byte(params.Meid.EnbID))
+                       copy(b, []byte(params.Meid.RanName))
                        C.rmr_bytes2meid(buf, (*C.uchar)(unsafe.Pointer(&b[0])), C.int(len(b)))
                }
                xidLen := len(params.Xid)

diff --git a/pkg/xapp/types.go b/pkg/xapp/types.go
index b67f9f1..110244b 100755 (executable)
--- a/pkg/xapp/types.go
+++ b/pkg/xapp/types.go
@@ -38,8 +38,9 @@ type RMRClient struct {
 }
 
 type RMRMeid struct {
-       PlmnID string
-       EnbID  string
+       PlmnID  string
+       EnbID   string
+       RanName string
 }
 
 type MessageConsumer interface {

diff --git a/pkg/xapp/xapp_test.go b/pkg/xapp/xapp_test.go
index 65c6b98..1aacc5e 100755 (executable)
--- a/pkg/xapp/xapp_test.go
+++ b/pkg/xapp/xapp_test.go
@@ -33,7 +33,7 @@ type Consumer struct {
 }
 
 func (m Consumer) Consume(params *RMRParams) (err error) {
-       //Logger.Info("Message received - type=%d subId=%d meid=%v xid=%s src=%s", params.Mtype, params.SubId, params.Meid, params.Xid, params.Src)
+       //Logger.Info("Message received - type=%d subId=%d meid=%v xid=%s src=%s", params.Mtype, params.SubId, params.Meid.RanName, params.Xid, params.Src)
        Sdl.Store("myKey", params.Payload)
        return nil
 }
@@ -105,7 +105,7 @@ func TestMessagesReceivedSuccessfully(t *testing.T) {
                params.Mtype = 10004
                params.SubId = -1
                params.Payload = []byte{1, 2, 3, 4, 5, 6}
-               params.Meid = &RMRMeid{PlmnID: "1234", EnbID: "7788"}
+               params.Meid = &RMRMeid{PlmnID: "1234", EnbID: "7788", RanName: "RanName-1234"}
                params.Xid = "TestXID"
                Rmr.SendMsg(params)
        }

diff --git a/test/xapp/forwarder.go b/test/xapp/forwarder.go
index d6032a4..4e38c3b 100755 (executable)
--- a/test/xapp/forwarder.go
+++ b/test/xapp/forwarder.go
@@ -8,8 +8,8 @@ type Forwarder struct {
 }
 
 func (m Forwarder) Consume(params *xapp.RMRParams) (err error) {
-       xapp.Logger.Debug("Message received - type=%d txid=%s subId=%d meid=%v", 
-                       params.Mtype, params.Xid, params.SubId, params.Meid)
+       xapp.Logger.Debug("Message received - type=%d txid=%s subId=%d meid=%s",
+               params.Mtype, params.Xid, params.SubId, params.Meid.RanName)
 
        // Store data and reply with the same message payload
        if xapp.Config.GetInt("test.store") != 0 {

diff --git a/test/xapp/generator.go b/test/xapp/generator.go
index 25cb0c3..5a17ad4 100755 (executable)
--- a/test/xapp/generator.go
+++ b/test/xapp/generator.go
@@ -18,7 +18,7 @@ type Generator struct {
 }
 
 func (m Generator) Consume(params *xapp.RMRParams) (err error) {
-       xapp.Logger.Debug("message received - type=%d txid=%s ubId=%d meid=%v", params.Mtype, params.Xid, params.SubId, params.Meid)
+       xapp.Logger.Debug("message received - type=%d txid=%s ubId=%d meid=%s", params.Mtype, params.Xid, params.SubId, params.Meid.RanName)
 
        mux.Lock()
        rx++
@@ -58,7 +58,7 @@ func runTests(mtype, subId, amount, msize, ack int) {
                params.Mtype = mtype
                params.SubId = subId
                params.Payload = s
-               params.Meid = &xapp.RMRMeid{PlmnID: "123456", EnbID: "7788"}
+               params.Meid = &xapp.RMRMeid{PlmnID: "123456", EnbID: "7788", RanName: "RanName-gnb-1234"}
                params.Xid = "TestXID1234"
                if ok := xapp.Rmr.SendMsg(params); ok {
                        tx++