January 2023 - gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: cosmetic: bsc: Fix typos in comments

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30845 ) Change subject: cosmetic: bsc: Fix typos in comments ...................................................................... cosmetic: bsc: Fix typos in comments Change-Id: I87f351fe2ab69120a3af8d6674f2738ef2d57a3a --- M bsc/BSC_Tests.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/45/30845/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 909b71f..469d7b6 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1695,7 +1695,7 @@ /* send assignment without AoIP IEs */ BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_AssignmentReq(ts_BSSMAP_IE_CIC(0, 1)))); } else { - /* Send assignmetn without CIC in IPA case */ + /* Send assignment without CIC in IPA case */ var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(ts_BSSMAP_IE_AoIP_TLA4('01020304'O, 2342)); BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_AssignmentReq(omit, tla))); @@ -9141,7 +9141,7 @@ f_vty_transceive(BSCVTY, "exit"); } -/* Begin assignmet procedure and send an EMERGENCY SETUP (RR) */ +/* Begin assignment procedure and send an EMERGENCY SETUP (RR) */ private function f_assignment_emerg_setup() runs on MSC_ConnHdlr { var PDU_ML3_MS_NW emerg_setup; var octetstring emerg_setup_enc; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30845 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: I87f351fe2ab69120a3af8d6674f2738ef2d57a3a Gerrit-Change-Number: 30845 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: Use f_rnd_ra_emerg() instead of hardcoded value

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30844 ) Change subject: bsc: Use f_rnd_ra_emerg() instead of hardcoded value ...................................................................... bsc: Use f_rnd_ra_emerg() instead of hardcoded value Change-Id: Id10d71868dc8ef427e0353ee4b7e51d5bebc6255 --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/44/30844/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index c3743df..909b71f 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -10466,7 +10466,7 @@ /* Make sure the CHAN RQD indicates an emergency call (0b101xxxxx). The difference is that osmo-bsc directly * assigns a TCH lchan and establishing voice for the emergency call will use Mode Modify, not reassignment to * another lchan. */ - g_pars.ra := 'b7'O; + g_pars.ra := f_rnd_ra_emerg(); f_assignment_emerg_setup(); var PDU_BSSAP emerg_setup_data_ind_bssap; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30844 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: Id10d71868dc8ef427e0353ee4b7e51d5bebc6255 Gerrit-Change-Number: 30844 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in osmo-bsc[master]: bsc_subscriber: Allow creating subscribers identified by IMEI

by pespin

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bsc/+/30843 ) Change subject: bsc_subscriber: Allow creating subscribers identified by IMEI ...................................................................... bsc_subscriber: Allow creating subscribers identified by IMEI IMEI may be used as MobileIdentity during MO emergency call establishment if the MS has no valid IMSI assigned. Related: OS#5849 Change-Id: I586b1ee30cbb26ddf58788168d56c962e03ccd5c --- M include/osmocom/bsc/bsc_subscriber.h M src/osmo-bsc/bsc_subscriber.c 2 files changed, 55 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/43/30843/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I586b1ee30cbb26ddf58788168d56c962e03ccd5c Gerrit-Change-Number: 30843 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 5 months

1
0
0 0

Change in osmo-bsc[master]: bsc_subscriber: Allow creating subscribers identified by IMEI

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30843 ) Change subject: bsc_subscriber: Allow creating subscribers identified by IMEI ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc/bsc_subscriber.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2393): https://gerrit.osmocom.org/c/osmo-bsc/+/30843/comment/d4e61944_4099b963 PS1, Line 249: OSMO_STRBUF_PRINTF(sb, "-IMEI-%s", bsub->imei);; Statements terminations use 1 semicolon -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I586b1ee30cbb26ddf58788168d56c962e03ccd5c Gerrit-Change-Number: 30843 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 03 Jan 2023 15:43:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 5 months

1
0
0 0

