<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/21992">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">power_control: vty: deprecate 'uplink-power-control' commands<br><br>MS/BS Power Control parameters have been recently moved to the BSC<br>and now signaled to the BTS over the A-bis/RSL link. Let's make<br>sure that the existing VTY commands for Uplink Power Control do:<br><br> - trigger deprecation warnings if present in the config file,<br> - not show up in the online VTY help nor VTY reference,<br> - affect the fall-back parameters in 'struct gsm_bts',<br> - still get printed by 'show running-config' command.<br><br>Change-Id: Icbd9a7d31ce6723294130a31a179a002fccb4612<br>Related: SYS#4918<br>---<br>M src/common/vty.c<br>1 file changed, 62 insertions(+), 24 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/92/21992/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index 52478b8..326e332 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -228,6 +228,37 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void config_write_dpc_params(struct vty *vty, const char *prefix,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_power_ctrl_params *params)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_power_ctrl_meas_params *mp = ¶ms->rxlev_meas;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mp->lower_thresh != power_ctrl_params_def.rxlev_meas.lower_thresh ||</span><br><span style="color: hsl(120, 100%, 40%);">+ mp->upper_thresh != power_ctrl_params_def.rxlev_meas.upper_thresh) {</span><br><span style="color: hsl(120, 100%, 40%);">+ int target = (mp->lower_thresh + mp->upper_thresh) / 2;</span><br><span style="color: hsl(120, 100%, 40%);">+ int hyst = (mp->upper_thresh - mp->lower_thresh) / 2;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " %s-power-target %d", prefix, rxlev2dbm(target));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (hyst > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " hysteresis %d", hyst);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%s", VTY_NEWLINE);</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%);">+ /* MS Tx power filtering algorithm and parameters */</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (mp->algo) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_PWR_CTRL_MEAS_AVG_ALGO_OSMO_EWMA: /* EWMA is the default */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mp->ewma.alpha != power_ctrl_params_def.rxlev_meas.ewma.alpha)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " %s-power-filtering algo ewma beta %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ prefix, 100 - mp->ewma.alpha, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Other algorithm cannot be set via the VTY */</span><br><span style="color: hsl(120, 100%, 40%);">+ case BTS_PF_ALGO_NONE:</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " no %s-power-filtering%s", prefix, VTY_NEWLINE);</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%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void config_write_bts_single(struct vty *vty, const struct gsm_bts *bts)</span><br><span> {</span><br><span> const struct gsm_bts_trx *trx;</span><br><span>@@ -255,22 +286,9 @@</span><br><span> VTY_NEWLINE);</span><br><span> vty_out(vty, " paging lifetime %u%s", paging_get_lifetime(bts->paging_state),</span><br><span> VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " uplink-power-target %d", bts->ul_power_ctrl.target_dbm);</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->ul_power_ctrl.hysteresis_db > 0)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " hysteresis %d", bts->ul_power_ctrl.hysteresis_db);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%s", VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* MS Tx power filtering algorithm and parameters */</span><br><span style="color: hsl(0, 100%, 40%);">- switch (bts->ul_power_ctrl.pf_algo) {</span><br><span style="color: hsl(0, 100%, 40%);">- case BTS_PF_ALGO_EWMA:</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " uplink-power-filtering algo ewma beta %u%s",</span><br><span style="color: hsl(0, 100%, 40%);">- 100 - bts->ul_power_ctrl.pf.ewma.alpha, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case BTS_PF_ALGO_NONE:</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " no uplink-power-filtering%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Fall-back MS Power Control parameters may be changed by the user */</span><br><span style="color: hsl(120, 100%, 40%);">+ config_write_dpc_params(vty, "uplink", &bts->ms_dpc_params);</span><br><span> </span><br><span> if (bts->agch_queue.thresh_level != GSM_BTS_AGCH_QUEUE_THRESH_LEVEL_DEFAULT</span><br><span> || bts->agch_queue.low_level != GSM_BTS_AGCH_QUEUE_LOW_LEVEL_DEFAULT</span><br><span>@@ -627,10 +645,16 @@</span><br><span> "Set the nominal target Rx Level for uplink power control loop\n" \</span><br><span> "Target uplink Rx level in dBm\n"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define UL_POWER_DEPR_MSG(fmt, args...) \</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Command '%s' has been deprecated.%s" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "%% MS/BS Power control parameters should be configured in osmo-bsc: " \</span><br><span style="color: hsl(120, 100%, 40%);">+ fmt, self->string, VTY_NEWLINE, ##args)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DEFUN_ATTR(cfg_bts_ul_power_target, cfg_bts_ul_power_target_cmd,</span><br><span> UL_POWER_TARGET_CMD, UL_POWER_TARGET_CMD_DESC,</span><br><span style="color: hsl(0, 100%, 40%);">- CMD_ATTR_IMMEDIATE)</span><br><span style="color: hsl(120, 100%, 40%);">+ CMD_ATTR_DEPRECATED)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_power_ctrl_meas_params *mp;</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> int rxlev_dbm = atoi(argv[0]);</span><br><span> int hyst = 0;</span><br><span>@@ -638,8 +662,13 @@</span><br><span> if (argc > 1) /* optional argument */</span><br><span> hyst = atoi(argv[1]);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->ul_power_ctrl.target_dbm = rxlev_dbm;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->ul_power_ctrl.hysteresis_db = hyst;</span><br><span style="color: hsl(120, 100%, 40%);">+ mp = &bts->ms_dpc_params.rxlev_meas;</span><br><span style="color: hsl(120, 100%, 40%);">+ mp->lower_thresh = dbm2rxlev(rxlev_dbm - hyst);</span><br><span style="color: hsl(120, 100%, 40%);">+ mp->upper_thresh = dbm2rxlev(rxlev_dbm + hyst);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ UL_POWER_DEPR_MSG("use 'rxlev-thresh lower %u upper %u'.%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ mp->lower_thresh, mp->upper_thresh,</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -651,17 +680,21 @@</span><br><span> UL_POWER_TARGET_CMD_DESC</span><br><span> "Target Rx Level hysteresis\n"</span><br><span> "Tolerable deviation in dBm\n",</span><br><span style="color: hsl(0, 100%, 40%);">- CMD_ATTR_IMMEDIATE, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ CMD_ATTR_DEPRECATED, 0);</span><br><span> </span><br><span> DEFUN_ATTR(cfg_no_bts_ul_power_filter,</span><br><span> cfg_bts_no_ul_power_filter_cmd,</span><br><span> "no uplink-power-filtering",</span><br><span> NO_STR "Disable filtering for uplink power control loop\n",</span><br><span style="color: hsl(0, 100%, 40%);">- CMD_ATTR_IMMEDIATE)</span><br><span style="color: hsl(120, 100%, 40%);">+ CMD_ATTR_DEPRECATED)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_power_ctrl_meas_params *mp;</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->ul_power_ctrl.pf_algo = BTS_PF_ALGO_NONE;</span><br><span style="color: hsl(120, 100%, 40%);">+ mp = &bts->ms_dpc_params.rxlev_meas;</span><br><span style="color: hsl(120, 100%, 40%);">+ mp->algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ UL_POWER_DEPR_MSG("use 'no rxlev-avg'.%s", VTY_NEWLINE);</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -674,12 +707,17 @@</span><br><span> "Exponentially Weighted Moving Average (EWMA)\n"</span><br><span> "Smoothing factor (in %): beta = (100 - alpha)\n"</span><br><span> "1% - lowest smoothing, 99% - highest smoothing\n",</span><br><span style="color: hsl(0, 100%, 40%);">- CMD_ATTR_IMMEDIATE)</span><br><span style="color: hsl(120, 100%, 40%);">+ CMD_ATTR_DEPRECATED)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_power_ctrl_meas_params *mp;</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->ul_power_ctrl.pf_algo = BTS_PF_ALGO_EWMA;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->ul_power_ctrl.pf.ewma.alpha = 100 - atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ mp = &bts->ms_dpc_params.rxlev_meas;</span><br><span style="color: hsl(120, 100%, 40%);">+ mp->algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_OSMO_EWMA;</span><br><span style="color: hsl(120, 100%, 40%);">+ mp->ewma.alpha = 100 - atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ UL_POWER_DEPR_MSG("use 'rxlev-avg algo osmo-ewma beta %s'.%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ argv[0], VTY_NEWLINE);</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/21992">change 21992</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-bts/+/21992"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Icbd9a7d31ce6723294130a31a179a002fccb4612 </div>
<div style="display:none"> Gerrit-Change-Number: 21992 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>