<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10633">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Neels Hofmeyr: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">neighbor_ident_vty.c: fix CI format, should be 16bit<br><br>In the 'lac-ci' and 'cgi' neighbor identity VTY parameters, fix the CI part to<br><0-65535>.<br><br>Use 65535 as CI in the neighbor_ident.vty test to verify the range.<br><br>Change-Id: Ie93bfe176b9d2d9445966e4ab0b928b9aa62a77f<br>---<br>M src/osmo-bsc/neighbor_ident_vty.c<br>M tests/neighbor_ident.vty<br>2 files changed, 16 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c</span><br><span>index 993e0b4..28f4afd 100644</span><br><span>--- a/src/osmo-bsc/neighbor_ident_vty.c</span><br><span>+++ b/src/osmo-bsc/neighbor_ident_vty.c</span><br><span>@@ -77,7 +77,7 @@</span><br><span> #define LAC_PARAMS "lac <0-65535>"</span><br><span> #define LAC_DOC "Neighbor cell by LAC\n" "LAC\n"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define LAC_CI_PARAMS "lac-ci <0-65535> <0-255>"</span><br><span style="color: hsl(120, 100%, 40%);">+#define LAC_CI_PARAMS "lac-ci <0-65535> <0-65535>"</span><br><span> #define LAC_CI_DOC "Neighbor cell by LAC and CI\n" "LAC\n" "CI\n"</span><br><span> </span><br><span> #define LOCAL_BTS_PARAMS "bts <0-255>"</span><br><span>@@ -379,7 +379,7 @@</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_neighbor_add_cgi_arfcn_bsic, cfg_neighbor_add_cgi_arfcn_bsic_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- NEIGHBOR_ADD_CMD "cgi <0-999> <0-999> <0-65535> <0-255> " NEIGHBOR_IDENT_VTY_KEY_PARAMS,</span><br><span style="color: hsl(120, 100%, 40%);">+ NEIGHBOR_ADD_CMD "cgi <0-999> <0-999> <0-65535> <0-65535> " NEIGHBOR_IDENT_VTY_KEY_PARAMS,</span><br><span> NEIGHBOR_ADD_DOC "Neighbor cell by cgi\n" "MCC\n" "MNC\n" "LAC\n" "CI\n" NEIGHBOR_IDENT_VTY_KEY_DOC)</span><br><span> {</span><br><span> struct neighbor_ident_key nik;</span><br><span>diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty</span><br><span>index 692d894..bbdb461 100644</span><br><span>--- a/tests/neighbor_ident.vty</span><br><span>+++ b/tests/neighbor_ident.vty</span><br><span>@@ -38,7 +38,7 @@</span><br><span> OsmoBSC(config-net-bts)# type sysmobts</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 style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-net-bts)# cell_identity 32</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# cell_identity 65535</span><br><span> OsmoBSC(config-net-bts)# trx 0</span><br><span> OsmoBSC(config-net-bts-trx)# arfcn 42</span><br><span> OsmoBSC(config-net-bts-trx)# exit</span><br><span>@@ -68,7 +68,7 @@</span><br><span> ...</span><br><span> bts 2</span><br><span> ...</span><br><span style="color: hsl(0, 100%, 40%);">- cell_identity 32</span><br><span style="color: hsl(120, 100%, 40%);">+ cell_identity 65535</span><br><span> location_area_code 22</span><br><span> base_station_id_code 12</span><br><span> ...</span><br><span>@@ -82,10 +82,10 @@</span><br><span> ...</span><br><span> neighbor add bts <0-255></span><br><span> neighbor add lac <0-65535></span><br><span style="color: hsl(0, 100%, 40%);">- neighbor add lac-ci <0-65535> <0-255></span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor add lac-ci <0-65535> <0-65535></span><br><span> neighbor add lac <0-65535> arfcn <0-1023> bsic (<0-63>|any)</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor add lac-ci <0-65535> <0-255> arfcn <0-1023> bsic (<0-63>|any)</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor add cgi <0-999> <0-999> <0-65535> <0-255> arfcn <0-1023> bsic (<0-63>|any)</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor add lac-ci <0-65535> <0-65535> arfcn <0-1023> bsic (<0-63>|any)</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor add cgi <0-999> <0-999> <0-65535> <0-65535> arfcn <0-1023> bsic (<0-63>|any)</span><br><span> neighbor del bts <0-255></span><br><span> neighbor del arfcn <0-1023> bsic (<0-63>|any)</span><br><span> ...</span><br><span>@@ -106,7 +106,7 @@</span><br><span> % BTS 0 now has local neighbor BTS 1 with LAC 21 CI 31 and ARFCN 41 BSIC 11</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# neighbor add lac 22</span><br><span style="color: hsl(0, 100%, 40%);">-% BTS 0 now has local neighbor BTS 2 with LAC 22 CI 32 and ARFCN 42 BSIC 12</span><br><span style="color: hsl(120, 100%, 40%);">+% BTS 0 now has local neighbor BTS 2 with LAC 22 CI 65535 and ARFCN 42 BSIC 12</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# neighbor add cgi 23 42 423 5 arfcn 23 bsic 42</span><br><span> % BTS 0 to ARFCN 23 BSIC 42 now has 1 remote BSS Cell Identifier List entry</span><br><span>@@ -148,7 +148,7 @@</span><br><span> bts 0</span><br><span> ... !neighbor add</span><br><span> neighbor add lac-ci 21 31</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor add lac-ci 22 32</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor add lac-ci 22 65535</span><br><span> neighbor add cgi 023 42 423 5 arfcn 23 bsic 42</span><br><span> neighbor add cgi 023 042 423 6 arfcn 23 bsic 42</span><br><span> neighbor add cgi 023 042 234 56 arfcn 23 bsic 42</span><br><span>@@ -179,7 +179,7 @@</span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ... !neighbor add</span><br><span> neighbor add lac-ci 21 31</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor add lac-ci 22 32</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor add lac-ci 22 65535</span><br><span> neighbor add lac 456 arfcn 123 bsic 45</span><br><span> neighbor add lac-ci 789 10 arfcn 423 bsic any</span><br><span> neighbor add lac-ci 789 10 arfcn 423 bsic 63</span><br><span>@@ -192,7 +192,7 @@</span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ... !neighbor add</span><br><span> neighbor add lac-ci 21 31</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor add lac-ci 22 32</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor add lac-ci 22 65535</span><br><span> neighbor add lac-ci 789 10 arfcn 423 bsic any</span><br><span> neighbor add lac-ci 789 10 arfcn 423 bsic 63</span><br><span> neighbor add lac-ci 789 10 arfcn 423 bsic 1</span><br><span>@@ -204,7 +204,7 @@</span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ... !neighbor add</span><br><span> neighbor add lac-ci 21 31</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor add lac-ci 22 32</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor add lac-ci 22 65535</span><br><span> neighbor add lac-ci 789 10 arfcn 423 bsic 63</span><br><span> neighbor add lac-ci 789 10 arfcn 423 bsic 1</span><br><span> ... !neighbor add</span><br><span>@@ -215,7 +215,7 @@</span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ... !neighbor add</span><br><span> neighbor add lac-ci 21 31</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor add lac-ci 22 32</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor add lac-ci 22 65535</span><br><span> neighbor add lac-ci 789 10 arfcn 423 bsic 1</span><br><span> ... !neighbor add</span><br><span> </span><br><span>@@ -225,7 +225,7 @@</span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ... !neighbor add</span><br><span> neighbor add lac-ci 21 31</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor add lac-ci 22 32</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor add lac-ci 22 65535</span><br><span> ... !neighbor add</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# neighbor del arfcn 41 bsic any</span><br><span>@@ -233,7 +233,7 @@</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ... !neighbor add</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor add lac-ci 22 32</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor add lac-ci 22 65535</span><br><span> ... !neighbor add</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# neighbor del arfcn 41 bsic any</span><br><span>@@ -241,7 +241,7 @@</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ... !neighbor add</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor add lac-ci 22 32</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor add lac-ci 22 65535</span><br><span> ... !neighbor add</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# neighbor del arfcn 42 bsic 12</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10633">change 10633</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/10633"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ie93bfe176b9d2d9445966e4ab0b928b9aa62a77f </div>
<div style="display:none"> Gerrit-Change-Number: 10633 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>