<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21887">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">power_control: enable dynamic MS power control for osmo-bts<br><br>Before the recent changes, the MS Power Parameters IE would always<br>be included empty in RSL CHANnel ACTIVation messages iff the BTS<br>type is 'osmo-bts'. Then this behavior was changed, so the user<br>would need to enable dynamic power control explicitly.<br><br>This is a regression, let's revert it back to the old behaviour.<br><br>Change-Id: Idb453fc894584ccf4f5f8b45a24421db958e9478<br>Related: SYS#4918<br>---<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/bts.c<br>M tests/power_ctrl.vty<br>3 files changed, 27 insertions(+), 18 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/87/21887/1</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 3cb479d..4d5f407 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -4885,7 +4885,7 @@</span><br><span> X(BSC_VTY_ATTR_NEW_LCHAN),</span><br><span> "mode (static|dyn-bts) [reset]",</span><br><span> "Power control mode\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "Instruct the MS/BTS to use a static power level (default)\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Instruct the MS/BTS to use a static power level\n"</span><br><span> "Power control to be performed dynamically by the BTS itself\n"</span><br><span> "Reset to default parameters for the given mode\n")</span><br><span> {</span><br><span>diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c</span><br><span>index d5a848d..747e8b7 100644</span><br><span>--- a/src/osmo-bsc/bts.c</span><br><span>+++ b/src/osmo-bsc/bts.c</span><br><span>@@ -504,8 +504,11 @@</span><br><span> }</span><br><span> </span><br><span> switch (bts->type) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_BTS_TYPE_NANOBTS:</span><br><span> case GSM_BTS_TYPE_OSMOBTS:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Enable dynamic Uplink power control by default */</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->ms_power_ctrl.mode = GSM_PWR_CTRL_MODE_DYN_BTS;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* fall-through */</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_BTS_TYPE_NANOBTS:</span><br><span> /* Set the default OML Stream ID to 0xff */</span><br><span> bts->oml_tei = 0xff;</span><br><span> bts->c0->nominal_power = 23;</span><br><span>diff --git a/tests/power_ctrl.vty b/tests/power_ctrl.vty</span><br><span>index d58c075..bdd3d03 100644</span><br><span>--- a/tests/power_ctrl.vty</span><br><span>+++ b/tests/power_ctrl.vty</span><br><span>@@ -1,12 +1,19 @@</span><br><span> OsmoBSC> enable</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC# ### Dynamic power control must be disabled by default</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC# ### Default configuration</span><br><span> OsmoBSC# show running-config</span><br><span> ...</span><br><span> bs-power-control</span><br><span> mode static</span><br><span> ms-power-control</span><br><span style="color: hsl(0, 100%, 40%);">- mode static</span><br><span style="color: hsl(120, 100%, 40%);">+ mode dyn-bts</span><br><span style="color: hsl(120, 100%, 40%);">+ step-size inc 4 red 2</span><br><span style="color: hsl(120, 100%, 40%);">+ rxlev-thresh lower 32 upper 38</span><br><span style="color: hsl(120, 100%, 40%);">+ rxlev-thresh-comp lower 10 12 upper 19 20</span><br><span style="color: hsl(120, 100%, 40%);">+ no rxlev-avg</span><br><span style="color: hsl(120, 100%, 40%);">+ rxqual-thresh lower 3 upper 0</span><br><span style="color: hsl(120, 100%, 40%);">+ rxqual-thresh-comp lower 5 7 upper 15 18</span><br><span style="color: hsl(120, 100%, 40%);">+ no rxqual-avg</span><br><span> ...</span><br><span> </span><br><span> OsmoBSC# ### Check that 'power-ctrl' node and its commands exist</span><br><span>@@ -48,7 +55,7 @@</span><br><span> mode static</span><br><span> bs-power static 6</span><br><span> ms-power-control</span><br><span style="color: hsl(0, 100%, 40%);">- mode static</span><br><span style="color: hsl(120, 100%, 40%);">+ mode dyn-bts</span><br><span> ... !bs-power</span><br><span> </span><br><span> OsmoBSC(config-bs-power-ctrl)# ### Check default BS Power Parameters</span><br><span>@@ -66,7 +73,7 @@</span><br><span> rxqual-thresh-comp lower 5 7 upper 15 18</span><br><span> no rxqual-avg</span><br><span> ms-power-control</span><br><span style="color: hsl(0, 100%, 40%);">- mode static</span><br><span style="color: hsl(120, 100%, 40%);">+ mode dyn-bts</span><br><span> ...</span><br><span> </span><br><span> OsmoBSC(config-bs-power-ctrl)# bs-power dyn-max 30</span><br><span>@@ -77,7 +84,7 @@</span><br><span> bs-power dyn-max 30</span><br><span> ... !bs-power</span><br><span> ms-power-control</span><br><span style="color: hsl(0, 100%, 40%);">- mode static</span><br><span style="color: hsl(120, 100%, 40%);">+ mode dyn-bts</span><br><span> ... !bs-power</span><br><span> </span><br><span> OsmoBSC(config-bs-power-ctrl)# exit</span><br><span>@@ -97,19 +104,11 @@</span><br><span> . lv (rxlev-avg|rxqual-avg) algo osmo-ewma beta <1-99></span><br><span> </span><br><span> OsmoBSC(config-ms-power-ctrl)# ### Check default MS Power Parameters</span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-ms-power-ctrl)# mode dyn-bts</span><br><span> OsmoBSC(config-ms-power-ctrl)# show running-config</span><br><span> ...</span><br><span> bs-power-control</span><br><span> mode dyn-bts</span><br><span style="color: hsl(0, 100%, 40%);">- bs-power dyn-max 30</span><br><span style="color: hsl(0, 100%, 40%);">- step-size inc 4 red 2</span><br><span style="color: hsl(0, 100%, 40%);">- rxlev-thresh lower 32 upper 38</span><br><span style="color: hsl(0, 100%, 40%);">- rxlev-thresh-comp lower 10 12 upper 19 20</span><br><span style="color: hsl(0, 100%, 40%);">- no rxlev-avg</span><br><span style="color: hsl(0, 100%, 40%);">- rxqual-thresh lower 3 upper 0</span><br><span style="color: hsl(0, 100%, 40%);">- rxqual-thresh-comp lower 5 7 upper 15 18</span><br><span style="color: hsl(0, 100%, 40%);">- no rxqual-avg</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span> ms-power-control</span><br><span> mode dyn-bts</span><br><span> step-size inc 4 red 2</span><br><span>@@ -230,7 +229,7 @@</span><br><span> OsmoBSC(config-bs-power-ctrl)# exit</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# ms-power-control</span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-ms-power-ctrl)# mode static reset</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-ms-power-ctrl)# mode dyn-bts reset</span><br><span> % Reset to default parameters</span><br><span> OsmoBSC(config-ms-power-ctrl)# exit</span><br><span> </span><br><span>@@ -239,5 +238,12 @@</span><br><span> bs-power-control</span><br><span> mode static</span><br><span> ms-power-control</span><br><span style="color: hsl(0, 100%, 40%);">- mode static</span><br><span style="color: hsl(120, 100%, 40%);">+ mode dyn-bts</span><br><span style="color: hsl(120, 100%, 40%);">+ step-size inc 4 red 2</span><br><span style="color: hsl(120, 100%, 40%);">+ rxlev-thresh lower 32 upper 38</span><br><span style="color: hsl(120, 100%, 40%);">+ rxlev-thresh-comp lower 10 12 upper 19 20</span><br><span style="color: hsl(120, 100%, 40%);">+ no rxlev-avg</span><br><span style="color: hsl(120, 100%, 40%);">+ rxqual-thresh lower 3 upper 0</span><br><span style="color: hsl(120, 100%, 40%);">+ rxqual-thresh-comp lower 5 7 upper 15 18</span><br><span style="color: hsl(120, 100%, 40%);">+ no rxqual-avg</span><br><span> ...</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21887">change 21887</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/+/21887"/><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: Idb453fc894584ccf4f5f8b45a24421db958e9478 </div>
<div style="display:none"> Gerrit-Change-Number: 21887 </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>