enrich context for vlr_subscr_name and ran_conn fi name

Include all available information in vlr_subscr_name(); instead of either IMSI
or MSISDN or TMSI, print all of them when present. Instead of a short log,
rather have more valuable context.

A context info would now look like:

  Process_Access_Request_VLR(GERAN-A-3_IMSI-901700000014706_MSISDN-2023_TMSI-0x08bde4ec_PAGING_RESP)

It does get quite long, but ensures easy correlation of any BSSAP / IuCS
messages with log output, especially if multiple subscribers are busy at the
same time.

When showing the RAN conn id, instead of

  GERAN_A-00000017

write

  GERAN-A-23

- We usually write the conn_id in decimal.
- Leading zeros are clutter.
- Don't mix - and _ separators.

These changes are combined to produce only one burst of humungous amounts of
msc_vlr_tests expected output. That is definitely a weak point of these tests:
blowing up the git history. OTOH they do show logging changes nicely.

Change-Id: I66a68ce2eb8957a35855a3743d91a86299900834

1 files changed, 103 insertions, 100 deletions

diff --git a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err
index 2fa071955..0c976193a 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_timeout.err
+++ b/tests/msc_vlr/msc_vlr_test_hlr_timeout.err
@@ -9,31 +9,32 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
+DMM RAN_conn(GERAN-A-0_unknown_LU){RAN_CONN_S_NEW}: Updated ID
 DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
 DMM LU/new-LAC: 1/23
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph)
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Received Event VLR_ULA_E_UPDATE_LA
+DVLR vlr_lu_fsm(GERAN-A-0_unknown_LU){VLR_ULA_S_IDLE}: Allocated
+DVLR vlr_lu_fsm(GERAN-A-0_unknown_LU){VLR_ULA_S_IDLE}: is child of RAN_conn(GERAN-A-0_unknown_LU)
+DVLR vlr_lu_fsm(GERAN-A-0_unknown_LU){VLR_ULA_S_IDLE}: rev=GSM net=GERAN Auth (no Ciph)
+DVLR vlr_lu_fsm(GERAN-A-0_unknown_LU){VLR_ULA_S_IDLE}: Received Event VLR_ULA_E_UPDATE_LA
 DREF VLR subscr unknown usage increases to: 1
 DVLR set IMSI on subscriber; IMSI=901700000004620 id=901700000004620
 DVLR New subscr, IMSI: 901700000004620
-DREF VLR subscr IMSI:901700000004620 usage increases to: 2
-DREF VLR subscr IMSI:901700000004620 usage decreases to: 1
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: vlr_loc_upd_node1()
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: state_chg to VLR_ULA_S_WAIT_AUTH
-DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Allocated
-DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(LU:901700000004620)
-DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START
+DREF VLR subscr IMSI-901700000004620 usage increases to: 2
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Updated ID
+DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
+DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_IDLE}: vlr_loc_upd_node1()
+DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_IDLE}: state_chg to VLR_ULA_S_WAIT_AUTH
+DVLR VLR_Authenticate(GERAN-A-0_IMSI-901700000004620_LU){VLR_SUB_AS_NEEDS_AUTH}: Allocated
+DVLR VLR_Authenticate(GERAN-A-0_IMSI-901700000004620_LU){VLR_SUB_AS_NEEDS_AUTH}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
+DVLR VLR_Authenticate(GERAN-A-0_IMSI-901700000004620_LU){VLR_SUB_AS_NEEDS_AUTH}: Received Event VLR_AUTH_E_START
 DVLR GSUP tx: 08010809710000004026f0
 GSUP --> HLR: OSMO_GSUP_MSGT_SEND_AUTH_INFO_REQUEST: 08010809710000004026f0
-DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
-DREF IMSI:901700000004620: MSC conn use - compl_l3 == 0 (0x0: )
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED
+DVLR VLR_Authenticate(GERAN-A-0_IMSI-901700000004620_LU){VLR_SUB_AS_NEEDS_AUTH}: state_chg to VLR_SUB_AS_NEEDS_AUTH_WAIT_AI
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
+DREF IMSI-901700000004620: MSC conn use - compl_l3 == 0 (0x0: )
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED
   lu_result_sent == 0
 ---
 - HLR never replies
