September 2024 - gerrit-log - lists.osmocom.org

[M] Change in pysim[master]: ts_51_011: replace encoding of EF.MSISDN with construct model

by dexter

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/38117?usp=email to look at the new patch set (#11). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: ts_51_011: replace encoding of EF.MSISDN with construct model ...................................................................... ts_51_011: replace encoding of EF.MSISDN with construct model The encoding of EF.MSISDN is currently done with enc_msisdn and dec_msisdn from utils.py. Let's replace this with a construct based model, similar to the one we already use with EF.ADN Related: OS#5714 Change-Id: I647f5c63f7f87902a86c0c5d8e92fdc7f4350a5a --- M pySim/ts_51_011.py M tests/pySim-trace_test/pySim-trace_test_gsmtap.pcapng.ok 2 files changed, 48 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/17/38117/11 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38117?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I647f5c63f7f87902a86c0c5d8e92fdc7f4350a5a Gerrit-Change-Number: 38117 Gerrit-PatchSet: 11 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org>

8 months, 4 weeks

1
0
0 0

[M] Change in pysim[master]: ts_51_011: replace encoding of EF.MSISDN with construct model

by dexter

Attention is currently required from: laforge. dexter has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38117?usp=email ) Change subject: ts_51_011: replace encoding of EF.MSISDN with construct model ...................................................................... Patch Set 11: (1 comment) File pySim/ts_51_011.py: https://gerrit.osmocom.org/c/pysim/+/38117/comment/d70075b0_82acf8b2?usp=em… : PS10, Line 191: _test_de_encode = [ > plese also add some test vectors for the letacy case with `{'msisdn'... […] I have done this now. I have taken the encoding results from current master pySim-shell, so we can be sure nothing is off. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38117?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I647f5c63f7f87902a86c0c5d8e92fdc7f4350a5a Gerrit-Change-Number: 38117 Gerrit-PatchSet: 11 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 27 Sep 2024 14:17:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

8 months, 4 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: s1gw: use the new counter name (out_pkt.forward.unmodified)

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38309?usp=email ) Change subject: s1gw: use the new counter name (out_pkt.forward.unmodified) ...................................................................... Patch Set 1: (1 comment) File s1gw/S1GW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38309/comment/cb8d85ec_d03f… : PS1, Line 206: {name := mp_statsd_prefix & "ctr.s1ap.proxy.out_pkt.forward.unmodified.value", mtype := "c", min := 2, max := 2} Well, imho the counter simply says what I explained: A received (input, incoming) packet was forwarded. > S1GW_CTR_S1AP_PROXY_IN_PKT_REPLY_ERAB_SETUP_RSP looks confusing as if the input packet was a reply I cannot find this counter in the metrics patch? > Alternatively, we could remove the IN/OUT classification? So to me that main problem right now in the current code base of osmo-s1gw, is that the parsing of pkts is done at the same time while operating/mangling it. This causes several problems like not having the full set of ERABS before operating on them. So the operation of the proxy would be imho: 1- I take an in_pkt, decode it generate some data structures that will be used later on (dictionaries, lists, etc.) 2- Operate on the parsed packet (FSMs, PFCP, etc.) 3- Generate an output packet if/whenever needed So for me clearly we have 2 separate sets of counters in the input and output phases. And we need to count on both phases, since eg. an error output packet may be generated in phase 1 or in phase 2, so we need to track that. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38309?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I037fea187bb78ba0d4b82d30915c5270d4cd28bb Gerrit-Change-Number: 38309 Gerrit-PatchSet: 1 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: Fri, 27 Sep 2024 12:12:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

8 months, 4 weeks

1
0
0 0

