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

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I60d5ff887a7c830180088904c2458f7e73ce3893 </div>
<div style="display:none"> Gerrit-Change-Number: 23625 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>