Change in osmo-bsc[master]: power_control: vty: do not print 'no (rxlev-avg|rxqual-avg)'

[laforge]

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

Change subject: power_control: vty: do not print 'no (rxlev-avg|rxqual-avg)'
......................................................................

power_control: vty: do not print 'no (rxlev-avg|rxqual-avg)'

Presence of these lines in the config file does not necessarily mean
that the BTS will not perform measurement pre-processing.  It actually
means that the BSC would not include the optional IEs related to the
measurement pre-processing, so the BTS may still apply its default
averaging algorythm with default parameters.

In order to avoid potential confusion, let's avoid printing them.

Change-Id: I585b5bf4fde93d66e47666e0fa9903f21a268b51
Related: SYS#4918
---
M src/osmo-bsc/bsc_vty.c
M tests/power_ctrl.vty
2 files changed, 1 insertion(+), 13 deletions(-)

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



diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c
index f4d2b82..7a68c3e 100644
--- a/src/osmo-bsc/bsc_vty.c
+++ b/src/osmo-bsc/bsc_vty.c
@@ -910,7 +910,7 @@
 
 	switch (mp->algo) {
 	case GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE:
-		cfg_out("no %s-avg%s", param, VTY_NEWLINE);
+		/* Do not print any averaging parameters */
 		return; /* we're done */
 	case GSM_PWR_CTRL_MEAS_AVG_ALGO_UNWEIGHTED:
 		cfg_out("%s-avg algo unweighted%s", param, VTY_NEWLINE);
diff --git a/tests/power_ctrl.vty b/tests/power_ctrl.vty
index 6a47154..021f9df 100644
--- a/tests/power_ctrl.vty
+++ b/tests/power_ctrl.vty
@@ -10,10 +10,8 @@
    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
@@ -68,10 +66,8 @@
    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
 ...
@@ -114,10 +110,8 @@
    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(config-ms-power-ctrl)# bs-power static 30
@@ -188,10 +182,6 @@
 ...
   bs-power-control
 ... !(rxlev-avg|rxqual-avg)
-   no rxlev-avg
-... !(rxlev-avg|rxqual-avg)
-   no rxqual-avg
-...
   ms-power-control
 ... !(rxlev-avg|rxqual-avg)
    rxlev-avg algo osmo-ewma beta 50
@@ -242,8 +232,6 @@
    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/+/21889
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I585b5bf4fde93d66e47666e0fa9903f21a268b51
Gerrit-Change-Number: 21889
Gerrit-PatchSet: 2
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/20210103/2d22a594/attachment.htm>