@@ -49,39 +50,39 @@ DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Aut
 - Total time passed: 4.001363 s
   llist_count(&net->ran_conns) == 1
 - Total time passed: 5.001598 s
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Timeout of T0
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_CN_CLOSE
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Close event, cause: CONGESTION
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_RELEASING
-DREF IMSI:901700000004620: MSC conn use + release == 1 (0x100: release)
-DREF VLR subscr IMSI:901700000004620 usage increases to: 2
-- sending LU Reject for IMSI:901700000004620, cause 22
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_DONE
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_RELEASING}: Received Event RAN_CONN_E_CN_CLOSE
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_RELEASING}: Event RAN_CONN_E_CN_CLOSE not permitted
-DREF VLR subscr IMSI:901700000004620 usage decreases to: 1
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Timeout of T0
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_CN_CLOSE
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Close event, cause: CONGESTION
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_RELEASING
+DREF IMSI-901700000004620: MSC conn use + release == 1 (0x100: release)
+DREF VLR subscr IMSI-901700000004620 usage increases to: 2
+- sending LU Reject for IMSI-901700000004620, cause 22
+DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_WAIT_AUTH}: state_chg to VLR_ULA_S_DONE
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_RELEASING}: Received Event RAN_CONN_E_CN_CLOSE
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_RELEASING}: Event RAN_CONN_E_CN_CLOSE not permitted
+DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
 - BSSAP Clear --RAN_GERAN_A--> MS
 - RAN_CONN_TIMEOUT has passed, conn is gone.
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
-DREF IMSI:901700000004620: MSC conn use - release == 0 (0x0: )
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_RELEASING}: Received Event RAN_CONN_E_UNUSED
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_RELEASING}: state_chg to RAN_CONN_S_RELEASED
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR)
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT)
-DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Terminating (cause = OSMO_FSM_TERM_PARENT)
-DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Removing from parent vlr_lu_fsm(LU:901700000004620)
-DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Freeing instance
-DVLR VLR_Authenticate(LU:901700000004620){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Deallocated
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Removing from parent RAN_conn(LU:901700000004620)
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: fsm_lu_cleanup called with cause OSMO_FSM_TERM_PARENT
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Freeing instance
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Deallocated
-DRLL IMSI:901700000004620: Freeing RAN connection
-DREF VLR subscr IMSI:901700000004620 usage decreases to: 0
-DREF freeing VLR subscr IMSI:901700000004620
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_RELEASED}: Freeing instance
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_RELEASED}: Deallocated
+DREF IMSI-901700000004620: MSC conn use - release == 0 (0x0: )
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_RELEASING}: Received Event RAN_CONN_E_UNUSED
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_RELEASING}: state_chg to RAN_CONN_S_RELEASED
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR)
+DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT)
+DVLR VLR_Authenticate(GERAN-A-0_IMSI-901700000004620_LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Terminating (cause = OSMO_FSM_TERM_PARENT)
+DVLR VLR_Authenticate(GERAN-A-0_IMSI-901700000004620_LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Removing from parent vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
+DVLR VLR_Authenticate(GERAN-A-0_IMSI-901700000004620_LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Freeing instance
+DVLR VLR_Authenticate(GERAN-A-0_IMSI-901700000004620_LU){VLR_SUB_AS_NEEDS_AUTH_WAIT_AI}: Deallocated
+DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_DONE}: Removing from parent RAN_conn(GERAN-A-0_IMSI-901700000004620_LU)
+DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_DONE}: fsm_lu_cleanup called with cause OSMO_FSM_TERM_PARENT
+DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_DONE}: Freeing instance
+DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_DONE}: Deallocated
+DRLL IMSI-901700000004620: Freeing RAN connection
+DREF VLR subscr IMSI-901700000004620 usage decreases to: 0
+DREF freeing VLR subscr IMSI-901700000004620
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_RELEASED}: Freeing instance
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_RELEASED}: Deallocated
   llist_count(&net->ran_conns) == 0
   lu_result_sent == 2
 ===== test_hlr_timeout_lu_auth_info: SUCCESS
@@ -97,44 +98,46 @@ talloc_total_blocks(tall_bsc_ctx) == 13
 DMM RAN_conn{RAN_CONN_S_NEW}: Allocated
 DREF unknown: MSC conn use + compl_l3 == 1 (0x1: compl_l3)
 DRLL Dispatching 04.08 message GSM48_MT_MM_LOC_UPD_REQUEST (0x5:0x8)
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Updated ID
+DMM RAN_conn(GERAN-A-0_unknown_LU){RAN_CONN_S_NEW}: Updated ID
 DMM LOCATION UPDATING REQUEST: MI(IMSI)=901700000004620 type=IMSI ATTACH
 DMM LU/new-LAC: 1/23
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Allocated
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: is child of RAN_conn(LU:901700000004620)
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth)
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: Received Event VLR_ULA_E_UPDATE_LA
+DVLR vlr_lu_fsm(GERAN-A-0_unknown_LU){VLR_ULA_S_IDLE}: Allocated
+DVLR vlr_lu_fsm(GERAN-A-0_unknown_LU){VLR_ULA_S_IDLE}: is child of RAN_conn(GERAN-A-0_unknown_LU)
+DVLR vlr_lu_fsm(GERAN-A-0_unknown_LU){VLR_ULA_S_IDLE}: rev=GSM net=GERAN (no Auth)
+DVLR vlr_lu_fsm(GERAN-A-0_unknown_LU){VLR_ULA_S_IDLE}: Received Event VLR_ULA_E_UPDATE_LA
 DREF VLR subscr unknown usage increases to: 1
 DVLR set IMSI on subscriber; IMSI=901700000004620 id=901700000004620
 DVLR New subscr, IMSI: 901700000004620
