<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/14768">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add vty 'no neighbors' to remove all HO targets<br><br>This is required for an upcoming TTCN3 test that plays through various neighbor<br>configurations.<br><br>Change-Id: I8623ab581639e9f8af6a9ff1eca990518d1b1211<br>---<br>M src/osmo-bsc/neighbor_ident_vty.c<br>M tests/neighbor_ident.vty<br>2 files changed, 93 insertions(+), 0 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/68/14768/1</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 203b150..715ee8b 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>@@ -372,6 +372,85 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct nil_match_bts_data {</span><br><span style="color: hsl(120, 100%, 40%);">+ int bts_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct neighbor_ident_key *found;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static bool nil_match_bts(const struct neighbor_ident_key *key,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm0808_cell_id_list2 *val,</span><br><span style="color: hsl(120, 100%, 40%);">+ void *cb_data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct nil_match_bts_data *d = cb_data;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (key->from_bts == d->bts_nr) {</span><br><span style="color: hsl(120, 100%, 40%);">+ d->found = key;</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int del_all(struct vty *vty)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ int removed = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vty->node != BTS_NODE) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Error: cannot remove BTS neighbor, not on BTS node%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bts) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Error: cannot remove BTS neighbor, no BTS on this node%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Remove all local neighbors */</span><br><span style="color: hsl(120, 100%, 40%);">+ while (1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_ref *neigh = llist_first_entry_or_null(&bts->local_neighbors, struct gsm_bts_ref, entry);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *neigh_bts = neigh ? neigh->bts : NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!neigh)</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gsm_bts_local_neighbor_del(bts, neigh_bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Removed local neighbor bts %u to bts %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->nr, neigh_bts->nr, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ removed += rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Error while removing local neigbor bts %u to bts %u, aborted%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->nr, neigh_bts->nr, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Remove all remote-BSS neighbors */</span><br><span style="color: hsl(120, 100%, 40%);">+ while (1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct neighbor_ident_key k;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct nil_match_bts_data d = {};</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor_ident_iter(g_neighbor_cells, nil_match_bts, &d);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!d.found)</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ k = *d.found;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (neighbor_ident_del(g_neighbor_cells, &k)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Removed remote BSS neighbor %s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor_ident_key_name(&k), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ removed++;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Error while removing remote BSS neighbor %s, aborted%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor_ident_key_name(&k), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!removed) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Cannot remove, no neighbors configured%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DEFUN(cfg_neighbor_add_lac_arfcn_bsic, cfg_neighbor_add_lac_arfcn_bsic_cmd,</span><br><span> NEIGHBOR_ADD_CMD LAC_PARAMS " " NEIGHBOR_IDENT_VTY_KEY_PARAMS,</span><br><span> NEIGHBOR_ADD_DOC LAC_DOC NEIGHBOR_IDENT_VTY_KEY_DOC)</span><br><span>@@ -430,6 +509,15 @@</span><br><span> return del_by_key(vty, &key);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_neighbor_del_all, cfg_neighbor_del_all_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no neighbors",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR</span><br><span style="color: hsl(120, 100%, 40%);">+ "Remove all local and remote-BSS neighbor config for this cell."</span><br><span style="color: hsl(120, 100%, 40%);">+ " Note that this falls back to the legacy behavior of regarding all local cells as neighbors.\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return del_all(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct write_neighbor_ident_entry_data {</span><br><span> struct vty *vty;</span><br><span> const char *indent;</span><br><span>@@ -576,5 +664,6 @@</span><br><span> install_element(BTS_NODE, &cfg_neighbor_add_cgi_arfcn_bsic_cmd);</span><br><span> install_element(BTS_NODE, &cfg_neighbor_del_bts_nr_cmd);</span><br><span> install_element(BTS_NODE, &cfg_neighbor_del_arfcn_bsic_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_neighbor_del_all_cmd);</span><br><span> install_element_ve(&show_bts_neighbor_cmd);</span><br><span> }</span><br><span>diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty</span><br><span>index 4aeb6cc..224e8b3 100644</span><br><span>--- a/tests/neighbor_ident.vty</span><br><span>+++ b/tests/neighbor_ident.vty</span><br><span>@@ -89,6 +89,7 @@</span><br><span> neighbor cgi <0-999> <0-999> <0-65535> <0-65535> arfcn <0-1023> bsic (<0-63>|any)</span><br><span> no neighbor bts <0-255></span><br><span> no neighbor arfcn <0-1023> bsic (<0-63>|any)</span><br><span style="color: hsl(120, 100%, 40%);">+ no neighbors</span><br><span> ...</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# neighbor?</span><br><span>@@ -158,6 +159,9 @@</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(120, 100%, 40%);">+OsmoBSC(config-net-bts)# no neighbors?</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbors Remove all local and remote-BSS neighbor config for this cell. Note that this falls back to the legacy behavior of regarding all local cells as neighbors.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> OsmoBSC(config-net-bts)# no neighbor?</span><br><span> neighbor Remove local or remote-BSS neighbor cell</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/14768">change 14768</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/+/14768"/><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: I8623ab581639e9f8af6a9ff1eca990518d1b1211 </div>
<div style="display:none"> Gerrit-Change-Number: 14768 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>