<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11126">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">neighbor vty: allow setting local neighbors by CGI<br><br>Add missing item in the landscape of VTY commands: allow identifying a local<br>cell by CGI (besides BTS nr, LAC or LAC+CI, which already exist).<br><br>Change-Id: I2d03de6b695904c4a86025bf250358d04f6e47de<br>---<br>M src/osmo-bsc/neighbor_ident_vty.c<br>M tests/neighbor_ident.vty<br>2 files changed, 18 insertions(+), 2 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/26/11126/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 70240ac..d0c23a8 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>@@ -80,6 +80,9 @@</span><br><span> #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 style="color: hsl(120, 100%, 40%);">+#define CGI_PARAMS "cgi <0-999> <0-999> <0-65535> <0-65535>"</span><br><span style="color: hsl(120, 100%, 40%);">+#define CGI_DOC "Neighbor cell by cgi\n" "MCC\n" "MNC\n" "LAC\n" "CI\n"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #define LOCAL_BTS_PARAMS "bts <0-255>"</span><br><span> #define LOCAL_BTS_DOC "Neighbor cell by local BTS number\n" "BTS number\n"</span><br><span> </span><br><span>@@ -235,6 +238,13 @@</span><br><span>       return add_local_bts(vty, bts_by_cell_id(vty, neighbor_ident_vty_parse_lac_ci(vty, argv)));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_neighbor_add_cgi, cfg_neighbor_add_cgi_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+   NEIGHBOR_ADD_CMD CGI_PARAMS,</span><br><span style="color: hsl(120, 100%, 40%);">+  NEIGHBOR_ADD_DOC CGI_DOC)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+  return add_local_bts(vty, bts_by_cell_id(vty, neighbor_ident_vty_parse_cgi(vty, argv)));</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> bool neighbor_ident_key_matches_bts(const struct neighbor_ident_key *key, struct gsm_bts *bts)</span><br><span> {</span><br><span>         if (!bts || !key)</span><br><span>@@ -379,8 +389,8 @@</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-65535> " NEIGHBOR_IDENT_VTY_KEY_PARAMS,</span><br><span style="color: hsl(0, 100%, 40%);">-    NEIGHBOR_ADD_DOC "Neighbor cell by cgi\n" "MCC\n" "MNC\n" "LAC\n" "CI\n" NEIGHBOR_IDENT_VTY_KEY_DOC)</span><br><span style="color: hsl(120, 100%, 40%);">+        NEIGHBOR_ADD_CMD CGI_PARAMS " " NEIGHBOR_IDENT_VTY_KEY_PARAMS,</span><br><span style="color: hsl(120, 100%, 40%);">+      NEIGHBOR_ADD_DOC CGI_DOC NEIGHBOR_IDENT_VTY_KEY_DOC)</span><br><span> {</span><br><span>    struct neighbor_ident_key nik;</span><br><span>       struct gsm0808_cell_id *cell_id = neighbor_ident_vty_parse_cgi(vty, argv);</span><br><span>@@ -552,6 +562,7 @@</span><br><span>     install_element(BTS_NODE, &cfg_neighbor_add_bts_nr_cmd);</span><br><span>         install_element(BTS_NODE, &cfg_neighbor_add_lac_cmd);</span><br><span>    install_element(BTS_NODE, &cfg_neighbor_add_lac_ci_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+  install_element(BTS_NODE, &cfg_neighbor_add_cgi_cmd);</span><br><span>    install_element(BTS_NODE, &cfg_neighbor_add_lac_arfcn_bsic_cmd);</span><br><span>         install_element(BTS_NODE, &cfg_neighbor_add_lac_ci_arfcn_bsic_cmd);</span><br><span>      install_element(BTS_NODE, &cfg_neighbor_add_cgi_arfcn_bsic_cmd);</span><br><span>diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty</span><br><span>index 8de34d6..02b0f50 100644</span><br><span>--- a/tests/neighbor_ident.vty</span><br><span>+++ b/tests/neighbor_ident.vty</span><br><span>@@ -83,6 +83,7 @@</span><br><span>   neighbor bts <0-255></span><br><span>   neighbor lac <0-65535></span><br><span>   neighbor lac-ci <0-65535> <0-65535></span><br><span style="color: hsl(120, 100%, 40%);">+  neighbor cgi <0-999> <0-999> <0-65535> <0-65535></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>@@ -146,6 +147,7 @@</span><br><span>   <0-65535>  CI</span><br><span> OsmoBSC(config-net-bts)# neighbor cgi 0 0 0 0 ?</span><br><span>   arfcn  ARFCN of neighbor cell</span><br><span style="color: hsl(120, 100%, 40%);">+  <cr>   </span><br><span> OsmoBSC(config-net-bts)# neighbor cgi 0 0 0 0 arfcn ?</span><br><span>   <0-1023>  ARFCN value</span><br><span> OsmoBSC(config-net-bts)# neighbor cgi 0 0 0 0 arfcn 0 ?</span><br><span>@@ -196,6 +198,9 @@</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# neighbor lac 22</span><br><span> % BTS 0 now has local neighbor BTS 2 with LAC 22 CI 65535 and ARFCN 42 BSIC 12</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# no neighbor bts 2</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# neighbor cgi 901 70 22 65535</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 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></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11126">change 11126</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/11126"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I2d03de6b695904c4a86025bf250358d04f6e47de </div>
<div style="display:none"> Gerrit-Change-Number: 11126 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>