March 2022 - gerrit-log - lists.osmocom.org

Change in osmo-bsc[master]: System Information Type 3: allow updating T3212 at run-time

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27528 ) Change subject: System Information Type 3: allow updating T3212 at run-time ...................................................................... System Information Type 3: allow updating T3212 at run-time The value in bts->si_common.chan_desc may get out of sync with the actual value in net->T_defs (e.g. after changing it via the VTY), so we need to sync it in generate_si3(). Change-Id: Iee291623c2825505eeb5175adcedadfe35375b9e Related: SYS#5888 --- M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/system_information.c 2 files changed, 20 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/28/27528/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index c1a6e44..5976721 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -2333,13 +2333,14 @@ return CMD_SUCCESS; } -/* FIXME: changing this value would not affect generated System Information */ -DEFUN(cfg_net_per_loc_upd, cfg_net_per_loc_upd_cmd, - "periodic location update <6-1530>", - "Periodic Location Updating Interval\n" - "Periodic Location Updating Interval\n" - "Periodic Location Updating Interval\n" - "Periodic Location Updating Interval in Minutes\n") +DEFUN_USRATTR(cfg_net_per_loc_upd, + cfg_net_per_loc_upd_cmd, + BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK, + "periodic location update <6-1530>", + "Periodic Location Updating Interval\n" + "Periodic Location Updating Interval\n" + "Periodic Location Updating Interval\n" + "Periodic Location Updating Interval in Minutes\n") { struct gsm_network *net = vty->index; struct osmo_tdef *d = osmo_tdef_get_entry(net->T_defs, 3212); @@ -2350,13 +2351,14 @@ return CMD_SUCCESS; } -/* FIXME: changing this value would not affect generated System Information */ -DEFUN(cfg_net_no_per_loc_upd, cfg_net_no_per_loc_upd_cmd, - "no periodic location update", - NO_STR - "Periodic Location Updating Interval\n" - "Periodic Location Updating Interval\n" - "Periodic Location Updating Interval\n") +DEFUN_USRATTR(cfg_net_no_per_loc_upd, + cfg_net_no_per_loc_upd_cmd, + BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK, + "no periodic location update", + NO_STR + "Periodic Location Updating Interval\n" + "Periodic Location Updating Interval\n" + "Periodic Location Updating Interval\n") { struct gsm_network *net = vty->index; struct osmo_tdef *d = osmo_tdef_get_entry(net->T_defs, 3212); diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 27c60a0..5541d7b 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -963,6 +963,10 @@ si3->header.skip_indicator = 0; si3->header.system_information = GSM48_MT_RR_SYSINFO_3; + /* The value in bts->si_common.chan_desc may get out of sync with the actual value + * in net->T_defs (e.g. after changing it via the VTY), so we need to sync it here. */ + bts->si_common.chan_desc.t3212 = osmo_tdef_get(bts->network->T_defs, 3212, OSMO_TDEF_CUSTOM, 0); + si3->cell_identity = htons(bts->cell_identity); gsm48_generate_lai2(&si3->lai, bts_lai(bts)); si3->control_channel_desc = bts->si_common.chan_desc; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27528 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iee291623c2825505eeb5175adcedadfe35375b9e Gerrit-Change-Number: 27528 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: gsm_bts_trx_set_system_infos(): cosmetic: improve readability

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27527 ) Change subject: gsm_bts_trx_set_system_infos(): cosmetic: improve readability ...................................................................... gsm_bts_trx_set_system_infos(): cosmetic: improve readability Change-Id: Ic63ee79c7509ec57ad72f85442b5756ae31c0a52 Related: SYS#5888 --- M src/osmo-bsc/bts_trx.c 1 file changed, 25 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/27/27527/1 diff --git a/src/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c index 0333f70..fa27b05 100644 --- a/src/osmo-bsc/bts_trx.c +++ b/src/osmo-bsc/bts_trx.c @@ -382,7 +382,7 @@ /* set all system information types for a TRX */ int gsm_bts_trx_set_system_infos(struct gsm_bts_trx *trx) { - int i, rc; + int rc; struct gsm_bts *bts = trx->bts; uint8_t gen_si[_MAX_SYSINFO_TYPE], n_si = 0, n; int si_len[_MAX_SYSINFO_TYPE]; @@ -420,42 +420,49 @@ /* Second, we generate the selected SI via RSL */ for (n = 0; n < n_si; n++) { - i = gen_si[n]; + const enum osmo_sysinfo_type si_type = gen_si[n]; + /* Only generate SI if this SI is not in "static" (user-defined) mode */ - if (!(bts->si_mode_static & (1 << i))) { + if (!(bts->si_mode_static & (1 << si_type))) { /* Set SI as being valid. gsm_generate_si() might unset * it, if SI is not required. */ - bts->si_valid |= (1 << i); - rc = gsm_generate_si(bts, i); + bts->si_valid |= (1 << si_type); + rc = gsm_generate_si(bts, si_type); if (rc < 0) goto err_out; - si_len[i] = rc; + si_len[si_type] = rc; } else { - if (i == SYSINFO_TYPE_5 || i == SYSINFO_TYPE_5bis - || i == SYSINFO_TYPE_5ter) - si_len[i] = 18; - else if (i == SYSINFO_TYPE_6) - si_len[i] = 11; - else - si_len[i] = 23; + switch (si_type) { + case SYSINFO_TYPE_5: + case SYSINFO_TYPE_5bis: + case SYSINFO_TYPE_5ter: + si_len[si_type] = 18; + break; + case SYSINFO_TYPE_6: + si_len[si_type] = 11; + break; + default: + si_len[si_type] = 23; + } } } /* Third, we send the selected SI via RSL */ for (n = 0; n < n_si; n++) { - i = gen_si[n]; + const enum osmo_sysinfo_type si_type = gen_si[n]; + /* 3GPP TS 08.58 §8.5.1 BCCH INFORMATION. If we don't currently * have this SI, we send a zero-length RSL BCCH FILLING / * SACCH FILLING in order to deactivate the SI, in case it * might have previously been active */ - if (!GSM_BTS_HAS_SI(bts, i)) { + if (!GSM_BTS_HAS_SI(bts, si_type)) { if (bts->si_unused_send_empty) - rc = rsl_si(trx, i, 0); + rc = rsl_si(trx, si_type, 0); else rc = 0; /* some nanoBTS fw don't like receiving empty unsupported SI */ } else - rc = rsl_si(trx, i, si_len[i]); + rc = rsl_si(trx, si_type, si_len[si_type]); if (rc < 0) return rc; } @@ -468,6 +475,6 @@ err_out: LOGP(DRR, LOGL_ERROR, "Cannot generate SI%s for BTS %u: error <%s>, " "most likely a problem with neighbor cell list generation\n", - get_value_string(osmo_sitype_strs, i), bts->nr, strerror(-rc)); + get_value_string(osmo_sitype_strs, gen_si[n]), bts->nr, strerror(-rc)); return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27527 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic63ee79c7509ec57ad72f85442b5756ae31c0a52 Gerrit-Change-Number: 27527 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: use tr_GsmBandArfcn in f_TC_fh_params_unset()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27526 ) Change subject: bsc: use tr_GsmBandArfcn in f_TC_fh_params_unset() ...................................................................... Patch Set 2: (1 comment) File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27526/comment/7b7e5f40_cfdb… PS2, Line 9214: GsmBandArfcn arfcn := tr_GsmBandArfcn(871, false)) ts_GsmBandArfcn()? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27526 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: I74e95297e9349764fde0732681a4d568e60b6a0a Gerrit-Change-Number: 27526 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 16 Mar 2022 17:36:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: fix some inadequate template restriction warnings

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27525 ) Change subject: bsc: fix some inadequate template restriction warnings ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27525 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: Icfc69aff2c923f4e12dbd6cc42c792d5712a7b27 Gerrit-Change-Number: 27525 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 16 Mar 2022 17:35:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/BSSLAP_Types: fix receive template used in ts_BSSLAP_Reset

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27524 ) Change subject: library/BSSLAP_Types: fix receive template used in ts_BSSLAP_Reset ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27524 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: I6ed967c18346263b05b624b0bb5698f23ee842f7 Gerrit-Change-Number: 27524 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 16 Mar 2022 17:34:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: fix some inadequate template restriction warnings

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27525 ) Change subject: bsc: fix some inadequate template restriction warnings ...................................................................... bsc: fix some inadequate template restriction warnings Change-Id: Icfc69aff2c923f4e12dbd6cc42c792d5712a7b27 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/25/27525/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 9a6980b..4683dc7 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1677,8 +1677,8 @@ var BSSMAP_IE_EncryptionInformation encryptionInformation := valueof(ts_BSSMAP_IE_EncrInfo('0000000000000000'O,'01'O)); - var template BSSMAP_IE_ChosenEncryptionAlgorithm chosenEncryptionAlgorithm := omit; - var template BSSMAP_IE_KC128 kc128 := omit; + var template (omit) BSSMAP_IE_ChosenEncryptionAlgorithm chosenEncryptionAlgorithm := omit; + var template (omit) BSSMAP_IE_KC128 kc128 := omit; if (ispresent(enc)) { var TestHdlrEncrParams v_enc := valueof(enc); encryptionInformation := valueof(ts_BSSMAP_IE_EncrInfo(v_enc.enc_key, v_enc.enc_alg_permitted)); @@ -2470,15 +2470,15 @@ } private function f_exp_sapi_n_reject(template (present) GsmSapi sapi := ?, - template myBSSMAP_Cause cause := ?, + template (present) myBSSMAP_Cause cause := ?, template (present) BIT2 cc := ?, float T_val := 2.0) runs on test_CT { var BSSAP_N_DATA_ind rx_di; timer T; - var template BSSMAP_IE_Cause tr_cause := tr_BSSMAP_IE_Cause(cause); - var template PDU_BSSAP tr_pdu := tr_BSSMAP_SAPInReject(sapi); + var template (present) BSSMAP_IE_Cause tr_cause := tr_BSSMAP_IE_Cause(cause); + var template (present) PDU_BSSAP tr_pdu := tr_BSSMAP_SAPInReject(sapi); T.start(T_val); alt { @@ -7988,7 +7988,7 @@ f_vty_transceive(BSCVTY, "bts 0 c0-power-reduction " & int2str(red)); /* Expect Osmocom specific BS Power Control message on the RSL */ - var template RSL_Message tr_rsl_pdu := tr_RSL_BS_PWR_CTRL( + var template (present) RSL_Message tr_rsl_pdu := tr_RSL_BS_PWR_CTRL( chan_nr := t_RslChanNr_BCCH(0), bs_power := tr_RSL_IE_BS_Power(red / 2)); tr_rsl_pdu.msg_disc := tr_RSL_MsgDisc(RSL_MDISC_CCHAN, false); @@ -10495,7 +10495,7 @@ } private function f_verify_imm_ass(RSL_Message imm_ass, template uint8_t ra := ?, template GsmFrameNumber fn := ?, - template RslChannelNr chan_nr := ?, + template (present) RslChannelNr chan_nr := ?, template (present) uint12_t arfcn := ?, template (present) uint3_t tsc := ?) { diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index b0daf61..a50b6f4 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -622,7 +622,7 @@ /* In this case, alg_permitted should have only one permitted algo */ alg_expect := valueof(alg_permitted); } - var template octetstring kc := omit; + var template (omit) octetstring kc := omit; if (kc128) { kc := f_rnd_octstring(16); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27525 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: Icfc69aff2c923f4e12dbd6cc42c792d5712a7b27 Gerrit-Change-Number: 27525 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: use tr_GsmBandArfcn in f_TC_fh_params_unset()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27526 ) Change subject: bsc: use tr_GsmBandArfcn in f_TC_fh_params_unset() ...................................................................... bsc: use tr_GsmBandArfcn in f_TC_fh_params_unset() This fixes compilation warnings about missing template fields: BSC_Tests.ttcn:9192.33-60: warning: Field `uplink' is missing from record value BSC_Tests.ttcn:9192.33-60: warning: Field `spare' is missing from record value Change-Id: I74e95297e9349764fde0732681a4d568e60b6a0a --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/26/27526/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 4683dc7..891c98d 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -9189,7 +9189,7 @@ private function f_TC_fh_params_unset(in FHParamsTrx fhp, uint8_t bts_nr := 0, uint8_t trx_nr := 0, - GsmBandArfcn arfcn := {pcs := false, arfcn := 871}) + GsmBandArfcn arfcn := tr_GsmBandArfcn(871, false)) runs on test_CT { f_TC_set_band_by_arfcn(bts_nr, arfcn); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27526 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: I74e95297e9349764fde0732681a4d568e60b6a0a Gerrit-Change-Number: 27526 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests: add '(present)' restriction to 'expect_rr_cause'

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27522 ) Change subject: BSC_Tests: add '(present)' restriction to 'expect_rr_cause' ...................................................................... BSC_Tests: add '(present)' restriction to 'expect_rr_cause' RR Cause is a mandatory IE, so it cannot be omitted. Therefore it makes no sense to check if istemplatekind(expect_rr_cause, "omit"). Change-Id: I564d00a4715b86d248bce449d2b9193ac5e99008 --- M bsc/BSC_Tests.ttcn 1 file changed, 22 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/22/27522/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 758b989..b5552e1 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2034,7 +2034,7 @@ boolean expect_rll_rel_req := true, boolean handle_rll_rel := true, template CellSelIndValue expect_cells := omit, - template RR_Cause expect_rr_cause := ? + template (present) RR_Cause expect_rr_cause := ? ) runs on test_CT { var RslLinkId main_dcch := valueof(ts_RslLinkID_DCCH(0)); @@ -2074,36 +2074,32 @@ } } - if (not istemplatekind(expect_rr_cause, "omit")) { - int2enum(oct2int(l3.msgs.rrm.channelRelease.rRCause.valuePart), got_cause); - log("GOT CAUSE CODE: ", l3.msgs.rrm.channelRelease.rRCause.valuePart, " = ", got_cause); - if (match(got_cause, expect_rr_cause)) { - setverdict(pass); - } else { - log("EXPECTED CAUSE CODE: ", expect_rr_cause); - setverdict(fail, "Received RR Channel Release Cause code does not match expectations"); - } + int2enum(oct2int(l3.msgs.rrm.channelRelease.rRCause.valuePart), got_cause); + log("GOT CAUSE CODE: ", l3.msgs.rrm.channelRelease.rRCause.valuePart, " = ", got_cause); + if (match(got_cause, expect_rr_cause)) { + setverdict(pass); + } else { + log("EXPECTED CAUSE CODE: ", expect_rr_cause); + setverdict(fail, "Received RR Channel Release Cause code does not match expectations"); } repeat; } [istemplatekind(expect_cells, "omit")] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(tr_RSL_DATA_REQ(rsl_chan_nr, ?, decmatch tr_RRM_RR_RELEASE))) -> value ud { got_rr_chan_rel := true; - if (not istemplatekind(expect_rr_cause, "omit")) { - if (f_rsl_find_ie(ud.rsl, RSL_IE_L3_INFO, l3_ie) == false) { - setverdict(fail, "cannot find L3"); - mtc.stop; - } - l3 := dec_PDU_ML3_NW_MS(l3_ie.l3_info.payload); + if (f_rsl_find_ie(ud.rsl, RSL_IE_L3_INFO, l3_ie) == false) { + setverdict(fail, "cannot find L3"); + mtc.stop; + } + l3 := dec_PDU_ML3_NW_MS(l3_ie.l3_info.payload); - int2enum(oct2int(l3.msgs.rrm.channelRelease.rRCause.valuePart), got_cause); - log("GOT CAUSE CODE: ", l3.msgs.rrm.channelRelease.rRCause.valuePart, " = ", got_cause); - if (match(got_cause, expect_rr_cause)) { - setverdict(pass); - } else { - log("EXPECTED CAUSE CODE: ", expect_rr_cause); - setverdict(fail, "Received RR Channel Release Cause code does not match expectations"); - } + int2enum(oct2int(l3.msgs.rrm.channelRelease.rRCause.valuePart), got_cause); + log("GOT CAUSE CODE: ", l3.msgs.rrm.channelRelease.rRCause.valuePart, " = ", got_cause); + if (match(got_cause, expect_rr_cause)) { + setverdict(pass); + } else { + log("EXPECTED CAUSE CODE: ", expect_rr_cause); + setverdict(fail, "Received RR Channel Release Cause code does not match expectations"); } repeat; } @@ -2309,7 +2305,8 @@ f_shutdown_helper(); } -private function f_tc_chan_rel_rr_cause(myBSSMAP_Cause clear_cmd_cause, template RR_Cause expect_rr_cause) +private function f_tc_chan_rel_rr_cause(myBSSMAP_Cause clear_cmd_cause, + template (present) RR_Cause expect_rr_cause) runs on test_CT { var DchanTuple dt; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27522 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: I564d00a4715b86d248bce449d2b9193ac5e99008 Gerrit-Change-Number: 27522 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BSC_Tests: avoid code duplication in f_expect_chan_rel()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27523 ) Change subject: BSC_Tests: avoid code duplication in f_expect_chan_rel() ...................................................................... BSC_Tests: avoid code duplication in f_expect_chan_rel() Using a guard statement makes no sense given that we match the cellSelectionIndicatorValue conditionally within the alt branch itself. Removing that guard statement eliminates the need to have an additional alt branch with identical body. Change-Id: I373376637a083637ce01f3ac59fe5fd2836ac6cd --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/23/27523/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index b5552e1..9a6980b 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2052,7 +2052,7 @@ got_deact_sacch := true; repeat; } - [not istemplatekind(expect_cells, "omit")] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(tr_RSL_DATA_REQ(rsl_chan_nr, ?, decmatch tr_RRM_RR_RELEASE_CellSelectInd))) -> value ud { + [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(tr_RSL_DATA_REQ(rsl_chan_nr, ?, decmatch tr_RRM_RR_RELEASE))) -> value ud { got_rr_chan_rel := true; if (f_rsl_find_ie(ud.rsl, RSL_IE_L3_INFO, l3_ie) == false) { @@ -2084,25 +2084,6 @@ } repeat; } - [istemplatekind(expect_cells, "omit")] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(tr_RSL_DATA_REQ(rsl_chan_nr, ?, decmatch tr_RRM_RR_RELEASE))) -> value ud { - got_rr_chan_rel := true; - - if (f_rsl_find_ie(ud.rsl, RSL_IE_L3_INFO, l3_ie) == false) { - setverdict(fail, "cannot find L3"); - mtc.stop; - } - l3 := dec_PDU_ML3_NW_MS(l3_ie.l3_info.payload); - - int2enum(oct2int(l3.msgs.rrm.channelRelease.rRCause.valuePart), got_cause); - log("GOT CAUSE CODE: ", l3.msgs.rrm.channelRelease.rRCause.valuePart, " = ", got_cause); - if (match(got_cause, expect_rr_cause)) { - setverdict(pass); - } else { - log("EXPECTED CAUSE CODE: ", expect_rr_cause); - setverdict(fail, "Received RR Channel Release Cause code does not match expectations"); - } - repeat; - } [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(tr_RSL_REL_REQ(rsl_chan_nr, ?))) { got_rll_rel_req := true; /* FIXME: Why are we getting this for LinkID SACCH? */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27523 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: I373376637a083637ce01f3ac59fe5fd2836ac6cd Gerrit-Change-Number: 27523 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: library/BSSLAP_Types: fix receive template used in ts_BSSLAP_Reset

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27524 ) Change subject: library/BSSLAP_Types: fix receive template used in ts_BSSLAP_Reset ...................................................................... library/BSSLAP_Types: fix receive template used in ts_BSSLAP_Reset Change-Id: I6ed967c18346263b05b624b0bb5698f23ee842f7 --- M library/BSSLAP_Types.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/24/27524/1 diff --git a/library/BSSLAP_Types.ttcn b/library/BSSLAP_Types.ttcn index 742d1f5..a55f5da 100644 --- a/library/BSSLAP_Types.ttcn +++ b/library/BSSLAP_Types.ttcn @@ -528,7 +528,7 @@ cell_id := ts_BSSLAP_IE_CellId(cell_id), timing_advance := ts_BSSLAP_IE_TA(ta), chan_desc := chan_desc, - cause := tr_BSSLAP_IE_Cause(cause), + cause := ts_BSSLAP_IE_Cause(cause), meas_rep := omit, enh_meas_rep := omit, meas_cell_id_list := omit, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27524 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: I6ed967c18346263b05b624b0bb5698f23ee842f7 Gerrit-Change-Number: 27524 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2022