From: E. Scott Daniels Date: Wed, 18 Mar 2020 12:41:07 +0000 (-0400) Subject: Additional message types added for TS and E2 X-Git-Tag: 3.6.0^0 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=fe9b5bd6536f4abb282f82e361db2bffbfdc03f8;p=ric-plt%2Flib%2Frmr.git Additional message types added for TS and E2 Message types added in RIC message types header for E2_RESET and TS (traffic steering). This change also includes additional constants in rmr.h to help framework code improve readability. Signed-off-by: E. Scott Daniels Change-Id: I3e0f358b4f34f461ea09dfe7d823c6251d4e398b --- diff --git a/CHANGES_CORE.txt b/CHANGES_CORE.txt index 6770f71..ba701f4 100644 --- a/CHANGES_CORE.txt +++ b/CHANGES_CORE.txt @@ -5,6 +5,9 @@ # API and build change and fix summaries. Doc correctsions # and/or changes are not mentioned here; see the commit messages. +2020 March 18; version 3.6.0 + Add message types to support traffic steering + 2020 March 16; version 3.5.2 Correct bug in the meid table parser that prevented the ack/nack of meid tables (RIC-273) diff --git a/CMakeLists.txt b/CMakeLists.txt index 85711af..d57ddbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,8 +39,8 @@ project( rmr LANGUAGES C ) cmake_minimum_required( VERSION 3.5 ) set( major_version "3" ) # should be automatically populated from git tag later, but until CI process sets a tag we use this -set( minor_version "5" ) -set( patch_level "2" ) +set( minor_version "6" ) +set( patch_level "0" ) set( install_root "${CMAKE_INSTALL_PREFIX}" ) set( install_inc "include/rmr" ) diff --git a/docs/rel-notes.rst b/docs/rel-notes.rst index 6207bd7..c316f66 100644 --- a/docs/rel-notes.rst +++ b/docs/rel-notes.rst @@ -28,6 +28,19 @@ Core RMR Changes -------------------------------------------------------------------------------------------- +2020 March 18; version 3.6.0 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Add message types to support traffic steering + + +2020 March 16; version 3.5.2 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Correct bug in the meid table parser that prevented the +ack/nack of meid tables (RIC-273) + + 2020 March 10; version 3.5.1 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/src/rmr/common/include/RIC_message_types.h b/src/rmr/common/include/RIC_message_types.h index 70ff94d..c3660a2 100644 --- a/src/rmr/common/include/RIC_message_types.h +++ b/src/rmr/common/include/RIC_message_types.h @@ -116,6 +116,11 @@ #define RIC_E2_SETUP_REQ 12001 #define RIC_E2_SETUP_RESP 12002 #define RIC_E2_SETUP_FAILURE 12003 +#define RIC_E2_RESET_REQ 12004 +#define RIC_E2_RESET_RESP 12005 +#define RIC_E2_RAN_ERROR_INDICATION 12006 +#define RIC_E2_RIC_ERROR_INDICATION 12007 + #define RIC_SUB_REQ 12010 #define RIC_SUB_RESP 12011 @@ -147,6 +152,12 @@ #define A1_POLICY_QUERY 20012 +// --- application specific message numbers 30000 - 39999 + +#define TS_UE_LIST 30000 // traffic steering +#define TS_QOE_PRED_REQ 30001 +#define TS_QUE_PREDICTION 30002 + // ---- these are old (release 0) definitions and should not be used ------ diff --git a/src/rmr/common/include/rmr.h b/src/rmr/common/include/rmr.h index 4932641..4a8968e 100644 --- a/src/rmr/common/include/rmr.h +++ b/src/rmr/common/include/rmr.h @@ -72,6 +72,11 @@ extern "C" { #define RMR_ERR_INITFAILED 15 // initialisation of something (probably message) failed #define RMR_ERR_NOTSUPP 16 // the request is not supported, or RMr was not initialised for the request +#define RMR_NO_CLONE 0 // parm constants for better readability +#define RMR_CLONE 1 +#define RMR_NO_COPY 0 +#define RMR_COPY 1 + #define RMR_WH_CONNECTED(a) (a>=0) // for now whid is integer; it could be pointer at some future date /*