Update for RMR version and E2 setup related message types

Change-Id: I6405c3216a8288a3f4392ed4303e5d76be7a1130
Signed-off-by: wahidw <abdulwahid.w@nokia.com>

diff --git a/ci/Dockerfile b/ci/Dockerfile
index c9886e2..7b95438 100755 (executable)
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update -y \
 RUN curl -s https://packagecloud.io/install/repositories/o-ran-sc/master/script.deb.sh | bash
 
 # RMR
-ARG RMRVERSION=3.5.2
+ARG RMRVERSION=3.6.0
 #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 856d7ad..4725324 100644 (file)
--- a/pkg/xapp/mtypes.go
+++ b/pkg/xapp/mtypes.go
@@ -110,6 +110,9 @@ var RICMessageTypes = map[string]int{
        "RMRRM_TABLE_DATA":                    C.RMRRM_TABLE_DATA,
        "RMRRM_REQ_TABLE":                     C.RMRRM_REQ_TABLE,
        "RMRRM_TABLE_STATE":                   C.RMRRM_TABLE_STATE,
+       "RIC_E2_SETUP_REQ":                    C.RIC_E2_SETUP_REQ,
+       "RIC_E2_SETUP_RESP":                   C.RIC_E2_SETUP_RESP,
+       "RIC_E2_SETUP_FAILURE":                C.RIC_E2_SETUP_FAILURE,
 }
 
 //-----------------------------------------------------------------------------
@@ -198,6 +201,9 @@ const (
        RMRRM_TABLE_DATA                    = C.RMRRM_TABLE_DATA
        RMRRM_REQ_TABLE                     = C.RMRRM_REQ_TABLE
        RMRRM_TABLE_STATE                   = C.RMRRM_TABLE_STATE
+       RIC_E2_SETUP_REQ                    = C.RIC_E2_SETUP_REQ
+       RIC_E2_SETUP_RESP                   = C.RIC_E2_SETUP_RESP
+       RIC_E2_SETUP_FAILURE                = C.RIC_E2_SETUP_FAILURE
 )
 
 //-----------------------------------------------------------------------------
@@ -286,4 +292,7 @@ var RicMessageTypeToName = map[int]string{
        RMRRM_TABLE_DATA:                    "RMRRM_TABLE_DATA",
        RMRRM_REQ_TABLE:                     "RMRRM_REQ_TABLE",
        RMRRM_TABLE_STATE:                   "RMRRM_TABLE_STATE",
+       RIC_E2_SETUP_REQ:                    "RIC_E2_SETUP_REQ",
+       RIC_E2_SETUP_RESP:                   "RIC_E2_SETUP_RESP",
+       RIC_E2_SETUP_FAILURE:                "RIC_E2_SETUP_FAILURE",
 }