logging vty: deprecate 'all', introduce 'force-all'

Add 'logging level force-all <level>' and 'no logging level force-all' as new
names for 'logging level all <level>' and 'logging level all everything'.

Resurrect the functionality of 'logging level all everything' -- even if it is
still deprecated because the name is confusing, it is now just an alias for
'no logging level force-all'.

Show in logging_vty_test.vty that we can now again lift the global logging
clamp, both with the new commands as well as with the deprecated ones.
Also show that 'force-all' is written back properly, if set.

Change-Id: I36f17c131cc70ce5a1aef62fd9693097de230cd4

1 files changed, 134 insertions, 14 deletions

diff --git a/tests/logging/logging_vty_test.vty b/tests/logging/logging_vty_test.vty
index a2c1e74b..03b0c4ae 100644
--- a/tests/logging/logging_vty_test.vty
+++ b/tests/logging/logging_vty_test.vty
@@ -12,6 +12,19 @@ log stderr
 ...
 
 logging_vty_test# configure terminal
+logging_vty_test(config)# log stderr
+
+logging_vty_test(config-log)# logging level force-all notice
+logging_vty_test(config-log)# show running-config
+... !logging level all
+  logging level force-all notice
+... !logging level all
+
+logging_vty_test(config-log)# no logging level force-all
+logging_vty_test(config-log)# show running-config
+... !logging level force-all
+
+logging_vty_test(config-log)# exit
 logging_vty_test(config)# no log stderr
 logging_vty_test(config)# exit
 
@@ -37,9 +50,10 @@ logging_vty_test# list
   logging print level (0|1)
   logging print file (0|1|basename) [last]
   logging set-log-mask MASK
-  logging level (all|aa|bb|ccc|dddd|eee|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf) (debug|info|notice|error|fatal)
-  show logging vty
-... !logging
+  logging level (aa|bb|ccc|dddd|eee|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf) (debug|info|notice|error|fatal)
+  logging level force-all (debug|info|notice|error|fatal)
+  no logging level force-all
+... !^  logging
 
 logging_vty_test# logging ?
   enable        Enables logging to this vty
@@ -52,14 +66,15 @@ logging_vty_test# logging ?
   level         Set the log level for a specified category
 
 logging_vty_test# logging level ?
-  all      Global setting for all subsystems
-  aa       Antropomorphic Armadillos (AA)
-  bb       Bidirectional Breadspread (BB)
-  ccc      Chaos Communication Congress (CCC)
-  dddd     Dehydrated Dribbling Duck Dunkers (DDDD)
-  eee      Exhaustive Entropy Extraction (EEE)
-  lglobal  Library-internal global log family
-...
+... ! all
+  aa         Antropomorphic Armadillos (AA)
+  bb         Bidirectional Breadspread (BB)
+  ccc        Chaos Communication Congress (CCC)
+  dddd       Dehydrated Dribbling Duck Dunkers (DDDD)
+  eee        Exhaustive Entropy Extraction (EEE)
+  lglobal    Library-internal global log family
+... ! all
+  force-all  Globally force all logging categories to a specific level. This is released by the 'no logging level force-all' command. Note: any 'logging level <category> <level>' commands will have no visible effect after this, until the forced level is released.
 
 logging_vty_test# logging level aa ?
   debug   Log debug messages and higher levels
@@ -69,12 +84,18 @@ logging_vty_test# logging level aa ?
   fatal   Log only fatal messages
 
 logging_vty_test# logging level all ?
+% There is no matched command.
+
+logging_vty_test# logging level force-all ?
   debug   Log debug messages and higher levels
   info    Log informational messages and higher levels
   notice  Log noticeable messages and higher levels
   error   Log error messages and higher levels
   fatal   Log only fatal messages
 
+logging_vty_test# no logging level ?
+  force-all  Release any globally forced log level set with 'logging level force-all <level>'
+
 
 logging_vty_test# log-sweep
 DAA DEBUG Log message for DAA on level LOGL_DEBUG
