clean up timer definitions: introduce groups, move some T to X

Backwards compatibly, introduce timer groups in OsmoBSC, and move some
non-specified T timers to new X timers:

T993111 -> X3111
T993210 -> X3210
T999 -> X4

Why X4? because there already is an X3 used elsewhere in Osmocom, and I find
it less confusing if X-numbers don't repeat across programs. See
https://osmocom.org/projects/cellular-infrastructure/wiki/List_of_Timer_numbers

Drop unused timers from g_mgw_tdefs. Only X2427 has an actual effect.
(libosmo-mgcp-client recently moved T2427001 to X2427.)

Put libosmo-mgcp-client related timers to the 'mgw' group, like in osmo-msc.
This makes the MGCP timeout configurable for the first time.

Keep previous timer commands as DEFUN_HIDDEN, and also translate the moved T
timers to X timers on-the-fly. All previous VTY commands still work, and new
'timer [(net|mgw)] ...' commands are added. timer.vty shows this.

Remove the "_OPTIONAL" from the legacy "timer" and "show timer" commands, so
that they don't ambiguously overload the new "timer [(net|mgw)] ..." commands.

Related: OS#4539
Related: If097f52701fd81f29bcca1d252f4fb4fca8a04f7 (osmo-mgw)
Change-Id: I4beec47502afa193dee343869c4be55dc6a4b536

1 files changed, 93 insertions, 52 deletions

diff --git a/tests/timer.vty b/tests/timer.vty
index 05fccf1df..fe2d2d8fc 100644
--- a/tests/timer.vty
+++ b/tests/timer.vty
@@ -1,62 +1,68 @@
 OsmoBSC> enable
 
 OsmoBSC# show timer
-T7 = 10 s	inter-BSC/MSC Handover outgoing, BSSMAP HO Required to HO Command timeout (default: 10 s)
-T8 = 10 s	inter-BSC/MSC Handover outgoing, BSSMAP HO Command to final Clear timeout (default: 10 s)
-T10 = 6 s	RR Assignment (default: 6 s)
-T101 = 10 s	inter-BSC/MSC Handover incoming, BSSMAP HO Request to HO Accept (default: 10 s)
-T3101 = 3 s	RR Immediate Assignment (default: 3 s)
-T3103 = 5 s	Handover (default: 5 s)
-T3105 = 100 ms	Physical Information (default: 100 ms)
-T3107 = 5 s	(unused) (default: 5 s)
-T3109 = 5 s	RSL SACCH deactivation (default: 5 s)
-T3111 = 2 s	Wait time before RSL RF Channel Release (default: 2 s)
-T993111 = 4 s	Wait time after lchan was released in error (should be T3111 + 2s) (default: 4 s)
-T3113 = 7 s	Paging (default: 7 s)
-T3115 = 10 s	(unused) (default: 10 s)
-T3117 = 10 s	(unused) (default: 10 s)
-T3119 = 10 s	(unused) (default: 10 s)
-T3122 = 10 s	Wait time after RR Immediate Assignment Reject (default: 10 s)
-T3141 = 10 s	(unused) (default: 10 s)
-T3212 = 5	Periodic Location Update timer, sent to MS (1 = 6 minutes) (default: 5)
-T993210 = 20 s	After L3 Complete, wait for MSC to confirm (default: 20 s)
-T999 = 60 s	After Clear Request, wait for MSC to Clear Command (sanity) (default: 60 s)
+net: T7 = 10 s	inter-BSC/MSC Handover outgoing, BSSMAP HO Required to HO Command timeout (default: 10 s)
+net: T8 = 10 s	inter-BSC/MSC Handover outgoing, BSSMAP HO Command to final Clear timeout (default: 10 s)
+net: T10 = 6 s	RR Assignment (default: 6 s)
+net: T101 = 10 s	inter-BSC/MSC Handover incoming, BSSMAP HO Request to HO Accept (default: 10 s)
+net: T3101 = 3 s	RR Immediate Assignment (default: 3 s)
+net: T3103 = 5 s	Handover (default: 5 s)
+net: T3105 = 100 ms	Physical Information (default: 100 ms)
+net: T3107 = 5 s	(unused) (default: 5 s)
+net: T3109 = 5 s	RSL SACCH deactivation (default: 5 s)
+net: T3111 = 2 s	Wait time before RSL RF Channel Release (default: 2 s)
+net: T3113 = 7 s	Paging (default: 7 s)
+net: T3115 = 10 s	(unused) (default: 10 s)
+net: T3117 = 10 s	(unused) (default: 10 s)
+net: T3119 = 10 s	(unused) (default: 10 s)
+net: T3122 = 10 s	Wait time after RR Immediate Assignment Reject (default: 10 s)
+net: T3141 = 10 s	(unused) (default: 10 s)
+net: T3212 = 5	Periodic Location Update timer, sent to MS (1 = 6 minutes) (default: 5)
+net: X4 = 60 s	After Clear Request, wait for MSC to Clear Command (sanity) (default: 60 s)
+net: X3111 = 4 s	Wait time after lchan was released in error (should be T3111 + 2s) (default: 4 s)
+net: X3210 = 20 s	After L3 Complete, wait for MSC to confirm (default: 20 s)
+mgw: X2427 = 5 s	timeout for MGCP response from MGW (default: 5 s)
 
 OsmoBSC# show timer T3111
 T3111 = 2 s	Wait time before RSL RF Channel Release (default: 2 s)
 
 OsmoBSC# # specifically test legacy timers that are moved to X timers
 OsmoBSC# show timer T993111
