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

[XS] Change in osmo-e1-hardware[master]: firmware: Update the CROSS for riscv toolchain

by tnt

tnt has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/38335?usp=email ) Change subject: firmware: Update the CROSS for riscv toolchain ...................................................................... firmware: Update the CROSS for riscv toolchain The newer xPack toolchains use the riscv-none-elf- prefix now Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I4e74f62af0d69592bb04a5529f30bfc78382aed0 --- M firmware/ice40-riscv/e1-tracer/Makefile M firmware/ice40-riscv/icE1usb/Makefile M gateware/common/fw/Makefile 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/firmware/ice40-riscv/e1-tracer/Makefile b/firmware/ice40-riscv/e1-tracer/Makefile index 5fa38fa..7507492 100644 --- a/firmware/ice40-riscv/e1-tracer/Makefile +++ b/firmware/ice40-riscv/e1-tracer/Makefile @@ -3,7 +3,7 @@ #ice1usb-proto-bitsty #e1-tracer BOARD ?= e1-tracer -CROSS ?= riscv-none-embed- +CROSS ?= riscv-none-elf- CC = $(CROSS)gcc OBJCOPY = $(CROSS)objcopy ICEPROG = iceprog diff --git a/firmware/ice40-riscv/icE1usb/Makefile b/firmware/ice40-riscv/icE1usb/Makefile index 5fcd1f7..47bc5f8 100644 --- a/firmware/ice40-riscv/icE1usb/Makefile +++ b/firmware/ice40-riscv/icE1usb/Makefile @@ -3,7 +3,7 @@ #ice1usb-proto-bitsty #e1-tracer BOARD ?= ice1usb -CROSS ?= riscv-none-embed- +CROSS ?= riscv-none-elf- CC = $(CROSS)gcc OBJCOPY = $(CROSS)objcopy ICEPROG = iceprog diff --git a/gateware/common/fw/Makefile b/gateware/common/fw/Makefile index 52889ee..71e1afd 100644 --- a/gateware/common/fw/Makefile +++ b/gateware/common/fw/Makefile @@ -1,4 +1,4 @@ -CROSS ?= riscv-none-embed- +CROSS ?= riscv-none-elf- CC := $(CROSS)gcc OBJCOPY := $(CROSS)objcopy -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/38335?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I4e74f62af0d69592bb04a5529f30bfc78382aed0 Gerrit-Change-Number: 38335 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com>

8 months, 2 weeks

1
0
0 0

[XS] Change in osmo-e1-hardware[master]: firmware: Update the CROSS for riscv toolchain

by osmith

Attention is currently required from: tnt. osmith has posted comments on this change by tnt. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/38335?usp=email ) Change subject: firmware: Update the CROSS for riscv toolchain ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/38335?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I4e74f62af0d69592bb04a5529f30bfc78382aed0 Gerrit-Change-Number: 38335 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Mon, 07 Oct 2024 08:42:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

8 months, 2 weeks

1
0
0 0