Change in osmo-bsc[master]: bsc_subscriber: Allow creating subscribers identified by IMEI

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30843 ) Change subject: bsc_subscriber: Allow creating subscribers identified by IMEI ...................................................................... bsc_subscriber: Allow creating subscribers identified by IMEI IMEI may be used as MobileIdentity during MO emergency call establishment if the MS has no valid IMSI assigned. Related: OS#5849 Change-Id: I586b1ee30cbb26ddf58788168d56c962e03ccd5c --- M include/osmocom/bsc/bsc_subscriber.h M src/osmo-bsc/bsc_subscriber.c 2 files changed, 55 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/43/30843/1 diff --git a/include/osmocom/bsc/bsc_subscriber.h b/include/osmocom/bsc/bsc_subscriber.h index 30b33dc..2beb998 100644 --- a/include/osmocom/bsc/bsc_subscriber.h +++ b/include/osmocom/bsc/bsc_subscriber.h @@ -17,6 +17,7 @@ struct osmo_use_count use_count; char imsi[GSM23003_IMSI_MAX_DIGITS+1]; + char imei[GSM23003_IMEI_NUM_DIGITS_NO_CHK+1]; uint32_t tmsi; /* List head of (struct gsm_paging_request).bsub_entry */ @@ -30,6 +31,9 @@ struct bsc_subscr *bsc_subscr_find_or_create_by_imsi(struct llist_head *list, const char *imsi, const char *use_token); +struct bsc_subscr *bsc_subscr_find_or_create_by_imei(struct llist_head *list, + const char *imei, + const char *use_token); struct bsc_subscr *bsc_subscr_find_or_create_by_tmsi(struct llist_head *list, uint32_t tmsi, const char *use_token); @@ -39,6 +43,9 @@ struct bsc_subscr *bsc_subscr_find_by_imsi(struct llist_head *list, const char *imsi, const char *use_token); +struct bsc_subscr *bsc_subscr_find_by_imei(struct llist_head *list, + const char *imei, + const char *use_token); struct bsc_subscr *bsc_subscr_find_by_tmsi(struct llist_head *list, uint32_t tmsi, const char *use_token); @@ -46,6 +53,7 @@ const char *use_token); void bsc_subscr_set_imsi(struct bsc_subscr *bsub, const char *imsi); +void bsc_subscr_set_imei(struct bsc_subscr *bsub, const char *imei); #define bsc_subscr_get(bsc_subscr, use) \ OSMO_ASSERT(osmo_use_count_get_put(&(bsc_subscr)->use_count, use, 1) == 0) diff --git a/src/osmo-bsc/bsc_subscriber.c b/src/osmo-bsc/bsc_subscriber.c index 15dc14f..db86144 100644 --- a/src/osmo-bsc/bsc_subscriber.c +++ b/src/osmo-bsc/bsc_subscriber.c @@ -103,6 +103,24 @@ return NULL; } +struct bsc_subscr *bsc_subscr_find_by_imei(struct llist_head *list, + const char *imei, + const char *use_token) +{ + struct bsc_subscr *bsub; + + if (!imei || !*imei) + return NULL; + + llist_for_each_entry(bsub, list, entry) { + if (!strcmp(bsub->imei, imei)) { + bsc_subscr_get(bsub, use_token); + return bsub; + } + } + return NULL; +} + struct bsc_subscr *bsc_subscr_find_by_tmsi(struct llist_head *list, uint32_t tmsi, const char *use_token) @@ -129,6 +147,8 @@ switch (mi->type) { case GSM_MI_TYPE_IMSI: return bsc_subscr_find_by_imsi(list, mi->imsi, use_token); + case GSM_MI_TYPE_IMEI: + return bsc_subscr_find_by_imei(list, mi->imei, use_token); case GSM_MI_TYPE_TMSI: return bsc_subscr_find_by_tmsi(list, mi->tmsi, use_token); default: @@ -143,6 +163,13 @@ osmo_strlcpy(bsub->imsi, imsi, sizeof(bsub->imsi)); } +void bsc_subscr_set_imei(struct bsc_subscr *bsub, const char *imei) +{ + if (!bsub) + return; + osmo_strlcpy(bsub->imei, imei, sizeof(bsub->imei)); +} + struct bsc_subscr *bsc_subscr_find_or_create_by_imsi(struct llist_head *list, const char *imsi, const char *use_token) @@ -159,6 +186,22 @@ return bsub; } +struct bsc_subscr *bsc_subscr_find_or_create_by_imei(struct llist_head *list, + const char *imei, + const char *use_token) +{ + struct bsc_subscr *bsub; + bsub = bsc_subscr_find_by_imei(list, imei, use_token); + if (bsub) + return bsub; + bsub = bsc_subscr_alloc(list); + if (!bsub) + return NULL; + bsc_subscr_set_imei(bsub, imei); + bsc_subscr_get(bsub, use_token); + return bsub; +} + struct bsc_subscr *bsc_subscr_find_or_create_by_tmsi(struct llist_head *list, uint32_t tmsi, const char *use_token) @@ -183,6 +226,8 @@ switch (mi->type) { case GSM_MI_TYPE_IMSI: return bsc_subscr_find_or_create_by_imsi(list, mi->imsi, use_token); + case GSM_MI_TYPE_IMEI: + return bsc_subscr_find_or_create_by_imei(list, mi->imei, use_token); case GSM_MI_TYPE_TMSI: return bsc_subscr_find_or_create_by_tmsi(list, mi->tmsi, use_token); default: @@ -200,6 +245,8 @@ } if (bsub->imsi[0]) OSMO_STRBUF_PRINTF(sb, "-IMSI-%s", bsub->imsi); + else if (bsub->imei[0]) + OSMO_STRBUF_PRINTF(sb, "-IMEI-%s", bsub->imei);; if (bsub->tmsi != GSM_RESERVED_TMSI) OSMO_STRBUF_PRINTF(sb, "-TMSI-0x%08x", bsub->tmsi); return sb.chars_needed; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I586b1ee30cbb26ddf58788168d56c962e03ccd5c Gerrit-Change-Number: 30843 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in osmo-bts[master]: vty: Fix typo in write-config: osmux / local-port

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/30842 ) Change subject: vty: Fix typo in write-config: osmux / local-port ...................................................................... vty: Fix typo in write-config: osmux / local-port The VTY command is "local-port", but write-config would write "port" instead, which would fail when re-reading the config file. Realted: SYS#6237 Change-Id: Id08530b626b0e69c3b3bb9d8bb9e16080a73e74d --- M src/common/vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/42/30842/1 diff --git a/src/common/vty.c b/src/common/vty.c index a33d719..7e36504 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -388,9 +388,9 @@ break; } vty_out(vty, "%s local-ip %s%s", prefix, bts->osmux.local_addr, VTY_NEWLINE); + vty_out(vty, "%s local-port %u%s", prefix, bts->osmux.local_port, VTY_NEWLINE); vty_out(vty, "%s batch-factor %d%s", prefix, bts->osmux.batch_factor, VTY_NEWLINE); vty_out(vty, "%s batch-size %u%s", prefix, bts->osmux.batch_size, VTY_NEWLINE); - vty_out(vty, "%s port %u%s", prefix, bts->osmux.local_port, VTY_NEWLINE); vty_out(vty, "%s dummy-padding %s%s", prefix, bts->osmux.dummy_padding ? "on" : "off", VTY_NEWLINE); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/30842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id08530b626b0e69c3b3bb9d8bb9e16080a73e74d Gerrit-Change-Number: 30842 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_assignment_emerg_setup_allow_imei

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30841 ) Change subject: bsc: Introduce test TC_assignment_emerg_setup_allow_imei ...................................................................... bsc: Introduce test TC_assignment_emerg_setup_allow_imei Related: OS#5849 Change-Id: I5a95cb0cd6903801db8cfcc1542bd6147461eebe --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn M library/Osmocom_Types.ttcn 3 files changed, 44 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/41/30841/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index ea73f4a..c3743df 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -759,6 +759,7 @@ pars.mscpool.bssap_idx := bssap_idx; pars.expect_tsc := c_BtsParams[0].tsc; pars.imsi := f_rnd_imsi('00101'H); + pars.imei := f_rnd_imei('00101'H); log(testcasename(), ": using IMSI ", pars.imsi); @@ -9223,6 +9224,26 @@ f_shutdown_helper(); } +/* Test MO emergency call using MobileIdentity=IMEI (possible for emergency + * calls from phones without SIM card). + * 3GPP TS 24.008 section 10.5.1.4, OS#5849 */ +testcase TC_assignment_emerg_setup_allow_imei() runs on test_CT { + var TestHdlrParams pars := f_gen_test_hdlr_pars(); + var MSC_ConnHdlr vc_conn; + + /* Remove IMSI set by f_gen_test_hdlr_pars(), then IMEI will be used to place the call */ + pars.imsi := omit; + + f_init(1, true); + f_sleep(1.0); + + f_vty_allow_emerg_msc(true); + f_vty_allow_emerg_bts(true, 0); + vc_conn := f_start_handler(refers(f_TC_assignment_emerg_setup_allow), pars); + vc_conn.done; + f_shutdown_helper(); +} + /* EMERGENCY CALL situation #2, forbidden globally but allowed by BTS */ testcase TC_assignment_emerg_setup_deny_msc() runs on test_CT { var TestHdlrParams pars := f_gen_test_hdlr_pars(); @@ -12387,6 +12408,7 @@ /* Emergency call handling (deny / allow) */ execute( TC_assignment_emerg_setup_allow() ); + execute( TC_assignment_emerg_setup_allow_imei() ); execute( TC_assignment_emerg_setup_deny_msc() ); execute( TC_assignment_emerg_setup_deny_bts() ); execute( TC_emerg_premption() ); diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index dd044e0..13fe723 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -730,7 +730,8 @@ type record TestHdlrParams { OCT1 ra, GsmFrameNumber fn, - hexstring imsi, + hexstring imsi optional, + hexstring imei optional, RslLinkId link_id, integer media_nr, /* determins MGCP EP, port numbers */ BSSMAP_IE_SpeechCodecList ass_codec_list optional, @@ -764,7 +765,8 @@ template (value) TestHdlrParams t_def_TestHdlrPars := { ra := '23'O, fn := 23, - imsi := '001019876543210'H, + imsi := omit, /* set to random in f_gen_test_hdlr_pars() */ + imei := omit, /* set to random in f_gen_test_hdlr_pars() */ link_id := valueof(ts_RslLinkID_DCCH(0)), media_nr := 1, ass_codec_list := omit, @@ -804,12 +806,23 @@ function f_create_chan_and_exp(template (present) PDU_BSSAP exp_l3_compl := ?) runs on MSC_ConnHdlr { - var MobileIdentityLV mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); - var PDU_ML3_MS_NW l3_info := valueof(ts_CM_SERV_REQ(CM_TYPE_MO_CALL, mi)); - var octetstring l3_enc := enc_PDU_ML3_MS_NW(l3_info); + var MobileIdentityLV mi; + var PDU_ML3_MS_NW l3_info; + var octetstring l3_enc; var template uint3_t tsc := ?; timer T; + if (ispresent(g_pars.imsi)) { + mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); + } else if (ispresent(g_pars.imei)) { + mi := valueof(ts_MI_IMEI_LV(g_pars.imei)); + } else { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Either imsi or imei must be set!"); + } + l3_info := valueof(ts_CM_SERV_REQ(CM_TYPE_MO_CALL, mi)); + l3_enc := enc_PDU_ML3_MS_NW(l3_info); + if (not istemplatekind(g_pars.expect_tsc, "omit")) { tsc := g_pars.expect_tsc; } diff --git a/library/Osmocom_Types.ttcn b/library/Osmocom_Types.ttcn index 2edec36..dc4fd65 100644 --- a/library/Osmocom_Types.ttcn +++ b/library/Osmocom_Types.ttcn @@ -105,6 +105,10 @@ return prefix & f_rnd_hexstring(15 - lengthof(prefix), 10); } +function f_rnd_imei(in hexstring prefix) return hexstring { + return prefix & f_rnd_hexstring(14 - lengthof(prefix), 10); +} + function f_rnd_msisdn(in octetstring prefix, integer len := 6) return octetstring { return prefix & f_rnd_octstring(len - lengthof(prefix)); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30841 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: I5a95cb0cd6903801db8cfcc1542bd6147461eebe Gerrit-Change-Number: 30841 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: Use c_l3_payload instead of random octetstring as l3 payload

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30823 ) Change subject: bsc: Use c_l3_payload instead of random octetstring as l3 payload ...................................................................... bsc: Use c_l3_payload instead of random octetstring as l3 payload OsmoBSC does some minimal parsing of l3 content to select MSC target, match paging response to paging request, etc. Since tests right now use potentially invalid data, osmo-bsc is not rejecting conns providing invalid l3 content. This commit is another step towards passing proper l3 data to osmo-bsc in TTCN3 tests. Related: SYS#6280 Change-Id: I012dbdc673ff98a6647280ce3d0245abff86cfa4 --- M bsc/BSC_Tests.ttcn 1 file changed, 10 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index de5b390..aebb64c 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -2581,17 +2581,16 @@ /* Check if we get SAPI N Reject on receipt of unexpected RLL RELease INDication */ testcase TC_rll_rel_ind_sapi_n_reject() runs on test_CT { - var octetstring rnd_data := f_rnd_octstring(16); var RSL_Message rx_rsl; var DchanTuple dt; f_init(1); /* MS establishes a SAPI=0 link on DCCH */ - dt := f_est_dchan(f_rnd_ra_cs(), 23, rnd_data); + dt := f_est_dchan(f_rnd_ra_cs(), 23, c_l3_payload); /* MSC sends some data on (not yet established) SAPI=3 link */ - BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSAP_DTAP(rnd_data, '03'O))); + BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSAP_DTAP(c_l3_payload, '03'O))); /* BSC attempts to establish a SAPI=3 link on DCCH */ rx_rsl := f_exp_ipa_rx(tr_RSL_EST_REQ(dt.rsl_chan_nr, tr_RslLinkID_DCCH(3))); @@ -2609,17 +2608,16 @@ /* Check if we get SAPI N Reject on receipt of unexpected RLL ERROR INDication */ testcase TC_rll_err_ind_sapi_n_reject() runs on test_CT { - var octetstring rnd_data := f_rnd_octstring(16); var RSL_Message rx_rsl; var DchanTuple dt; f_init(1); /* MS establishes a SAPI=0 link on DCCH */ - dt := f_est_dchan(f_rnd_ra_cs(), 23, rnd_data); + dt := f_est_dchan(f_rnd_ra_cs(), 23, c_l3_payload); /* MSC sends some data on (not yet established) SAPI=3 link */ - BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSAP_DTAP(rnd_data, '03'O))); + BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSAP_DTAP(c_l3_payload, '03'O))); /* BSC attempts to establish a SAPI=3 link on DCCH */ rx_rsl := f_exp_ipa_rx(tr_RSL_EST_REQ(dt.rsl_chan_nr, tr_RslLinkID_DCCH(3))); @@ -2637,17 +2635,16 @@ /* Check if we get SAPI N Reject due to a SAPI=3 link establishment timeout */ testcase TC_rll_timeout_sapi_n_reject() runs on test_CT { - var octetstring rnd_data := f_rnd_octstring(16); var RSL_Message rx_rsl; var DchanTuple dt; f_init(1); /* MS establishes a SAPI=0 link on DCCH */ - dt := f_est_dchan(f_rnd_ra_cs(), 23, rnd_data); + dt := f_est_dchan(f_rnd_ra_cs(), 23, c_l3_payload); /* MSC sends some data on (not yet established) SAPI=3 link */ - BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSAP_DTAP(rnd_data, '03'O))); + BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSAP_DTAP(c_l3_payload, '03'O))); /* BSC attempts to establish a SAPI=3 link on DCCH */ rx_rsl := f_exp_ipa_rx(tr_RSL_EST_REQ(dt.rsl_chan_nr, tr_RslLinkID_DCCH(3))); @@ -2663,17 +2660,16 @@ /* Check DLCI CC (Control Channel type) bits in SAPI N Reject */ testcase TC_rll_sapi_n_reject_dlci_cc() runs on test_CT { - var octetstring rnd_data := f_rnd_octstring(16); var RSL_Message rx_rsl; var DchanTuple dt; f_init(1); /* MS establishes a SAPI=0 link on DCCH */ - dt := f_est_dchan(f_rnd_ra_cs(), 23, rnd_data); + dt := f_est_dchan(f_rnd_ra_cs(), 23, c_l3_payload); /* MSC sends some data on (not yet established) SAPI=3 link */ - BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSAP_DTAP(rnd_data, '03'O))); + BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSAP_DTAP(c_l3_payload, '03'O))); /* BSC attempts to establish a SAPI=3 link on DCCH */ rx_rsl := f_exp_ipa_rx(tr_RSL_EST_REQ(dt.rsl_chan_nr, tr_RslLinkID_DCCH(3))); @@ -9619,7 +9615,7 @@ * NOTE: only 3 SDCCH/4 channels are available on CCCH+SDCCH4+CBCH */ for (var integer i := 0; i < 3; i := i + 1) { /* Establish a dedicated channel, so we can trigger (late) TCH assignment */ - var DchanTuple dt := f_est_dchan(f_rnd_ra_cs(), 23, f_rnd_octstring(16)); + var DchanTuple dt := f_est_dchan(f_rnd_ra_cs(), 23, c_l3_payload); /* Send a BSSMAP Assignment Command, expect CHANnel ACTIVation */ BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ass_cmd)); @@ -9685,7 +9681,7 @@ var DchanTuple dt; /* Establish a dedicated channel, so we can trigger handover */ - dt := f_est_dchan(f_rnd_ra_cs(), 23, f_rnd_octstring(16)); + dt := f_est_dchan(f_rnd_ra_cs(), 23, c_l3_payload); f_sleep(0.5); /* Trigger handover from BTS0 to BTS1 */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30823 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: I012dbdc673ff98a6647280ce3d0245abff86cfa4 Gerrit-Change-Number: 30823 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cosmetic: library/L3_Templates: Fix trailing whitespace

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30825 ) Change subject: cosmetic: library/L3_Templates: Fix trailing whitespace ...................................................................... cosmetic: library/L3_Templates: Fix trailing whitespace Change-Id: I9c27b9a2b9dc4dbabd5c2db3a63fbec4768ca4ea --- M library/L3_Templates.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/library/L3_Templates.ttcn b/library/L3_Templates.ttcn index 7a051e0..3b0da5a 100644 --- a/library/L3_Templates.ttcn +++ b/library/L3_Templates.ttcn @@ -605,7 +605,7 @@ secondaryPSDomainTSCSet := ?, secondaryPSDomainTSCValue := ? } - + template PDU_ML3_NW_MS tr_RRM_ModeModify(template ChannelDescription2_V desc := ?, template ChannelMode_V mode := ?, template ExtendedTSCSet_TV extendedTSCSet) := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30825 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: I9c27b9a2b9dc4dbabd5c2db3a63fbec4768ca4ea Gerrit-Change-Number: 30825 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: Move hardcoded octetstring to single constant field

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30822 ) Change subject: bsc: Move hardcoded octetstring to single constant field ...................................................................... bsc: Move hardcoded octetstring to single constant field This makes it easier changing it to be a valid l3 payload in the future. Related: SYS#6280 Change-Id: I888bcc42d4b68bac4c12dfbbf3c74e1734318699 --- M bsc/BSC_Tests.ttcn M bsc/BSC_Tests_CBSP.ttcn M bsc/BSC_Tests_VAMOS.ttcn 3 files changed, 66 insertions(+), 76 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 501b3e9..de5b390 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -115,6 +115,8 @@ private const RSL_IE_Body c_mr_conf_5_90 := valueof(RSL_IE_Body:{multirate_cfg := ts_RSL_MultirateCfg(true, 0, '00000100'B /* 5,90k */)}); +friend const octetstring c_l3_payload := '00010203040506'O; + /* per-BTS state which we keep */ type record BTS_State { /* component reference to the IPA_Client component used for RSL */ @@ -1521,10 +1523,9 @@ /* Send CHAN RQD and wait for allocation; acknowledge it */ var RslChannelNr chan_nr := f_chreq_act_ack(); - var octetstring l3 := '00010203040506'O - f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), l3)); + f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), c_l3_payload)); - BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3))); + BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(c_l3_payload))); /* expect BSC to disable the channel again if there's no response from MSC */ /* MS waits 20s (T3210) at LU; 10s (T3230) at CM SERV REQ and 5s (T3220) AT detach */ @@ -1542,10 +1543,9 @@ /* Send CHAN RQD and wait for allocation; acknowledge it */ var RslChannelNr chan_nr := f_chreq_act_ack(); - var octetstring l3 := '00010203040506'O - f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), l3)); + f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), c_l3_payload)); - BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3))) -> value rx_c_ind; + BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(c_l3_payload))) -> value rx_c_ind; BSSAP.send(ts_BSSAP_DISC_req(rx_c_ind.connectionId, 0)); /* expect BSC to disable the channel */ @@ -1680,7 +1680,7 @@ f_init(1); - dt := f_est_dchan('23'O, 23, '00000000'O); + dt := f_est_dchan('23'O, 23, c_l3_payload); if (mp_bssap_cfg[bssap_idx].transport == BSSAP_TRANSPORT_AoIP) { /* send assignment without AoIP IEs */ BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_AssignmentReq(ts_BSSMAP_IE_CIC(0, 1)))); @@ -1806,7 +1806,7 @@ f_init(1); - dt := f_est_dchan('23'O, 23, '00000000'O); + dt := f_est_dchan('23'O, 23, c_l3_payload); /* send assignment without AoIP IEs */ BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ass_cmd)); alt { @@ -1946,7 +1946,7 @@ f_init(1); - dt := f_est_dchan('23'O, 23, '00010203040506'O); + dt := f_est_dchan('23'O, 23, c_l3_payload); /* simulate RLL REL IND */ f_ipa_tx(ts_RSL_REL_IND(dt.rsl_chan_nr, valueof(ts_RslLinkID_DCCH(0)))); @@ -1974,7 +1974,7 @@ f_init(1); - dt := f_est_dchan('23'O, 23, '00010203040506'O); + dt := f_est_dchan('23'O, 23, c_l3_payload); /* Sending CONN FAIL IND immediately may trigger a race condition. * Give the BSC some time to process a new SCCP connection (OS#5823). */ @@ -2031,7 +2031,7 @@ f_init(1); - dt := f_est_dchan('23'O, 23, '00010203040506'O); + dt := f_est_dchan('23'O, 23, c_l3_payload); /* BSC<-MSC: Instruct BSC to clear connection */ BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_ClearCommand(0))); @@ -2198,7 +2198,7 @@ f_init(1); - dt := f_est_dchan('23'O, 23, '00010203040506'O); + dt := f_est_dchan('23'O, 23, c_l3_payload); /* Instruct BSC to clear channel */ var BssmapCause cause := 0; @@ -2220,7 +2220,7 @@ f_init(1); - dt := f_est_dchan('23'O, 23, '00010203040506'O); + dt := f_est_dchan('23'O, 23, c_l3_payload); /* Send CommonID with some random PLMN (BSC doesn't take it into account /* yet when generating the EUTRAN neigh list in RR CHannel Release) */ BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_CommonId('001019876543210'H, '323454'O))); @@ -2276,7 +2276,7 @@ f_init(1); - dt := f_est_dchan('23'O, 23, '00010203040506'O); + dt := f_est_dchan('23'O, 23, c_l3_payload); /* Instruct BSC to clear channel */ var BssmapCause cause := 0; @@ -2298,7 +2298,7 @@ f_init(1); - dt := f_est_dchan('23'O, 23, '00010203040506'O); + dt := f_est_dchan('23'O, 23, c_l3_payload); /* release the SCCP connection */ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); @@ -2313,7 +2313,7 @@ f_init(1); - dt := f_est_dchan('23'O, 23, '00010203040506'O); + dt := f_est_dchan('23'O, 23, c_l3_payload); /* release the SCCP connection */ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); @@ -2328,7 +2328,7 @@ f_init(1); - dt := f_est_dchan('23'O, 23, '00010203040506'O); + dt := f_est_dchan('23'O, 23, c_l3_payload); /* Clear the queue, it might still contain stuff like IMMEDIATE ASSIGN */ IPA_RSL[0][0].clear; @@ -2356,7 +2356,7 @@ f_init(1); - dt := f_est_dchan('23'O, 23, '00010203040506'O); + dt := f_est_dchan('23'O, 23, c_l3_payload); f_expect_chan_rel(dt.rsl_chan_nr, expect_rll_rel_req := false); f_shutdown_helper(); } @@ -2367,7 +2367,7 @@ { var DchanTuple dt; - dt := f_est_dchan('23'O, 23, '00010203040506'O); + dt := f_est_dchan('23'O, 23, c_l3_payload); var BssmapCause cause := 0; BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_ClearCommand(enum2int(clear_cmd_cause)))); BSSAP.receive(tr_BSSAP_DATA_ind(dt.sccp_conn_id, tr_BSSMAP_ClearComplete)) { @@ -2397,13 +2397,12 @@ f_init(1); - var octetstring l3 := '00010203040506'O; var RslChannelNr chan_nr := valueof(t_RslChanNr_Bm(6)); - f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), l3)); + f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), c_l3_payload)); T.start; alt { - [] BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3))) { + [] BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(c_l3_payload))) { setverdict(fail, "MSC received COMPL L3 for non-active lchan"); } [] BSSAP.receive {} @@ -2422,13 +2421,12 @@ chan_nr := f_chreq_act_ack() - var octetstring l3 := '00010203040506'O; - f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(1)), l3)); + f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(1)), c_l3_payload)); timer T := 2.0; T.start; alt { - [] BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3))) { + [] BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(c_l3_payload))) { setverdict(fail, "MSC received COMPL L3 for invalid SAPI 1"); } [] BSSAP.receive { repeat; } @@ -2447,12 +2445,11 @@ var RslChannelNr chan_nr := f_chreq_act_ack(); - var octetstring l3 := '00010203040506'O; - f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(3)), l3)); + f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(3)), c_l3_payload)); T.start; alt { - [] BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3))) { + [] BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(c_l3_payload))) { setverdict(fail, "MSC received COMPL L3 for invalid SAPI 3"); } [] BSSAP.receive { repeat; } @@ -2471,12 +2468,11 @@ var RslChannelNr chan_nr := f_chreq_act_ack(); - var octetstring l3 := '00010203040506'O; - f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_SACCH(0)), l3)); + f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_SACCH(0)), c_l3_payload)); T.start; alt { - [] BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3))) { + [] BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(c_l3_payload))) { setverdict(fail, "MSC received COMPL L3 for invalid Link SACCH"); } [] BSSAP.receive { repeat; } @@ -2741,7 +2737,7 @@ var BSSAP_N_DATA_ind rx_di; var DchanTuple dt; - dt := f_est_dchan('23'O, 23, '00010203040506'O); + dt := f_est_dchan('23'O, 23, c_l3_payload); /* Send CommonID with some random PLMN (BSC doesn't take it into account * yet when generating the EUTRAN neigh list in RR CHannel Release) */ BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_CommonId('001019876543210'H, '323454'O))); @@ -7555,7 +7551,7 @@ /* Setup a BSSAP connection and clear it right away. This is * the MSC telling the BSC about a planned release, it's not an * erratic loss of a connection. */ - dt := f_est_dchan(int2oct(i,1), 23+i, '00010203040506'O); + dt := f_est_dchan(int2oct(i,1), 23+i, c_l3_payload); /* MSC disconnects (RLSD). */ BSSAP.send(ts_BSSAP_DISC_req(dt.sccp_conn_id, 0)); @@ -7599,7 +7595,7 @@ /* Setup a BSSAP connection and clear it right away. This is * the MSC telling the BSC about a planned release, it's not an * erratic loss of a connection. */ - dt := f_est_dchan(int2oct(i,1), 23+i, '00010203040506'O); + dt := f_est_dchan(int2oct(i,1), 23+i, c_l3_payload); /* Instruct BSC to clear channel */ BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_ClearCommand(cause))); @@ -7645,7 +7641,7 @@ /* Setup a BSSAP connection and clear it right away. This is * the MSC telling the BSC about a planned release, it's not an * erratic loss of a connection. */ - dt := f_est_dchan('23'O, 23, '00010203040506'O); + dt := f_est_dchan('23'O, 23, c_l3_payload); /* simulate RLL REL IND */ f_ipa_tx(ts_RSL_REL_IND(dt.rsl_chan_nr, valueof(ts_RslLinkID_DCCH(0)))); @@ -7959,7 +7955,7 @@ var DchanTuples sdcch_cleanup := {}; var integer i; for (i := 0; i < NUM_SDCCH_PER_BTS; i := i + 1) { - dt := f_est_dchan('23'O, i, '00010203040506'O); + dt := f_est_dchan('23'O, i, c_l3_payload); sdcch_cleanup := sdcch_cleanup & { dt }; } @@ -8036,14 +8032,14 @@ */ var DchanTuples chan_cleanup := {}; for (i := 0; i < NUM_SDCCH_PER_BTS; i := i+1) { - chan_cleanup := chan_cleanup & { f_est_dchan('13'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O) }; + chan_cleanup := chan_cleanup & { f_est_dchan('13'O, NUM_SDCCH_PER_BTS + i, c_l3_payload) }; } /* Only the dyn TS is still available. Its first lchan gets converted to SDCCH8 */ - chan_cleanup := chan_cleanup & { f_est_dchan_dyn('33'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O) }; + chan_cleanup := chan_cleanup & { f_est_dchan_dyn('33'O, NUM_SDCCH_PER_BTS + i, c_l3_payload) }; /* Also occupy the seven other SDCCH of the dyn TS */ for (i := 0; i < 7; i := i+1) { - chan_cleanup := chan_cleanup & { f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O) }; + chan_cleanup := chan_cleanup & { f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, c_l3_payload) }; } /* Clean up SDCCH lchans */ @@ -8097,7 +8093,7 @@ var DchanTuples chan_cleanup := {}; var OCT1 ra := '43'O; /* RA containing reason=originating speech call*/ for (i := 0; i < NUM_SDCCH_PER_BTS; i := i + 1) { - dt := f_est_dchan(ra, i, '00010203040506'O); + dt := f_est_dchan(ra, i, c_l3_payload); chan_cleanup := chan_cleanup & { dt }; } @@ -8175,7 +8171,7 @@ var DchanTuples chan_cleanup := {}; var integer i; for (i := 0; i < NUM_SDCCH_PER_BTS; i := i + 1) { - dt := f_est_dchan('23'O, i, '00010203040506'O); + dt := f_est_dchan('23'O, i, c_l3_payload); chan_cleanup := chan_cleanup & { dt }; } @@ -9234,12 +9230,11 @@ /* Send EST IND for the first TCH, so we get to test the RR release cause */ var RslChannelNr first_tch := valueof(t_RslChanNr_Bm(1)); - var octetstring l3 := '00010203040506'O; - f_ipa_tx(ts_RSL_EST_IND(first_tch, valueof(ts_RslLinkID_DCCH(0)), l3)); + f_ipa_tx(ts_RSL_EST_IND(first_tch, valueof(ts_RslLinkID_DCCH(0)), c_l3_payload)); /* Accept BSSAP conn, so we get to test the Clear Request cause */ var BSSAP_N_CONNECT_ind rx_c_ind; - BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3))) -> value rx_c_ind; + BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(c_l3_payload))) -> value rx_c_ind; var integer sccp_conn_id := rx_c_ind.connectionId; BSSAP.send(ts_BSSAP_CONNECT_res(rx_c_ind.connectionId)); @@ -11063,11 +11058,10 @@ chan_ident_ie.chan_ident.ch_desc.v.tsc); /* Check that the lchan is working */ - var octetstring l3 := '00010203040506'O; - f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), l3)); + f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), c_l3_payload)); var BSSAP_N_CONNECT_ind rx_c_ind; - BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3))) -> value rx_c_ind; + BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(c_l3_payload))) -> value rx_c_ind; dt.sccp_conn_id := rx_c_ind.connectionId; BSSAP.send(ts_BSSAP_CONNECT_res(rx_c_ind.connectionId)); @@ -11111,11 +11105,10 @@ f_ipa_tx(ts_RSL_CHAN_ACT_ACK(chan_nr, fn+10)); /* Check that the lchan is working */ - var octetstring l3 := '00010203040506'O; - f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), l3)); + f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), c_l3_payload)); var BSSAP_N_CONNECT_ind rx_c_ind; - BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3))) -> value rx_c_ind; + BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(c_l3_payload))) -> value rx_c_ind; dt.sccp_conn_id := rx_c_ind.connectionId; BSSAP.send(ts_BSSAP_CONNECT_res(rx_c_ind.connectionId)); @@ -11159,11 +11152,10 @@ f_ipa_tx(ts_RSL_CHAN_ACT_ACK(chan_nr, fn+10)); /* Check that the lchan is working */ - var octetstring l3 := '00010203040506'O; - f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), l3)); + f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), c_l3_payload)); var BSSAP_N_CONNECT_ind rx_c_ind; - BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3))) -> value rx_c_ind; + BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(c_l3_payload))) -> value rx_c_ind; dt.sccp_conn_id := rx_c_ind.connectionId; BSSAP.send(ts_BSSAP_CONNECT_res(rx_c_ind.connectionId)); @@ -11228,11 +11220,10 @@ f_ipa_tx(ts_RSL_CHAN_ACT_ACK(chan_nr, fn+10)); /* Check that the lchan is working */ - var octetstring l3 := '00010203040506'O; - f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), l3)); + f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), c_l3_payload)); var BSSAP_N_CONNECT_ind rx_c_ind; - BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3))) -> value rx_c_ind; + BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(c_l3_payload))) -> value rx_c_ind; dt.sccp_conn_id := rx_c_ind.connectionId; BSSAP.send(ts_BSSAP_CONNECT_res(rx_c_ind.connectionId)); @@ -11301,11 +11292,10 @@ chan_ident_ie.chan_ident.ch_desc.v.tsc); /* Check that the lchan is working */ - var octetstring l3 := '00010203040506'O; - f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), l3)); + f_ipa_tx(ts_RSL_EST_IND(chan_nr, valueof(ts_RslLinkID_DCCH(0)), c_l3_payload)); var BSSAP_N_CONNECT_ind rx_c_ind; - BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3))) -> value rx_c_ind; + BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(c_l3_payload))) -> value rx_c_ind; dt.sccp_conn_id := rx_c_ind.connectionId; BSSAP.send(ts_BSSAP_CONNECT_res(rx_c_ind.connectionId)); @@ -11581,7 +11571,7 @@ */ var DchanTuples chan_cleanup := {}; for (i := 0; i < NUM_SDCCH_PER_BTS; i := i+1) { - chan_cleanup := chan_cleanup & { f_est_dchan('13'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O) }; + chan_cleanup := chan_cleanup & { f_est_dchan('13'O, NUM_SDCCH_PER_BTS + i, c_l3_payload) }; } /* Since only bts 0 is connected, expecting all_allocated to become true for both bts 0 and the "global" bsc @@ -11591,7 +11581,7 @@ /* Also fill up all remaining (TCH) channels */ for (i := 0; i < NUM_TCHF_PER_BTS + NUM_TCHH_PER_BTS; i := i+1) { - chan_cleanup := chan_cleanup & { f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O) }; + chan_cleanup := chan_cleanup & { f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, c_l3_payload) }; } /* All TCH are now also occupied */ @@ -11631,7 +11621,7 @@ */ var DchanTuples chan_cleanup := {}; for (i := 0; i < NUM_SDCCH_PER_BTS; i := i+1) { - chan_cleanup := chan_cleanup & { f_est_dchan('13'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O) }; + chan_cleanup := chan_cleanup & { f_est_dchan('13'O, NUM_SDCCH_PER_BTS + i, c_l3_payload) }; } /* The static SDCCH should now be occupied, while still 3x8 dynamic SDCCH potentially remain. So only @@ -11641,11 +11631,11 @@ /* Request more SDCCH, hence convert the first dyn TS to SDCCH8. * Will release them later, so remember all the DchanTuples. */ var DchanTuples dyn_sddch := {}; - dyn_sddch := dyn_sddch & { f_est_dchan_dyn('33'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O) }; + dyn_sddch := dyn_sddch & { f_est_dchan_dyn('33'O, NUM_SDCCH_PER_BTS + i, c_l3_payload) }; /* Also occupy the seven other SDCCH of the dyn TS */ for (i := 0; i < 7; i := i+1) { - dyn_sddch := dyn_sddch & { f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O) }; + dyn_sddch := dyn_sddch & { f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, c_l3_payload) }; } /* Now all dynamic SDCCH are also occupied, so for the first time all_allocated:sdcch will trigger... */ @@ -11653,7 +11643,7 @@ /* occupy the remaining TCH, three TCH/F and two TCH/H lchans */ for (i := 0; i < 5; i := i+1) { - chan_cleanup := chan_cleanup & { f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O) }; + chan_cleanup := chan_cleanup & { f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, c_l3_payload) }; } /* All TCH lchans are now also occupied, both static and dynamic */ @@ -11727,7 +11717,7 @@ /* Expect the BSC to allocate 4 x TCH/F channels on BTS2/TRX0 */ for (var integer i := 0; i < 4; i := i + 1) { - var DchanTuple dt := f_est_dchan('23'O, 23, '00000000'O, {2, 0}); + var DchanTuple dt := f_est_dchan('23'O, 23, c_l3_payload, {2, 0}); f_TC_chan_alloc_algo(dt, {2, 0}); f_perform_clear_test_ct(dt); } @@ -11750,7 +11740,7 @@ /* Expect the BSC to allocate 5 x TCH/F channels on BTS2/TRX3 */ for (var integer i := 0; i < 5; i := i + 1) { - var DchanTuple dt := f_est_dchan('23'O, 23, '00000000'O, {2, 0}); + var DchanTuple dt := f_est_dchan('23'O, 23, c_l3_payload, {2, 0}); f_TC_chan_alloc_algo(dt, {2, 3}); f_perform_clear_test_ct(dt); } @@ -11779,12 +11769,12 @@ var DchanTuple dt; f_logp(BSCVTY, "Case a) Unknown Uplink RxLev, fall-back to ascending"); - dt := f_est_dchan('23'O, 23, '00000000'O, TRX0); + dt := f_est_dchan('23'O, 23, c_l3_payload, TRX0); f_TC_chan_alloc_algo(dt, TRX0); f_perform_clear_test_ct(dt); f_logp(BSCVTY, "Case b) Not enough RxLev samples, use ascending"); - dt := f_est_dchan('23'O, 23, '00000000'O, TRX0); + dt := f_est_dchan('23'O, 23, c_l3_payload, TRX0); f_ipa_tx(ts_RSL_MEAS_RES_EMPTY(dt.rsl_chan_nr, 0, ts_RSL_IE_UplinkMeas(30, 0), ts_RSL_IE_BS_Power(0)), TRX0); @@ -11793,7 +11783,7 @@ f_perform_clear_test_ct(dt); f_logp(BSCVTY, "Case c) Uplink RxLev below the threshold, use ascending"); - dt := f_est_dchan('23'O, 23, '00000000'O, TRX0); + dt := f_est_dchan('23'O, 23, c_l3_payload, TRX0); f_ipa_tx(ts_RSL_MEAS_RES_EMPTY(dt.rsl_chan_nr, 0, ts_RSL_IE_UplinkMeas(45, 0), ts_RSL_IE_BS_Power(0)), TRX0); @@ -11805,7 +11795,7 @@ f_perform_clear_test_ct(dt); f_logp(BSCVTY, "Case d) Uplink RxLev above the threshold, use descending"); - dt := f_est_dchan('23'O, 23, '00000000'O, TRX0); + dt := f_est_dchan('23'O, 23, c_l3_payload, TRX0); f_ipa_tx(ts_RSL_MEAS_RES_EMPTY(dt.rsl_chan_nr, 0, ts_RSL_IE_UplinkMeas(50, 0), ts_RSL_IE_BS_Power(0)), TRX0); @@ -11821,7 +11811,7 @@ f_vty_transceive(BSCVTY, "end"); f_logp(BSCVTY, "Case e) Uplink RxLev above the threshold, but C0 load is not"); - dt := f_est_dchan('23'O, 23, '00000000'O, TRX0); + dt := f_est_dchan('23'O, 23, c_l3_payload, TRX0); f_ipa_tx(ts_RSL_MEAS_RES_EMPTY(dt.rsl_chan_nr, 0, ts_RSL_IE_UplinkMeas(50, 0), ts_RSL_IE_BS_Power(0)), TRX0); diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn index c07b605..ae77ac8 100644 --- a/bsc/BSC_Tests_CBSP.ttcn +++ b/bsc/BSC_Tests_CBSP.ttcn @@ -1005,7 +1005,7 @@ cell_list := ts_BSSMAP_CIL_CGI({bssmap_cgi(mp_cgi_bts0)}); /* first establish a dedicated channel */ - var DchanTuple dt := f_est_dchan('23'O, 23, '00010203040506'O); + var DchanTuple dt := f_est_dchan('23'O, 23, c_l3_payload); /* then send ETWS PN */ f_cbsp_write_emerg(g_cbsp_msg_id, g_cbsp_ser_no, cell_list); diff --git a/bsc/BSC_Tests_VAMOS.ttcn b/bsc/BSC_Tests_VAMOS.ttcn index cd9ffd0..3ebcaaa 100644 --- a/bsc/BSC_Tests_VAMOS.ttcn +++ b/bsc/BSC_Tests_VAMOS.ttcn @@ -279,13 +279,13 @@ /* verify that DTAP passes through both ways with the right cbits */ private function f_verify_dtap() runs on MSC_ConnHdlr { - var octetstring l3_data := '00010203040506'O; var PDU_BSSAP rx_bssap_dtap; + var octetstring l3_data; /* MS to NW */ - RSL.send(ts_RSL_DATA_IND(g_chan_nr, valueof(ts_RslLinkID_DCCH(0)), l3_data)); + RSL.send(ts_RSL_DATA_IND(g_chan_nr, valueof(ts_RslLinkID_DCCH(0)), c_l3_payload)); BSSAP.receive(tr_BSSAP_DTAP) -> value rx_bssap_dtap; - if (not match(rx_bssap_dtap.pdu.dtap, l3_data)) { + if (not match(rx_bssap_dtap.pdu.dtap, c_l3_payload)) { setverdict(fail, "unexpected L3 data"); mtc.stop; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/30822 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: I888bcc42d4b68bac4c12dfbbf3c74e1734318699 Gerrit-Change-Number: 30822 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log January 2023