<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11581">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Neels Hofmeyr: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty doc: drop "(HO algo 2 only)" strings<br><br>These indicators are a legacy of early handover_decision_2.c work, where there<br>were no separate handover1 and handover2 config commands. No need to restate<br>the abundantly obvious anymore.<br><br>Change-Id: Id4d29542f7dd5bd125d6f10c7783569f13092612<br>---<br>M include/osmocom/bsc/handover_cfg.h<br>M src/osmo-bsc/handover_vty.c<br>M tests/handover_cfg.vty<br>3 files changed, 26 insertions(+), 27 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/handover_cfg.h b/include/osmocom/bsc/handover_cfg.h</span><br><span>index 865fab9..92b5cd4 100644</span><br><span>--- a/include/osmocom/bsc/handover_cfg.h</span><br><span>+++ b/include/osmocom/bsc/handover_cfg.h</span><br><span>@@ -21,11 +21,10 @@</span><br><span> #define HO_CFG_STR_WIN_RXQUAL HO_CFG_STR_WIN "Received-Quality averaging\n"</span><br><span> #define HO_CFG_STR_POWER_BUDGET "Neighbor cell power triggering\n" "Neighbor cell power triggering\n"</span><br><span> #define HO_CFG_STR_AVG_COUNT "Number of values to average over\n"</span><br><span style="color: hsl(0, 100%, 40%);">-#define HO_CFG_STR_2 " (HO algo 2 only)\n"</span><br><span style="color: hsl(0, 100%, 40%);">-#define HO_CFG_STR_MIN "Minimum Level/Quality thresholds before triggering HO" HO_CFG_STR_2</span><br><span style="color: hsl(0, 100%, 40%);">-#define HO_CFG_STR_AFS_BIAS "Configure bias to prefer AFS (AMR on TCH/F) over other codecs" HO_CFG_STR_2</span><br><span style="color: hsl(0, 100%, 40%);">-#define HO_CFG_STR_MIN_TCH "Minimum free TCH timeslots before cell is considered congested" HO_CFG_STR_2</span><br><span style="color: hsl(0, 100%, 40%);">-#define HO_CFG_STR_PENALTY_TIME "Set penalty times to wait between repeated handovers" HO_CFG_STR_2</span><br><span style="color: hsl(120, 100%, 40%);">+#define HO_CFG_STR_MIN "Minimum Level/Quality thresholds before triggering HO\n"</span><br><span style="color: hsl(120, 100%, 40%);">+#define HO_CFG_STR_AFS_BIAS "Configure bias to prefer AFS (AMR on TCH/F) over other codecs\n"</span><br><span style="color: hsl(120, 100%, 40%);">+#define HO_CFG_STR_MIN_TCH "Minimum free TCH timeslots before cell is considered congested\n"</span><br><span style="color: hsl(120, 100%, 40%);">+#define HO_CFG_STR_PENALTY_TIME "Set penalty times to wait between repeated handovers\n"</span><br><span> </span><br><span> #define as_is(x) (x)</span><br><span> </span><br><span>@@ -185,14 +184,14 @@</span><br><span> HO_CFG_ONE_MEMBER(bool, hodec2_as_active, 0, \</span><br><span> "handover2 ", "assignment", "0|1", a2bool, "%d", bool2i, \</span><br><span> HO_CFG_STR_HANDOVER2 \</span><br><span style="color: hsl(0, 100%, 40%);">- "Enable or disable in-call channel re-assignment" HO_CFG_STR_2 \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Enable or disable in-call channel re-assignment\n" \</span><br><span> "Disable in-call assignment\n" \</span><br><span> "Enable in-call assignment\n") \</span><br><span> \</span><br><span> HO_CFG_ONE_MEMBER(bool, hodec2_full_tdma, subset, \</span><br><span> "handover2 ", "tdma-measurement", "full|subset", a2tdma, "%s", tdma2a, \</span><br><span> HO_CFG_STR_HANDOVER2 \</span><br><span style="color: hsl(0, 100%, 40%);">- "Define measurement set of TDMA frames" HO_CFG_STR_2 \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Define measurement set of TDMA frames\n" \</span><br><span> "Full set of 102/104 TDMA frames\n" \</span><br><span> "Sub set of 4 TDMA frames (SACCH)\n") \</span><br><span> \</span><br><span>@@ -241,7 +240,7 @@</span><br><span> HO_CFG_ONE_MEMBER(int, hodec2_ho_max, 9999, \</span><br><span> "handover2 ", "max-handovers", "<1-9999>", atoi, "%d", as_is, \</span><br><span> HO_CFG_STR_HANDOVER2 \</span><br><span style="color: hsl(0, 100%, 40%);">- "Maximum number of concurrent handovers allowed per cell" HO_CFG_STR_2 \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Maximum number of concurrent handovers allowed per cell\n" \</span><br><span> "Number\n") \</span><br><span> \</span><br><span> HO_CFG_ONE_MEMBER(int, hodec2_penalty_max_dist, 300, \</span><br><span>@@ -268,7 +267,7 @@</span><br><span> HO_CFG_ONE_MEMBER(int, hodec2_retries, 0, \</span><br><span> "handover2 ", "retries", "<0-9>", atoi, "%d", as_is, \</span><br><span> HO_CFG_STR_HANDOVER2 \</span><br><span style="color: hsl(0, 100%, 40%);">- "Immediately retry on handover/assignment failure" HO_CFG_STR_2 \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Immediately retry on handover/assignment failure\n" \</span><br><span> "Number of retries\n") \</span><br><span> </span><br><span> #define HO_CFG_ALL_MEMBERS \</span><br><span>diff --git a/src/osmo-bsc/handover_vty.c b/src/osmo-bsc/handover_vty.c</span><br><span>index 51e448e..7979511 100644</span><br><span>--- a/src/osmo-bsc/handover_vty.c</span><br><span>+++ b/src/osmo-bsc/handover_vty.c</span><br><span>@@ -106,7 +106,7 @@</span><br><span> DEFUN(cfg_net_ho_congestion_check_interval, cfg_net_ho_congestion_check_interval_cmd,</span><br><span> "handover2 congestion-check (disabled|<1-999>|now)",</span><br><span> HO_CFG_STR_HANDOVER2</span><br><span style="color: hsl(0, 100%, 40%);">- "Configure congestion check interval" HO_CFG_STR_2</span><br><span style="color: hsl(120, 100%, 40%);">+ "Configure congestion check interval\n"</span><br><span> "Disable congestion checking, do not handover based on cell overload\n"</span><br><span> "Congestion check interval in seconds (default "</span><br><span> OSMO_STRINGIFY_VAL(HO_CFG_CONGESTION_CHECK_DEFAULT) ")\n"</span><br><span>diff --git a/tests/handover_cfg.vty b/tests/handover_cfg.vty</span><br><span>index 119eaf5..94c20d9 100644</span><br><span>--- a/tests/handover_cfg.vty</span><br><span>+++ b/tests/handover_cfg.vty</span><br><span>@@ -218,15 +218,15 @@</span><br><span> window Measurement averaging settings</span><br><span> power Neighbor cell power triggering</span><br><span> maximum Maximum Timing-Advance value (i.e. MS distance) before triggering HO</span><br><span style="color: hsl(0, 100%, 40%);">- assignment Enable or disable in-call channel re-assignment (HO algo 2 only)</span><br><span style="color: hsl(0, 100%, 40%);">- tdma-measurement Define measurement set of TDMA frames (HO algo 2 only)</span><br><span style="color: hsl(0, 100%, 40%);">- min Minimum Level/Quality thresholds before triggering HO (HO algo 2 only)</span><br><span style="color: hsl(0, 100%, 40%);">- afs-bias Configure bias to prefer AFS (AMR on TCH/F) over other codecs (HO algo 2 only)</span><br><span style="color: hsl(0, 100%, 40%);">- min-free-slots Minimum free TCH timeslots before cell is considered congested (HO algo 2 only)</span><br><span style="color: hsl(0, 100%, 40%);">- max-handovers Maximum number of concurrent handovers allowed per cell (HO algo 2 only)</span><br><span style="color: hsl(0, 100%, 40%);">- penalty-time Set penalty times to wait between repeated handovers (HO algo 2 only)</span><br><span style="color: hsl(0, 100%, 40%);">- retries Immediately retry on handover/assignment failure (HO algo 2 only)</span><br><span style="color: hsl(0, 100%, 40%);">- congestion-check Configure congestion check interval (HO algo 2 only)</span><br><span style="color: hsl(120, 100%, 40%);">+ assignment Enable or disable in-call channel re-assignment</span><br><span style="color: hsl(120, 100%, 40%);">+ tdma-measurement Define measurement set of TDMA frames</span><br><span style="color: hsl(120, 100%, 40%);">+ min Minimum Level/Quality thresholds before triggering HO</span><br><span style="color: hsl(120, 100%, 40%);">+ afs-bias Configure bias to prefer AFS (AMR on TCH/F) over other codecs</span><br><span style="color: hsl(120, 100%, 40%);">+ min-free-slots Minimum free TCH timeslots before cell is considered congested</span><br><span style="color: hsl(120, 100%, 40%);">+ max-handovers Maximum number of concurrent handovers allowed per cell</span><br><span style="color: hsl(120, 100%, 40%);">+ penalty-time Set penalty times to wait between repeated handovers</span><br><span style="color: hsl(120, 100%, 40%);">+ retries Immediately retry on handover/assignment failure</span><br><span style="color: hsl(120, 100%, 40%);">+ congestion-check Configure congestion check interval</span><br><span> </span><br><span> OsmoBSC(config-net)# handover algorithm ?</span><br><span> 1 Algorithm 1: trigger handover based on comparing current cell and neighbor RxLev and RxQual, only.</span><br><span>@@ -437,14 +437,14 @@</span><br><span> window Measurement averaging settings</span><br><span> power Neighbor cell power triggering</span><br><span> maximum Maximum Timing-Advance value (i.e. MS distance) before triggering HO</span><br><span style="color: hsl(0, 100%, 40%);">- assignment Enable or disable in-call channel re-assignment (HO algo 2 only)</span><br><span style="color: hsl(0, 100%, 40%);">- tdma-measurement Define measurement set of TDMA frames (HO algo 2 only)</span><br><span style="color: hsl(0, 100%, 40%);">- min Minimum Level/Quality thresholds before triggering HO (HO algo 2 only)</span><br><span style="color: hsl(0, 100%, 40%);">- afs-bias Configure bias to prefer AFS (AMR on TCH/F) over other codecs (HO algo 2 only)</span><br><span style="color: hsl(0, 100%, 40%);">- min-free-slots Minimum free TCH timeslots before cell is considered congested (HO algo 2 only)</span><br><span style="color: hsl(0, 100%, 40%);">- max-handovers Maximum number of concurrent handovers allowed per cell (HO algo 2 only)</span><br><span style="color: hsl(0, 100%, 40%);">- penalty-time Set penalty times to wait between repeated handovers (HO algo 2 only)</span><br><span style="color: hsl(0, 100%, 40%);">- retries Immediately retry on handover/assignment failure (HO algo 2 only)</span><br><span style="color: hsl(120, 100%, 40%);">+ assignment Enable or disable in-call channel re-assignment</span><br><span style="color: hsl(120, 100%, 40%);">+ tdma-measurement Define measurement set of TDMA frames</span><br><span style="color: hsl(120, 100%, 40%);">+ min Minimum Level/Quality thresholds before triggering HO</span><br><span style="color: hsl(120, 100%, 40%);">+ afs-bias Configure bias to prefer AFS (AMR on TCH/F) over other codecs</span><br><span style="color: hsl(120, 100%, 40%);">+ min-free-slots Minimum free TCH timeslots before cell is considered congested</span><br><span style="color: hsl(120, 100%, 40%);">+ max-handovers Maximum number of concurrent handovers allowed per cell</span><br><span style="color: hsl(120, 100%, 40%);">+ penalty-time Set penalty times to wait between repeated handovers</span><br><span style="color: hsl(120, 100%, 40%);">+ retries Immediately retry on handover/assignment failure</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# handover algorithm ?</span><br><span> 1 Algorithm 1: trigger handover based on comparing current cell and neighbor RxLev and RxQual, only.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11581">change 11581</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/11581"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Id4d29542f7dd5bd125d6f10c7783569f13092612 </div>
<div style="display:none"> Gerrit-Change-Number: 11581 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>