[XS] Change in osmo-e1-hardware[master]: firmware: Update the CROSS for riscv toolchain

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/38335?usp=email ) Change subject: firmware: Update the CROSS for riscv toolchain ...................................................................... firmware: Update the CROSS for riscv toolchain The newer xPack toolchains use the riscv-none-elf- prefix now Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> Change-Id: I4e74f62af0d69592bb04a5529f30bfc78382aed0 --- M firmware/ice40-riscv/e1-tracer/Makefile M firmware/ice40-riscv/icE1usb/Makefile M gateware/common/fw/Makefile 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1-hardware refs/changes/35/38335/1 diff --git a/firmware/ice40-riscv/e1-tracer/Makefile b/firmware/ice40-riscv/e1-tracer/Makefile index 5fa38fa..7507492 100644 --- a/firmware/ice40-riscv/e1-tracer/Makefile +++ b/firmware/ice40-riscv/e1-tracer/Makefile @@ -3,7 +3,7 @@ #ice1usb-proto-bitsty #e1-tracer BOARD ?= e1-tracer -CROSS ?= riscv-none-embed- +CROSS ?= riscv-none-elf- CC = $(CROSS)gcc OBJCOPY = $(CROSS)objcopy ICEPROG = iceprog diff --git a/firmware/ice40-riscv/icE1usb/Makefile b/firmware/ice40-riscv/icE1usb/Makefile index 5fcd1f7..47bc5f8 100644 --- a/firmware/ice40-riscv/icE1usb/Makefile +++ b/firmware/ice40-riscv/icE1usb/Makefile @@ -3,7 +3,7 @@ #ice1usb-proto-bitsty #e1-tracer BOARD ?= ice1usb -CROSS ?= riscv-none-embed- +CROSS ?= riscv-none-elf- CC = $(CROSS)gcc OBJCOPY = $(CROSS)objcopy ICEPROG = iceprog diff --git a/gateware/common/fw/Makefile b/gateware/common/fw/Makefile index 52889ee..71e1afd 100644 --- a/gateware/common/fw/Makefile +++ b/gateware/common/fw/Makefile @@ -1,4 +1,4 @@ -CROSS ?= riscv-none-embed- +CROSS ?= riscv-none-elf- CC := $(CROSS)gcc OBJCOPY := $(CROSS)objcopy -- To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/38335?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-e1-hardware Gerrit-Branch: master Gerrit-Change-Id: I4e74f62af0d69592bb04a5529f30bfc78382aed0 Gerrit-Change-Number: 38335 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com>

8 months, 2 weeks

1
0
0 0

[S] Change in docker-playground[master]: fpga-build: Update RISC-V toolchain to riscv-none-elf

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/38334?usp=email ) Change subject: fpga-build: Update RISC-V toolchain to riscv-none-elf ...................................................................... fpga-build: Update RISC-V toolchain to riscv-none-elf The riscv-none-embeded was deprecated ... Change-Id: Iecdeae61f730d55d4e76056472100ca926229270 Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> --- M fpga-build/Dockerfile 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/fpga-build/Dockerfile b/fpga-build/Dockerfile index a5444d2..78eaaf6 100644 --- a/fpga-build/Dockerfile +++ b/fpga-build/Dockerfile @@ -3,7 +3,7 @@ # Arguments used after FROM must be specified again ARG FPGA_TOOLCHAIN_DATE=20200914 -ARG RISCV_TOOLCHAIN_VER=8.3.0-1.2 +ARG RISCV_TOOLCHAIN_VER=14.2.0-2 # Install fpga-toolchain RUN set -x && \ @@ -11,10 +11,10 @@ tar -C /opt -xf fpga-toolchain-linux_x86_64-nightly-${FPGA_TOOLCHAIN_DATE}.tar.xz && \ rm fpga-toolchain-linux_x86_64-nightly-${FPGA_TOOLCHAIN_DATE}.tar.xz -# Install riscv-none-embed-gcc +# Install riscv-none-elf-gcc RUN set -x && \ - wget --quiet https://github.com/xpack-dev-tools/riscv-none-embed-gcc-xpack/releases/down… && \ - tar -C /opt -xf /xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}-linux-x64.tar.gz && \ - rm xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}-linux-x64.tar.gz + wget --quiet https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/downlo… && \ + tar -C /opt -xf xpack-riscv-none-elf-gcc-${RISCV_TOOLCHAIN_VER}-linux-x64.tar.gz && \ + rm xpack-riscv-none-elf-gcc-${RISCV_TOOLCHAIN_VER}-linux-x64.tar.gz -ENV PATH=/opt/fpga-toolchain/bin:/opt/xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}/bin:${PATH} +ENV PATH=/opt/fpga-toolchain/bin:/opt/xpack-riscv-none-elf-gcc-${RISCV_TOOLCHAIN_VER}/bin:${PATH} -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/38334?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iecdeae61f730d55d4e76056472100ca926229270 Gerrit-Change-Number: 38334 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