[M] Change in osmo-bts[master]: tests/csd: add NT variants for TCH/F4.8 and TCH/F9.6

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/38302?usp=email ) Change subject: tests/csd: add NT variants for TCH/F4.8 and TCH/F9.6 ...................................................................... tests/csd: add NT variants for TCH/F4.8 and TCH/F9.6 The existing tests are all for T (transparent mode). Add NT (non-transparent mode) variants. Change-Id: Ie335bc0623dd7e887a0b3b1c40d61153b84924b2 Related: OS#1572 --- M tests/csd/csd_test.c M tests/csd/csd_test.err 2 files changed, 62 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/tests/csd/csd_test.c b/tests/csd/csd_test.c index 13a6419..0ad611f 100644 --- a/tests/csd/csd_test.c +++ b/tests/csd/csd_test.c @@ -54,12 +54,24 @@ .csd_mode = LCHAN_CSD_M_T_9600, }, { + .name = "TCH/F9.6 NT", + .lchan_type = GSM_LCHAN_TCH_F, + .tch_mode = GSM48_CMODE_DATA_12k0, + .csd_mode = LCHAN_CSD_M_NT, + }, + { .name = "TCH/F4.8", .lchan_type = GSM_LCHAN_TCH_F, .tch_mode = GSM48_CMODE_DATA_6k0, .csd_mode = LCHAN_CSD_M_T_4800, }, { + .name = "TCH/F4.8 NT", + .lchan_type = GSM_LCHAN_TCH_F, + .tch_mode = GSM48_CMODE_DATA_6k0, + .csd_mode = LCHAN_CSD_M_NT, + }, + { .name = "TCH/H4.8", .lchan_type = GSM_LCHAN_TCH_H, .tch_mode = GSM48_CMODE_DATA_6k0, diff --git a/tests/csd/csd_test.err b/tests/csd/csd_test.err index b862324..cf19aff 100644 --- a/tests/csd/csd_test.err +++ b/tests/csd/csd_test.err @@ -24,6 +24,31 @@ ff ff ff ff ff ff ff ff 3f 3f 3f 3f ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff +[i] Testing 'TCH/F9.6 NT' (bitnum=240) +[i] csd_v110_rtp_encode() returns 160 + 3f 3f 3f 3f bf bf bf bf ff 7f 7f 7f bf bf bf bf + ff 7f 7f 7f bf 3f 7f 7f bf bf bf bf ff 7f 7f 7f + bf bf bf bf ff 7f 7f 7f 3f 3f 3f 3f bf bf bf bf + ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f bf 7f 7f 7f + bf bf bf bf ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f + 3f 3f 3f 3f bf bf bf bf ff 7f 7f 7f bf bf bf bf + ff 7f 7f 7f bf bf 7f 7f bf bf bf bf ff 7f 7f 7f + bf bf bf bf ff 7f 7f 7f 3f 3f 3f 3f bf bf bf bf + ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f bf ff 7f 7f + bf bf bf bf ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f +[i] csd_v110_rtp_decode() returns 240 +[i] Testing 'TCH/F9.6 NT' (IDLE) +[i] csd_v110_rtp_encode() returns 160 + 3f 3f 3f 3f ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff 3f 3f 3f 3f ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + 3f 3f 3f 3f ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff 3f 3f 3f 3f ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff [i] Testing 'TCH/F4.8' (bitnum=120) [i] csd_v110_rtp_encode() returns 160 7f 7f 7f 7f 7f 7f 7f 7f ff 7f ff 7f ff 7f ff 7f @@ -49,6 +74,31 @@ ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff +[i] Testing 'TCH/F4.8 NT' (bitnum=120) +[i] csd_v110_rtp_encode() returns 160 + 7f 7f 7f 7f 7f 7f 7f 7f ff 7f ff 7f ff 7f ff 7f + ff ff 7f ff 7f ff 7f ff ff 7f ff 7f ff 7f ff 7f + ff ff 7f ff 7f ff 7f ff ff 7f 7f 7f 7f ff 7f ff + ff 7f ff 7f ff 7f ff 7f ff ff 7f ff 7f ff 7f ff + ff 7f ff 7f ff 7f ff 7f ff ff 7f ff 7f ff 7f ff + 7f 7f 7f 7f 7f 7f 7f 7f ff 7f ff 7f ff 7f ff 7f + ff ff 7f ff 7f ff 7f ff ff 7f ff 7f ff 7f ff 7f + ff ff 7f ff 7f ff 7f ff ff 7f 7f ff 7f ff 7f ff + ff 7f ff 7f ff 7f ff 7f ff ff 7f ff 7f ff 7f ff + ff 7f ff 7f ff 7f ff 7f ff ff 7f ff 7f ff 7f ff +[i] csd_v110_rtp_decode() returns 120 +[i] Testing 'TCH/F4.8 NT' (IDLE) +[i] csd_v110_rtp_encode() returns 160 + 7f 7f 7f 7f 7f 7f 7f 7f ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + 7f 7f 7f 7f 7f 7f 7f 7f ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff + ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff [i] Testing 'TCH/H4.8' (bitnum=240) [i] csd_v110_rtp_encode() returns 160 3f 3f 3f 3f bf bf bf bf ff 7f 7f 7f bf bf bf bf -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38302?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie335bc0623dd7e887a0b3b1c40d61153b84924b2 Gerrit-Change-Number: 38302 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(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>