-T993111 = 4 s	Wait time after lchan was released in error (should be T3111 + 2s) (default: 4 s)
+% Legacy: timer T993111 is now X3111
+X3111 = 4 s	Wait time after lchan was released in error (should be T3111 + 2s) (default: 4 s)
 OsmoBSC# show timer T993210
-T993210 = 20 s	After L3 Complete, wait for MSC to confirm (default: 20 s)
+% Legacy: timer T993210 is now X3210
+X3210 = 20 s	After L3 Complete, wait for MSC to confirm (default: 20 s)
 OsmoBSC# show timer T999
-T999 = 60 s	After Clear Request, wait for MSC to Clear Command (sanity) (default: 60 s)
+% Legacy: timer T999 is now X4
+X4 = 60 s	After Clear Request, wait for MSC to Clear Command (sanity) (default: 60 s)
 
 OsmoBSC# configure terminal
 OsmoBSC(config)# network
 OsmoBSC(config-net)# timer
-T7 = 10 s	inter-BSC/MSC Handover outgoing, BSSMAP HO Required to HO Command timeout (default: 10 s)
-T8 = 10 s	inter-BSC/MSC Handover outgoing, BSSMAP HO Command to final Clear timeout (default: 10 s)
-T10 = 6 s	RR Assignment (default: 6 s)
-T101 = 10 s	inter-BSC/MSC Handover incoming, BSSMAP HO Request to HO Accept (default: 10 s)
-T3101 = 3 s	RR Immediate Assignment (default: 3 s)
-T3103 = 5 s	Handover (default: 5 s)
-T3105 = 100 ms	Physical Information (default: 100 ms)
-T3107 = 5 s	(unused) (default: 5 s)
-T3109 = 5 s	RSL SACCH deactivation (default: 5 s)
-T3111 = 2 s	Wait time before RSL RF Channel Release (default: 2 s)
-T993111 = 4 s	Wait time after lchan was released in error (should be T3111 + 2s) (default: 4 s)
-T3113 = 7 s	Paging (default: 7 s)
-T3115 = 10 s	(unused) (default: 10 s)
-T3117 = 10 s	(unused) (default: 10 s)
-T3119 = 10 s	(unused) (default: 10 s)
-T3122 = 10 s	Wait time after RR Immediate Assignment Reject (default: 10 s)
-T3141 = 10 s	(unused) (default: 10 s)
-T3212 = 5	Periodic Location Update timer, sent to MS (1 = 6 minutes) (default: 5)
-T993210 = 20 s	After L3 Complete, wait for MSC to confirm (default: 20 s)
-T999 = 60 s	After Clear Request, wait for MSC to Clear Command (sanity) (default: 60 s)
+net: T7 = 10 s	inter-BSC/MSC Handover outgoing, BSSMAP HO Required to HO Command timeout (default: 10 s)
+net: T8 = 10 s	inter-BSC/MSC Handover outgoing, BSSMAP HO Command to final Clear timeout (default: 10 s)
+net: T10 = 6 s	RR Assignment (default: 6 s)
+net: T101 = 10 s	inter-BSC/MSC Handover incoming, BSSMAP HO Request to HO Accept (default: 10 s)
+net: T3101 = 3 s	RR Immediate Assignment (default: 3 s)
+net: T3103 = 5 s	Handover (default: 5 s)
+net: T3105 = 100 ms	Physical Information (default: 100 ms)
+net: T3107 = 5 s	(unused) (default: 5 s)
+net: T3109 = 5 s	RSL SACCH deactivation (default: 5 s)
+net: T3111 = 2 s	Wait time before RSL RF Channel Release (default: 2 s)
+net: T3113 = 7 s	Paging (default: 7 s)
+net: T3115 = 10 s	(unused) (default: 10 s)
+net: T3117 = 10 s	(unused) (default: 10 s)
+net: T3119 = 10 s	(unused) (default: 10 s)
+net: T3122 = 10 s	Wait time after RR Immediate Assignment Reject (default: 10 s)
+net: T3141 = 10 s	(unused) (default: 10 s)
+net: T3212 = 5	Periodic Location Update timer, sent to MS (1 = 6 minutes) (default: 5)
+net: X4 = 60 s	After Clear Request, wait for MSC to Clear Command (sanity) (default: 60 s)
+net: X3111 = 4 s	Wait time after lchan was released in error (should be T3111 + 2s) (default: 4 s)
+net: X3210 = 20 s	After L3 Complete, wait for MSC to confirm (default: 20 s)
+mgw: X2427 = 5 s	timeout for MGCP response from MGW (default: 5 s)
 