-DREF VLR subscr IMSI:901700000004620 usage increases to: 2
-DREF VLR subscr IMSI:901700000004620 usage decreases to: 1
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: vlr_loc_upd_node1()
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: vlr_loc_upd_post_auth()
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: vlr_loc_upd_post_ciph()
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: vlr_loc_upd_node_4()
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_IDLE}: state_chg to VLR_ULA_S_WAIT_HLR_UPD
-DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Allocated
-DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(LU:901700000004620)
-DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
+DREF VLR subscr IMSI-901700000004620 usage increases to: 2
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Updated ID
+DREF VLR subscr IMSI-901700000004620 usage decreases to: 1
+DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_IDLE}: vlr_loc_upd_node1()
+DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_IDLE}: vlr_loc_upd_post_auth()
+DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_IDLE}: vlr_loc_upd_post_ciph()
+DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_IDLE}: vlr_loc_upd_node_4()
+DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU){VLR_ULA_S_IDLE}: state_chg to VLR_ULA_S_WAIT_HLR_UPD
+DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Allocated
+DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: is child of vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_LU)
+DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: Received Event UPD_HLR_VLR_E_START
 DVLR GSUP tx: 04010809710000004026f0280102
 GSUP --> HLR: OSMO_GSUP_MSGT_UPDATE_LOCATION_REQUEST: 04010809710000004026f0280102
-DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
-DREF IMSI:901700000004620: MSC conn use - compl_l3 == 0 (0x0: )
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED
+DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_INIT}: state_chg to UPD_HLR_VLR_S_WAIT_FOR_DATA
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: Received Event RAN_CONN_E_COMPLETE_LAYER_3
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_NEW}: state_chg to RAN_CONN_S_AUTH_CIPH
+DREF IMSI-901700000004620: MSC conn use - compl_l3 == 0 (0x0: )
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_UNUSED
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_LU){RAN_CONN_S_AUTH_CIPH}: Awaiting results for Auth+Ciph, overruling event RAN_CONN_E_UNUSED
   lu_result_sent == 0
 - HLR sends _INSERT_DATA_REQUEST, VLR responds with _INSERT_DATA_RESULT
 <-- GSUP rx OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: 10010809710000004026f00804036470f1
 DVLR GSUP rx 17: 10010809710000004026f00804036470f1
-DREF VLR subscr IMSI:901700000004620 usage increases to: 2
+DREF VLR subscr IMSI-901700000004620 usage increases to: 2
 DVLR IMSI:901700000004620 has MSISDN:46071
-DVLR SUBSCR(MSISDN:46071) VLR: update for IMSI=901700000004620 (MSISDN=46071, used=2)
+DVLR SUBSCR(IMSI-901700000004620_MSISDN-46071) VLR: update for IMSI=901700000004620 (MSISDN=46071, used=2)
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_AUTH_CIPH}: Updated ID
 DVLR GSUP tx: 12010809710000004026f0
 GSUP --> HLR: OSMO_GSUP_MSGT_INSERT_DATA_RESULT: 12010809710000004026f0
-DREF VLR subscr MSISDN:46071 usage decreases to: 1
+DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
 <-- GSUP rx OSMO_GSUP_MSGT_INSERT_DATA_REQUEST: vlr_gsupc_read_cb() returns 0
   lu_result_sent == 0
 ---
