fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/23625 )
Change subject: vty: deprecate BTS type 'sysmobts' in favor of 'osmo-bts'
......................................................................
vty: deprecate BTS type 'sysmobts' in favor of 'osmo-bts'
Change-Id: I60d5ff887a7c830180088904c2458f7e73ce3893
---
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.adoc
M src/osmo-bsc/bsc_vty.c
M src/osmo-bsc/bts.c
M tests/ctrl/osmo-bsc-neigh-test.cfg
M tests/neighbor_ident.vty
8 files changed, 26 insertions(+), 11 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/25/23625/1
diff --git a/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg
b/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg
index b8cd78d..2258495 100644
--- a/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg
+++ b/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg
@@ -2,7 +2,7 @@
network country code 901
mobile network code 70
bts 0
- type sysmobts
+ type osmo-bts
band GSM-1800
location_area_code 23
ipa unit-id 1800 0
diff --git a/doc/examples/osmo-bsc/osmo-bsc.cfg
b/doc/examples/osmo-bsc/osmo-bsc.cfg
index 828875d..807bd19 100644
--- a/doc/examples/osmo-bsc/osmo-bsc.cfg
+++ b/doc/examples/osmo-bsc/osmo-bsc.cfg
@@ -19,7 +19,7 @@
handover1 maximum distance 9999
periodic location update 30
bts 0
- type sysmobts
+ type osmo-bts
band DCS1800
cell_identity 6969
location_area_code 1
diff --git a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg
b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg
index 0ecb5fc..335e23d 100644
--- a/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg
+++ b/doc/examples/osmo-bsc/osmo-bsc_custom-sccp.cfg
@@ -18,7 +18,7 @@
handover1 maximum distance 9999
periodic location update 30
bts 0
- type sysmobts
+ type osmo-bts
band DCS1800
cell_identity 0
location_area_code 1
diff --git a/doc/manuals/chapters/bts.adoc b/doc/manuals/chapters/bts.adoc
index e416775..6ef0a0c 100644
--- a/doc/manuals/chapters/bts.adoc
+++ b/doc/manuals/chapters/bts.adoc
@@ -105,7 +105,7 @@
----
network
bts 0
- type sysmobts
+ type osmo-bts
band DCS1800
description The new BTS in Baikonur
location_area_code 2342
diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c
index 91eaee0..eebfc33 100644
--- a/src/osmo-bsc/bsc_vty.c
+++ b/src/osmo-bsc/bsc_vty.c
@@ -2342,6 +2342,20 @@
return CMD_SUCCESS;
}
+DEFUN_DEPRECATED(cfg_bts_type_sysmobts,
+ cfg_bts_type_sysmobts_cmd,
+ "type sysmobts",
+ "Set the BTS type\n"
+ "Deprecated alias for 'osmo-bts'\n")
+{
+ const char *args[] = { "osmo-bts" };
+
+ vty_out(vty, "%% BTS type 'sysmobts' is deprecated, "
+ "use 'type osmo-bts' instead.%s", VTY_NEWLINE);
+
+ return cfg_bts_type(self, vty, 1, args);
+}
+
DEFUN_USRATTR(cfg_bts_band,
cfg_bts_band_cmd,
X(BSC_VTY_ATTR_RESTART_ABIS_OML_LINK),
@@ -7659,6 +7673,7 @@
install_element(GSMNET_NODE, &cfg_bts_cmd);
install_node(&bts_node, config_write_bts);
install_element(BTS_NODE, &cfg_bts_type_cmd);
+ install_element(BTS_NODE, &cfg_bts_type_sysmobts_cmd);
install_element(BTS_NODE, &cfg_description_cmd);
install_element(BTS_NODE, &cfg_no_description_cmd);
install_element(BTS_NODE, &cfg_bts_band_cmd);
diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c
index b5b7136..471829c 100644
--- a/src/osmo-bsc/bts.c
+++ b/src/osmo-bsc/bts.c
@@ -67,7 +67,7 @@
{ GSM_BTS_TYPE_NANOBTS, "nanobts" },
{ GSM_BTS_TYPE_RBS2000, "rbs2000" },
{ GSM_BTS_TYPE_NOKIA_SITE, "nokia_site" },
- { GSM_BTS_TYPE_OSMOBTS, "sysmobts" },
+ { GSM_BTS_TYPE_OSMOBTS, "osmo-bts" },
{ 0, NULL }
};
@@ -77,7 +77,7 @@
{ GSM_BTS_TYPE_NANOBTS, "ip.access nanoBTS or compatible" },
{ GSM_BTS_TYPE_RBS2000, "Ericsson RBS2000 Series" },
{ GSM_BTS_TYPE_NOKIA_SITE, "Nokia {Metro,Ultra,In}Site" },
- { GSM_BTS_TYPE_OSMOBTS, "sysmocom sysmoBTS" },
+ { GSM_BTS_TYPE_OSMOBTS, "Osmocom Base Transceiver Station" },
{ 0, NULL }
};
diff --git a/tests/ctrl/osmo-bsc-neigh-test.cfg
b/tests/ctrl/osmo-bsc-neigh-test.cfg
index 7ef8271..93d7fca 100644
--- a/tests/ctrl/osmo-bsc-neigh-test.cfg
+++ b/tests/ctrl/osmo-bsc-neigh-test.cfg
@@ -26,7 +26,7 @@
periodic location update 30
neighbor-resolution bind 127.0.0.1
bts 0
- type sysmobts
+ type osmo-bts
band DCS1800
cell_identity 6969
location_area_code 1
@@ -83,7 +83,7 @@
phys_chan_config TCH/F
hopping enabled 0
bts 1
- type sysmobts
+ type osmo-bts
band DCS1800
cell_identity 123
location_area_code 1
diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty
index b1429d8..950d852 100644
--- a/tests/neighbor_ident.vty
+++ b/tests/neighbor_ident.vty
@@ -19,7 +19,7 @@
[<0-65535>] Port to bind the service to [defaults to 4248 if not provided]
OsmoBSC(config-net)# bts 0
-OsmoBSC(config-net-bts)# type sysmobts
+OsmoBSC(config-net-bts)# type osmo-bts
OsmoBSC(config-net-bts)# base_station_id_code 10
OsmoBSC(config-net-bts)# location_area_code 20
OsmoBSC(config-net-bts)# cell_identity 30
@@ -29,7 +29,7 @@
OsmoBSC(config-net-bts)# exit
OsmoBSC(config-net)# bts 1
-OsmoBSC(config-net-bts)# type sysmobts
+OsmoBSC(config-net-bts)# type osmo-bts
OsmoBSC(config-net-bts)# base_station_id_code 11
OsmoBSC(config-net-bts)# location_area_code 21
OsmoBSC(config-net-bts)# cell_identity 31
@@ -39,7 +39,7 @@
OsmoBSC(config-net-bts)# exit
OsmoBSC(config-net)# bts 2
-OsmoBSC(config-net-bts)# type sysmobts
+OsmoBSC(config-net-bts)# type osmo-bts
OsmoBSC(config-net-bts)# base_station_id_code 12
OsmoBSC(config-net-bts)# location_area_code 22
OsmoBSC(config-net-bts)# cell_identity 65535
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/23625
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I60d5ff887a7c830180088904c2458f7e73ce3893
Gerrit-Change-Number: 23625
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanits...@sysmocom.de>
Gerrit-MessageType: newchange