@@ -93,6 +114,7 @@ DDDDD ERROR Log message for DDDDD on level LOGL_ERROR
 DDDDD FATAL Log message for DDDDD on level LOGL_FATAL
 DEEE FATAL Log message for DEEE on level LOGL_FATAL
 
+logging_vty_test# ! The deprecated 'logging level all' still does what it did
 logging_vty_test# logging level all fatal
 logging_vty_test# log-sweep
 DAA FATAL Log message for DAA on level LOGL_FATAL
@@ -175,12 +197,110 @@ DEEE NOTICE Log message for DEEE on level LOGL_NOTICE
 DEEE ERROR Log message for DEEE on level LOGL_ERROR
 DEEE FATAL Log message for DEEE on level LOGL_FATAL
 
-logging_vty_test# ! Old 'logging level all everything' has no effect
+logging_vty_test# ! Deprecated 'logging level all everything' lifts the globally forced level
 logging_vty_test# logging level all everything
-% Ignoring deprecated logging level 'everything' keyword
 logging_vty_test# log-sweep eee
+DEEE FATAL Log message for DEEE on level LOGL_FATAL
+
+
+logging_vty_test# ! Now do the same dance with the new 'logging level force-all' commands
+logging_vty_test# logging level force-all fatal
+logging_vty_test# log-sweep
+DAA FATAL Log message for DAA on level LOGL_FATAL
+DBB FATAL Log message for DBB on level LOGL_FATAL
+DCCC FATAL Log message for DCCC on level LOGL_FATAL
+DDDDD FATAL Log message for DDDDD on level LOGL_FATAL
+DEEE FATAL Log message for DEEE on level LOGL_FATAL
+
+logging_vty_test# logging level force-all error
+logging_vty_test# log-sweep
+DAA ERROR Log message for DAA on level LOGL_ERROR
+DAA FATAL Log message for DAA on level LOGL_FATAL
+DBB ERROR Log message for DBB on level LOGL_ERROR
+DBB FATAL Log message for DBB on level LOGL_FATAL
+DCCC ERROR Log message for DCCC on level LOGL_ERROR
+DCCC FATAL Log message for DCCC on level LOGL_FATAL
+DDDDD ERROR Log message for DDDDD on level LOGL_ERROR
+DDDDD FATAL Log message for DDDDD on level LOGL_FATAL
+DEEE ERROR Log message for DEEE on level LOGL_ERROR
+DEEE FATAL Log message for DEEE on level LOGL_FATAL
+
+logging_vty_test# logging level force-all notice
+logging_vty_test# log-sweep
+DAA NOTICE Log message for DAA on level LOGL_NOTICE
+DAA ERROR Log message for DAA on level LOGL_ERROR
+DAA FATAL Log message for DAA on level LOGL_FATAL
+DBB NOTICE Log message for DBB on level LOGL_NOTICE
+DBB ERROR Log message for DBB on level LOGL_ERROR
+DBB FATAL Log message for DBB on level LOGL_FATAL
+DCCC NOTICE Log message for DCCC on level LOGL_NOTICE
+DCCC ERROR Log message for DCCC on level LOGL_ERROR
+DCCC FATAL Log message for DCCC on level LOGL_FATAL
+DDDDD NOTICE Log message for DDDDD on level LOGL_NOTICE
+DDDDD ERROR Log message for DDDDD on level LOGL_ERROR
+DDDDD FATAL Log message for DDDDD on level LOGL_FATAL
 DEEE NOTICE Log message for DEEE on level LOGL_NOTICE
 DEEE ERROR Log message for DEEE on level LOGL_ERROR
 DEEE FATAL Log message for DEEE on level LOGL_FATAL
 
