Change in osmo-bsc[master]: power_control: enable dynamic MS power control for osmo-bts

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/21887 )

Change subject: power_control: enable dynamic MS power control for osmo-bts
......................................................................

power_control: enable dynamic MS power control for osmo-bts

Before the recent changes, the MS Power Parameters IE would always
be included empty in RSL CHANnel ACTIVation messages iff the BTS
type is 'osmo-bts'.  Then this behavior was changed, so the user
would need to enable dynamic power control explicitly.

This is a regression, let's revert it back to the old behaviour.

Change-Id: Idb453fc894584ccf4f5f8b45a24421db958e9478
Related: SYS#4918
---
M src/osmo-bsc/bsc_vty.c
M src/osmo-bsc/bts.c
M tests/power_ctrl.vty
3 files changed, 27 insertions(+), 18 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c
index 3cb479d..4d5f407 100644
--- a/src/osmo-bsc/bsc_vty.c
+++ b/src/osmo-bsc/bsc_vty.c
@@ -4885,7 +4885,7 @@
 	      X(BSC_VTY_ATTR_NEW_LCHAN),
 	      "mode (static|dyn-bts) [reset]",
 	      "Power control mode\n"
-	      "Instruct the MS/BTS to use a static power level (default)\n"
+	      "Instruct the MS/BTS to use a static power level\n"
 	      "Power control to be performed dynamically by the BTS itself\n"
 	      "Reset to default parameters for the given mode\n")
 {
diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c
index d5a848d..747e8b7 100644
--- a/src/osmo-bsc/bts.c
+++ b/src/osmo-bsc/bts.c
@@ -504,8 +504,11 @@
 	}
 
 	switch (bts->type) {
-	case GSM_BTS_TYPE_NANOBTS:
 	case GSM_BTS_TYPE_OSMOBTS:
+		/* Enable dynamic Uplink power control by default */
+		bts->ms_power_ctrl.mode = GSM_PWR_CTRL_MODE_DYN_BTS;
+		/* fall-through */
+	case GSM_BTS_TYPE_NANOBTS:
 		/* Set the default OML Stream ID to 0xff */
 		bts->oml_tei = 0xff;
 		bts->c0->nominal_power = 23;
diff --git a/tests/power_ctrl.vty b/tests/power_ctrl.vty
index d58c075..bdd3d03 100644
--- a/tests/power_ctrl.vty
+++ b/tests/power_ctrl.vty
@@ -1,12 +1,19 @@
 OsmoBSC> enable
 
-OsmoBSC# ### Dynamic power control must be disabled by default
+OsmoBSC# ### Default configuration
 OsmoBSC# show running-config
 ...
   bs-power-control
    mode static
   ms-power-control
-   mode static
+   mode dyn-bts
+   step-size inc 4 red 2
+   rxlev-thresh lower 32 upper 38
+   rxlev-thresh-comp lower 10 12 upper 19 20
+   no rxlev-avg
+   rxqual-thresh lower 3 upper 0
+   rxqual-thresh-comp lower 5 7 upper 15 18
+   no rxqual-avg
 ...
 
 OsmoBSC# ### Check that 'power-ctrl' node and its commands exist
@@ -48,7 +55,7 @@
    mode static
    bs-power static 6
   ms-power-control
-   mode static
+   mode dyn-bts
 ... !bs-power
 
 OsmoBSC(config-bs-power-ctrl)# ### Check default BS Power Parameters
@@ -66,7 +73,7 @@
    rxqual-thresh-comp lower 5 7 upper 15 18
    no rxqual-avg
   ms-power-control
-   mode static
+   mode dyn-bts
 ...
 
 OsmoBSC(config-bs-power-ctrl)# bs-power dyn-max 30
@@ -77,7 +84,7 @@
    bs-power dyn-max 30
 ... !bs-power
   ms-power-control
-   mode static
+   mode dyn-bts
 ... !bs-power
 
 OsmoBSC(config-bs-power-ctrl)# exit
@@ -97,19 +104,11 @@
   . lv  (rxlev-avg|rxqual-avg) algo osmo-ewma beta <1-99>
 
 OsmoBSC(config-ms-power-ctrl)# ### Check default MS Power Parameters
-OsmoBSC(config-ms-power-ctrl)# mode dyn-bts
 OsmoBSC(config-ms-power-ctrl)# show running-config
 ...
   bs-power-control
    mode dyn-bts
-   bs-power dyn-max 30
-   step-size inc 4 red 2
-   rxlev-thresh lower 32 upper 38
-   rxlev-thresh-comp lower 10 12 upper 19 20
-   no rxlev-avg
-   rxqual-thresh lower 3 upper 0
-   rxqual-thresh-comp lower 5 7 upper 15 18
-   no rxqual-avg
+...
   ms-power-control
    mode dyn-bts
    step-size inc 4 red 2
@@ -230,7 +229,7 @@
 OsmoBSC(config-bs-power-ctrl)# exit
 
 OsmoBSC(config-net-bts)# ms-power-control
-OsmoBSC(config-ms-power-ctrl)# mode static reset
+OsmoBSC(config-ms-power-ctrl)# mode dyn-bts reset
 % Reset to default parameters
 OsmoBSC(config-ms-power-ctrl)# exit
 
@@ -239,5 +238,12 @@
   bs-power-control
    mode static
   ms-power-control
-   mode static
+   mode dyn-bts
+   step-size inc 4 red 2
+   rxlev-thresh lower 32 upper 38
+   rxlev-thresh-comp lower 10 12 upper 19 20
+   no rxlev-avg
+   rxqual-thresh lower 3 upper 0
+   rxqual-thresh-comp lower 5 7 upper 15 18
+   no rxqual-avg
 ...

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/21887
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Idb453fc894584ccf4f5f8b45a24421db958e9478
Gerrit-Change-Number: 21887
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201229/9da40dd0/attachment.htm>