8 months, 2 weeks

1
0
0 0

[S] Change in docker-playground[master]: fpga-build: Update RISC-V toolchain to riscv-none-elf

by laforge

Attention is currently required from: tnt. laforge has posted comments on this change by tnt. ( https://gerrit.osmocom.org/c/docker-playground/+/38334?usp=email ) Change subject: fpga-build: Update RISC-V toolchain to riscv-none-elf ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/38334?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iecdeae61f730d55d4e76056472100ca926229270 Gerrit-Change-Number: 38334 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Mon, 07 Oct 2024 06:58:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

8 months, 2 weeks

1
0
0 0

[S] Change in docker-playground[master]: fpga-build: Update RISC-V toolchain to riscv-none-elf

by tnt

tnt has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/38334?usp=email ) Change subject: fpga-build: Update RISC-V toolchain to riscv-none-elf ...................................................................... fpga-build: Update RISC-V toolchain to riscv-none-elf The riscv-none-embeded was deprecated ... Change-Id: Iecdeae61f730d55d4e76056472100ca926229270 Signed-off-by: Sylvain Munaut <tnt(a)246tNt.com> --- M fpga-build/Dockerfile 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/34/38334/1 diff --git a/fpga-build/Dockerfile b/fpga-build/Dockerfile index a5444d2..78eaaf6 100644 --- a/fpga-build/Dockerfile +++ b/fpga-build/Dockerfile @@ -3,7 +3,7 @@ # Arguments used after FROM must be specified again ARG FPGA_TOOLCHAIN_DATE=20200914 -ARG RISCV_TOOLCHAIN_VER=8.3.0-1.2 +ARG RISCV_TOOLCHAIN_VER=14.2.0-2 # Install fpga-toolchain RUN set -x && \ @@ -11,10 +11,10 @@ tar -C /opt -xf fpga-toolchain-linux_x86_64-nightly-${FPGA_TOOLCHAIN_DATE}.tar.xz && \ rm fpga-toolchain-linux_x86_64-nightly-${FPGA_TOOLCHAIN_DATE}.tar.xz -# Install riscv-none-embed-gcc +# Install riscv-none-elf-gcc RUN set -x && \ - wget --quiet https://github.com/xpack-dev-tools/riscv-none-embed-gcc-xpack/releases/down… && \ - tar -C /opt -xf /xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}-linux-x64.tar.gz && \ - rm xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}-linux-x64.tar.gz + wget --quiet https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/downlo… && \ + tar -C /opt -xf xpack-riscv-none-elf-gcc-${RISCV_TOOLCHAIN_VER}-linux-x64.tar.gz && \ + rm xpack-riscv-none-elf-gcc-${RISCV_TOOLCHAIN_VER}-linux-x64.tar.gz -ENV PATH=/opt/fpga-toolchain/bin:/opt/xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}/bin:${PATH} +ENV PATH=/opt/fpga-toolchain/bin:/opt/xpack-riscv-none-elf-gcc-${RISCV_TOOLCHAIN_VER}/bin:${PATH} -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/38334?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iecdeae61f730d55d4e76056472100ca926229270 Gerrit-Change-Number: 38334 Gerrit-PatchSet: 1 Gerrit-Owner: tnt <tnt(a)246tNt.com>

8 months, 2 weeks

