Change in ...osmo-ttcn3-hacks[master]: fix TC_ho_int; make neighbor config more robust
neels has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15216 )
Change subject: fix TC_ho_int; make neighbor config more robust
..
fix TC_ho_int; make neighbor config more robust
Since osmo-bsc commit "neighbor config: allow re-using ARFCN+BSIC pairs"
(I29bca59ab232eddc74e0d4698efb9c9992443983), osmo-bsc considers only those
cells as neighbors that are explicitly listed, or all local cells if none are
listed. This lead to breaking TC_ho_int, because the osmo-bsc.cfg has only one
remote-cell neighbor for bts 0, and hence a handover to local cell bts 1 is now
regarded as invalid.
The remote-cell neighbor is needed for inter-BSC handover tests; also consider
that the TC_ho_neighbor_config_* tests each place individual neighbor
configuration by live VTY interaction.
Hence make all of these tests more robust: remove the neighbor config from the
osmo-bsc.cfg file, and instead include VTY interaction for each test case that
sets the particularly needed neighbor configuration at runtime.
An analogous osmo-bsc.cfg change in docker-playground is in change
If44dd6b578cdc55076c8180707d1c2d69fe5f2a8.
(It is not actually harmful to leave the neighbor config in osmo-bsc.cfg, but
remove that since it is also not needed anymore.)
Change-Id: If44dd6b578cdc55076c8180707d1c2d69fe5f2a8
---
M bsc/BSC_Tests.ttcn
M bsc/osmo-bsc.cfg
2 files changed, 5 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
neels: Looks good to me, approved
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 4497a2e..09c5e5c 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -2863,6 +2863,7 @@
ass_cmd.pdu.bssmap.assignmentRequest.codecList :=
valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR}));
f_establish_fully(ass_cmd, exp_compl);
+ f_bts_0_cfg({"neighbor bts 1"});
var HandoverState hs := {
rr_ho_cmpl_seen := false,
@@ -2944,6 +2945,7 @@
var template PDU_BSSAP exp_compl := f_gen_exp_compl();
f_establish_fully(ass_req, exp_compl);
+ f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"});
f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any");
BSSAP.receive(tr_BSSMAP_HandoverRequired);
@@ -3010,6 +3012,7 @@
var template PDU_BSSAP exp_compl := f_gen_exp_compl();
f_establish_fully(ass_req, exp_compl);
+ f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"});
f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any");
BSSAP.receive(tr_BSSMAP_HandoverRequired);
@@ -3056,6 +3059,7 @@
var template PDU_BSSAP exp_compl := f_gen_exp_compl();
f_establish_fully(ass_req, exp_compl);
+ f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"});
f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any");
BSSAP.receive(tr_BSSMAP_HandoverRequired);
@@ -3140,6 +3144,7 @@
var template PDU_BSSAP exp_compl := f_gen_exp_compl();
f_establish_fully(ass_req, exp_compl);
+ f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"});
f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any");
BSSAP.receive(tr_BSSMAP_HandoverRequired);
diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg
index 9384491..74fe255 100644
--- a/bsc/osmo-bsc.cfg
+++ b/bsc/osmo-bsc.cfg
@@ -88,8 +88,6 @@
early-classmark-sending forbidden
ip.access unit_id 1234 0
oml ip.access stream_id 255 line 0
- # remote-BSS neighbor:
- neighbor lac 99 arfcn 123 bsic any
neighbor-list mode manual-si5
neighbor-list add arfcn 100
neighbor-list add arfcn 200
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15216
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: If44dd6b578cdc55076c8180707d1c2d69fe5f2a8
Gerrit-Change-Number: 15216
Gerrit-PatchSet: 2
Gerrit-Owner: neels
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: neels
Gerrit-MessageType: merged
Change in ...osmo-ttcn3-hacks[master]: fix TC_ho_int; make neighbor config more robust
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15216 ) Change subject: fix TC_ho_int; make neighbor config more robust .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If44dd6b578cdc55076c8180707d1c2d69fe5f2a8 Gerrit-Change-Number: 15216 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 14 Aug 2019 23:08:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: fix TC_ho_int; make neighbor config more robust
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15216 ) Change subject: fix TC_ho_int; make neighbor config more robust .. Patch Set 2: +2 to self to fix a ttcn3-bsc-test failure -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If44dd6b578cdc55076c8180707d1c2d69fe5f2a8 Gerrit-Change-Number: 15216 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 14 Aug 2019 23:09:09 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: fix TC_ho_int; make neighbor config more robust
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15216 to look at the new patch set (#2). Change subject: fix TC_ho_int; make neighbor config more robust .. fix TC_ho_int; make neighbor config more robust Since osmo-bsc commit "neighbor config: allow re-using ARFCN+BSIC pairs" (I29bca59ab232eddc74e0d4698efb9c9992443983), osmo-bsc considers only those cells as neighbors that are explicitly listed, or all local cells if none are listed. This lead to breaking TC_ho_int, because the osmo-bsc.cfg has only one remote-cell neighbor for bts 0, and hence a handover to local cell bts 1 is now regarded as invalid. The remote-cell neighbor is needed for inter-BSC handover tests; also consider that the TC_ho_neighbor_config_* tests each place individual neighbor configuration by live VTY interaction. Hence make all of these tests more robust: remove the neighbor config from the osmo-bsc.cfg file, and instead include VTY interaction for each test case that sets the particularly needed neighbor configuration at runtime. An analogous osmo-bsc.cfg change in docker-playground is in change If44dd6b578cdc55076c8180707d1c2d69fe5f2a8. (It is not actually harmful to leave the neighbor config in osmo-bsc.cfg, but remove that since it is also not needed anymore.) Change-Id: If44dd6b578cdc55076c8180707d1c2d69fe5f2a8 --- M bsc/BSC_Tests.ttcn M bsc/osmo-bsc.cfg 2 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/15216/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15216 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If44dd6b578cdc55076c8180707d1c2d69fe5f2a8 Gerrit-Change-Number: 15216 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: fix TC_ho_int; make neighbor config more robust
neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15216
Change subject: fix TC_ho_int; make neighbor config more robust
..
fix TC_ho_int; make neighbor config more robust
Since osmo-bsc commit "neighbor config: allow re-using ARFCN+BSIC pairs"
(I29bca59ab232eddc74e0d4698efb9c9992443983), osmo-bsc considers only those
cells as neighbors that are explicitly listed, or all local cells if none are
listed. This lead to breaking TC_ho_int, because the osmo-bsc.cfg has only one
remote-cell neighbor for bts 0, and hence a handover to local cell bts 1 is now
regarded as invalid.
The remote-cell neighbor is needed for inter-BSC handover tests; also consider
that the TC_ho_neighbor_config_* tests each place individual neighbor
configuration by live VTY interaction.
Hence make all of these tests more robust: remove the neighbor config from the
osmo-bsc.cfg file, and instead include VTY interaction for each test case that
sets the particularly needed neighbor configuration at runtime.
An analogous osmo-bsc.cfg change in docker-playground is in change
If44dd6b578cdc55076c8180707d1c2d69fe5f2a8.
(It is not actually harmful to leave the neighbor config in osmo-bsc.cfg, but
remove that since it is also not needed anymore.)
Change-Id: If44dd6b578cdc55076c8180707d1c2d69fe5f2a8
---
M bsc/BSC_Tests.ttcn
M bsc/BSC_Tests_LCLS.ttcn
M bsc/osmo-bsc.cfg
3 files changed, 5 insertions(+), 157 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/16/15216/1
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index 4497a2e..e286905 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -2863,6 +2863,7 @@
ass_cmd.pdu.bssmap.assignmentRequest.codecList :=
valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR}));
f_establish_fully(ass_cmd, exp_compl);
+ f_bts_0_cfg({"neighbor bts 1"});
var HandoverState hs := {
rr_ho_cmpl_seen := false,
@@ -2944,6 +2945,7 @@
var template PDU_BSSAP exp_compl := f_gen_exp_compl();
f_establish_fully(ass_req, exp_compl);
+ f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"});
f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any");
BSSAP.receive(tr_BSSMAP_HandoverRequired);
@@ -3010,6 +3012,7 @@
var template PDU_BSSAP exp_compl := f_gen_exp_compl();
f_establish_fully(ass_req, exp_compl);
+ f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"});
f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any");
BSSAP.receive(tr_BSSMAP_HandoverRequired);
@@ -3056,6 +3059,7 @@
var template PDU_BSSAP exp_compl := f_gen_exp_compl();
f_establish_fully(ass_req, exp_compl);
+ f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"});
f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any");
BSSAP.receive(tr_BSSMAP_HandoverRequired);
@@ -3140,6 +3144,7 @@
var template PDU_BSSAP exp_compl := f_gen_exp_compl();
f_establish_fully(ass_req, exp_compl);
+ f_bts_0_cfg({"neighbor lac 99 arfcn 123 bsic any"});
f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any");
BSSAP.receive(tr_BSSMAP_HandoverRequired);
@@ -4357,131 +4362,6 @@
*/
control {
- /* CTRL interface testing */
- execute( TC_ctrl_msc_connection_status() );
- execute( TC_ctrl_msc0_connection_status() );
- execute( TC_ctrl() );
- if (mp_bssap_cfg.transport == BSSAP_TRANSPORT_SCCPlite_SERVER) {
- execute( TC_ctrl_location() );
- }
-
- /* RSL DCHAN Channel ACtivation / Deactivation */
- execute( TC_chan_act_noreply() );
- execute( TC_chan_act_counter() );
- execute( TC_chan_act_ack_noest() );
- execute( TC_chan_act_ack_est_ind_noreply() );
- execute( TC_chan_act_ack_est_ind_refused() );
- execute( TC_chan_act_nack() );
- execute( TC_chan_exhaustion() );
- execute( TC_chan_deact_silence() );
- execute( TC_chan_rel_rll_rel_ind() );
- execute( TC_chan_rel_conn_fail() );
- execute( TC_chan_rel_hard_clear() );
- execute( TC_chan_rel_hard_clear_csfb() );
- execute( TC_chan_rel_hard_rlsd() );
- execute( TC_chan_rel_hard_rlsd_ms_dead() );
- execute( TC_chan_rel_a_reset() );
-
- execute( TC_outbound_connect() );
-
- /* Assignment related */
- execute( TC_assignment_cic_only() );
- execute( TC_assignment_csd() );
- execute( TC_assignment_ctm() );
- execute( TC_assignment_sign() );
- execute( TC_assignment_fr_a5_0() );
- execute( TC_assignment_fr_a5_1() );
- if (mp_bssap_cfg.transport == BSSAP_TRANSPORT_AoIP) {
- execute( TC_assignment_fr_a5_1_codec_missing() );
- }
- execute( TC_assignment_fr_a5_3() );
- execute( TC_assignment_fr_a5_4() );
- execute( TC_ciph_mode_a5_0() );
-
