Change in osmo-ttcn3-hacks[master]: bsc vamos: ensure lchan state in some places

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27087 ) Change subject: bsc vamos: ensure lchan state in some places ...................................................................... bsc vamos: ensure lchan state in some places Change-Id: I5979516cf2b2e1adf5269acd0b8e7adb5e6a1ac5 --- M bsc/BSC_Tests_VAMOS.ttcn 1 file changed, 16 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/87/27087/1 diff --git a/bsc/BSC_Tests_VAMOS.ttcn b/bsc/BSC_Tests_VAMOS.ttcn index 6266634..ec74be2 100644 --- a/bsc/BSC_Tests_VAMOS.ttcn +++ b/bsc/BSC_Tests_VAMOS.ttcn @@ -83,7 +83,7 @@ const integer NUM_BTS := 3; const integer NUM_MSC := 3; -private function f_rsl_chan_nr_to_subslot(RslChannelNr chan_nr) +private function f_rsl_chan_nr_to_subslot(RslChannelNr chan_nr, boolean use_vamos_subslot_nr := false) return integer { var integer subslot; @@ -97,12 +97,19 @@ subslot := chan_nr.u.lm.sub_chan; } case (t_RslChanNr_Osmo_VAMOS_Bm(?)) { - /* TCH/F, always subslot 0 */ - subslot := 0; + /* TCH/F shadow */ + if (use_vamos_subslot_nr) { + subslot := 1; + } else { + subslot := 0; + } } case (t_RslChanNr_Osmo_VAMOS_Lm(?, ?)) { - /* TCH/H */ + /* TCH/H shadow */ subslot := chan_nr.u.lm.sub_chan; + if (use_vamos_subslot_nr) { + subslot := subslot + 2; + } } case else { setverdict(fail, "unsupported RslChannelNr type in f_rsl_chan_nr_to_subslot()"); @@ -201,10 +208,10 @@ } } -private function f_lchan_str(integer bts_nr, integer trx_nr, RslChannelNr chan_nr) +private function f_lchan_str(integer bts_nr, integer trx_nr, RslChannelNr chan_nr, boolean use_vamos_subslot_nr := false) return charstring { - var integer subslot := f_rsl_chan_nr_to_subslot(chan_nr); + var integer subslot := f_rsl_chan_nr_to_subslot(chan_nr, use_vamos_subslot_nr := use_vamos_subslot_nr); return "lchan " & int2str(bts_nr) & " " & int2str(trx_nr) & " " & int2str(chan_nr.tn) & " " & int2str(subslot); } @@ -217,7 +224,7 @@ private function f_lchan_ensure_established(TELNETasp_PT vty, integer bts_nr, integer trx_nr, RslChannelNr chan_nr) { - var charstring lchan_str := f_lchan_str(bts_nr, trx_nr, chan_nr); + var charstring lchan_str := f_lchan_str(bts_nr, trx_nr, chan_nr, use_vamos_subslot_nr := true); var charstring lchan_info := f_vty_transceive_ret(vty, "show " & lchan_str); if (f_strstr(lchan_info, "State: ESTABLISHED") < 0) { log("'show lchan' replied: ", lchan_info); @@ -465,7 +472,7 @@ setverdict(pass); f_sleep(1.0); - f_vty_transceive(BSCVTY, "show lchan summary"); + f_lchan_ensure_established(BSCVTY, 0, 0, g_chan_nr); f_verify_dtap(); } @@ -575,8 +582,7 @@ setverdict(pass); f_sleep(1.0); - f_vty_transceive(BSCVTY, "show lchan summary"); - + f_lchan_ensure_established(BSCVTY, 0, 0, g_chan_nr); f_verify_dtap(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27087 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: I5979516cf2b2e1adf5269acd0b8e7adb5e6a1ac5 Gerrit-Change-Number: 27087 Gerrit-PatchSet: 1 Gerrit-Owner: neels &lt;nhofmeyr(a)sysmocom.de&gt; Gerrit-MessageType: newchange