8 months, 4 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: add TC_e_rab_setup_failure

by fixeria

fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38310?usp=email ) Change subject: s1gw: add TC_e_rab_setup_failure ...................................................................... Patch Set 1: (1 comment) File s1gw/S1GW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38310/comment/81f62833_6f9b… : PS1, Line 405: XXX: expect E-RAB SETUP RESPONSE here this needs to be addressed -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38310?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I97102292678e732265dcae04d60f7a708a5246dc Gerrit-Change-Number: 38310 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Sep 2024 12:00:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

8 months, 4 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: s1gw: use the new counter name (out_pkt.forward.unmodified)

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38309?usp=email ) Change subject: s1gw: use the new counter name (out_pkt.forward.unmodified) ...................................................................... Patch Set 1: (1 comment) File s1gw/S1GW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38309/comment/5cb048d4_f9eb… : PS1, Line 206: {name := mp_statsd_prefix & "ctr.s1ap.proxy.out_pkt.forward.unmodified.value", mtype := "c", min := 2, max := 2} > this change of name looks weird to me tbh. […] I changed it because it looked more logical to have it together with other `out_pkt` counters. We're taking decision on the incoming PDUs -- this is right, but the counter tells that the outgoing PDU was basically an incoming PDU without modifications. Does that make sense? I could move it back to `in_pkt`, but then `S1GW_CTR_S1AP_PROXY_IN_PKT_REPLY_ERAB_SETUP_RSP` looks confusing as if the input packet was a reply. Alternatively, we could remove the IN/OUT classification? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38309?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I037fea187bb78ba0d4b82d30915c5270d4cd28bb Gerrit-Change-Number: 38309 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Sep 2024 11:59:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

8 months, 4 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: add TC_initial_ctx_setup_failure

by pespin

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38280?usp=email ) Change subject: s1gw: add TC_initial_ctx_setup_failure ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File s1gw/S1GW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38280/comment/f7dc1eb0_db20… : PS1, Line 434: /* TODO: Ideally, the IUT should terminate PFCP session(s) immediately. */ > TBH, I am not sure how the S1GW should behave in this case. […] From my understanding in 3GPP TS 36.413, "INITIAL CONTEXT SETUP FAILURE" means the eRABs were never created because the request failed, hence they should all be considered as not created. So yes, upon receiving that we should tear down related UPF sessions. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38280?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I969ea6813c9b805d116a974c70ab5f6e6e721e48 Gerrit-Change-Number: 38280 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Sep 2024 11:58:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

8 months, 4 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: add TC_initial_ctx_setup_failure

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38280?usp=email ) Change subject: s1gw: add TC_initial_ctx_setup_failure ...................................................................... Patch Set 2: (1 comment) File s1gw/S1GW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38280/comment/29a2c521_2af6… : PS1, Line 434: /* TODO: Ideally, the IUT should terminate PFCP session(s) immediately. */ > IIUC you plan to add this in next steps? TBH, I am not sure how the S1GW should behave in this case. It's not clear whether the `INITIAL CONTEXT SETUP FAILURE` from eNB indicates that all E-RABs requested in the `INITIAL CONTEXT SETUP REQUEST` are rejected implicitly, or does the eNB then send `E-RAB RELEASE INDICATION` explicitly? If the former, then it's a non-trivial task that would require us to maintain some additional FSMs. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38280?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I969ea6813c9b805d116a974c70ab5f6e6e721e48 Gerrit-Change-Number: 38280 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 27 Sep 2024 11:50:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

