Add RIC message types to header

Message types added to the RIC message type header for:
	RIC_ALARM           (110)
	RIC_ALARM_QUERY     (111)
	RIC_METRICS         (120)
	RAN_E2_RESET_REQ    (12008)
	RAN_E2_RESET_RESP   (12009)

Issue-ID: RIC-514

Signed-off-by: E. Scott Daniels <daniels@research.att.com>
Change-Id: I544cec60e4e9402139261b6fe0291d7c1253475e

diff --git a/CHANGES_CORE.txt b/CHANGES_CORE.txt
index 7b2679c..05e0f73 100644 (file)
--- a/CHANGES_CORE.txt
+++ b/CHANGES_CORE.txt
@@ -5,6 +5,14 @@
 # API and build change  and fix summaries. Doc correctsions
 # and/or changes are not mentioned here; see the commit messages.
 
+2020 June 22; version 4.1.1
+       Add new message types to RIC header file for
+               RIC_ALARM           (110)
+               RIC_ALARM_QUERY     (111)
+               RIC_METRICS         (120)
+               RAN_E2_RESET_REQ    (12008)
+               RAN_E2_RESET_RESP   (12009)
+
 2020 June 18; version 4.1.0
        Bump version minor to move away from 4.0.* which will bump for any
        patches applied back to bronze.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e44affd..1ea8d25 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@ cmake_minimum_required( VERSION 3.5 )
 
 set( major_version "4" )               # should be automatically populated from git tag later, but until CI process sets a tag we use this
 set( minor_version "1" )
-set( patch_level "0" )
+set( patch_level "1" )
 
 set( install_root "${CMAKE_INSTALL_PREFIX}" )
 set( install_inc "include/rmr" )

diff --git a/doc/src/rtd/fmt_changes.ksh b/doc/src/rtd/fmt_changes.ksh
index 930bce4..a3528cc 100644 (file)
--- a/doc/src/rtd/fmt_changes.ksh
+++ b/doc/src/rtd/fmt_changes.ksh
@@ -54,7 +54,19 @@ do
                /4\.0\.5$/  { printf( "&h1(Bronze Release)\n" ); rheader = 1 }
                /1\.11\.1$/ { printf( "&h1(Amber Release)\n" ); rheader = 1 }
 
+               print_raw && /^\t\t/ {                  # anything indented should be unformatted
+                       gsub( "^\t\t", "    ", $0 )
+                       if( ! format_off ) {
+                               format_off = 1
+                               printf( ".nf\n" )
+                       }
+               }
+
                print_raw && /^$/ {                             # include blank lines after first real stuff
+                       if( format_off ) {
+                               format_off = 0
+                               printf( ".fo\n" );
+                       }
                        printf( "&space\n\n" );
                        next
                }

diff --git a/docs/rel-notes.rst b/docs/rel-notes.rst
index 1ea3c61..cb1559e 100644 (file)
--- a/docs/rel-notes.rst
+++ b/docs/rel-notes.rst
@@ -22,6 +22,29 @@ the need to leap frog versions ceased, and beginning with
 version 4.0.0, the RMR versions should no longer skip. 
 
 
+2020 June 22; version 4.1.1
+---------------------------
+
+Add new message types to RIC header file for 
+    RIC_ALARM           (110)
+    RIC_ALARM_QUERY     (111)
+    RIC_METRICS         (120)
+    RAN_E2_RESET_REQ    (12008)
+    RAN_E2_RESET_RESP   (12009)
+ 
+
+
+2020 June 18; version 4.1.0
+---------------------------
+
+Bump version minor to move away from 4.0.* which will bump 
+for any patches applied back to bronze. 
+ 
+Add magic C++ goo to symtab header file allowing C++ xAPPs to 
+use the symbol table directly. 
+ 
+
+
 Bronze Release
 ==============
 
@@ -486,8 +509,8 @@ Correct missing constant for wrappers.
 2019 September 19; version 1.8.0
 --------------------------------
 
-New message types added: RAN_CONNECTED, RAN_RESTARTED, 
-RAN_RECONFIGURED 
+New message types added: 
+    RAN_CONNECTED, RAN_RESTARTED, RAN_RECONFIGURED
  
 
 
@@ -558,16 +581,17 @@ rmr_alloc_msg manual page for more details.
 ---------------------------------------------
 
 Support for the Nanomsg transport library has been dropped. 
-The library librmr.* will no longer be included in packages. 
+    The library librmr.* will no longer be included in packages.
  
 Packages will install RMR libraries into the system preferred 
-target directory. On some systems this is /usr/local/lib and 
-on others it is /usr/local/lib64. The diretory is determined 
-by the sytem on which the package is built and NOT by the 
-system installing the package, so it's possible that the RMR 
-libraries end up in a strange location if the .deb or .rpm 
-file was generated on a Linux flavour that has a different 
-preference than the one where the package is installed. 
+    target directory. On some systems this is /usr/local/lib
+    and on others it is /usr/local/lib64.  The diretory is
+    determined by the sytem on which the package is built and
+    NOT by the system installing the package, so it's possible
+    that the RMR libraries end up in a strange location if the
+    .deb or .rpm file was generated on a Linux flavour that
+    has a different preference than the one where the package
+    is installed.
  
 
 
@@ -596,9 +620,9 @@ Added new message types to RIC_message_types.h.
 ----------------------------
 
  
-librmr and librmr_nng - Add message buffer API function 
-rmr_trace_ref() (see rmr_trace_ref.3 manual page in dev 
-package). 
+librmr and librmr_nng 
+    - Add message buffer API function rmr_trace_ref()
+      (see rmr_trace_ref.3 manual page in dev package).
  
 
 

diff --git a/src/rmr/common/include/RIC_message_types.h b/src/rmr/common/include/RIC_message_types.h
index 8452302..b336237 100644 (file)
--- a/src/rmr/common/include/RIC_message_types.h
+++ b/src/rmr/common/include/RIC_message_types.h
@@ -42,6 +42,11 @@
 #define RIC_HEALTH_CHECK_REQ    100
 #define RIC_HEALTH_CHECK_RESP   101
 
+#define RIC_ALARMi                             110
+#define RIC_ALARM_QUERY                        111
+
+#define RIC_METRICS                            120
+
 // --- please keep additions in numerical order ------
 
 #define RIC_SCTP_CONNECTION_FAILURE 1080
@@ -120,6 +125,9 @@
 #define RIC_E2_RESET_RESP                      12005
 #define RIC_E2_RAN_ERROR_INDICATION    12006
 #define RIC_E2_RIC_ERROR_INDICATION    12007
+#define RAN_E2_RESET_REQ                       12008
+#define RAN_E2_RESET_RESP                      12009
+
 
 
 #define RIC_SUB_REQ                                    12010