<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11125">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;">neighbor vty: rather 'no neighbor', not 'neighbor del'<br><br>Now the scheme nicely matches:<br><br> bts 0<br> neighbor bts 1<br> no neighbor bts 1<br><br>Change-Id: Ib6015b8b48c1f6b98a02cb5a68e568083466e0d5<br>---<br>M src/osmo-bsc/neighbor_ident_vty.c<br>M tests/neighbor_ident.vty<br>2 files changed, 23 insertions(+), 21 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 8db9db7..70240ac 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>@@ -69,10 +69,10 @@</span><br><span> }</span><br><span> </span><br><span> #define NEIGHBOR_ADD_CMD "neighbor "</span><br><span style="color: hsl(0, 100%, 40%);">-#define NEIGHBOR_DEL_CMD "neighbor del "</span><br><span style="color: hsl(120, 100%, 40%);">+#define NEIGHBOR_DEL_CMD "no neighbor "</span><br><span> #define NEIGHBOR_DOC "Manage local and remote-BSS neighbor cells\n"</span><br><span> #define NEIGHBOR_ADD_DOC NEIGHBOR_DOC "Add "</span><br><span style="color: hsl(0, 100%, 40%);">-#define NEIGHBOR_DEL_DOC NEIGHBOR_DOC "Remove local or remote-BSS neighbor cell\n"</span><br><span style="color: hsl(120, 100%, 40%);">+#define NEIGHBOR_DEL_DOC NO_STR "Remove local or remote-BSS neighbor cell\n"</span><br><span> </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>diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty</span><br><span>index 644e330..8de34d6 100644</span><br><span>--- a/tests/neighbor_ident.vty</span><br><span>+++ b/tests/neighbor_ident.vty</span><br><span>@@ -86,8 +86,8 @@</span><br><span> neighbor lac <0-65535> arfcn <0-1023> bsic (<0-63>|any)</span><br><span> neighbor lac-ci <0-65535> <0-65535> arfcn <0-1023> bsic (<0-63>|any)</span><br><span> neighbor cgi <0-999> <0-999> <0-65535> <0-65535> arfcn <0-1023> bsic (<0-63>|any)</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor del bts <0-255></span><br><span style="color: hsl(0, 100%, 40%);">- neighbor del arfcn <0-1023> bsic (<0-63>|any)</span><br><span style="color: hsl(120, 100%, 40%);">+ no neighbor bts <0-255></span><br><span style="color: hsl(120, 100%, 40%);">+ no neighbor arfcn <0-1023> bsic (<0-63>|any)</span><br><span> ...</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# neighbor?</span><br><span>@@ -98,7 +98,6 @@</span><br><span> lac Add Neighbor cell by LAC</span><br><span> lac-ci Add Neighbor cell by LAC and CI</span><br><span> cgi Add Neighbor cell by cgi</span><br><span style="color: hsl(0, 100%, 40%);">- del Remove local or remote-BSS neighbor cell</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# neighbor bts ?</span><br><span> <0-255> BTS number</span><br><span>@@ -157,23 +156,26 @@</span><br><span> OsmoBSC(config-net-bts)# neighbor cgi 0 0 0 0 arfcn 0 bsic 0 ?</span><br><span> <cr> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-net-bts)# neighbor del ?</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# no neighbor?</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor Remove local or remote-BSS neighbor cell</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# no neighbor ?</span><br><span> bts Neighbor cell by local BTS number</span><br><span> arfcn ARFCN of neighbor cell</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-net-bts)# neighbor del bts ?</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# no neighbor bts ?</span><br><span> <0-255> BTS number</span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-net-bts)# neighbor del bts 0 ?</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# no neighbor bts 0 ?</span><br><span> <cr> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-net-bts)# neighbor del arfcn ?</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# no neighbor arfcn ?</span><br><span> <0-1023> ARFCN value</span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-net-bts)# neighbor del arfcn 0 ?</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# no neighbor arfcn 0 ?</span><br><span> bsic BSIC of neighbor cell</span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-net-bts)# neighbor del arfcn 0 bsic ?</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# no neighbor arfcn 0 bsic ?</span><br><span> <0-63> BSIC value</span><br><span> any for all BSICs / use any BSIC in this ARFCN</span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-net-bts)# neighbor del arfcn 0 bsic 0 ?</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# no neighbor arfcn 0 bsic 0 ?</span><br><span> <cr> </span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span>@@ -257,10 +259,10 @@</span><br><span> OsmoBSC(config-net-bts)# do show bts 0 neighbor arfcn 423 bsic 23</span><br><span> % neighbor lac-ci 789 10 arfcn 423 bsic 23</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-net-bts)# neighbor del arfcn 99 bsic 7</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# no neighbor arfcn 99 bsic 7</span><br><span> % Cannot remove, no such neighbor: BTS 0 to ARFCN 99 BSIC 7</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-net-bts)# neighbor del arfcn 23 bsic 42</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# no neighbor arfcn 23 bsic 42</span><br><span> % Removed remote BSS neighbor BTS 0 to ARFCN 23 BSIC 42</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span>@@ -273,7 +275,7 @@</span><br><span> neighbor lac-ci 789 10 arfcn 423 bsic 1</span><br><span> ... !neighbor </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-net-bts)# neighbor del arfcn 123 bsic 45</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# no neighbor arfcn 123 bsic 45</span><br><span> % Removed remote BSS neighbor BTS 0 to ARFCN 123 BSIC 45</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span>@@ -285,7 +287,7 @@</span><br><span> neighbor lac-ci 789 10 arfcn 423 bsic 1</span><br><span> ... !neighbor </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-net-bts)# neighbor del arfcn 423 bsic any</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# no neighbor arfcn 423 bsic any</span><br><span> % Removed remote BSS neighbor BTS 0 to ARFCN 423 (any BSIC)</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span>@@ -296,7 +298,7 @@</span><br><span> neighbor lac-ci 789 10 arfcn 423 bsic 1</span><br><span> ... !neighbor </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-net-bts)# neighbor del arfcn 423 bsic 63</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# no neighbor arfcn 423 bsic 63</span><br><span> % Removed remote BSS neighbor BTS 0 to ARFCN 423 BSIC 63</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span>@@ -306,7 +308,7 @@</span><br><span> neighbor lac-ci 789 10 arfcn 423 bsic 1</span><br><span> ... !neighbor </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-net-bts)# neighbor del arfcn 423 bsic 1</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# no neighbor arfcn 423 bsic 1</span><br><span> % Removed remote BSS neighbor BTS 0 to ARFCN 423 BSIC 1</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span>@@ -315,7 +317,7 @@</span><br><span> neighbor lac-ci 22 65535</span><br><span> ... !neighbor </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-net-bts)# neighbor del arfcn 41 bsic any</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# no neighbor arfcn 41 bsic any</span><br><span> % Removed local neighbor bts 0 to bts 1</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span>@@ -323,7 +325,7 @@</span><br><span> neighbor lac-ci 22 65535</span><br><span> ... !neighbor </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-net-bts)# neighbor del arfcn 41 bsic any</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# no neighbor arfcn 41 bsic any</span><br><span> % Cannot remove, no such neighbor: BTS 0 to ARFCN 41 (any BSIC)</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span>@@ -331,7 +333,7 @@</span><br><span> neighbor lac-ci 22 65535</span><br><span> ... !neighbor </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-net-bts)# neighbor del arfcn 42 bsic 12</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# no neighbor arfcn 42 bsic 12</span><br><span> % Removed local neighbor bts 0 to bts 2</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11125">change 11125</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/11125"/><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: Ib6015b8b48c1f6b98a02cb5a68e568083466e0d5 </div>
<div style="display:none"> Gerrit-Change-Number: 11125 </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>