From 6af063ee12dc292b7d37459199e2a51285030217 Mon Sep 17 00:00:00 2001 From: "E. Scott Daniels" Date: Fri, 2 Oct 2020 07:36:41 -0400 Subject: [PATCH] Add message types for traffic steering anomaly messages This change addes the following message types: TS_ANOMALY_UPDATE TS_ANOMALY_ACK The RTD message type page will also be updated. Issue-ID: RIC-651 Signed-off-by: E. Scott Daniels Change-Id: I4a8efd6d9c2aced40b6ff1eb6e42ee3d034f0745 --- CHANGES_CORE.txt | 3 ++ CMakeLists.txt | 4 +-- docs/msg_types.rst | 8 +++++ docs/rel-notes.rst | 7 +++++ src/rmr/common/include/RIC_message_types.h | 3 ++ src/rmr/common/include/vet_mtypes.ksh | 50 ++++++++++++++++-------------- 6 files changed, 49 insertions(+), 26 deletions(-) diff --git a/CHANGES_CORE.txt b/CHANGES_CORE.txt index 881263a..e8a418b 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 October 2; Version 4.3.0 + Add message types for traffic steering anomaly messages + 2020 September 15; Version 4.2.4 Add man page for the rmr_set_low_latency() function (RIC-631) diff --git a/CMakeLists.txt b/CMakeLists.txt index f71f8dc..66e0d74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,8 +40,8 @@ project( rmr LANGUAGES C ) 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 "2" ) -set( patch_level "4" ) +set( minor_version "3" ) +set( patch_level "0" ) set( install_root "${CMAKE_INSTALL_PREFIX}" ) set( install_inc "include/rmr" ) diff --git a/docs/msg_types.rst b/docs/msg_types.rst index 090d112..ed074bf 100644 --- a/docs/msg_types.rst +++ b/docs/msg_types.rst @@ -439,6 +439,14 @@ specific category. - | + * - **TS_ANOMALY_UPDATE** + - + | + + * - **TS_ANOMALY_ACK** + - + | + * - **MC_REPORT** - | diff --git a/docs/rel-notes.rst b/docs/rel-notes.rst index f73f2da..948016c 100644 --- a/docs/rel-notes.rst +++ b/docs/rel-notes.rst @@ -22,6 +22,13 @@ the need to leap frog versions ceased, and beginning with version 4.0.0, the RMR versions should no longer skip. +2020 October 2; Version 4.3.0 +----------------------------- + +Add message types for anomaly detection + + + 2020 September 15; Version 4.2.4 -------------------------------- diff --git a/src/rmr/common/include/RIC_message_types.h b/src/rmr/common/include/RIC_message_types.h index 3b8f8ea..dcefd64 100644 --- a/src/rmr/common/include/RIC_message_types.h +++ b/src/rmr/common/include/RIC_message_types.h @@ -231,6 +231,9 @@ #define TS_UE_LIST 30000 // traffic steering #define TS_QOE_PRED_REQ 30001 #define TS_QOE_PREDICTION 30002 +#define TS_ANOMALY_UPDATE 30003 +#define TS_ANOMALY_ACK 30004 + #define MC_REPORT 30010 // Measurement campaign xApp reports diff --git a/src/rmr/common/include/vet_mtypes.ksh b/src/rmr/common/include/vet_mtypes.ksh index c4e1b82..8d36853 100755 --- a/src/rmr/common/include/vet_mtypes.ksh +++ b/src/rmr/common/include/vet_mtypes.ksh @@ -22,7 +22,7 @@ # the header file. The check is only to ensure that there are # no duplicate constant names or values for any #define in the file. # -# By default RIC_message_types.h is parsed, but it will accept the +# By default RIC_message_types.h is parsed, but it will accept the # filename as the first positional parameter on the command line should # it be necessary. # @@ -31,37 +31,39 @@ # CAUTION: this breaks if any define is more than a simple key/value # pair in the header file. -awk ' - /#define/ { - vcount[$NF]++; +sed 's!//.*!!' ${1:-RIC_message_types.h} | awk ' + /#define/ { + vcount[$NF]++; ncount[$2]++; + lines[$2] = lines[$2] " " NR + lines[$NF] = lines[$NF] " " NR next - } + } - END { + END { vgood = 0 ngood = 0 bad = 0 - for( x in vcount ) { - if( vcount[x] != 1 ) { - printf( "duplicate value? %s\n", x ); - bad++ - } else { - vgood++ - } - } + for( x in vcount ) { + if( vcount[x] != 1 ) { + printf( "duplicate value? %s on lines: %s\n", x, lines[x] ); + bad++ + } else { + vgood++ + } + } - for( x in ncount ) { - if( ncount[x] != 1 ) { - printf( "duplicate name? %s\n", x ); - bad++ - } else { - ngood++ - } - } + for( x in ncount ) { + if( ncount[x] != 1 ) { + printf( "duplicate name? %s on lines: %s\n", x, lines[x] ); + bad++ + } else { + ngood++ + } + } - printf( "good values=%d good names=%d bad things=%d\n", vgood, ngood, bad ) + printf( "good values=%d good names=%d bad things=%d\n", vgood, ngood, bad ) exit( !! bad ) - }' ${1:-RIC_message_types.h} + }' -- 2.16.6