hodec2: implement upgrade TCH/H -> TCH/F (without AFS bias)

Pass flag into find_alternative_lchan() indicating that a TCH/H channel
has low ratings (rxqual or rxlev, doesn't matter).

Heed this flag in the last round, the requirement A check, and allow
candidates that have equal rxlev, if they result in an upgrade from
TCH/H to TCH/F. This allows intra-cell upgrades to TCH/F.

An important point is that this patch allows upgrade to TCH/F *without*
the AFS bias setting. See also I315f24123ae016887ab91666870ce252e096f90f.

Related: SYS#5198 SYS#5365
Change-Id: Id40d1cf8b58410c7d4eb87407fe8b8106e352438

4 files changed, 24 insertions, 48 deletions

diff --git a/tests/handover/test_amr_tch_h_to_f_rxlev.ho_vty b/tests/handover/test_amr_tch_h_to_f_rxlev.ho_vty
index 34fb5e613..a22ad6d85 100644
--- a/tests/handover/test_amr_tch_h_to_f_rxlev.ho_vty
+++ b/tests/handover/test_amr_tch_h_to_f_rxlev.ho_vty
@@ -12,7 +12,5 @@ meas-rep repeat 9 lchan 0 0 4 0 rxlev 23 rxqual 1 ta 0
 expect-no-chan
 meas-rep lchan 0 0 4 0 rxlev 23 rxqual 1 ta 0
 # average rxlev is now -110 + 23 = -87 < -80: reassign to TCH/F due to bad rxlev
-#expect-as from lchan 0 0 4 0 to lchan 0 0 1 0
-#expect-ts-use trx 0 0 states * TCH/F - - - - - *
-# FAIL: osmo-bsc does not move to TCH/F from bad rxlev
-expect-no-chan
+expect-as from lchan 0 0 4 0 to lchan 0 0 1 0
+expect-ts-use trx 0 0 states * TCH/F - - - - - *
diff --git a/tests/handover/test_amr_tch_h_to_f_rxlev_congested.ho_vty b/tests/handover/test_amr_tch_h_to_f_rxlev_congested.ho_vty
index a4633873a..776b09311 100644
--- a/tests/handover/test_amr_tch_h_to_f_rxlev_congested.ho_vty
+++ b/tests/handover/test_amr_tch_h_to_f_rxlev_congested.ho_vty
@@ -14,10 +14,8 @@ meas-rep repeat 9 lchan 0 0 4 0 rxlev 23 rxqual 1 ta 0
 expect-no-chan
 meas-rep lchan 0 0 4 0 rxlev 23 rxqual 1 ta 0
 # average rxlev is now -110 + 23 = -87 < -80: reassign to TCH/F due to bad rxlev
-#expect-as from lchan 0 0 4 0 to lchan 0 0 1 0
-#expect-ts-use trx 0 0 states     *    TCH/F -     -     TCH/-H TCH/HH *    *
-# FAIL: osmo-bsc does not move to TCH/F from bad rxlev
-expect-no-chan
+expect-as from lchan 0 0 4 0 to lchan 0 0 1 0
+expect-ts-use trx 0 0 states     *    TCH/F -     -     TCH/-H TCH/HH *    *
 
 
 # This situation actually balances congestion
@@ -27,10 +25,8 @@ meas-rep repeat 9 lchan 0 0 4 0 rxlev 23 rxqual 1 ta 0
 expect-no-chan
 meas-rep lchan 0 0 4 0 rxlev 23 rxqual 1 ta 0
 # average rxlev is now -110 + 23 = -87 < -80: reassign to TCH/F due to bad rxlev
-#expect-as from lchan 0 0 4 0 to lchan 0 0 2 0
-#expect-ts-use trx 0 0 states     *    TCH/F TCH/F -     TCH/-H TCH/HH *    *
-# FAIL: osmo-bsc does not move to TCH/F from bad rxlev
-expect-no-chan
+expect-as from lchan 0 0 4 0 to lchan 0 0 2 0
+expect-ts-use trx 0 0 states     *    TCH/F TCH/F -     TCH/-H TCH/HH *    *
 
 # This situation moves congestion from TCH/H to TCH/F (TCH/H was 100% congested, then makes TCH/F 100% congested)
 # The congestion requirements would normally forbid this, but since this is an "RxQual emergency", we should reassign.
@@ -40,10 +36,8 @@ meas-rep repeat 9 lchan 0 0 4 0 rxlev 23 rxqual 1 ta 0
 expect-no-chan
 meas-rep lchan 0 0 4 0 rxlev 23 rxqual 1 ta 0
 # average rxlev is now -110 + 23 = -87 < -80: reassign to TCH/F due to bad rxlev
-#expect-as from lchan 0 0 4 0 to lchan 0 0 3 0
-#expect-ts-use trx 0 0 states     *    TCH/F TCH/F TCH/F TCH/-H TCH/HH *    *
-# FAIL: osmo-bsc does not move to TCH/F from bad rxlev
-expect-no-chan
+expect-as from lchan 0 0 4 0 to lchan 0 0 3 0
+expect-ts-use trx 0 0 states     *    TCH/F TCH/F TCH/F TCH/-H TCH/HH *    *
 
 # This situation worsens congestion (TCH/H was 50% congested, then makes TCH/F 100% congested)
 # The congestion requirements would normally forbid this, but since this is an "RxQual emergency", we should reassign.
@@ -53,10 +47,8 @@ meas-rep repeat 9 lchan 0 0 4 0 rxlev 23 rxqual 1 ta 0
 expect-no-chan
 meas-rep lchan 0 0 4 0 rxlev 23 rxqual 1 ta 0
 # average rxlev is now -110 + 23 = -87 < -80: reassign to TCH/F due to bad rxlev
-#expect-as from lchan 0 0 4 0 to lchan 0 0 3 0
-#expect-ts-use trx 0 0 states     *    TCH/F TCH/F TCH/F -      TCH/HH *    *
-# FAIL: osmo-bsc does not move to TCH/F from bad rxlev
-expect-no-chan
+expect-as from lchan 0 0 4 0 to lchan 0 0 3 0
+expect-ts-use trx 0 0 states     *    TCH/F TCH/F TCH/F -      TCH/HH *    *
 
 
 # This situation creates congestion (TCH/H was not congested, then makes TCH/F 50% congested)
@@ -67,7 +59,5 @@ meas-rep repeat 9 lchan 0 0 4 0 rxlev 23 rxqual 1 ta 0
 expect-no-chan
 meas-rep lchan 0 0 4 0 rxlev 23 rxqual 1 ta 0
 # average rxlev is now -110 + 23 = -87 < -80: reassign to TCH/F due to bad rxlev
-#expect-as from lchan 0 0 4 0 to lchan 0 0 2 0
-#expect-ts-use trx 0 0 states     *    TCH/F TCH/F -     -      -      *    *
-# FAIL: osmo-bsc does not move to TCH/F from bad rxlev
-expect-no-chan
+expect-as from lchan 0 0 4 0 to lchan 0 0 2 0
+expect-ts-use trx 0 0 states     *    TCH/F TCH/F -     -      -      *    *
diff --git a/tests/handover/test_amr_tch_h_to_f_rxqual.ho_vty b/tests/handover/test_amr_tch_h_to_f_rxqual.ho_vty
index 414a5fd86..10db40434 100644
--- a/tests/handover/test_amr_tch_h_to_f_rxqual.ho_vty
+++ b/tests/handover/test_amr_tch_h_to_f_rxqual.ho_vty
@@ -12,7 +12,5 @@ meas-rep lchan 0 0 4 0 rxlev 30 rxqual 6 ta 0
 expect-no-chan
 meas-rep lchan 0 0 4 0 rxlev 30 rxqual 6 ta 0
 # average rxqual now at 6 which is worse than 5, reassign to TCH/F due to bad rxqual.
-#expect-as from lchan 0 0 4 0 to lchan 0 0 1 0
-#expect-ts-use trx 0 0 states * TCH/F - - - - - *
-# FAIL: osmo-bsc does not move to TCH/F from bad rxqual
-expect-no-chan
+expect-as from lchan 0 0 4 0 to lchan 0 0 1 0
+expect-ts-use trx 0 0 states * TCH/F - - - - - *
diff --git a/tests/handover/test_amr_tch_h_to_f_rxqual_congested.ho_vty b/tests/handover/test_amr_tch_h_to_f_rxqual_congested.ho_vty
index 30c2c67fd..79ff0a72f 100644
--- a/tests/handover/test_amr_tch_h_to_f_rxqual_congested.ho_vty
+++ b/tests/handover/test_amr_tch_h_to_f_rxqual_congested.ho_vty
@@ -17,10 +17,8 @@ meas-rep lchan 0 0 4 0 rxlev 50 rxqual 6 ta 0
 expect-no-chan
 meas-rep lchan 0 0 4 0 rxlev 50 rxqual 6 ta 0
 # average rxqual now at 6 which is worse than 5, reassign to TCH/F due to bad rxqual.
-#expect-as from lchan 0 0 4 0 to lchan 0 0 1 0
-#expect-ts-use trx 0 0 states     *    TCH/F -     -     TCH/-H TCH/HH *    *
-# FAIL: osmo-bsc does not move to TCH/F from bad rxqual
-expect-no-chan
+expect-as from lchan 0 0 4 0 to lchan 0 0 1 0
+expect-ts-use trx 0 0 states     *    TCH/F -     -     TCH/-H TCH/HH *    *
 
 
 # This situation actually balances congestion
@@ -30,10 +28,8 @@ meas-rep lchan 0 0 4 0 rxlev 50 rxqual 6 ta 0
 expect-no-chan
 meas-rep lchan 0 0 4 0 rxlev 50 rxqual 6 ta 0
 # average rxqual now at 6 which is worse than 5, reassign to TCH/F due to bad rxqual.
-#expect-as from lchan 0 0 4 0 to lchan 0 0 2 0
-#expect-ts-use trx 0 0 states     *    TCH/F TCH/F -     TCH/-H TCH/HH *    *
-# FAIL: osmo-bsc does not move to TCH/F from bad rxqual
-expect-no-chan
+expect-as from lchan 0 0 4 0 to lchan 0 0 2 0
+expect-ts-use trx 0 0 states     *    TCH/F TCH/F -     TCH/-H TCH/HH *    *
 
 
 # This situation moves congestion from TCH/H to TCH/F (TCH/H was 100% congested, then makes TCH/F 100% congested)
@@ -44,10 +40,8 @@ meas-rep lchan 0 0 4 0 rxlev 50 rxqual 6 ta 0
 expect-no-chan
 meas-rep lchan 0 0 4 0 rxlev 50 rxqual 6 ta 0
 # average rxqual now at 6 which is worse than 5, reassign to TCH/F due to bad rxqual.
-#expect-as from lchan 0 0 4 0 to lchan 0 0 3 0
-#expect-ts-use trx 0 0 states     *    TCH/F TCH/F TCH/F TCH/-H TCH/HH *    *
-# FAIL: osmo-bsc does not move to TCH/F from bad rxqual
-expect-no-chan
+expect-as from lchan 0 0 4 0 to lchan 0 0 3 0
+expect-ts-use trx 0 0 states     *    TCH/F TCH/F TCH/F TCH/-H TCH/HH *    *
 
 
 # This situation worsens congestion (TCH/H was 50% congested, then makes TCH/F 100% congested)
@@ -58,10 +52,8 @@ meas-rep lchan 0 0 4 0 rxlev 50 rxqual 6 ta 0
 expect-no-chan
 meas-rep lchan 0 0 4 0 rxlev 50 rxqual 6 ta 0
 # average rxqual now at 6 which is worse than 5, reassign to TCH/F due to bad rxqual.
-#expect-as from lchan 0 0 4 0 to lchan 0 0 3 0
-#expect-ts-use trx 0 0 states     *    TCH/F TCH/F TCH/F -      TCH/HH *    *
-# FAIL: osmo-bsc does not move to TCH/F from bad rxqual
-expect-no-chan
+expect-as from lchan 0 0 4 0 to lchan 0 0 3 0
+expect-ts-use trx 0 0 states     *    TCH/F TCH/F TCH/F -      TCH/HH *    *
 
 
 # This situation creates congestion (TCH/H was not congested, then makes TCH/F 50% congested)
@@ -72,7 +64,5 @@ meas-rep lchan 0 0 4 0 rxlev 50 rxqual 6 ta 0
 expect-no-chan
 meas-rep lchan 0 0 4 0 rxlev 50 rxqual 6 ta 0
 # average rxqual now at 6 which is worse than 5, reassign to TCH/F due to bad rxqual.
-#expect-as from lchan 0 0 4 0 to lchan 0 0 2 0
-#expect-ts-use trx 0 0 states     *    TCH/F TCH/F -     -      -      *    *
-# FAIL: osmo-bsc does not move to TCH/F from bad rxqual
-expect-no-chan
+expect-as from lchan 0 0 4 0 to lchan 0 0 2 0
+expect-ts-use trx 0 0 states     *    TCH/F TCH/F -     -      -      *    *