neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31632 )
Change subject: tweak gsm_pchan_ids[]: s/OSMO_DYN/OSMODYN ......................................................................
tweak gsm_pchan_ids[]: s/OSMO_DYN/OSMODYN
This patch affects *only* on osmo_fsm instance IDs, which are visible on the CTRL and VTY interfaces to identify FSM instances, and in the log.
Why bother: An upcoming patch wants to replace gsm_pchan_ids[] with osmo_fsm_inst_update_id_f_sanitize(gsm_pchan_name(x)), this is an explicit step to match gsm_pchan_names[].
Why drop the underscore: On the VTY, in phys_chan_config names, there commonly is an underscore separator to indicate that a timeslot can become either of the parts, e.g. TCH/F_PDCH means the timeslot can be TCH/F, or it can be PDCH. The name "OSMO_DYN" would then imply that it can be either OSMO, or DYN, so let's rather name it OSMODYN.
Change-Id: I4a540744cced466f0ca4fc605db4d0ec14ee8e87 --- M TODO-RELEASE M src/osmo-bsc/gsm_data.c M tests/bsc/bsc_test.ok 3 files changed, 27 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/32/31632/1
diff --git a/TODO-RELEASE b/TODO-RELEASE index d0852fc..ab85fc3 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line + osmo-bsc CTRL,VTY osmo_fsm instance IDs are tweaked: OSMO_DYN becomes OSMODYN diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 96c291d..33a878b 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -207,7 +207,7 @@ { GSM_PCHAN_UNKNOWN, "UNKNOWN" }, { GSM_PCHAN_CCCH_SDCCH4_CBCH, "CCCH_SDCCH4_CBCH" }, { GSM_PCHAN_SDCCH8_SACCH8C_CBCH, "SDCCH8_CBCH" }, - { GSM_PCHAN_OSMO_DYN, "OSMO_DYN" }, + { GSM_PCHAN_OSMO_DYN, "OSMODYN" }, { 0, NULL } };
diff --git a/tests/bsc/bsc_test.ok b/tests/bsc/bsc_test.ok index bb255ad..f0adbd1 100644 --- a/tests/bsc/bsc_test.ok +++ b/tests/bsc/bsc_test.ok @@ -48,8 +48,8 @@ lchan->fi->id = 0-1-0-SDCCH8_CBCH-0 assignment.fi->id = msc4294967295-conn123_subscr-TMSI-0x00000423_0-1-0-SDCCH8_CBCH-0 pchan=OSMODYN: - ts->fi->id = 0-1-0-OSMO_DYN - lchan->fi->id = 0-1-0-OSMO_DYN-0 - assignment.fi->id = msc4294967295-conn123_subscr-TMSI-0x00000423_0-1-0-OSMO_DYNasNONE-0 + ts->fi->id = 0-1-0-OSMODYN + lchan->fi->id = 0-1-0-OSMODYN-0 + assignment.fi->id = msc4294967295-conn123_subscr-TMSI-0x00000423_0-1-0-OSMODYNasNONE-0
Testing execution completed.
-
neels