8 months, 4 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: add testcases for INITIAL CONTEXT SETUP

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38279?usp=email ) Change subject: s1gw: add testcases for INITIAL CONTEXT SETUP ...................................................................... s1gw: add testcases for INITIAL CONTEXT SETUP Change-Id: I72e3ab932fee1de0fce8ddf4041b8f2174416bc1 --- M s1gw/S1GW_ConnHdlr.ttcn M s1gw/S1GW_Tests.ttcn M s1gw/expected-results.xml 3 files changed, 192 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index 97df4c0..775f44c 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -501,6 +501,110 @@ return pdu; } +function f_ConnHdlr_tx_initial_ctx_setup_req(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) +runs on ConnHdlr { + var template (value) E_RABToBeSetupListCtxtSUReq items; + var template (value) E_RABLevelQoSParameters qos_params; + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + + qos_params := valueof(ts_E_RABLevelQoSParameters); + + for (var integer i := 0; i < lengthof(erabs); i := i + 1) { + var template (value) E_RABToBeSetupItemCtxtSUReq item; + var template (value) TransportLayerAddress tla; + var ERabParams epars := erabs[i].u2c; + + tla := oct2bit(f_inet_addr(epars.tla)); + item := ts_E_RABToBeSetupItemCtxtSUReq(rab_id := erabs[i].erab_id, + qos_params := qos_params, + tla := tla, + gtp_teid := epars.teid, + nas_pdu := omit); + items[i] := ts_E_RABToBeSetupListCtxtSUReq(item)[0]; + } + + f_ConnHdlr_tx_s1ap_from_mme(ts_S1AP_IntialCtxSetupReq(mme_id := mme_ue_id, + enb_id := enb_ue_id, + max_br := ts_UEAggregateMaximumBitrate, + rab_setup_items := items, + ue_sec_par := ts_UESecurityCapabilities, + sec_key := f_rnd_bitstring(256))); +} + +function f_ConnHdlr_rx_initial_ctx_setup_req(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) +runs on ConnHdlr return S1AP_PDU { + var template (present) E_RABToBeSetupListCtxtSUReq items; + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + var S1AP_PDU pdu; + + for (var integer i := 0; i < lengthof(erabs); i := i + 1) { + var template (present) E_RABToBeSetupItemCtxtSUReq item; + var template (present) TransportLayerAddress tla; + var ERabParams epars := erabs[i].a2u; + + tla := oct2bit(f_inet_addr(epars.tla)); + item := tr_E_RABToBeSetupItemCtxtSUReq(rab_id := erabs[i].erab_id, + qos_params := ?, + tla := tla, + gtp_teid := epars.teid, + nas_pdu := omit); + items[i] := tr_E_RABToBeSetupListCtxtSUReq(item)[0]; + } + + f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_IntialCtxSetupReq(mme_id := mme_ue_id, + enb_id := enb_ue_id, + max_br := tr_UEAggregateMaximumBitrate, + rab_setup_items := items, + ue_sec_par := tr_UESecurityCapabilities)); + return pdu; +} + +function f_ConnHdlr_tx_initial_ctx_setup_rsp(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) +runs on ConnHdlr { + var template (value) E_RABSetupListCtxtSURes items; + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + + for (var integer i := 0; i < lengthof(erabs); i := i + 1) { + var template (value) E_RABSetupItemCtxtSURes item; + var template (value) TransportLayerAddress tla; + var ERabParams epars := erabs[i].u2a; + + tla := oct2bit(f_inet_addr(epars.tla)); + item := ts_S1AP_RABSetupItemCtxtSURes(rab_id := erabs[i].erab_id, + tla := tla, + gtp_teid := epars.teid); + items[i] := ts_S1AP_RABSetupListCtxtSURes(item)[0]; + } + + f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_InitialCtxSetupResp(mme_ue_id, enb_ue_id, items)); +} + +function f_ConnHdlr_rx_initial_ctx_setup_rsp(in ERabList erabs, + MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) +runs on ConnHdlr return S1AP_PDU { + var template (present) E_RABSetupListCtxtSURes items; + var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; + var S1AP_PDU pdu; + + for (var integer i := 0; i < lengthof(erabs); i := i + 1) { + var template (present) E_RABSetupItemCtxtSURes item; + var template (present) TransportLayerAddress tla; + var ERabParams epars := erabs[i].c2u; + + tla := oct2bit(f_inet_addr(epars.tla)); + item := tr_S1AP_RABSetupItemCtxtSURes(rab_id := erabs[i].erab_id, + tla := tla, + gtp_teid := epars.teid); + items[i] := tr_S1AP_RABSetupListCtxtSURes(item)[0]; + } + + f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_InitialCtxSetupResp(mme_ue_id, enb_ue_id, items)); + return pdu; +} + function f_ConnHdlr_rx_session_establish_req(in ERab erab) runs on ConnHdlr return PDU_PFCP { var OCT4 addr := f_inet_addr(g_pars.pfcp_rem_addr); @@ -725,4 +829,41 @@ f_ConnHdlr_rx_erab_release_ind(erabs, cause); } +function f_ConnHdlr_initial_ctx_setup_req(inout ERabList erabs) +runs on ConnHdlr { + const OCT8 c_SEID0 := '0000000000000000'O; + + /* This code block cannot be executed by more than one component at a time because + * the S1AP E-RAB SETUP REQUEST triggers the IUT to send PFCP Session Establishment + * Request PDU(s), with need to be routed to the respective ConnHdlr component (us). + * As per 3GPP TS 29.244, section 7.2.2.4.2, these PFCP PDUs shall all have SEID=0, + * so that the PFCPEM component cannot route them unambiguously. This is why we + * need to ensure that only one ConnHdlr is triggering PFCP session establishment + * at the given moment of time. */ + f_Mutex_lock(__BFILE__, __LINE__); + f_PFCPEM_subscribe_seid(c_SEID0); + + log("eNB <- [S1GW <- MME]: INITIAL CONTEXT SETUP REQUEST"); + f_ConnHdlr_tx_initial_ctx_setup_req(erabs); + f_ConnHdlr_session_establish(erabs); + + /* We're done establishing PFCP sessions, so at this point we no longer expect to + * receive Session Establishment Request PDUs with SEID=0. Unregister and unlock + * the mutex, enabling other components to establish PFCP sessions after us. */ + f_PFCPEM_unsubscribe_seid(c_SEID0); + f_Mutex_unlock(__BFILE__, __LINE__); + + log("[eNB <- S1GW] <- MME: INITIAL CONTEXT SETUP REQUEST"); + f_ConnHdlr_rx_initial_ctx_setup_req(erabs); +} + +function f_ConnHdlr_initial_ctx_setup_rsp(inout ERabList erabs) +runs on ConnHdlr { + log("[eNB -> S1GW] -> MME: INITIAL CONTEXT SETUP RESPONSE"); + f_ConnHdlr_tx_initial_ctx_setup_rsp(erabs); + f_ConnHdlr_session_modify(erabs); + log("eNB -> [S1GW -> MME]: INITIAL CONTEXT SETUP RESPONSE"); + f_ConnHdlr_rx_initial_ctx_setup_rsp(erabs); +} + } diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 9713c1a..2e8ebcb 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -366,6 +366,48 @@ vc_conn.done; } +/* Test INITIAL CONTEXT SETUP procedure */ +function f_TC_initial_ctx_setup(charstring id) runs on ConnHdlr { + f_ConnHdlr_s1ap_register(g_pars.genb_id); + f_ConnHdlr_s1ap_connect(mp_enb_bind_ip, mp_s1gw_enb_ip); + f_ConnHdlr_s1ap_setup(g_pars.genb_id); + + f_ConnHdlr_initial_ctx_setup_req(g_pars.erabs); + f_ConnHdlr_initial_ctx_setup_rsp(g_pars.erabs); + + f_ConnHdlr_s1ap_disconnect(); + f_ConnHdlr_s1ap_unregister(g_pars.genb_id); +} +private function f_TC_initial_ctx_setup_exec(integer num_enbs, integer num_erabs) +runs on test_CT { + var ConnHdlrList vc_conns; + + f_init(); + + for (var integer i := 0; i < num_enbs; i := i + 1) { + var ConnHdlrPars pars := valueof(t_ConnHdlrPars(i, num_erabs)); + vc_conns[i] := f_ConnHdlr_spawn(refers(f_TC_initial_ctx_setup), pars); + } + + f_ConnHdlrList_all_done(vc_conns); +} +/* 1 E-RAB at a time, single eNB */ +testcase TC_initial_ctx_setup() runs on test_CT { + f_TC_initial_ctx_setup_exec(num_enbs := 1, num_erabs := 1); +} +/* 1 E-RAB at a time, multiple eNB connections */ +testcase TC_initial_ctx_setup_multi() runs on test_CT { + f_TC_initial_ctx_setup_exec(num_enbs := mp_multi_enb_num, num_erabs := 1); +} +/* 3 E-RABs at a time, single eNB */ +testcase TC_initial_ctx_setup3() runs on test_CT { + f_TC_initial_ctx_setup_exec(num_enbs := 1, num_erabs := 3); +} +/* 3 E-RABs at a time, multiple eNB connections */ +testcase TC_initial_ctx_setup3_multi() runs on test_CT { + f_TC_initial_ctx_setup_exec(num_enbs := mp_multi_enb_num, num_erabs := 3); +} + function f_TC_pfcp_heartbeat(charstring id) runs on ConnHdlr { var integer rts := f_PFCPEM_get_recovery_timestamp(); var PDU_PFCP pfcp_pdu; @@ -399,6 +441,10 @@ execute( TC_e_rab_setup_multi() ); execute( TC_e_rab_setup3_multi() ); execute( TC_e_rab_release_ind() ); + execute( TC_initial_ctx_setup() ); + execute( TC_initial_ctx_setup3() ); + execute( TC_initial_ctx_setup_multi() ); + execute( TC_initial_ctx_setup3_multi() ); execute( TC_pfcp_heartbeat() ); } diff --git a/s1gw/expected-results.xml b/s1gw/expected-results.xml index 9075dc3..e50f978 100644 --- a/s1gw/expected-results.xml +++ b/s1gw/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='S1GW_Tests' tests='10' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='S1GW_Tests' tests='14' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='S1GW_Tests' name='TC_setup' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_setup_multi' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_conn_term_by_mme' time='MASKED'/> @@ -9,5 +9,9 @@ <testcase classname='S1GW_Tests' name='TC_e_rab_setup_multi' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_e_rab_setup3_multi' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_e_rab_release_ind' time='MASKED'/> + <testcase classname='S1GW_Tests' name='TC_initial_ctx_setup' time='MASKED'/> + <testcase classname='S1GW_Tests' name='TC_initial_ctx_setup3' time='MASKED'/> + <testcase classname='S1GW_Tests' name='TC_initial_ctx_setup_multi' time='MASKED'/> + <testcase classname='S1GW_Tests' name='TC_initial_ctx_setup3_multi' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_pfcp_heartbeat' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38279?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I72e3ab932fee1de0fce8ddf4041b8f2174416bc1 Gerrit-Change-Number: 38279 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(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>