+OsmoBSC(config-net)# # Using the legacy 'timer Txxx' still works:
 OsmoBSC(config-net)# timer T3111
 T3111 = 2 s	Wait time before RSL RF Channel Release (default: 2 s)
 OsmoBSC(config-net)# timer T3111 23
@@ -66,30 +72,65 @@ OsmoBSC(config-net)# timer T3111 default
 OsmoBSC(config-net)# timer T3111
 T3111 = 2 s	Wait time before RSL RF Channel Release (default: 2 s)
 
+OsmoBSC(config-net)# # Using the new timer group commands also works:
+OsmoBSC(config-net)# timer net T3111
+net: T3111 = 2 s	Wait time before RSL RF Channel Release (default: 2 s)
+OsmoBSC(config-net)# timer net T3111 42
+OsmoBSC(config-net)# timer net T3111
+net: T3111 = 42 s	Wait time before RSL RF Channel Release (default: 2 s)
+OsmoBSC(config-net)# timer net T3111 default
+OsmoBSC(config-net)# timer net T3111
+net: T3111 = 2 s	Wait time before RSL RF Channel Release (default: 2 s)
+OsmoBSC(config-net)# timer mgw
+mgw: X2427 = 5 s	timeout for MGCP response from MGW (default: 5 s)
+OsmoBSC(config-net)# timer mgw X2427
+mgw: X2427 = 5 s	timeout for MGCP response from MGW (default: 5 s)
+OsmoBSC(config-net)# timer mgw X2427 42
+OsmoBSC(config-net)# timer mgw X2427
+mgw: X2427 = 42 s	timeout for MGCP response from MGW (default: 5 s)
+OsmoBSC(config-net)# timer mgw X2427 default
+OsmoBSC(config-net)# timer mgw X2427
+mgw: X2427 = 5 s	timeout for MGCP response from MGW (default: 5 s)
+
 OsmoBSC(config-net)# # specifically test legacy timers that are moved to X timers
 OsmoBSC(config-net)# timer T993111
