Change in osmo-bsc[master]: vty doc: drop "(HO algo 2 only)" strings

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Neels Hofmeyr gerrit-no-reply at lists.osmocom.org
Tue Nov 6 20:01:53 UTC 2018


Neels Hofmeyr has submitted this change and it was merged. ( https://gerrit.osmocom.org/11581 )

Change subject: vty doc: drop "(HO algo 2 only)" strings
......................................................................

vty doc: drop "(HO algo 2 only)" strings

These indicators are a legacy of early handover_decision_2.c work, where there
were no separate handover1 and handover2 config commands. No need to restate
the abundantly obvious anymore.

Change-Id: Id4d29542f7dd5bd125d6f10c7783569f13092612
---
M include/osmocom/bsc/handover_cfg.h
M src/osmo-bsc/handover_vty.c
M tests/handover_cfg.vty
3 files changed, 26 insertions(+), 27 deletions(-)

Approvals:
  Neels Hofmeyr: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmocom/bsc/handover_cfg.h b/include/osmocom/bsc/handover_cfg.h
index 865fab9..92b5cd4 100644
--- a/include/osmocom/bsc/handover_cfg.h
+++ b/include/osmocom/bsc/handover_cfg.h
@@ -21,11 +21,10 @@
 #define HO_CFG_STR_WIN_RXQUAL HO_CFG_STR_WIN "Received-Quality averaging\n"
 #define HO_CFG_STR_POWER_BUDGET "Neighbor cell power triggering\n" "Neighbor cell power triggering\n"
 #define HO_CFG_STR_AVG_COUNT "Number of values to average over\n"
-#define HO_CFG_STR_2 " (HO algo 2 only)\n"
-#define HO_CFG_STR_MIN "Minimum Level/Quality thresholds before triggering HO" HO_CFG_STR_2
-#define HO_CFG_STR_AFS_BIAS "Configure bias to prefer AFS (AMR on TCH/F) over other codecs" HO_CFG_STR_2
-#define HO_CFG_STR_MIN_TCH "Minimum free TCH timeslots before cell is considered congested" HO_CFG_STR_2
-#define HO_CFG_STR_PENALTY_TIME "Set penalty times to wait between repeated handovers" HO_CFG_STR_2
+#define HO_CFG_STR_MIN "Minimum Level/Quality thresholds before triggering HO\n"
+#define HO_CFG_STR_AFS_BIAS "Configure bias to prefer AFS (AMR on TCH/F) over other codecs\n"
+#define HO_CFG_STR_MIN_TCH "Minimum free TCH timeslots before cell is considered congested\n"
+#define HO_CFG_STR_PENALTY_TIME "Set penalty times to wait between repeated handovers\n"
 
 #define as_is(x) (x)
 
@@ -185,14 +184,14 @@
 	HO_CFG_ONE_MEMBER(bool, hodec2_as_active, 0, \
 		"handover2 ", "assignment", "0|1", a2bool, "%d", bool2i, \
 		HO_CFG_STR_HANDOVER2 \
-		"Enable or disable in-call channel re-assignment" HO_CFG_STR_2 \
+		"Enable or disable in-call channel re-assignment\n" \
 		"Disable in-call assignment\n" \
 		"Enable in-call assignment\n") \
 	\
 	HO_CFG_ONE_MEMBER(bool, hodec2_full_tdma, subset, \
 		"handover2 ", "tdma-measurement", "full|subset", a2tdma, "%s", tdma2a, \
 		HO_CFG_STR_HANDOVER2 \
-		"Define measurement set of TDMA frames" HO_CFG_STR_2 \
+		"Define measurement set of TDMA frames\n" \
 		"Full set of 102/104 TDMA frames\n" \
 		"Sub set of 4 TDMA frames (SACCH)\n") \
 	\
@@ -241,7 +240,7 @@
 	HO_CFG_ONE_MEMBER(int, hodec2_ho_max, 9999, \
 		"handover2 ", "max-handovers", "<1-9999>", atoi, "%d", as_is, \
 		HO_CFG_STR_HANDOVER2 \
-		"Maximum number of concurrent handovers allowed per cell" HO_CFG_STR_2 \
+		"Maximum number of concurrent handovers allowed per cell\n" \
 		"Number\n") \
 	\
 	HO_CFG_ONE_MEMBER(int, hodec2_penalty_max_dist, 300, \
@@ -268,7 +267,7 @@
 	HO_CFG_ONE_MEMBER(int, hodec2_retries, 0, \
 		"handover2 ", "retries", "<0-9>", atoi, "%d", as_is, \
 		HO_CFG_STR_HANDOVER2 \
-		"Immediately retry on handover/assignment failure" HO_CFG_STR_2 \
+		"Immediately retry on handover/assignment failure\n" \
 		"Number of retries\n") \
 
 #define HO_CFG_ALL_MEMBERS \
diff --git a/src/osmo-bsc/handover_vty.c b/src/osmo-bsc/handover_vty.c
index 51e448e..7979511 100644
--- a/src/osmo-bsc/handover_vty.c
+++ b/src/osmo-bsc/handover_vty.c
@@ -106,7 +106,7 @@
 DEFUN(cfg_net_ho_congestion_check_interval, cfg_net_ho_congestion_check_interval_cmd,
       "handover2 congestion-check (disabled|<1-999>|now)",
       HO_CFG_STR_HANDOVER2
-      "Configure congestion check interval" HO_CFG_STR_2
+      "Configure congestion check interval\n"
       "Disable congestion checking, do not handover based on cell overload\n"
       "Congestion check interval in seconds (default "
       OSMO_STRINGIFY_VAL(HO_CFG_CONGESTION_CHECK_DEFAULT) ")\n"
diff --git a/tests/handover_cfg.vty b/tests/handover_cfg.vty
index 119eaf5..94c20d9 100644
--- a/tests/handover_cfg.vty
+++ b/tests/handover_cfg.vty
@@ -218,15 +218,15 @@
   window            Measurement averaging settings
   power             Neighbor cell power triggering
   maximum           Maximum Timing-Advance value (i.e. MS distance) before triggering HO
-  assignment        Enable or disable in-call channel re-assignment (HO algo 2 only)
-  tdma-measurement  Define measurement set of TDMA frames (HO algo 2 only)
-  min               Minimum Level/Quality thresholds before triggering HO (HO algo 2 only)
-  afs-bias          Configure bias to prefer AFS (AMR on TCH/F) over other codecs (HO algo 2 only)
-  min-free-slots    Minimum free TCH timeslots before cell is considered congested (HO algo 2 only)
-  max-handovers     Maximum number of concurrent handovers allowed per cell (HO algo 2 only)
-  penalty-time      Set penalty times to wait between repeated handovers (HO algo 2 only)
-  retries           Immediately retry on handover/assignment failure (HO algo 2 only)
-  congestion-check  Configure congestion check interval (HO algo 2 only)
+  assignment        Enable or disable in-call channel re-assignment
+  tdma-measurement  Define measurement set of TDMA frames
+  min               Minimum Level/Quality thresholds before triggering HO
+  afs-bias          Configure bias to prefer AFS (AMR on TCH/F) over other codecs
+  min-free-slots    Minimum free TCH timeslots before cell is considered congested
+  max-handovers     Maximum number of concurrent handovers allowed per cell
+  penalty-time      Set penalty times to wait between repeated handovers
+  retries           Immediately retry on handover/assignment failure
+  congestion-check  Configure congestion check interval
 
 OsmoBSC(config-net)# handover algorithm ?
   1        Algorithm 1: trigger handover based on comparing current cell and neighbor RxLev and RxQual, only.
@@ -437,14 +437,14 @@
   window            Measurement averaging settings
   power             Neighbor cell power triggering
   maximum           Maximum Timing-Advance value (i.e. MS distance) before triggering HO
-  assignment        Enable or disable in-call channel re-assignment (HO algo 2 only)
-  tdma-measurement  Define measurement set of TDMA frames (HO algo 2 only)
-  min               Minimum Level/Quality thresholds before triggering HO (HO algo 2 only)
-  afs-bias          Configure bias to prefer AFS (AMR on TCH/F) over other codecs (HO algo 2 only)
-  min-free-slots    Minimum free TCH timeslots before cell is considered congested (HO algo 2 only)
-  max-handovers     Maximum number of concurrent handovers allowed per cell (HO algo 2 only)
-  penalty-time      Set penalty times to wait between repeated handovers (HO algo 2 only)
-  retries           Immediately retry on handover/assignment failure (HO algo 2 only)
+  assignment        Enable or disable in-call channel re-assignment
+  tdma-measurement  Define measurement set of TDMA frames
+  min               Minimum Level/Quality thresholds before triggering HO
+  afs-bias          Configure bias to prefer AFS (AMR on TCH/F) over other codecs
+  min-free-slots    Minimum free TCH timeslots before cell is considered congested
+  max-handovers     Maximum number of concurrent handovers allowed per cell
+  penalty-time      Set penalty times to wait between repeated handovers
+  retries           Immediately retry on handover/assignment failure
 
 OsmoBSC(config-net-bts)# handover algorithm ?
   1        Algorithm 1: trigger handover based on comparing current cell and neighbor RxLev and RxQual, only.

-- 
To view, visit https://gerrit.osmocom.org/11581
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4d29542f7dd5bd125d6f10c7783569f13092612
Gerrit-Change-Number: 11581
Gerrit-PatchSet: 2
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181106/d1da1ae5/attachment.htm>


More information about the gerrit-log mailing list