@@ -156,39 +159,39 @@ DREF VLR subscr MSISDN:46071 usage decreases to: 1
   llist_count(&net->ran_conns) == 1
   lu_result_sent == 0
 - Total time passed: 5.001598 s
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Timeout of T0
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_CN_CLOSE
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: Close event, cause: CONGESTION
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_RELEASING
-DREF MSISDN:46071: MSC conn use + release == 1 (0x100: release)
-DREF VLR subscr MSISDN:46071 usage increases to: 2
-- sending LU Reject for MSISDN:46071, cause 22
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_WAIT_HLR_UPD}: state_chg to VLR_ULA_S_DONE
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_RELEASING}: Received Event RAN_CONN_E_CN_CLOSE
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_RELEASING}: Event RAN_CONN_E_CN_CLOSE not permitted
-DREF VLR subscr MSISDN:46071 usage decreases to: 1
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_AUTH_CIPH}: Timeout of T0
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_AUTH_CIPH}: Received Event RAN_CONN_E_CN_CLOSE
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_AUTH_CIPH}: Close event, cause: CONGESTION
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_AUTH_CIPH}: state_chg to RAN_CONN_S_RELEASING
+DREF IMSI-901700000004620_MSISDN-46071: MSC conn use + release == 1 (0x100: release)
+DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage increases to: 2
+- sending LU Reject for IMSI-901700000004620_MSISDN-46071, cause 22
+DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){VLR_ULA_S_WAIT_HLR_UPD}: state_chg to VLR_ULA_S_DONE
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_RELEASING}: Received Event RAN_CONN_E_CN_CLOSE
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_RELEASING}: Event RAN_CONN_E_CN_CLOSE not permitted
+DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 1
 - BSSAP Clear --RAN_GERAN_A--> MS
 - RAN_CONN_TIMEOUT has passed, conn is gone.
   bssap_clear_sent == 1
 - BSS sends BSSMAP Clear Complete
-DREF MSISDN:46071: MSC conn use - release == 0 (0x0: )
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_RELEASING}: Received Event RAN_CONN_E_UNUSED
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_RELEASING}: state_chg to RAN_CONN_S_RELEASED
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR)
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT)
-DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_WAIT_FOR_DATA}: Terminating (cause = OSMO_FSM_TERM_PARENT)
-DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_WAIT_FOR_DATA}: Removing from parent vlr_lu_fsm(LU:901700000004620)
-DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_WAIT_FOR_DATA}: Freeing instance
-DVLR upd_hlr_vlr_fsm(LU:901700000004620){UPD_HLR_VLR_S_WAIT_FOR_DATA}: Deallocated
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Removing from parent RAN_conn(LU:901700000004620)
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: fsm_lu_cleanup called with cause OSMO_FSM_TERM_PARENT
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Freeing instance
-DVLR vlr_lu_fsm(LU:901700000004620){VLR_ULA_S_DONE}: Deallocated
-DRLL MSISDN:46071: Freeing RAN connection
-DREF VLR subscr MSISDN:46071 usage decreases to: 0
-DREF freeing VLR subscr MSISDN:46071
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_RELEASED}: Freeing instance
-DMM RAN_conn(LU:901700000004620){RAN_CONN_S_RELEASED}: Deallocated
+DREF IMSI-901700000004620_MSISDN-46071: MSC conn use - release == 0 (0x0: )
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_RELEASING}: Received Event RAN_CONN_E_UNUSED
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_RELEASING}: state_chg to RAN_CONN_S_RELEASED
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_RELEASED}: Terminating (cause = OSMO_FSM_TERM_REGULAR)
+DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){VLR_ULA_S_DONE}: Terminating (cause = OSMO_FSM_TERM_PARENT)
+DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_WAIT_FOR_DATA}: Terminating (cause = OSMO_FSM_TERM_PARENT)
+DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_WAIT_FOR_DATA}: Removing from parent vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU)
+DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_WAIT_FOR_DATA}: Freeing instance
+DVLR upd_hlr_vlr_fsm(GERAN-A-0_IMSI-901700000004620_LU){UPD_HLR_VLR_S_WAIT_FOR_DATA}: Deallocated
+DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){VLR_ULA_S_DONE}: Removing from parent RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU)
+DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){VLR_ULA_S_DONE}: fsm_lu_cleanup called with cause OSMO_FSM_TERM_PARENT
+DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){VLR_ULA_S_DONE}: Freeing instance
+DVLR vlr_lu_fsm(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){VLR_ULA_S_DONE}: Deallocated
+DRLL IMSI-901700000004620_MSISDN-46071: Freeing RAN connection
+DREF VLR subscr IMSI-901700000004620_MSISDN-46071 usage decreases to: 0
+DREF freeing VLR subscr IMSI-901700000004620_MSISDN-46071
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_RELEASED}: Freeing instance
+DMM RAN_conn(GERAN-A-0_IMSI-901700000004620_MSISDN-46071_LU){RAN_CONN_S_RELEASED}: Deallocated
   llist_count(&net->ran_conns) == 0
   lu_result_sent == 2
 ===== test_hlr_timeout_lu_upd_loc_result: SUCCESS