-T993111 = 4 s	Wait time after lchan was released in error (should be T3111 + 2s) (default: 4 s)
+% Legacy: timer T993111 is now X3111
+X3111 = 4 s	Wait time after lchan was released in error (should be T3111 + 2s) (default: 4 s)
 OsmoBSC(config-net)# timer T993111 1
+% Legacy: timer T993111 is now X3111
 OsmoBSC(config-net)# timer T993111
-T993111 = 1 s	Wait time after lchan was released in error (should be T3111 + 2s) (default: 4 s)
+% Legacy: timer T993111 is now X3111
+X3111 = 1 s	Wait time after lchan was released in error (should be T3111 + 2s) (default: 4 s)
 OsmoBSC(config-net)# timer T993111 default
+% Legacy: timer T993111 is now X3111
 OsmoBSC(config-net)# timer T993111
-T993111 = 4 s	Wait time after lchan was released in error (should be T3111 + 2s) (default: 4 s)
+% Legacy: timer T993111 is now X3111
+X3111 = 4 s	Wait time after lchan was released in error (should be T3111 + 2s) (default: 4 s)
 
 OsmoBSC(config-net)# timer T993210
-T993210 = 20 s	After L3 Complete, wait for MSC to confirm (default: 20 s)
+% Legacy: timer T993210 is now X3210
+X3210 = 20 s	After L3 Complete, wait for MSC to confirm (default: 20 s)
 OsmoBSC(config-net)# timer T993210 2
+% Legacy: timer T993210 is now X3210
 OsmoBSC(config-net)# timer T993210
-T993210 = 2 s	After L3 Complete, wait for MSC to confirm (default: 20 s)
+% Legacy: timer T993210 is now X3210
+X3210 = 2 s	After L3 Complete, wait for MSC to confirm (default: 20 s)
 OsmoBSC(config-net)# timer T993210 default
+% Legacy: timer T993210 is now X3210
 OsmoBSC(config-net)# timer T993210
-T993210 = 20 s	After L3 Complete, wait for MSC to confirm (default: 20 s)
+% Legacy: timer T993210 is now X3210
+X3210 = 20 s	After L3 Complete, wait for MSC to confirm (default: 20 s)
 
 OsmoBSC(config-net)# timer T999
-T999 = 60 s	After Clear Request, wait for MSC to Clear Command (sanity) (default: 60 s)
+% Legacy: timer T999 is now X4
+X4 = 60 s	After Clear Request, wait for MSC to Clear Command (sanity) (default: 60 s)
 OsmoBSC(config-net)# timer T999 3
+% Legacy: timer T999 is now X4
 OsmoBSC(config-net)# timer T999
-T999 = 3 s	After Clear Request, wait for MSC to Clear Command (sanity) (default: 60 s)
+% Legacy: timer T999 is now X4
+X4 = 3 s	After Clear Request, wait for MSC to Clear Command (sanity) (default: 60 s)
 OsmoBSC(config-net)# timer T999 default
+% Legacy: timer T999 is now X4
 OsmoBSC(config-net)# timer T999
-T999 = 60 s	After Clear Request, wait for MSC to Clear Command (sanity) (default: 60 s)
+% Legacy: timer T999 is now X4
+X4 = 60 s	After Clear Request, wait for MSC to Clear Command (sanity) (default: 60 s)