neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/31632 )
Change subject: tweak gsm_pchan_ids[]: DYNAMIC/{OSMOCOM,IPACCESS}
......................................................................
tweak gsm_pchan_ids[]: DYNAMIC/{OSMOCOM,IPACCESS}
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[].
Change-Id: I4a540744cced466f0ca4fc605db4d0ec14ee8e87
---
M TODO-RELEASE
M src/osmo-bsc/gsm_data.c
M tests/bsc/bsc_test.ok
3 files changed, 25 insertions(+), 8 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
neels: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/TODO-RELEASE b/TODO-RELEASE
index 6f680a6..78fcea3 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -9,3 +9,4 @@
#library what description / commit summary line
osmo-bsc VTY Timeslot phys_chan_config will now write back
with new dynamic timeslot names: 'DYNAMIC/OSMOCOM' instead of
'TCH/F_TCH/H_SDCCH8_PDCH' and 'DYNAMIC/IPACCESS' instead of 'TCH/F_PDCH'
osmo-bsc CTRL CTRL commands like 'bts.N.channel-load' will
now respond with new dynamic timeslot names: 'DYNAMIC/OSMOCOM' instead of
'TCH/F_TCH/H_SDCCH8_PDCH' and 'DYNAMIC/IPACCESS' instead of 'TCH/F_PDCH'
+ osmo-bsc CTRL,VTY osmo_fsm instance IDs now use new
dynamic timeslot names 'DYNAMIC_OSMOCOM' and 'DYNAMIC_IPACCESS'
diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c
index afedb22..295b7f1 100644
--- a/src/osmo-bsc/gsm_data.c
+++ b/src/osmo-bsc/gsm_data.c
@@ -205,11 +205,11 @@
{ GSM_PCHAN_TCH_H, "TCH_H" },
{ GSM_PCHAN_SDCCH8_SACCH8C, "SDCCH8" },
{ GSM_PCHAN_PDCH, "PDCH" },
- { GSM_PCHAN_TCH_F_PDCH, "TCH_F_PDCH" },
+ { GSM_PCHAN_TCH_F_PDCH, "DYNAMIC_IPACCESS" },
{ 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, "DYNAMIC_OSMOCOM" },
{ 0, NULL }
};
diff --git a/tests/bsc/bsc_test.ok b/tests/bsc/bsc_test.ok
index fbfc49a..172ee0d 100644
--- a/tests/bsc/bsc_test.ok
+++ b/tests/bsc/bsc_test.ok
@@ -32,9 +32,9 @@
lchan->fi->id = null
assignment.fi->id = null
pchan=DYNAMIC/IPACCESS:
- ts->fi->id = 0-1-0-TCH_F_PDCH
- lchan->fi->id = 0-1-0-TCH_F_PDCH-0
- assignment.fi->id =
msc4294967295-conn123_subscr-TMSI-0x00000423_0-1-0-TCH_F_PDCHasTCH_F-0
+ ts->fi->id = 0-1-0-DYNAMIC_IPACCESS
+ lchan->fi->id = 0-1-0-DYNAMIC_IPACCESS-0
+ assignment.fi->id =
msc4294967295-conn123_subscr-TMSI-0x00000423_0-1-0-DYNAMIC_IPACCESSasTCH_F-0
pchan=UNKNOWN:
ts->fi->id = 0-1-0-UNKNOWN
lchan->fi->id = null
@@ -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=DYNAMIC/OSMOCOM:
- 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-DYNAMIC_OSMOCOM
+ lchan->fi->id = 0-1-0-DYNAMIC_OSMOCOM-0
+ assignment.fi->id =
msc4294967295-conn123_subscr-TMSI-0x00000423_0-1-0-DYNAMIC_OSMOCOMasNONE-0
Testing execution completed.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31632
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I4a540744cced466f0ca4fc605db4d0ec14ee8e87
Gerrit-Change-Number: 31632
Gerrit-PatchSet: 9
Gerrit-Owner: neels <nhofm...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: neels <nhofm...@sysmocom.de>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged
