<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11127">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: write local neighbors by bts nr, not lac-ci<br><br>Change-Id: I35783f9624eacbdffccdb59a0179ffda54a26990<br>---<br>M src/osmo-bsc/neighbor_ident_vty.c<br>M tests/neighbor_ident.vty<br>2 files changed, 15 insertions(+), 17 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 d0c23a8..409153b 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>@@ -495,9 +495,7 @@</span><br><span>   struct gsm_bts_ref *neigh;</span><br><span> </span><br><span>       llist_for_each_entry(neigh, &bts->local_neighbors, entry) {</span><br><span style="color: hsl(0, 100%, 40%);">-              vty_out(vty, "%sneighbor lac-ci %u %u%s",</span><br><span style="color: hsl(0, 100%, 40%);">-                     indent, neigh->bts->location_area_code, neigh->bts->cell_identity,</span><br><span style="color: hsl(0, 100%, 40%);">-                  VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+         vty_out(vty, "%sneighbor bts %u%s", indent, neigh->bts->nr, VTY_NEWLINE);</span><br><span>    }</span><br><span> }</span><br><span> </span><br><span>diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty</span><br><span>index 02b0f50..4f86383 100644</span><br><span>--- a/tests/neighbor_ident.vty</span><br><span>+++ b/tests/neighbor_ident.vty</span><br><span>@@ -241,8 +241,8 @@</span><br><span> ... !neighbor </span><br><span>  bts 0</span><br><span> ... !neighbor </span><br><span style="color: hsl(0, 100%, 40%);">-  neighbor lac-ci 21 31</span><br><span style="color: hsl(0, 100%, 40%);">-  neighbor lac-ci 22 65535</span><br><span style="color: hsl(120, 100%, 40%);">+  neighbor bts 1</span><br><span style="color: hsl(120, 100%, 40%);">+  neighbor bts 2</span><br><span>   neighbor cgi 023 42 423 5 arfcn 23 bsic 42</span><br><span>   neighbor cgi 023 042 423 6 arfcn 23 bsic 42</span><br><span>   neighbor cgi 023 042 234 56 arfcn 23 bsic 42</span><br><span>@@ -272,8 +272,8 @@</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ... !neighbor </span><br><span style="color: hsl(0, 100%, 40%);">-  neighbor lac-ci 21 31</span><br><span style="color: hsl(0, 100%, 40%);">-  neighbor lac-ci 22 65535</span><br><span style="color: hsl(120, 100%, 40%);">+  neighbor bts 1</span><br><span style="color: hsl(120, 100%, 40%);">+  neighbor bts 2</span><br><span>   neighbor lac 456 arfcn 123 bsic 45</span><br><span>   neighbor lac-ci 789 10 arfcn 423 bsic any</span><br><span>   neighbor lac-ci 789 10 arfcn 423 bsic 63</span><br><span>@@ -285,8 +285,8 @@</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ... !neighbor </span><br><span style="color: hsl(0, 100%, 40%);">-  neighbor lac-ci 21 31</span><br><span style="color: hsl(0, 100%, 40%);">-  neighbor lac-ci 22 65535</span><br><span style="color: hsl(120, 100%, 40%);">+  neighbor bts 1</span><br><span style="color: hsl(120, 100%, 40%);">+  neighbor bts 2</span><br><span>   neighbor lac-ci 789 10 arfcn 423 bsic any</span><br><span>   neighbor lac-ci 789 10 arfcn 423 bsic 63</span><br><span>   neighbor lac-ci 789 10 arfcn 423 bsic 1</span><br><span>@@ -297,8 +297,8 @@</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ... !neighbor </span><br><span style="color: hsl(0, 100%, 40%);">-  neighbor lac-ci 21 31</span><br><span style="color: hsl(0, 100%, 40%);">-  neighbor lac-ci 22 65535</span><br><span style="color: hsl(120, 100%, 40%);">+  neighbor bts 1</span><br><span style="color: hsl(120, 100%, 40%);">+  neighbor bts 2</span><br><span>   neighbor lac-ci 789 10 arfcn 423 bsic 63</span><br><span>   neighbor lac-ci 789 10 arfcn 423 bsic 1</span><br><span> ... !neighbor </span><br><span>@@ -308,8 +308,8 @@</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ... !neighbor </span><br><span style="color: hsl(0, 100%, 40%);">-  neighbor lac-ci 21 31</span><br><span style="color: hsl(0, 100%, 40%);">-  neighbor lac-ci 22 65535</span><br><span style="color: hsl(120, 100%, 40%);">+  neighbor bts 1</span><br><span style="color: hsl(120, 100%, 40%);">+  neighbor bts 2</span><br><span>   neighbor lac-ci 789 10 arfcn 423 bsic 1</span><br><span> ... !neighbor </span><br><span> </span><br><span>@@ -318,8 +318,8 @@</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ... !neighbor </span><br><span style="color: hsl(0, 100%, 40%);">-  neighbor lac-ci 21 31</span><br><span style="color: hsl(0, 100%, 40%);">-  neighbor lac-ci 22 65535</span><br><span style="color: hsl(120, 100%, 40%);">+  neighbor bts 1</span><br><span style="color: hsl(120, 100%, 40%);">+  neighbor bts 2</span><br><span> ... !neighbor </span><br><span> </span><br><span> OsmoBSC(config-net-bts)# no neighbor arfcn 41 bsic any</span><br><span>@@ -327,7 +327,7 @@</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ... !neighbor </span><br><span style="color: hsl(0, 100%, 40%);">-  neighbor lac-ci 22 65535</span><br><span style="color: hsl(120, 100%, 40%);">+  neighbor bts 2</span><br><span> ... !neighbor </span><br><span> </span><br><span> OsmoBSC(config-net-bts)# no neighbor arfcn 41 bsic any</span><br><span>@@ -335,7 +335,7 @@</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ... !neighbor </span><br><span style="color: hsl(0, 100%, 40%);">-  neighbor lac-ci 22 65535</span><br><span style="color: hsl(120, 100%, 40%);">+  neighbor bts 2</span><br><span> ... !neighbor </span><br><span> </span><br><span> OsmoBSC(config-net-bts)# no neighbor arfcn 42 bsic 12</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11127">change 11127</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/11127"/><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: I35783f9624eacbdffccdb59a0179ffda54a26990 </div>
<div style="display:none"> Gerrit-Change-Number: 11127 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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>