Updating the rmr version and included new message types
Change-Id: I32c3c3d92f3246e393056a093dc5d8de612f5a1e
Signed-off-by: wahidw <abdulwahid.w@nokia.com>
diff --git a/ci/Dockerfile b/ci/Dockerfile
index 01e3994..73ec7cd 100755
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -17,7 +17,7 @@
#
#----------------------------------------------------------
-FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:2-u18.04-nng as xapp-base
+FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:3-u18.04-nng as xapp-base
RUN apt-get update -y \
&&apt-get install -y \
@@ -36,7 +36,7 @@
RUN curl -s https://packagecloud.io/install/repositories/o-ran-sc/master/script.deb.sh | bash
# RMR
-ARG RMRVERSION=1.9.0
+ARG RMRVERSION=1.13.1
#RUN apt-get install -y rmr=${RMRVERSION} rmr-dev=${RMRVERSION}
RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr_${RMRVERSION}_amd64.deb
RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_${RMRVERSION}_amd64.deb/download.deb && dpkg -i rmr-dev_${RMRVERSION}_amd64.deb
diff --git a/pkg/xapp/mtypes.go b/pkg/xapp/mtypes.go
index 5cee681..5577823 100644
--- a/pkg/xapp/mtypes.go
+++ b/pkg/xapp/mtypes.go
@@ -28,6 +28,14 @@
//
//-----------------------------------------------------------------------------
var RICMessageTypes = map[string]int{
+ "RIC_SCTP_CONNECTION_FAILURE": C.RIC_SCTP_CONNECTION_FAILURE,
+ "RIC_SCTP_CLEAR_ALL": C.RIC_SCTP_CLEAR_ALL,
+ "E2_TERM_INIT": C.E2_TERM_INIT,
+ "E2_TERM_KEEP_ALIVE_REQ": C.E2_TERM_KEEP_ALIVE_REQ,
+ "E2_TERM_KEEP_ALIVE_RESP": C.E2_TERM_KEEP_ALIVE_RESP,
+ "RAN_CONNECTED": C.RAN_CONNECTED,
+ "RAN_RESTARTED": C.RAN_RESTARTED,
+ "RAN_RECONFIGURED": C.RAN_RECONFIGURED,
"RIC_SUB_REQ": C.RIC_SUB_REQ,
"RIC_SUB_RESP": C.RIC_SUB_RESP,
"RIC_SUB_FAILURE": C.RIC_SUB_FAILURE,
@@ -83,12 +91,36 @@
"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,
+ "DC_ADM_GET_POLICY": C.DC_ADM_GET_POLICY,
+ "DC_ADM_GET_POLICY_ACK": C.DC_ADM_GET_POLICY_ACK,
+ "A1_POLICY_REQ": C.A1_POLICY_REQ,
+ "A1_POLICY_RESP": C.A1_POLICY_RESP,
+ "A1_POLICY_QUERY": C.A1_POLICY_QUERY,
+ "RIC_X2_SETUP": C.RIC_X2_SETUP,
+ "RIC_X2_RESPONSE": C.RIC_X2_RESPONSE,
+ "RIC_X2_RESOURCE_STATUS_REQUEST": C.RIC_X2_RESOURCE_STATUS_REQUEST,
+ "RIC_X2_RESOURCE_STATUS_RESPONSE": C.RIC_X2_RESOURCE_STATUS_RESPONSE,
+ "RIC_X2_LOAD_INFORMATION": C.RIC_X2_LOAD_INFORMATION,
+ "RIC_E2_TERMINATION_HC_REQUEST": C.RIC_E2_TERMINATION_HC_REQUEST,
+ "RIC_E2_TERMINATION_HC_RESPONSE": C.RIC_E2_TERMINATION_HC_RESPONSE,
+ "RIC_E2_MANAGER_HC_REQUEST": C.RIC_E2_MANAGER_HC_REQUEST,
+ "RIC_E2_MANAGER_HC_RESPONSE": C.RIC_E2_MANAGER_HC_RESPONSE,
+ "RIC_CONTROL_XAPP_CONFIG_REQUEST": C.RIC_CONTROL_XAPP_CONFIG_REQUEST,
+ "RIC_CONTROL_XAPP_CONFIG_RESPONSE": C.RIC_CONTROL_XAPP_CONFIG_RESPONSE,
}
//-----------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------
const (
+ RIC_SCTP_CONNECTION_FAILURE = C.RIC_SCTP_CONNECTION_FAILURE
+ RIC_SCTP_CLEAR_ALL = C.RIC_SCTP_CLEAR_ALL
+ E2_TERM_INIT = C.E2_TERM_INIT
+ E2_TERM_KEEP_ALIVE_REQ = C.E2_TERM_KEEP_ALIVE_REQ
+ E2_TERM_KEEP_ALIVE_RESP = C.E2_TERM_KEEP_ALIVE_RESP
+ RAN_CONNECTED = C.RAN_CONNECTED
+ RAN_RESTARTED = C.RAN_RESTARTED
+ RAN_RECONFIGURED = C.RAN_RECONFIGURED
RIC_SUB_REQ = C.RIC_SUB_REQ
RIC_SUB_RESP = C.RIC_SUB_RESP
RIC_SUB_FAILURE = C.RIC_SUB_FAILURE
@@ -144,12 +176,36 @@
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
+ DC_ADM_GET_POLICY = C.DC_ADM_GET_POLICY
+ DC_ADM_GET_POLICY_ACK = C.DC_ADM_GET_POLICY_ACK
+ A1_POLICY_REQ = C.A1_POLICY_REQ
+ A1_POLICY_RESP = C.A1_POLICY_RESP
+ A1_POLICY_QUERY = C.A1_POLICY_QUERY
+ RIC_X2_SETUP = C.RIC_X2_SETUP
+ RIC_X2_RESPONSE = C.RIC_X2_RESPONSE
+ RIC_X2_RESOURCE_STATUS_REQUEST = C.RIC_X2_RESOURCE_STATUS_REQUEST
+ RIC_X2_RESOURCE_STATUS_RESPONSE = C.RIC_X2_RESOURCE_STATUS_RESPONSE
+ RIC_X2_LOAD_INFORMATION = C.RIC_X2_LOAD_INFORMATION
+ RIC_E2_TERMINATION_HC_REQUEST = C.RIC_E2_TERMINATION_HC_REQUEST
+ RIC_E2_TERMINATION_HC_RESPONSE = C.RIC_E2_TERMINATION_HC_RESPONSE
+ RIC_E2_MANAGER_HC_REQUEST = C.RIC_E2_MANAGER_HC_REQUEST
+ RIC_E2_MANAGER_HC_RESPONSE = C.RIC_E2_MANAGER_HC_RESPONSE
+ RIC_CONTROL_XAPP_CONFIG_REQUEST = C.RIC_CONTROL_XAPP_CONFIG_REQUEST
+ RIC_CONTROL_XAPP_CONFIG_RESPONSE = C.RIC_CONTROL_XAPP_CONFIG_RESPONSE
)
//-----------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------
var RicMessageTypeToName = map[int]string{
+ RIC_SCTP_CONNECTION_FAILURE: "RIC SCTP CONNECTION FAILURE",
+ RIC_SCTP_CLEAR_ALL: "RIC SCTP CLEAR ALL",
+ E2_TERM_INIT: "E2 TERM INIT",
+ E2_TERM_KEEP_ALIVE_REQ: "E2 TERM KEEP ALIVE REQ",
+ E2_TERM_KEEP_ALIVE_RESP: "E2 TERM KEEP ALIVE RESP",
+ RAN_CONNECTED: "RAN CONNECTED",
+ RAN_RESTARTED: "RAN RESTARTED",
+ RAN_RECONFIGURED: "RAN RECONFIGURED",
RIC_SUB_REQ: "RIC SUBSCRIPTION REQUEST",
RIC_SUB_RESP: "RIC SUBSCRIPTION RESPONSE",
RIC_SUB_FAILURE: "RIC SUBSCRIPTION FAILURE",
@@ -205,4 +261,20 @@
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",
+ DC_ADM_GET_POLICY: "DC_ADM_GET_POLICY",
+ DC_ADM_GET_POLICY_ACK: "DC_ADM_GET_POLICY_ACK",
+ A1_POLICY_REQ: "A1_POLICY_REQ",
+ A1_POLICY_RESP: "A1_POLICY_RESP",
+ A1_POLICY_QUERY: "A1_POLICY_QUERY",
+ RIC_X2_SETUP: "RIC_X2_SETUP",
+ RIC_X2_RESPONSE: "RIC_X2_RESPONSE",
+ RIC_X2_RESOURCE_STATUS_REQUEST: "RIC_X2_RESOURCE_STATUS_REQUEST",
+ RIC_X2_RESOURCE_STATUS_RESPONSE: "RIC_X2_RESOURCE_STATUS_RESPONSE",
+ RIC_X2_LOAD_INFORMATION: "RIC_X2_LOAD_INFORMATION",
+ RIC_E2_TERMINATION_HC_REQUEST: "RIC_E2_TERMINATION_HC_REQUEST",
+ RIC_E2_TERMINATION_HC_RESPONSE: "RIC_E2_TERMINATION_HC_RESPONSE",
+ RIC_E2_MANAGER_HC_REQUEST: "RIC_E2_MANAGER_HC_REQUEST",
+ RIC_E2_MANAGER_HC_RESPONSE: "RIC_E2_MANAGER_HC_RESPONSE",
+ RIC_CONTROL_XAPP_CONFIG_REQUEST: "RIC_CONTROL_XAPP_CONFIG_REQUEST",
+ RIC_CONTROL_XAPP_CONFIG_RESPONSE: "RIC_CONTROL_XAPP_CONFIG_RESPONSE",
}