aboutsummaryrefslogtreecommitdiffstats
path: root/bsc
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2019-11-05 11:46:53 +0100
committerlaforge <laforge@osmocom.org>2019-11-05 19:32:34 +0000
commit8f77363ea3776c77eb1d5e6195ca5ed05d6506fc (patch)
tree41683648faaa1739a0a8e2c979d6c10b94a1b8e5 /bsc
parent7a9ccf8df91e7dc52c953ade6564297bf5d10346 (diff)
bsc: Verify presence of MS Power Parameters IE on one test
Otherwise most tests in bsc-latest fail because in latest release BSC never sends that IE. Related: OS#4244 Change-Id: I725836784a7900d2ea51eae188c2c279e8639dbf
Diffstat (limited to 'bsc')
-rw-r--r--bsc/BSC_Tests.ttcn15
-rw-r--r--bsc/MSC_ConnectionHandler.ttcn4
-rw-r--r--bsc/expected-results.xml1
3 files changed, 19 insertions, 1 deletions
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index e7a4c131..9c8d68d2 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -4372,6 +4372,19 @@ testcase TC_chopped_ipa_payload() runs on test_CT {
}
}
+/* Verify the BSC sends the MS Power Parameters IE during CHAN ACT to make sure
+ the BTS does autonomous MS power control loop */
+testcase TC_assignment_verify_ms_power_params_ie() runs on test_CT {
+ var MSC_ConnHdlr vc_conn;
+ var TestHdlrParams pars := f_gen_test_hdlr_pars();
+ //pars.encr := valueof(t_EncrParams('01'O, f_rnd_octstring(8)));
+ pars.exp_ms_power_params := true;
+
+ f_init(1, true);
+ f_sleep(1.0);
+ vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5), pars);
+ vc_conn.done;
+}
/* Dyn PDCH todo:
* activate OSMO as TCH/F
@@ -4541,6 +4554,8 @@ control {
execute( TC_chopped_ipa_ping() );
execute( TC_chopped_ipa_payload() );
+ /* Power control related */
+ execute( TC_assignment_verify_ms_power_params_ie() );
/* at bottom as they might crash OsmoBSC before OS#3182 is fixed */
execute( TC_early_conn_fail() );
execute( TC_late_conn_fail() );
diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn
index 09190e3c..01415229 100644
--- a/bsc/MSC_ConnectionHandler.ttcn
+++ b/bsc/MSC_ConnectionHandler.ttcn
@@ -527,6 +527,7 @@ type record TestHdlrParams {
TestHdlrParamsLcls lcls,
TestHdlrParamsHandover handover optional,
uint5_t exp_ms_power_level,
+ boolean exp_ms_power_params,
boolean aoip,
boolean use_osmux
};
@@ -553,6 +554,7 @@ template (value) TestHdlrParams t_def_TestHdlrPars := {
},
handover := omit,
exp_ms_power_level := 7, /* calculated from osmo-bsc.cfg "ms max power" */
+ exp_ms_power_params := false,
aoip := true,
use_osmux := false
}
@@ -762,7 +764,7 @@ private function f_check_chan_act(AssignmentState st, RSL_Message chan_act) runs
/* FIXME: validate RSL_IE_ACT_TYPE, RSL_IE_CHAN_MODE, RSL_IE_CHAN_IDENT, RSL_IE_BS_POWER,
* RSL_IE_TIMING_ADVANCE */
- if (not f_rsl_find_ie(chan_act, RSL_IE_MS_POWER_PARAM, ms_power_param)) {
+ if (g_pars.exp_ms_power_params and not f_rsl_find_ie(chan_act, RSL_IE_MS_POWER_PARAM, ms_power_param)) {
Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "IE MS Power Parameters not found in CHAN ACT");
}
diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml
index 3ea202c5..eb932ef1 100644
--- a/bsc/expected-results.xml
+++ b/bsc/expected-results.xml
@@ -102,6 +102,7 @@
<testcase classname='BSC_Tests' name='TC_dyn_pdch_osmo_act_nack' time='MASKED'/>
<testcase classname='BSC_Tests' name='TC_chopped_ipa_ping' time='MASKED'/>
<testcase classname='BSC_Tests' name='TC_chopped_ipa_payload' time='MASKED'/>
+ <testcase classname='BSC_Tests' name='TC_assignment_verify_ms_power_params_ie' time='MASKED'/>
<testcase classname='BSC_Tests' name='TC_early_conn_fail' time='MASKED'/>
<testcase classname='BSC_Tests' name='TC_late_conn_fail' time='MASKED'/>
<testcase classname='BSC_Tests' name='TC_assignment_codec_amr_f_S1' time='MASKED'/>