1
0
0 0

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

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38280?usp=email ) Change subject: s1gw: add TC_initial_ctx_setup_failure ...................................................................... s1gw: add TC_initial_ctx_setup_failure Change-Id: I969ea6813c9b805d116a974c70ab5f6e6e721e48 --- M s1gw/S1GW_Tests.ttcn M s1gw/expected-results.xml 2 files changed, 46 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index 2e8ebcb..fbe9d44 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -366,7 +366,7 @@ vc_conn.done; } -/* Test INITIAL CONTEXT SETUP procedure */ +/* Test INITIAL CONTEXT SETUP procedure (successful case) */ 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); @@ -408,6 +408,48 @@ f_TC_initial_ctx_setup_exec(num_enbs := mp_multi_enb_num, num_erabs := 3); } +/* Test INITIAL CONTEXT SETUP procedure (failure) */ +function f_TC_initial_ctx_setup_failure(charstring id) runs on ConnHdlr { + var template (present) PDU_PFCP pfcp_pdu; + var template (value) S1AP_PDU s1ap_pdu; + var S1AP_PDU unused; + + 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); + + /* Initiate E-RAB establishment by sending INITIAL CONTEXT SETUP */ + f_ConnHdlr_initial_ctx_setup_req(g_pars.erabs); + /* At this point, the associated PFCP session is created, but not modified yet. + * The E-RAB FSM in the IUT is waiting for INITIAL CONTEXT SETUP RESPONSE. */ + + /* INITIAL CONTEXT SETUP FAILURE does not immediately trigger deletion of PFCP + * sessions. It's forwarded as-is without any action. */ + s1ap_pdu := ts_S1AP_InitialCtxSetupFail(mme_id := 4242, + enb_id := g_pars.idx, + cause := { misc := unspecified }); + f_ConnHdlr_tx_s1ap_from_enb(s1ap_pdu); + f_ConnHdlr_rx_s1ap_from_enb(unused, s1ap_pdu); + + /* TODO: Ideally, the IUT should terminate PFCP session(s) immediately. */ + + /* E-RAB FSM in the IUT terminates due to a timeout and deletes PFCP session. */ + pfcp_pdu := tr_PFCP_Session_Del_Req(g_pars.erabs[0].pfcp_loc_seid); + f_ConnHdlr_pfcp_expect(pfcp_pdu, Tval := 8.0); /* > ERAB_T_WAIT_RELEASE_RSP */ + + f_ConnHdlr_s1ap_disconnect(); + f_ConnHdlr_s1ap_unregister(g_pars.genb_id); +} +testcase TC_initial_ctx_setup_failure() runs on test_CT { + var ConnHdlrPars pars := valueof(t_ConnHdlrPars); + var ConnHdlr vc_conn; + + f_init(); + + vc_conn := f_ConnHdlr_spawn(refers(f_TC_initial_ctx_setup_failure), pars); + vc_conn.done; +} + function f_TC_pfcp_heartbeat(charstring id) runs on ConnHdlr { var integer rts := f_PFCPEM_get_recovery_timestamp(); var PDU_PFCP pfcp_pdu; @@ -445,6 +487,7 @@ execute( TC_initial_ctx_setup3() ); execute( TC_initial_ctx_setup_multi() ); execute( TC_initial_ctx_setup3_multi() ); + execute( TC_initial_ctx_setup_failure() ); execute( TC_pfcp_heartbeat() ); } diff --git a/s1gw/expected-results.xml b/s1gw/expected-results.xml index e50f978..3ddbb23 100644 --- a/s1gw/expected-results.xml +++ b/s1gw/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='S1GW_Tests' tests='14' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='S1GW_Tests' tests='15' 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'/> @@ -13,5 +13,6 @@ <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_initial_ctx_setup_failure' time='MASKED'/> <testcase classname='S1GW_Tests' name='TC_pfcp_heartbeat' time='MASKED'/> </testsuite> -- 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: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I969ea6813c9b805d116a974c70ab5f6e6e721e48 Gerrit-Change-Number: 38280 Gerrit-PatchSet: 3 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, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: s1gw: move MME_UE_S1AP_ID to ConnHdlrPars

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38308?usp=email ) Change subject: s1gw: move MME_UE_S1AP_ID to ConnHdlrPars ...................................................................... s1gw: move MME_UE_S1AP_ID to ConnHdlrPars Change-Id: Idac24c54529073855f75bef7bcec87fc68b66e1e --- M s1gw/S1GW_ConnHdlr.ttcn M s1gw/S1GW_Tests.ttcn 2 files changed, 31 insertions(+), 44 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index 775f44c..453eff5 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -54,6 +54,7 @@ charstring statsd_prefix, charstring pfcp_loc_addr, charstring pfcp_rem_addr, + MME_UE_S1AP_ID mme_ue_id, ERabList erabs }; @@ -296,11 +297,9 @@ charstring tla /* Transport Layer Address */ }; -private const MME_UE_S1AP_ID c_MME_UE_ID := 4242; private const S1AP_IEs.Cause c_REL_CMD_CAUSE := { nas := normal_release }; -function f_ConnHdlr_tx_erab_setup_req(in ERabList erabs, - MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) +function f_ConnHdlr_tx_erab_setup_req(in ERabList erabs) runs on ConnHdlr { var template (value) E_RABToBeSetupListBearerSUReq items; var template (value) E_RABLevelQoSParameters qos_params; @@ -322,11 +321,10 @@ items[i] := ts_S1AP_RABToBeSetupListBearerSUReq(item)[0]; } - f_ConnHdlr_tx_s1ap_from_mme(ts_S1AP_RABSetupReq(mme_ue_id, enb_ue_id, items)); + f_ConnHdlr_tx_s1ap_from_mme(ts_S1AP_RABSetupReq(g_pars.mme_ue_id, enb_ue_id, items)); } -function f_ConnHdlr_rx_erab_setup_req(in ERabList erabs, - MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) +function f_ConnHdlr_rx_erab_setup_req(in ERabList erabs) runs on ConnHdlr return S1AP_PDU { var template (present) E_RABToBeSetupListBearerSUReq items; var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; @@ -346,12 +344,11 @@ items[i] := tr_S1AP_RABToBeSetupListBearerSUReq(item)[0]; } - f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_RABSetupReq(mme_ue_id, enb_ue_id, items)); + f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_RABSetupReq(g_pars.mme_ue_id, enb_ue_id, items)); return pdu; } -function f_ConnHdlr_tx_erab_setup_rsp(in ERabList erabs, - MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) +function f_ConnHdlr_tx_erab_setup_rsp(in ERabList erabs) runs on ConnHdlr { var template (value) E_RABSetupListBearerSURes items; var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; @@ -368,11 +365,10 @@ items[i] := ts_S1AP_RABSetupListBearerSURes(item)[0]; } - f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_RABSetupRsp(mme_ue_id, enb_ue_id, items)); + f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_RABSetupRsp(g_pars.mme_ue_id, enb_ue_id, items)); } -function f_ConnHdlr_rx_erab_setup_rsp(in ERabList erabs, - MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) +function f_ConnHdlr_rx_erab_setup_rsp(in ERabList erabs) runs on ConnHdlr return S1AP_PDU { var template (present) E_RABSetupListBearerSURes items; var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; @@ -390,7 +386,7 @@ items[i] := tr_S1AP_RABSetupListBearerSURes(item)[0]; } - f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_RABSetupRsp(mme_ue_id, enb_ue_id, items)); + f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_RABSetupRsp(g_pars.mme_ue_id, enb_ue_id, items)); return pdu; } @@ -424,29 +420,26 @@ } function f_ConnHdlr_tx_erab_release_cmd(in ERabList erabs, - S1AP_IEs.Cause cause := c_REL_CMD_CAUSE, - MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) + S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) runs on ConnHdlr { var template (value) E_RABList items := f_ts_E_RABList(erabs, cause); var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; - f_ConnHdlr_tx_s1ap_from_mme(ts_S1AP_RABReleaseCmd(mme_ue_id, enb_ue_id, items)); + f_ConnHdlr_tx_s1ap_from_mme(ts_S1AP_RABReleaseCmd(g_pars.mme_ue_id, enb_ue_id, items)); } function f_ConnHdlr_rx_erab_release_cmd(in ERabList erabs, - S1AP_IEs.Cause cause := c_REL_CMD_CAUSE, - MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) + S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) runs on ConnHdlr return S1AP_PDU { var template (present) E_RABList items := f_tr_E_RABList(erabs, cause); var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; var S1AP_PDU pdu; - f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_RABReleaseCmd(mme_ue_id, enb_ue_id, items)); + f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_RABReleaseCmd(g_pars.mme_ue_id, enb_ue_id, items)); return pdu; } -function f_ConnHdlr_tx_erab_release_rsp(in ERabList erabs, - MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) +function f_ConnHdlr_tx_erab_release_rsp(in ERabList erabs) runs on ConnHdlr { var template (value) E_RABReleaseListBearerRelComp items; var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; @@ -458,11 +451,10 @@ items[i] := ts_E_RABReleaseListBearerRelComp(item)[0]; } - f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_RABReleaseRsp(mme_ue_id, enb_ue_id, items)); + f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_RABReleaseRsp(g_pars.mme_ue_id, enb_ue_id, items)); } -function f_ConnHdlr_rx_erab_release_rsp(in ERabList erabs, - MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) +function f_ConnHdlr_rx_erab_release_rsp(in ERabList erabs) runs on ConnHdlr return S1AP_PDU { var template (present) E_RABReleaseListBearerRelComp items; var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; @@ -475,34 +467,31 @@ items[i] := tr_E_RABReleaseListBearerRelComp(item)[0]; } - f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_RABReleaseRsp(mme_ue_id, enb_ue_id, items)); + f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_RABReleaseRsp(g_pars.mme_ue_id, enb_ue_id, items)); return pdu; } function f_ConnHdlr_tx_erab_release_ind(in ERabList erabs, - S1AP_IEs.Cause cause := c_REL_CMD_CAUSE, - MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) + S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) runs on ConnHdlr { var template (value) E_RABList items := f_ts_E_RABList(erabs, cause); var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; - f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_RABReleaseInd(mme_ue_id, enb_ue_id, items)); + f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_RABReleaseInd(g_pars.mme_ue_id, enb_ue_id, items)); } function f_ConnHdlr_rx_erab_release_ind(in ERabList erabs, - S1AP_IEs.Cause cause := c_REL_CMD_CAUSE, - MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) + S1AP_IEs.Cause cause := c_REL_CMD_CAUSE) runs on ConnHdlr return S1AP_PDU { var template (present) E_RABList items := f_tr_E_RABList(erabs, cause); var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; var S1AP_PDU pdu; - f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_RABReleaseInd(mme_ue_id, enb_ue_id, items)); + f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_RABReleaseInd(g_pars.mme_ue_id, enb_ue_id, items)); return pdu; } -function f_ConnHdlr_tx_initial_ctx_setup_req(in ERabList erabs, - MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) +function f_ConnHdlr_tx_initial_ctx_setup_req(in ERabList erabs) runs on ConnHdlr { var template (value) E_RABToBeSetupListCtxtSUReq items; var template (value) E_RABLevelQoSParameters qos_params; @@ -524,7 +513,7 @@ items[i] := ts_E_RABToBeSetupListCtxtSUReq(item)[0]; } - f_ConnHdlr_tx_s1ap_from_mme(ts_S1AP_IntialCtxSetupReq(mme_id := mme_ue_id, + f_ConnHdlr_tx_s1ap_from_mme(ts_S1AP_IntialCtxSetupReq(mme_id := g_pars.mme_ue_id, enb_id := enb_ue_id, max_br := ts_UEAggregateMaximumBitrate, rab_setup_items := items, @@ -532,8 +521,7 @@ 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) +function f_ConnHdlr_rx_initial_ctx_setup_req(in ERabList erabs) runs on ConnHdlr return S1AP_PDU { var template (present) E_RABToBeSetupListCtxtSUReq items; var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; @@ -553,7 +541,7 @@ items[i] := tr_E_RABToBeSetupListCtxtSUReq(item)[0]; } - f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_IntialCtxSetupReq(mme_id := mme_ue_id, + f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_IntialCtxSetupReq(mme_id := g_pars.mme_ue_id, enb_id := enb_ue_id, max_br := tr_UEAggregateMaximumBitrate, rab_setup_items := items, @@ -561,8 +549,7 @@ return pdu; } -function f_ConnHdlr_tx_initial_ctx_setup_rsp(in ERabList erabs, - MME_UE_S1AP_ID mme_ue_id := c_MME_UE_ID) +function f_ConnHdlr_tx_initial_ctx_setup_rsp(in ERabList erabs) runs on ConnHdlr { var template (value) E_RABSetupListCtxtSURes items; var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; @@ -579,11 +566,10 @@ items[i] := ts_S1AP_RABSetupListCtxtSURes(item)[0]; } - f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_InitialCtxSetupResp(mme_ue_id, enb_ue_id, items)); + f_ConnHdlr_tx_s1ap_from_enb(ts_S1AP_InitialCtxSetupResp(g_pars.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) +function f_ConnHdlr_rx_initial_ctx_setup_rsp(in ERabList erabs) runs on ConnHdlr return S1AP_PDU { var template (present) E_RABSetupListCtxtSURes items; var ENB_UE_S1AP_ID enb_ue_id := g_pars.idx; @@ -601,7 +587,7 @@ items[i] := tr_S1AP_RABSetupListCtxtSURes(item)[0]; } - f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_InitialCtxSetupResp(mme_ue_id, enb_ue_id, items)); + f_ConnHdlr_rx_s1ap_from_enb(pdu, tr_S1AP_InitialCtxSetupResp(g_pars.mme_ue_id, enb_ue_id, items)); return pdu; } diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn index fbe9d44..7fcc5d8 100644 --- a/s1gw/S1GW_Tests.ttcn +++ b/s1gw/S1GW_Tests.ttcn @@ -140,6 +140,7 @@ statsd_prefix := statsd_prefix, pfcp_loc_addr := pfcp_loc_addr, pfcp_rem_addr := pfcp_rem_addr, + mme_ue_id := 4242, erabs := f_gen_erab_list(idx, num_erabs) } @@ -425,7 +426,7 @@ /* INITIAL CONTEXT SETUP FAILURE does not immediately trigger deletion of PFCP * sessions. It's forwarded as-is without any action. */ - s1ap_pdu := ts_S1AP_InitialCtxSetupFail(mme_id := 4242, + s1ap_pdu := ts_S1AP_InitialCtxSetupFail(mme_id := g_pars.mme_ue_id, enb_id := g_pars.idx, cause := { misc := unspecified }); f_ConnHdlr_tx_s1ap_from_enb(s1ap_pdu); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38308?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: Idac24c54529073855f75bef7bcec87fc68b66e1e Gerrit-Change-Number: 38308 Gerrit-PatchSet: 2 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, 2 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: Code-Review+2 (1 comment) File s1gw/S1GW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38280/comment/5b79dc26_2d9f… : PS1, Line 434: /* TODO: Ideally, the IUT should terminate PFCP session(s) immediately. */ > From my understanding in 3GPP TS 36. […] Makes sense. I'll create a separate ticket about that. -- 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Oct 2024 06:25:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

8 months, 2 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: on RUA DT for unknown context, respond with RUA Disconnect

by laforge

Attention is currently required from: neels, pespin. laforge has posted comments on this change by neels. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/37808?usp=email ) Change subject: on RUA DT for unknown context, respond with RUA Disconnect ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: ping? It's almost 4 weeks since we're waiting for feedback (incorporate or strongly argue against) some trivial review comment. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/37808?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: If0b9a999649c9822f55b42b0cae8408af668e1b8 Gerrit-Change-Number: 37808 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Oct 2024 06:09:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

8 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log October 2024