-logging_vty_test# ! There is currently no way to remove the 'logging level all' level!
+logging_vty_test# logging level force-all debug
+logging_vty_test# log-sweep
+DAA DEBUG Log message for DAA on level LOGL_DEBUG
+DAA INFO Log message for DAA on level LOGL_INFO
+DAA NOTICE Log message for DAA on level LOGL_NOTICE
+DAA ERROR Log message for DAA on level LOGL_ERROR
+DAA FATAL Log message for DAA on level LOGL_FATAL
+DBB DEBUG Log message for DBB on level LOGL_DEBUG
+DBB INFO Log message for DBB on level LOGL_INFO
+DBB NOTICE Log message for DBB on level LOGL_NOTICE
+DBB ERROR Log message for DBB on level LOGL_ERROR
+DBB FATAL Log message for DBB on level LOGL_FATAL
+DCCC DEBUG Log message for DCCC on level LOGL_DEBUG
+DCCC INFO Log message for DCCC on level LOGL_INFO
+DCCC NOTICE Log message for DCCC on level LOGL_NOTICE
+DCCC ERROR Log message for DCCC on level LOGL_ERROR
+DCCC FATAL Log message for DCCC on level LOGL_FATAL
+DDDDD DEBUG Log message for DDDDD on level LOGL_DEBUG
+DDDDD INFO Log message for DDDDD on level LOGL_INFO
+DDDDD NOTICE Log message for DDDDD on level LOGL_NOTICE
+DDDDD ERROR Log message for DDDDD on level LOGL_ERROR
+DDDDD FATAL Log message for DDDDD on level LOGL_FATAL
+DEEE DEBUG Log message for DEEE on level LOGL_DEBUG
+DEEE INFO Log message for DEEE on level LOGL_INFO
+DEEE NOTICE Log message for DEEE on level LOGL_NOTICE
+DEEE ERROR Log message for DEEE on level LOGL_ERROR
+DEEE FATAL Log message for DEEE on level LOGL_FATAL
+
+logging_vty_test# ! 'force-all' overrides everything, be it stronger or weaker
+logging_vty_test# logging level force-all notice
+logging_vty_test# logging level eee debug
+logging_vty_test# log-sweep eee
+DEEE NOTICE Log message for DEEE on level LOGL_NOTICE
+DEEE ERROR Log message for DEEE on level LOGL_ERROR
+DEEE FATAL Log message for DEEE on level LOGL_FATAL
+
+logging_vty_test# logging level force-all notice
+logging_vty_test# logging level eee fatal
+logging_vty_test# log-sweep eee
+DEEE NOTICE Log message for DEEE on level LOGL_NOTICE
+DEEE ERROR Log message for DEEE on level LOGL_ERROR
+DEEE FATAL Log message for DEEE on level LOGL_FATAL
+
+logging_vty_test# ! lift the globally forced level
+logging_vty_test# no logging level force-all
+logging_vty_test# log-sweep
+DAA DEBUG Log message for DAA on level LOGL_DEBUG
+DAA INFO Log message for DAA on level LOGL_INFO
+DAA NOTICE Log message for DAA on level LOGL_NOTICE
+DAA ERROR Log message for DAA on level LOGL_ERROR
+DAA FATAL Log message for DAA on level LOGL_FATAL
+DBB INFO Log message for DBB on level LOGL_INFO
+DBB NOTICE Log message for DBB on level LOGL_NOTICE
+DBB ERROR Log message for DBB on level LOGL_ERROR
+DBB FATAL Log message for DBB on level LOGL_FATAL
+DCCC NOTICE Log message for DCCC on level LOGL_NOTICE
+DCCC ERROR Log message for DCCC on level LOGL_ERROR
+DCCC FATAL Log message for DCCC on level LOGL_FATAL
+DDDDD ERROR Log message for DDDDD on level LOGL_ERROR
+DDDDD FATAL Log message for DDDDD on level LOGL_FATAL
+DEEE FATAL Log message for DEEE on level LOGL_FATAL