Take new RMR version=1.3-0 into use
Change-Id: Ib8305d2e439f04e498c9d2aef50501627bf85aea
Signed-off-by: Mohamed Abukar <abukar.mohamed@nokia.com>
diff --git a/pkg/xapp/mtypes.go b/pkg/xapp/mtypes.go
index 82f3466..0023776 100755
--- a/pkg/xapp/mtypes.go
+++ b/pkg/xapp/mtypes.go
@@ -63,6 +63,11 @@
"RIC_GNB_STATUS_INDICATION": C.RIC_GNB_STATUS_INDICATION,
"RIC_RESOURCE_STATUS_UPDATE": C.RIC_RESOURCE_STATUS_UPDATE,
"RIC_ERROR_INDICATION": C.RIC_ERROR_INDICATION,
+ "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_RECONF_COMPLETE": C.RIC_SGNB_RECONF_COMPLETE,
+ "RIC_RRC_TRANSFER": C.RIC_RRC_TRANSFER,
"DC_ADM_INT_CONTROL": C.DC_ADM_INT_CONTROL,
"DC_ADM_INT_CONTROL_ACK": C.DC_ADM_INT_CONTROL_ACK,
}
@@ -106,6 +111,11 @@
RIC_GNB_STATUS_INDICATION = C.RIC_GNB_STATUS_INDICATION
RIC_RESOURCE_STATUS_UPDATE = C.RIC_RESOURCE_STATUS_UPDATE
RIC_ERROR_INDICATION = C.RIC_ERROR_INDICATION
+ 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_RECONF_COMPLETE = C.RIC_SGNB_RECONF_COMPLETE
+ RIC_RRC_TRANSFER = C.RIC_RRC_TRANSFER
DC_ADM_INT_CONTROL = C.DC_ADM_INT_CONTROL
DC_ADM_INT_CONTROL_ACK = C.DC_ADM_INT_CONTROL_ACK
)
@@ -149,6 +159,11 @@
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",
DC_ADM_INT_CONTROL: "DC ADMISSION INTERVAL CONTROL",
DC_ADM_INT_CONTROL_ACK: "DC ADMISSION INTERVAL CONTROL ACK",
}
diff --git a/test/xapp/forwarder.go b/test/xapp/forwarder.go
index 63ec16f..d6032a4 100755
--- a/test/xapp/forwarder.go
+++ b/test/xapp/forwarder.go
@@ -8,7 +8,8 @@
}
func (m Forwarder) Consume(params *xapp.RMRParams) (err error) {
- xapp.Logger.Debug("Message received - type=%d subId=%d meid=%v xid=%v", params.Mtype, params.SubId, params.Meid, params.Xid)
+ xapp.Logger.Debug("Message received - type=%d txid=%s subId=%d meid=%v",
+ params.Mtype, params.Xid, params.SubId, params.Meid)
// Store data and reply with the same message payload
if xapp.Config.GetInt("test.store") != 0 {
@@ -27,7 +28,7 @@
params.SubId = sid
}
- if ok := xapp.Rmr.SendMsg(params); !ok {
+ if ok := xapp.Rmr.SendRts(params); !ok {
xapp.Logger.Info("Rmr.Send failed ...")
}
return
diff --git a/test/xapp/generator.go b/test/xapp/generator.go
index 7db5f80..25cb0c3 100755
--- a/test/xapp/generator.go
+++ b/test/xapp/generator.go
@@ -18,7 +18,7 @@
}
func (m Generator) Consume(params *xapp.RMRParams) (err error) {
- xapp.Logger.Debug("message received - type=%d subId=%d meid=%v", params.Mtype, params.SubId, params.Meid)
+ xapp.Logger.Debug("message received - type=%d txid=%s ubId=%d meid=%v", params.Mtype, params.Xid, params.SubId, params.Meid)
mux.Lock()
rx++
@@ -59,7 +59,7 @@
params.SubId = subId
params.Payload = s
params.Meid = &xapp.RMRMeid{PlmnID: "123456", EnbID: "7788"}
- params.Xid = "TestXID"
+ params.Xid = "TestXID1234"
if ok := xapp.Rmr.SendMsg(params); ok {
tx++
if ack != 0 {