<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21911">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: join UL/DL SACCH repetition commands together<br><br>Both commands are basically doing the same thing, so we can merge<br>them into a single command by adding a parameter to the command<br>string.  The VTY syntax remains the same:<br><br>  do-something foo<br>  do-something bar<br><br>becomes:<br><br>  do-something (foo|bar)<br><br>This change reduces code duplication.<br><br>Change-Id: Ibe98718d8f4933926eed0e622109c9c82537f526<br>Related: SYS#5114<br>---<br>M src/osmo-bsc/bsc_vty.c<br>1 file changed, 20 insertions(+), 45 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 7a68c3e..34ea87e 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -2784,11 +2784,13 @@</span><br><span>  return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN_ATTR(cfg_bts_rep_dl_sacch,</span><br><span style="color: hsl(0, 100%, 40%);">-       cfg_bts_rep_dl_sacch_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">-       "repeat dl-sacch",</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(cfg_bts_rep_ul_dl_sacch,</span><br><span style="color: hsl(120, 100%, 40%);">+     cfg_bts_rep_ul_dl_sacch_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+          "repeat (ul-sacch|dl-sacch)",</span><br><span>      REP_ACCH_STR</span><br><span style="color: hsl(0, 100%, 40%);">-    "Enable DL-SACCH repetition for this BTS\n", CMD_ATTR_IMMEDIATE)</span><br><span style="color: hsl(120, 100%, 40%);">+    "Enable UL-SACCH repetition for this BTS\n"</span><br><span style="color: hsl(120, 100%, 40%);">+         "Enable DL-SACCH repetition for this BTS\n",</span><br><span style="color: hsl(120, 100%, 40%);">+        CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span>  struct gsm_bts *bts = vty->index;</span><br><span> </span><br><span>@@ -2798,52 +2800,27 @@</span><br><span>           return CMD_WARNING;</span><br><span>  }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   bts->repeated_acch_policy.dl_sacch = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcmp(argv[0], "ul-sacch") == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+               bts->repeated_acch_policy.ul_sacch = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+          bts->repeated_acch_policy.dl_sacch = true;</span><br><span> </span><br><span>    return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN_ATTR(cfg_bts_rep_no_dl_sacch,</span><br><span style="color: hsl(0, 100%, 40%);">-    cfg_bts_rep_no_dl_sacch_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">-    "no repeat dl-sacch",</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(cfg_bts_rep_no_ul_dl_sacch,</span><br><span style="color: hsl(120, 100%, 40%);">+       cfg_bts_rep_no_ul_dl_sacch_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+       "no repeat (ul-sacch|dl-sacch)",</span><br><span>           NO_STR REP_ACCH_STR</span><br><span style="color: hsl(120, 100%, 40%);">+           "Disable UL-SACCH repetition for this BTS\n"</span><br><span>       "Disable DL-SACCH repetition for this BTS\n", CMD_ATTR_IMMEDIATE)</span><br><span> {</span><br><span>  struct gsm_bts *bts = vty->index;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        bts->repeated_acch_policy.dl_sacch = false;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  return CMD_SUCCESS;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN_ATTR(cfg_bts_rep_ul_sacch,</span><br><span style="color: hsl(0, 100%, 40%);">-       cfg_bts_rep_ul_sacch_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">-       "repeat ul-sacch",</span><br><span style="color: hsl(0, 100%, 40%);">-    REP_ACCH_STR</span><br><span style="color: hsl(0, 100%, 40%);">-    "Enable UL-SACCH repetition for this BTS\n", CMD_ATTR_IMMEDIATE)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-  struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-    if (bts->model->type != GSM_BTS_TYPE_OSMOBTS) {</span><br><span style="color: hsl(0, 100%, 40%);">-           vty_out(vty, "%% repeated ACCH not supported by BTS %u%s",</span><br><span style="color: hsl(0, 100%, 40%);">-                    bts->nr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">-               return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">-     }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-       bts->repeated_acch_policy.ul_sacch = true;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-   return CMD_SUCCESS;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN_ATTR(cfg_bts_rep_no_ul_sacch,</span><br><span style="color: hsl(0, 100%, 40%);">-    cfg_bts_rep_no_ul_sacch_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">-    "no repeat ul-sacch",</span><br><span style="color: hsl(0, 100%, 40%);">-         NO_STR REP_ACCH_STR</span><br><span style="color: hsl(0, 100%, 40%);">-     "Disable UL-SACCH repetition for this BTS\n", CMD_ATTR_IMMEDIATE)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-    bts->repeated_acch_policy.ul_sacch = false;</span><br><span style="color: hsl(120, 100%, 40%);">+        if (strcmp(argv[0], "ul-sacch") == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+               bts->repeated_acch_policy.ul_sacch = false;</span><br><span style="color: hsl(120, 100%, 40%);">+        else</span><br><span style="color: hsl(120, 100%, 40%);">+          bts->repeated_acch_policy.dl_sacch = false;</span><br><span> </span><br><span>   return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -7705,10 +7682,8 @@</span><br><span>    install_element(BTS_NODE, &cfg_bts_no_t3113_dynamic_cmd);</span><br><span>        install_element(BTS_NODE, &cfg_bts_rep_dl_facch_cmd);</span><br><span>    install_element(BTS_NODE, &cfg_bts_rep_no_dl_facch_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">-    install_element(BTS_NODE, &cfg_bts_rep_dl_sacch_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">-       install_element(BTS_NODE, &cfg_bts_rep_no_dl_sacch_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">-    install_element(BTS_NODE, &cfg_bts_rep_ul_sacch_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">-       install_element(BTS_NODE, &cfg_bts_rep_no_ul_sacch_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+  install_element(BTS_NODE, &cfg_bts_rep_ul_dl_sacch_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+  install_element(BTS_NODE, &cfg_bts_rep_no_ul_dl_sacch_cmd);</span><br><span>      install_element(BTS_NODE, &cfg_bts_rep_rxqual_cmd);</span><br><span> </span><br><span>  neighbor_ident_vty_init(network, network->neighbor_bss_cells);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21911">change 21911</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/+/21911"/><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: Ibe98718d8f4933926eed0e622109c9c82537f526 </div>
<div style="display:none"> Gerrit-Change-Number: 21911 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>