Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/14365
Change subject: vty: adjust config name for unit-id ...................................................................... vty: adjust config name for unit-id Having different names for the same config setting is misleading, so let's stick to the one used by osmo-bts. Change-Id: Ide5ceb5db7403a70313405752579e30d7bb94eac --- M doc/examples/osmo-bsc/osmo-bsc-minimal.cfg M doc/examples/osmo-bsc/osmo-bsc.cfg M doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg M doc/manuals/chapters/bts-examples.adoc M doc/manuals/vty/bsc_vty_reference.xml M doc/manuals/vty/libbsc_vty_additions.xml M src/osmo-bsc/bsc_vty.c 7 files changed, 18 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/65/14365/1 diff --git a/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg b/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg index 850e29c..d9a3040 100644 --- a/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg @@ -5,7 +5,7 @@ type sysmobts band GSM-1800 location_area_code 23 - ip.access unit_id 1800 0 + ipa unit_id 1800 0 trx 0 rf_locked 0 arfcn 868 diff --git a/doc/examples/osmo-bsc/osmo-bsc.cfg b/doc/examples/osmo-bsc/osmo-bsc.cfg index eec154d..1871f55 100644 --- a/doc/examples/osmo-bsc/osmo-bsc.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc.cfg @@ -36,7 +36,7 @@ channel-descrption bs-pa-mfrms 5 channel-descrption bs-ag-blks-res 1 early-classmark-sending forbidden - ip.access unit_id 0 0 + ipa unit_id 0 0 oml ip.access stream_id 255 line 0 codec-support fr gprs mode none diff --git a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg index fd3a349..7fc705f 100644 --- a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg @@ -35,7 +35,7 @@ channel-descrption bs-pa-mfrms 5 channel-descrption bs-ag-blks-res 1 early-classmark-sending forbidden - ip.access unit_id 0 0 + ipa unit_id 0 0 oml ip.access stream_id 255 line 0 codec-support fr gprs mode none diff --git a/doc/manuals/chapters/bts-examples.adoc b/doc/manuals/chapters/bts-examples.adoc index 2dd8b37..0844059 100644 --- a/doc/manuals/chapters/bts-examples.adoc +++ b/doc/manuals/chapters/bts-examples.adoc @@ -35,7 +35,7 @@ channel allocator ascending rach tx integer 9 rach max transmission 7 - ip.access unit_id 1801 0 <4> + ipa unit_id 1801 0 <4> oml ip.access stream_id 255 line 0 gprs mode none trx 0 @@ -113,7 +113,7 @@ channel allocator ascending rach tx integer 9 rach max transmission 7 - ip.access unit_id 1800 0 <1> + ipa unit_id 1800 0 <1> oml ip.access stream_id 255 line 0 gprs mode none trx 0 diff --git a/doc/manuals/vty/bsc_vty_reference.xml b/doc/manuals/vty/bsc_vty_reference.xml index f56b951..1367f8a 100644 --- a/doc/manuals/vty/bsc_vty_reference.xml +++ b/doc/manuals/vty/bsc_vty_reference.xml @@ -2839,7 +2839,7 @@ <param name='<0-63>' doc='BSIC of this BTS' /> </params> </command> - <command id='ip.access unit_id <0-65534> <0-255>'> + <command id='ipa unit_id <0-65534> <0-255>'> <params> <param name='ip.access' doc='Abis/IP specific options' /> <param name='unit_id' doc='Set the IPA BTS Unit ID' /> diff --git a/doc/manuals/vty/libbsc_vty_additions.xml b/doc/manuals/vty/libbsc_vty_additions.xml index 8685398..7a71011 100644 --- a/doc/manuals/vty/libbsc_vty_additions.xml +++ b/doc/manuals/vty/libbsc_vty_additions.xml @@ -96,7 +96,7 @@ re-selection. </description> </command> - <command id='ip.access unit_id <0-65534> <0-255>'> + <command id='ipa unit_id <0-65534> <0-255>'> <description> The ip.access unit ID is a parameter of the IPA Signalling-over-IP multiplex. It is administratively diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 111c910..c09911d 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -897,7 +897,7 @@ switch (bts->type) { case GSM_BTS_TYPE_NANOBTS: case GSM_BTS_TYPE_OSMOBTS: - vty_out(vty, " ip.access unit_id %u %u%s", + vty_out(vty, " ipa unit_id %u %u%s", bts->ip_access.site_id, bts->ip_access.bts_id, VTY_NEWLINE); if (bts->ip_access.rsl_ip) { struct in_addr ia; @@ -2180,7 +2180,7 @@ DEFUN(cfg_bts_unit_id, cfg_bts_unit_id_cmd, - "ip.access unit_id <0-65534> <0-255>", + "ipa unit_id <0-65534> <0-255>", "Abis/IP specific options\n" "Set the IPA BTS Unit ID\n" "Unit ID (Site)\n" @@ -2201,6 +2201,14 @@ return CMD_SUCCESS; } +DEFUN_DEPRECATED(cfg_bts_unit_id, + cfg_bts_deprecated_unit_id_cmd, + "ip.access unit_id <0-65534> <0-255>", + "Abis/IP specific options\n" + "Set the IPA BTS Unit ID\n" + "Unit ID (Site)\n" + "Unit ID (BTS)\n"); + DEFUN(cfg_bts_rsl_ip, cfg_bts_rsl_ip_cmd, "ip.access rsl-ip A.B.C.D", @@ -5237,6 +5245,7 @@ install_element(BTS_NODE, &cfg_bts_tsc_cmd); install_element(BTS_NODE, &cfg_bts_bsic_cmd); install_element(BTS_NODE, &cfg_bts_unit_id_cmd); + install_element(BTS_NODE, &cfg_bts_deprecated_unit_id_cmd); install_element(BTS_NODE, &cfg_bts_rsl_ip_cmd); install_element(BTS_NODE, &cfg_bts_nokia_site_skip_reset_cmd); install_element(BTS_NODE, &cfg_bts_nokia_site_no_loc_rel_cnf_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/14365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ide5ceb5db7403a70313405752579e30d7bb94eac Gerrit-Change-Number: 14365 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ew...@sysmocom.de> Gerrit-MessageType: newchange