8 months, 4 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: library/pfcp: fix template restriction in PFCP_Session_Est_Resp

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38306?usp=email ) Change subject: library/pfcp: fix template restriction in PFCP_Session_Est_Resp ...................................................................... library/pfcp: fix template restriction in PFCP_Session_Est_Resp Change-Id: Icf070443ffb7cfff84559db40459d0e9629ad024 --- M library/PFCP_Templates.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/library/PFCP_Templates.ttcn b/library/PFCP_Templates.ttcn index 3a49df3..9635c4d 100644 --- a/library/PFCP_Templates.ttcn +++ b/library/PFCP_Templates.ttcn @@ -794,7 +794,7 @@ template (value) Node_ID node_id, template (value) OCT8 seid, template (value) F_SEID f_seid, - template (omit) PFCP_Session_Establishment_Response.created_PDR_list created_pdr) + template (value) PFCP_Session_Establishment_Response.created_PDR_list created_pdr) modifies ts_PDU_PFCP_ := { seid := seid, sequence_number := seq_nr, @@ -818,7 +818,7 @@ template (present) Node_ID node_id := ?, template (present) OCT8 seid := ?, template (present) F_SEID f_seid := ?, - template PFCP_Session_Establishment_Response.created_PDR_list created_pdr := *) + template (present) PFCP_Session_Establishment_Response.created_PDR_list created_pdr := ?) modifies tr_PDU_PFCP_ := { seid := seid, sequence_number := ?, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38306?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icf070443ffb7cfff84559db40459d0e9629ad024 Gerrit-Change-Number: 38306 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

8 months, 4 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2024