<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/14365">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: adjust config name for unit-id<br><br>Having different names for the same config setting is misleading, so<br>let's stick to the one used by osmo-bts.<br><br>Change-Id: Ide5ceb5db7403a70313405752579e30d7bb94eac<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-examples.adoc<br>M doc/manuals/vty/bsc_vty_reference.xml<br>M doc/manuals/vty/libbsc_vty_additions.xml<br>M src/osmo-bsc/bsc_vty.c<br>7 files changed, 47 insertions(+), 22 deletions(-)<br><br></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 850e29c..f2597b8 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>@@ -5,7 +5,7 @@</span><br><span> type sysmobts</span><br><span> band GSM-1800</span><br><span> location_area_code 23</span><br><span style="color: hsl(0, 100%, 40%);">- ip.access unit_id 1800 0</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa unit-id 1800 0</span><br><span> trx 0</span><br><span> rf_locked 0</span><br><span> arfcn 868</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 eec154d..926951b 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>@@ -36,8 +36,8 @@</span><br><span> channel-descrption bs-pa-mfrms 5</span><br><span> channel-descrption bs-ag-blks-res 1</span><br><span> early-classmark-sending forbidden</span><br><span style="color: hsl(0, 100%, 40%);">- ip.access unit_id 0 0</span><br><span style="color: hsl(0, 100%, 40%);">- oml ip.access stream_id 255 line 0</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa unit-id 0 0</span><br><span style="color: hsl(120, 100%, 40%);">+ oml ipa stream-id 255 line 0</span><br><span> codec-support fr</span><br><span> gprs mode none</span><br><span> trx 0</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 fd3a349..80a38ba 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>@@ -35,8 +35,8 @@</span><br><span> channel-descrption bs-pa-mfrms 5</span><br><span> channel-descrption bs-ag-blks-res 1</span><br><span> early-classmark-sending forbidden</span><br><span style="color: hsl(0, 100%, 40%);">- ip.access unit_id 0 0</span><br><span style="color: hsl(0, 100%, 40%);">- oml ip.access stream_id 255 line 0</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa unit-id 0 0</span><br><span style="color: hsl(120, 100%, 40%);">+ oml ipa stream-id 255 line 0</span><br><span> codec-support fr</span><br><span> gprs mode none</span><br><span> trx 0</span><br><span>diff --git a/doc/manuals/chapters/bts-examples.adoc b/doc/manuals/chapters/bts-examples.adoc</span><br><span>index 2dd8b37..58cb3ab 100644</span><br><span>--- a/doc/manuals/chapters/bts-examples.adoc</span><br><span>+++ b/doc/manuals/chapters/bts-examples.adoc</span><br><span>@@ -35,8 +35,8 @@</span><br><span> channel allocator ascending</span><br><span> rach tx integer 9</span><br><span> rach max transmission 7</span><br><span style="color: hsl(0, 100%, 40%);">- ip.access unit_id 1801 0 <4></span><br><span style="color: hsl(0, 100%, 40%);">- oml ip.access stream_id 255 line 0</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa unit-id 1801 0 <4></span><br><span style="color: hsl(120, 100%, 40%);">+ oml ipa stream-id 255 line 0</span><br><span> gprs mode none</span><br><span> trx 0</span><br><span> rf_locked 0</span><br><span>@@ -113,8 +113,8 @@</span><br><span> channel allocator ascending</span><br><span> rach tx integer 9</span><br><span> rach max transmission 7</span><br><span style="color: hsl(0, 100%, 40%);">- ip.access unit_id 1800 0 <1></span><br><span style="color: hsl(0, 100%, 40%);">- oml ip.access stream_id 255 line 0</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa unit-id 1800 0 <1></span><br><span style="color: hsl(120, 100%, 40%);">+ oml ipa stream-id 255 line 0</span><br><span> gprs mode none</span><br><span> trx 0</span><br><span> rf_locked 0</span><br><span>diff --git a/doc/manuals/vty/bsc_vty_reference.xml b/doc/manuals/vty/bsc_vty_reference.xml</span><br><span>index 9992267..4d25e69 100644</span><br><span>--- a/doc/manuals/vty/bsc_vty_reference.xml</span><br><span>+++ b/doc/manuals/vty/bsc_vty_reference.xml</span><br><span>@@ -2884,7 +2884,7 @@</span><br><span> <param name='<0-63>' doc='BSIC of this BTS' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(0, 100%, 40%);">- <command id='ip.access unit_id <0-65534> <0-255>'></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='ipa unit-id <0-65534> <0-255>'></span><br><span> <params></span><br><span> <param name='ip.access' doc='Abis/IP specific options' /></span><br><span> <param name='unit_id' doc='Set the IPA BTS Unit ID' /></span><br><span>@@ -2892,7 +2892,7 @@</span><br><span> <param name='<0-255>' doc='Unit ID (BTS)' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(0, 100%, 40%);">- <command id='ip.access rsl-ip A.B.C.D'></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='ipa rsl-ip A.B.C.D'></span><br><span> <params></span><br><span> <param name='ip.access' doc='Abis/IP specific options' /></span><br><span> <param name='rsl-ip' doc='Set the IPA RSL IP Address of the BSC' /></span><br><span>@@ -2922,7 +2922,7 @@</span><br><span> <param name='<15-100>' doc='and the BTS is being bootstrapped.' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(0, 100%, 40%);">- <command id='oml ip.access stream_id <0-255> line E1_LINE'></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='oml ipa stream-id <0-255> line E1_LINE'></span><br><span> <params></span><br><span> <param name='oml' doc='Organization & Maintenance Link' /></span><br><span> <param name='ip.access' doc='A-bis/IP Specific Options' /></span><br><span>diff --git a/doc/manuals/vty/libbsc_vty_additions.xml b/doc/manuals/vty/libbsc_vty_additions.xml</span><br><span>index 8685398..cf61961 100644</span><br><span>--- a/doc/manuals/vty/libbsc_vty_additions.xml</span><br><span>+++ b/doc/manuals/vty/libbsc_vty_additions.xml</span><br><span>@@ -11,7 +11,7 @@</span><br><span> <child_of nodeid='14' /></span><br><span> <name>BTS Configuration</name></span><br><span> <description>This is the configuration of a single BTS.</description></span><br><span style="color: hsl(0, 100%, 40%);">- <command id='oml ip.access stream_id <0-255> line E1_LINE'></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='oml ipa stream-id <0-255> line E1_LINE'></span><br><span> <description></span><br><span> Set the IPA stream identifier for the OML link within the IPA</span><br><span> multiplex. Must be the same as on the BTS side. The default</span><br><span>@@ -40,7 +40,7 @@</span><br><span> shall be used by MS in this cell. The default should be enabled.</span><br><span> </description></span><br><span> </command></span><br><span style="color: hsl(0, 100%, 40%);">- <command id='ip.access rsl-ip A.B.C.D'></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='ipa rsl-ip A.B.C.D'></span><br><span> <description></span><br><span> Configure the IP address of the BSC used for RSL. Abis/IP</span><br><span> BTSs, including OsmoBTS and the nanoBTS will be instructed to</span><br><span>@@ -96,7 +96,7 @@</span><br><span> re-selection.</span><br><span> </description></span><br><span> </command></span><br><span style="color: hsl(0, 100%, 40%);">- <command id='ip.access unit_id <0-65534> <0-255>'></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='ipa unit-id <0-65534> <0-255>'></span><br><span> <description></span><br><span> The ip.access unit ID is a parameter of the IPA</span><br><span> Signalling-over-IP multiplex. It is administratively</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 111c910..c4e091c 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -897,15 +897,15 @@</span><br><span> switch (bts->type) {</span><br><span> case GSM_BTS_TYPE_NANOBTS:</span><br><span> case GSM_BTS_TYPE_OSMOBTS:</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " ip.access unit_id %u %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " ipa unit-id %u %u%s",</span><br><span> bts->ip_access.site_id, bts->ip_access.bts_id, VTY_NEWLINE);</span><br><span> if (bts->ip_access.rsl_ip) {</span><br><span> struct in_addr ia;</span><br><span> ia.s_addr = htonl(bts->ip_access.rsl_ip);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " ip.access rsl-ip %s%s", inet_ntoa(ia),</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " ipa rsl-ip %s%s", inet_ntoa(ia),</span><br><span> VTY_NEWLINE);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " oml ip.access stream_id %u line %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " oml ipa stream-id %u line %u%s",</span><br><span> bts->oml_tei, bts->oml_e1_link.e1_nr, VTY_NEWLINE);</span><br><span> break;</span><br><span> case GSM_BTS_TYPE_NOKIA_SITE:</span><br><span>@@ -2180,7 +2180,7 @@</span><br><span> </span><br><span> DEFUN(cfg_bts_unit_id,</span><br><span> cfg_bts_unit_id_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "ip.access unit_id <0-65534> <0-255>",</span><br><span style="color: hsl(120, 100%, 40%);">+ "ipa unit-id <0-65534> <0-255>",</span><br><span> "Abis/IP specific options\n"</span><br><span> "Set the IPA BTS Unit ID\n"</span><br><span> "Unit ID (Site)\n"</span><br><span>@@ -2201,9 +2201,17 @@</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_unit_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bts_deprecated_unit_id_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "ip.access unit_id <0-65534> <0-255>",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Abis/IP specific options\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set the IPA BTS Unit ID\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Unit ID (Site)\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Unit ID (BTS)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DEFUN(cfg_bts_rsl_ip,</span><br><span> cfg_bts_rsl_ip_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "ip.access rsl-ip A.B.C.D",</span><br><span style="color: hsl(120, 100%, 40%);">+ "ipa rsl-ip A.B.C.D",</span><br><span> "Abis/IP specific options\n"</span><br><span> "Set the IPA RSL IP Address of the BSC\n"</span><br><span> "Destination IP address for RSL connection\n")</span><br><span>@@ -2222,6 +2230,13 @@</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_rsl_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bts_deprecated_rsl_ip_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "ip.access rsl-ip A.B.C.D",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Abis/IP specific options\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set the IPA RSL IP Address of the BSC\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Destination IP address for RSL connection\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #define NOKIA_STR "Nokia *Site related commands\n"</span><br><span> </span><br><span> DEFUN(cfg_bts_nokia_site_skip_reset,</span><br><span>@@ -2287,9 +2302,9 @@</span><br><span> </span><br><span> DEFUN(cfg_bts_stream_id,</span><br><span> cfg_bts_stream_id_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "oml ip.access stream_id <0-255> line E1_LINE",</span><br><span style="color: hsl(120, 100%, 40%);">+ "oml ipa stream-id <0-255> line E1_LINE",</span><br><span> OML_STR IPA_STR</span><br><span style="color: hsl(0, 100%, 40%);">- "Set the ip.access Stream ID of the OML link of this BTS\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set the ipa Stream ID of the OML link of this BTS\n"</span><br><span> "Stream Identifier\n" "Virtual E1 Line Number\n" "Virtual E1 Line Number\n")</span><br><span> {</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span>@@ -2307,6 +2322,13 @@</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_stream_id,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bts_deprecated_stream_id_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "oml ip.access stream_id <0-255> line E1_LINE",</span><br><span style="color: hsl(120, 100%, 40%);">+ OML_STR IPA_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set the ip.access Stream ID of the OML link of this BTS\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Stream Identifier\n" "Virtual E1 Line Number\n" "Virtual E1 Line Number\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #define OML_E1_STR OML_STR "OML E1/T1 Configuration\n"</span><br><span> </span><br><span> DEFUN(cfg_bts_oml_e1,</span><br><span>@@ -5237,11 +5259,14 @@</span><br><span> install_element(BTS_NODE, &cfg_bts_tsc_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_bsic_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_unit_id_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_deprecated_unit_id_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_rsl_ip_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_deprecated_rsl_ip_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_nokia_site_skip_reset_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_nokia_site_no_loc_rel_cnf_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_nokia_site_bts_reset_timer_cnf_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_stream_id_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_deprecated_stream_id_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_oml_e1_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_oml_e1_tei_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_challoc_cmd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/14365">change 14365</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/+/14365"/><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: Ide5ceb5db7403a70313405752579e30d7bb94eac </div>
<div style="display:none"> Gerrit-Change-Number: 14365 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>