August 2026 - gerrit-log - lists.osmocom.org

[XS] Change in osmo-ci[master]: OBS: build_binpkg: centos7: disable fastest mirror plugin
by fixeria 19 Aug '26

19 Aug '26

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/43300?usp=email ) Change subject: OBS: build_binpkg: centos7: disable fastest mirror plugin ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43300?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibf7364b91f94064226bd5ee9ed55e8cf21d0c3ce Gerrit-Change-Number: 43300 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 19 Aug 2026 12:33:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-ci[master]: OBS: fix 45-60 min delay for libosmocore CI jobs
by osmith 19 Aug '26

19 Aug '26

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/43301?usp=email ) Change subject: OBS: fix 45-60 min delay for libosmocore CI jobs ...................................................................... OBS: fix 45-60 min delay for libosmocore CI jobs In our jenkins, installing packages for centos7 is very slow when doing it right before building packages. Work around it by installing all build dependencies when building the docker image already. Related: OS#7064 Change-Id: I0983201f6c65589e39d23f30c728fc8b0e2e5069 --- M scripts/obs/data/build_binpkg.Dockerfile 1 file changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/01/43301/1 diff --git a/scripts/obs/data/build_binpkg.Dockerfile b/scripts/obs/data/build_binpkg.Dockerfile index 386147e..fb3df72 100644 --- a/scripts/obs/data/build_binpkg.Dockerfile +++ b/scripts/obs/data/build_binpkg.Dockerfile @@ -122,4 +122,31 @@ ;; \ esac +# OS#7064: In our jenkins, installing packages for centos7 is very slow when +# doing it right before building packages. Work around it by installing all +# build dependencies when building the docker image already (where for some +# reason it is not slow). This saves ~45 min for each CI run and can be done +# here since we only have very few packages that we still must build for +# centos7. +# List of packages are from BuildRequires in these files: +# https://gitea.osmocom.org/osmocom/libosmocore/src/branch/master/contrib/lib… +# https://gitea.osmocom.org/osmocom/libosmo-netif/src/branch/master/contrib/l… +# https://gitea.osmocom.org/osmocom/osmo-pcap/src/branch/master/contrib/osmo-… +RUN case "$DISTRO" in \ + centos:7) \ + yum -y install \ + 'pkgconfig(gnutls)' \ + 'pkgconfig(libmnl)' \ + 'pkgconfig(libpcsclite)' \ + 'pkgconfig(libsystemd)' \ + 'pkgconfig(libusb-1.0)' \ + 'pkgconfig(libzmq)' \ + 'pkgconfig(talloc)' \ + libpcap-devel \ + lksctp-tools-devel \ + python3 \ + xz \ + ;; \ + esac + WORKDIR /obs/ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43301?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I0983201f6c65589e39d23f30c728fc8b0e2e5069 Gerrit-Change-Number: 43301 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ci[master]: OBS: build_binpkg: centos7: disable fastest mirror plugin
by osmith 19 Aug '26

19 Aug '26

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/43300?usp=email ) Change subject: OBS: build_binpkg: centos7: disable fastest mirror plugin ...................................................................... OBS: build_binpkg: centos7: disable fastest mirror plugin Centos 7 is EOL and we can only use few vault mirrors. Disable the "fastest mirror" plugin that attempts to scan multiple mirrors. Change-Id: Ibf7364b91f94064226bd5ee9ed55e8cf21d0c3ce --- M scripts/obs/data/build_binpkg.Dockerfile 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/00/43300/1 diff --git a/scripts/obs/data/build_binpkg.Dockerfile b/scripts/obs/data/build_binpkg.Dockerfile index a18d0e8..386147e 100644 --- a/scripts/obs/data/build_binpkg.Dockerfile +++ b/scripts/obs/data/build_binpkg.Dockerfile @@ -61,6 +61,7 @@ sed -i 's/mirror.centos.org/vault.centos.org/g' /etc/yum.repos.d/*.repo && \ sed -i 's/^#.*baseurl=http/baseurl=http/g' /etc/yum.repos.d/*.repo && \ sed -i 's/^mirrorlist=http/#mirrorlist=http/g' /etc/yum.repos.d/*.repo && \ + sed -i "s/enabled=1/enabled=0/" /etc/yum/pluginconf.d/fastestmirror.conf && \ \ yum -y install \ autoconf \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43300?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibf7364b91f94064226bd5ee9ed55e8cf21d0c3ce Gerrit-Change-Number: 43300 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[L] Change in onomondo-ipa[master]: V1.2: Change fields in ProvideEimPackage(Result)
by dexter 19 Aug '26

19 Aug '26

Attention is currently required from: jolly. dexter has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/onomondo-ipa/+/43055?usp=email ) Change subject: V1.2: Change fields in ProvideEimPackage(Result) ...................................................................... Patch Set 6: Code-Review+1 (1 comment) File src/ipa/libipa/esipa_prvde_eim_pkg_rslt.c: https://gerrit.osmocom.org/c/onomondo-ipa/+/43055/comment/582d45c9_c65bba65… : PS6, Line 86: res->eim_acknowledgements = &msg_to_ipa->choice.provideEimPackageResultResponse.choice.eimAcknowledgements; I wonder if we should be more explcit in the case of an emptyResponse. We could have a bool empty_response in the result and set that to true in case ProvideEimPackageResultResponse_PR_emptyResponse is present. Then the caller has a more exact result. We also do not return the provideEimPackageResultError field yet. Maybe we should do that. (sure, the caller can always look into msg_to_ipa but that pointer servers more as an input for the free functions. The philosophy is to bring the interesting IEs directly to the front in the response structure.) -- To view, visit https://gerrit.osmocom.org/c/onomondo-ipa/+/43055?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: onomondo-ipa Gerrit-Branch: master Gerrit-Change-Id: I24baab4f9351aec27c58403b94974cba4b274c34 Gerrit-Change-Number: 43055 Gerrit-PatchSet: 6 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Wed, 19 Aug 2026 12:21:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: Move generic PFCP ConnHdlr helpers to library/PFCP_Emulation.ttcn
by pespin 19 Aug '26

19 Aug '26

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43299?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: hnbgw: Move generic PFCP ConnHdlr helpers to library/PFCP_Emulation.ttcn ...................................................................... hnbgw: Move generic PFCP ConnHdlr helpers to library/PFCP_Emulation.ttcn Change-Id: Ic40bea51934ad465a68e0d5690de066cbe1dc57d --- M hnbgw/HNBGW_Tests.ttcn M library/PFCP_Emulation.ttcn 2 files changed, 108 insertions(+), 98 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/99/43299/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43299?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic40bea51934ad465a68e0d5690de066cbe1dc57d Gerrit-Change-Number: 43299 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: Move generic PFCP ConnHdlr helpers to library/PFCP_Emulation.ttcn
by pespin 19 Aug '26

19 Aug '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43299?usp=email ) Change subject: hnbgw: Move generic PFCP ConnHdlr helpers to library/PFCP_Emulation.ttcn ...................................................................... hnbgw: Move generic PFCP ConnHdlr helpers to library/PFCP_Emulation.ttcn Change-Id: Ic40bea51934ad465a68e0d5690de066cbe1dc57d --- M hnbgw/HNBGW_Tests.ttcn M library/PFCP_Emulation.ttcn 2 files changed, 96 insertions(+), 94 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/99/43299/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index f43a738..da4a64d 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -260,100 +260,6 @@ return pfcp_associated; } -private function f_pfcp_wait_assoc_setup_req(boolean fail_timeout := true, boolean fail_rx_others := true, float wait_timeout := 16.0) runs on PFCP_ConnHdlr { - var PDU_PFCP m; - timer T := wait_timeout; - var integer rts := f_PFCPEM_get_recovery_timestamp(); - /* ask PFCPEM to route all PDUs to us */ - f_PFCPEM_subscribe_bcast(); - - T.start; - alt { - [] PFCP.receive(tr_PFCP_Assoc_Setup_Req()) -> value m { - PFCP.send(ts_PFCP_Assoc_Setup_Resp(m.sequence_number, ts_PFCP_Node_ID_fqdn(mp_pfcp_upf_node_id), - ts_PFCP_Cause(REQUEST_ACCEPTED), rts)); - setverdict(pass); - } - [fail_rx_others] PFCP.receive(PDU_PFCP:?) -> value m { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - log2str("Got an unexpected PFCP message ", m, " vs exp ", tr_PFCP_Assoc_Setup_Req())); - } - [fail_timeout] T.timeout { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - log2str("Timeout waiting for PFCP ", tr_PFCP_Assoc_Setup_Req())); - } - [not fail_timeout] T.timeout { - log("Timeout waiting for PFCP ", tr_PFCP_Assoc_Setup_Req()); - } - } - T.stop; - /* ask PFCPEM to *not* route all PDUs to us anymore */ - f_PFCPEM_unsubscribe_bcast(); -} - -altstep as_pfcp_handle_heartbeat_req(integer tx_recovery_timestamp) -runs on PFCP_ConnHdlr { - var PDU_PFCP m; - - [] PFCP.receive(tr_PFCP_Heartbeat_Req) -> value m { - var PDU_PFCP tx_pfcp; - tx_pfcp := valueof(ts_PFCP_Heartbeat_Resp(tx_recovery_timestamp)); - tx_pfcp.sequence_number := m.sequence_number; - PFCP.send(tx_pfcp); - } -} - -/* Notify peer that we restarted, it will then try to associate again. */ -private function f_pfcp_force_assoc_setup_req(boolean fail_timeout := true, - boolean fail_rx_others := true, - float wait_timeout := 16.0) -runs on PFCP_ConnHdlr { - var boolean rx_hb_resp := false; - var boolean rx_assoc_setup_req := false; - var integer rts := f_PFCPEM_get_recovery_timestamp(); - var PDU_PFCP m; - timer T := wait_timeout; - - /* ask PFCPEM to route all PDUs to us */ - f_PFCPEM_subscribe_bcast(); - - T.start; - PFCP.send(ts_PFCP_Heartbeat_Req(rts)); - alt { - [not rx_hb_resp] PFCP.receive(tr_PFCP_Heartbeat_Resp) { - rx_hb_resp := true; - if (not rx_assoc_setup_req) { - repeat; - } - } - [not rx_assoc_setup_req] PFCP.receive(tr_PFCP_Assoc_Setup_Req()) -> value m { - rx_assoc_setup_req := true; - PFCP.send(ts_PFCP_Assoc_Setup_Resp(m.sequence_number, ts_PFCP_Node_ID_fqdn(mp_pfcp_upf_node_id), - ts_PFCP_Cause(REQUEST_ACCEPTED), rts)); - if (not rx_hb_resp) { - repeat; - } - } - [] as_pfcp_handle_heartbeat_req(rts) { repeat; } - [fail_rx_others] PFCP.receive(PDU_PFCP:?) -> value m { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - log2str("Got an unexpected PFCP message ", m, " vs exp ", tr_PFCP_Assoc_Setup_Req())); - } - [fail_timeout] T.timeout { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - log2str("Timeout waiting for PFCP ", tr_PFCP_Assoc_Setup_Req())); - } - [not fail_timeout] T.timeout { - log("Timeout waiting for PFCP ", tr_PFCP_Assoc_Setup_Req()); - } - } - T.stop; - setverdict(pass); - - /* ask PFCPEM to *not* route all PDUs to us anymore */ - f_PFCPEM_unsubscribe_bcast(); -} - function f_init_pfcp(charstring id) runs on test_CT { id := id & "-PFCP"; diff --git a/library/PFCP_Emulation.ttcn b/library/PFCP_Emulation.ttcn index a5ec818..ec6777c 100644 --- a/library/PFCP_Emulation.ttcn +++ b/library/PFCP_Emulation.ttcn @@ -401,4 +401,100 @@ } } +/* Wait for peer to send a PFCP HEARTBEAT REQ to us, answer it */ +altstep as_pfcp_handle_heartbeat_req(integer tx_recovery_timestamp) +runs on PFCP_ConnHdlr { + var PDU_PFCP m; + + [] PFCP.receive(tr_PFCP_Heartbeat_Req) -> value m { + var PDU_PFCP tx_pfcp; + tx_pfcp := valueof(ts_PFCP_Heartbeat_Resp(tx_recovery_timestamp)); + tx_pfcp.sequence_number := m.sequence_number; + PFCP.send(tx_pfcp); + } +} + +/* Wait for peer to send a PFCP ASSOC SETUP REQ to us, answer it */ +function f_pfcp_wait_assoc_setup_req(boolean fail_timeout := true, boolean fail_rx_others := true, float wait_timeout := 16.0) runs on PFCP_ConnHdlr { + var PDU_PFCP m; + timer T := wait_timeout; + var integer rts := f_PFCPEM_get_recovery_timestamp(); + /* ask PFCPEM to route all PDUs to us */ + f_PFCPEM_subscribe_bcast(); + + T.start; + alt { + [] PFCP.receive(tr_PFCP_Assoc_Setup_Req()) -> value m { + PFCP.send(ts_PFCP_Assoc_Setup_Resp(m.sequence_number, ts_PFCP_Node_ID_fqdn(mp_pfcp_upf_node_id), + ts_PFCP_Cause(REQUEST_ACCEPTED), rts)); + setverdict(pass); + } + [fail_rx_others] PFCP.receive(PDU_PFCP:?) -> value m { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Got an unexpected PFCP message ", m, " vs exp ", tr_PFCP_Assoc_Setup_Req())); + } + [fail_timeout] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Timeout waiting for PFCP ", tr_PFCP_Assoc_Setup_Req())); + } + [not fail_timeout] T.timeout { + log("Timeout waiting for PFCP ", tr_PFCP_Assoc_Setup_Req()); + } + } + T.stop; + /* ask PFCPEM to *not* route all PDUs to us anymore */ + f_PFCPEM_unsubscribe_bcast(); +} + +/* Notify peer that we restarted, it will then try to associate again. */ +function f_pfcp_force_assoc_setup_req(boolean fail_timeout := true, + boolean fail_rx_others := true, + float wait_timeout := 16.0) +runs on PFCP_ConnHdlr { + var boolean rx_hb_resp := false; + var boolean rx_assoc_setup_req := false; + var integer rts := f_PFCPEM_get_recovery_timestamp(); + var PDU_PFCP m; + timer T := wait_timeout; + + /* ask PFCPEM to route all PDUs to us */ + f_PFCPEM_subscribe_bcast(); + + T.start; + PFCP.send(ts_PFCP_Heartbeat_Req(rts)); + alt { + [not rx_hb_resp] PFCP.receive(tr_PFCP_Heartbeat_Resp) { + rx_hb_resp := true; + if (not rx_assoc_setup_req) { + repeat; + } + } + [not rx_assoc_setup_req] PFCP.receive(tr_PFCP_Assoc_Setup_Req()) -> value m { + rx_assoc_setup_req := true; + PFCP.send(ts_PFCP_Assoc_Setup_Resp(m.sequence_number, ts_PFCP_Node_ID_fqdn(mp_pfcp_upf_node_id), + ts_PFCP_Cause(REQUEST_ACCEPTED), rts)); + if (not rx_hb_resp) { + repeat; + } + } + [] as_pfcp_handle_heartbeat_req(rts) { repeat; } + [fail_rx_others] PFCP.receive(PDU_PFCP:?) -> value m { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Got an unexpected PFCP message ", m, " vs exp ", tr_PFCP_Assoc_Setup_Req())); + } + [fail_timeout] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Timeout waiting for PFCP ", tr_PFCP_Assoc_Setup_Req())); + } + [not fail_timeout] T.timeout { + log("Timeout waiting for PFCP ", tr_PFCP_Assoc_Setup_Req()); + } + } + T.stop; + setverdict(pass); + + /* ask PFCPEM to *not* route all PDUs to us anymore */ + f_PFCPEM_unsubscribe_bcast(); +} + } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43299?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic40bea51934ad465a68e0d5690de066cbe1dc57d Gerrit-Change-Number: 43299 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: hnbgw: Send correct recovery timestamp in PFCP Assoc Setup Resp
by pespin 19 Aug '26

19 Aug '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43298?usp=email ) Change subject: hnbgw: Send correct recovery timestamp in PFCP Assoc Setup Resp ...................................................................... hnbgw: Send correct recovery timestamp in PFCP Assoc Setup Resp Change-Id: If57d58edbb4f4da529c6c189a84c25b153ac3326 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/98/43298/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index fc33521..f43a738 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -263,6 +263,7 @@ private function f_pfcp_wait_assoc_setup_req(boolean fail_timeout := true, boolean fail_rx_others := true, float wait_timeout := 16.0) runs on PFCP_ConnHdlr { var PDU_PFCP m; timer T := wait_timeout; + var integer rts := f_PFCPEM_get_recovery_timestamp(); /* ask PFCPEM to route all PDUs to us */ f_PFCPEM_subscribe_bcast(); @@ -270,7 +271,7 @@ alt { [] PFCP.receive(tr_PFCP_Assoc_Setup_Req()) -> value m { PFCP.send(ts_PFCP_Assoc_Setup_Resp(m.sequence_number, ts_PFCP_Node_ID_fqdn(mp_pfcp_upf_node_id), - ts_PFCP_Cause(REQUEST_ACCEPTED), 1234)); + ts_PFCP_Cause(REQUEST_ACCEPTED), rts)); setverdict(pass); } [fail_rx_others] PFCP.receive(PDU_PFCP:?) -> value m { @@ -328,7 +329,7 @@ [not rx_assoc_setup_req] PFCP.receive(tr_PFCP_Assoc_Setup_Req()) -> value m { rx_assoc_setup_req := true; PFCP.send(ts_PFCP_Assoc_Setup_Resp(m.sequence_number, ts_PFCP_Node_ID_fqdn(mp_pfcp_upf_node_id), - ts_PFCP_Cause(REQUEST_ACCEPTED), 1234)); + ts_PFCP_Cause(REQUEST_ACCEPTED), rts)); if (not rx_hb_resp) { repeat; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43298?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If57d58edbb4f4da529c6c189a84c25b153ac3326 Gerrit-Change-Number: 43298 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in onomondo-ipa[master]: V1.2: Add function ES10b.GetConnectivityParameters
by dexter 19 Aug '26

19 Aug '26

Attention is currently required from: jolly, laforge. dexter has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/onomondo-ipa/+/43054?usp=email ) Change subject: V1.2: Add function ES10b.GetConnectivityParameters ...................................................................... Patch Set 7: Code-Review+1 (4 comments) Patchset: PS7: I think the return code should be 0 in case no httpParams are deposited. The caller then gets a null pointer in *http_params and the return code 0 would tell the caller that the command was successful but there were simply no httpParams deposited. PS7: > Refer to Change-Id: I1ac4cf8980af501bb119208213242468ee4f3c06 Also good to know: The asn1c compiler writes a comment in each generated source file: "Generated by asn1c-0.9.29 (http://lionet.info/asn1c)" File src/ipa/libipa/ipad.c: https://gerrit.osmocom.org/c/onomondo-ipa/+/43054/comment/a8e7e60a_4c02dcc9… : PS7, Line 366: res->res->choice.connectivityParameters.httpParams->buf); maybe the sheer absence of httpParams is not an error. Its an optional fields. Maybe some cards just return an emtpy struct if the httpParams are not set. https://gerrit.osmocom.org/c/onomondo-ipa/+/43054/comment/c1bef69a_da962df8… : PS7, Line 369: } maybe it makes sense to evaluate the GetConnectivityParametersResponse_PR_connectivityParametersError. If res->res->choice.connectivityParametersError is ConnectivityParametersError_parametersNotAvailable, we may return 0, since there are no parameters available, which is technically not an error. In all other cases we would return -EINVAL. Then the caller can know if he couldn't get the parameters just because there are none or if the reason was a real error. -- To view, visit https://gerrit.osmocom.org/c/onomondo-ipa/+/43054?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: onomondo-ipa Gerrit-Branch: master Gerrit-Change-Id: I075590e095dbbe05fa6cdb0a96d5b38c7a17ff78 Gerrit-Change-Number: 43054 Gerrit-PatchSet: 7 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 19 Aug 2026 11:52:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

1 0

[L] Change in osmo-ttcn3-hacks[master]: pgw: Move lots of diameter msg building to library/
by pespin 19 Aug '26

19 Aug '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43286?usp=email ) Change subject: pgw: Move lots of diameter msg building to library/ ...................................................................... pgw: Move lots of diameter msg building to library/ This way it can be easily reused on other testsuites willing to emulate an OCS, and PCRF, etc. Change-Id: Ifff21ed39c685406abf734b03aa2d9d17c37c4f6 --- M library/DIAMETER_ts29_212_Templates.ttcn M library/DIAMETER_ts29_273_Templates.ttcn M library/DIAMETER_ts32_299_Templates.ttcn M pgw/PGW_Tests.ttcn 4 files changed, 274 insertions(+), 209 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/library/DIAMETER_ts29_212_Templates.ttcn b/library/DIAMETER_ts29_212_Templates.ttcn index ec0e637..d36bfbb 100644 --- a/library/DIAMETER_ts29_212_Templates.ttcn +++ b/library/DIAMETER_ts29_212_Templates.ttcn @@ -102,4 +102,28 @@ tr_AVP_CcReqNum(?) )); +/* generate a send template successful answer based on received request */ +function f_ts_DIA_Gx_CCA(PDU_DIAMETER rx_gx) +return template (value) PDU_DIAMETER +{ + var template (value) PDU_DIAMETER tx_dia; + var template (omit) AVP avp; + var octetstring sess_id; + var AVP_Unsigned32 req_num; + var DCC_NONE_CC_Request_Type req_type; + + avp := f_DIAMETER_get_avp(rx_gx, c_AVP_Code_BASE_NONE_Session_Id); + sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); + + avp := f_DIAMETER_get_avp(rx_gx, c_AVP_Code_DCC_NONE_CC_Request_Number); + req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number); + + avp := f_DIAMETER_get_avp(rx_gx, c_AVP_Code_DCC_NONE_CC_Request_Type); + req_type := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Type); + + tx_dia := ts_DIA_Gx_CCA(rx_gx.hop_by_hop_id, rx_gx.end_to_end_id, sess_id, + req_type, req_num); + return tx_dia; +} + } /* module */ diff --git a/library/DIAMETER_ts29_273_Templates.ttcn b/library/DIAMETER_ts29_273_Templates.ttcn index 6ed00ff..a9f1769 100644 --- a/library/DIAMETER_ts29_273_Templates.ttcn +++ b/library/DIAMETER_ts29_273_Templates.ttcn @@ -674,4 +674,27 @@ ts_AVP_OriginRealm(orig_realm) }); + +/* generate a send template successful answer based on received AAR */ +function f_ts_DIA_S6b_AAA(PDU_DIAMETER rx_s6b, + template (value) charstring orig_host := "aaa.localdomain", + template (value) charstring orig_realm := "localdomain", + template (value) charstring dest_realm := "localdomain") +return template (value) PDU_DIAMETER +{ + var template (value) PDU_DIAMETER tx_dia; + var template (omit) AVP avp; + var octetstring sess_id; + + avp := f_DIAMETER_get_avp(rx_s6b, c_AVP_Code_BASE_NONE_Session_Id); + sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); + + tx_dia := ts_DIA_S6b_AAA(sess_id, orig_host, + orig_realm, + dest_realm, + rx_s6b.hop_by_hop_id, + rx_s6b.end_to_end_id); + return tx_dia; +} + } diff --git a/library/DIAMETER_ts32_299_Templates.ttcn b/library/DIAMETER_ts32_299_Templates.ttcn index ffbd15f..249e633 100644 --- a/library/DIAMETER_ts32_299_Templates.ttcn +++ b/library/DIAMETER_ts32_299_Templates.ttcn @@ -14,6 +14,7 @@ import from General_Types all; import from DIAMETER_Types all; import from DIAMETER_Templates all; +import from DIAMETER_ts29_272_Templates all; /* tr_AVP_GI_3GPP_RatType */ import from Osmocom_Types all; import from Misc_Helpers all; @@ -181,4 +182,200 @@ } } +function f_tr_DIA_Gy_CCR(DCC_NONE_CC_Request_Type req_type, + template (present) octetstring imsi := ?, + template (present) octetstring msisdn := ?, + template (present) octetstring rat_type := ?, + template (present) OCT1 nsapi := ?, + template (present) OCT4 charging_char := ?, + template (present) charstring origin_host := ?, + template (present) charstring diam_realm := ?, + template (present) octetstring sgsn_addr := ?, + template (present) octetstring ggsn_addr := ?) +return template (present) PDU_DIAMETER +{ + var template (present) PDU_DIAMETER tpl; + select (req_type) { + case (INITIAL_REQUEST) { + tpl := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, + avps := superset( + tr_AVP_SessionId, + tr_AVP_OriginHost(origin_host), + tr_AVP_OriginRealm(diam_realm), + tr_AVP_DestinationRealm(diam_realm), + tr_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), + tr_AVP_ServiceContextId, + tr_AVP_CcReqType(req_type), + tr_AVP_CcReqNum(?), + tr_AVP_EventTimestamp(?), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_IMSI), tr_AVP_SubcrIdData(imsi)}), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_E164), tr_AVP_SubcrIdData(msisdn)}), + tr_AVP_RequestedAction(DIRECT_DEBITING), + tr_AVP_3GPP_AoCRequestType, + tr_AVP_MultipleServicesIndicator, + tr_AVP_Multiple_Services_Credit_Control(content := superset( + tr_AVP_Requested_Service_Unit, + tr_AVP_PCC_3GPP_QoS_Information + )), + tr_AVP_3GPP_ServiceInformation(content := superset( + tr_AVP_3GPP_PSInformation(content := superset( + tr_AVP_3GPP_ChargingId, + tr_AVP_3GPP_PDPType((IPv4,IPv6,IPv4v6)), + tr_AVP_3GPP_PDPAddress(tr_AVP_Address((IP,IP6), ?)), + tr_AVP_3GPP_SGSNAddress(tr_AVP_Address(IP, sgsn_addr)), + tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, ggsn_addr)), + tr_AVP_3GPP_CalledStationId, + tr_AVP_3GPP_SelectionMode, + tr_AVP_3GPP_ChargingCharacteristics(charging_char), + tr_AVP_3GPP_SGSNMCCMNC, + tr_AVP_3GPP_NSAPI(nsapi), + /*We don't yet send MS_Tz in CreateSessionReq: + tr_AVP_3GPP_MS_TimeZone,*/ + tr_AVP_3GPP_ULI, + tr_AVP_GI_3GPP_RatType(rat_type)/*, + We don't yet send IMEI in CreateSessionReq: + tr_AVP_UserEquipmentInfo({ + tr_AVP_UserEquipmentInfoType(IMEISV), + tr_AVP_UserEquipmentInfoValue(imeisv) + })*/ + )) + )) + )); + } + case (UPDATE_REQUEST) { + tpl := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, + avps := superset( + tr_AVP_SessionId, + tr_AVP_OriginHost(origin_host), + tr_AVP_OriginRealm(diam_realm), + tr_AVP_DestinationRealm(diam_realm), + tr_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), + tr_AVP_ServiceContextId, + tr_AVP_CcReqType(req_type), + tr_AVP_CcReqNum(?), + tr_AVP_DestinationHost(?), + tr_AVP_EventTimestamp(?), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_IMSI), tr_AVP_SubcrIdData(imsi)}), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_E164), tr_AVP_SubcrIdData(msisdn)}), + tr_AVP_RequestedAction(DIRECT_DEBITING), + tr_AVP_3GPP_AoCRequestType, + tr_AVP_Multiple_Services_Credit_Control(content := superset( + tr_AVP_Requested_Service_Unit, + tr_AVP_Used_Service_Unit, + /* tr_AVP_3GPP_Reporting_Reason, can be sometimes inside UsedServiceUnit */ + tr_AVP_PCC_3GPP_QoS_Information + )), + tr_AVP_3GPP_ServiceInformation(content := superset( + tr_AVP_3GPP_PSInformation(content := superset( + tr_AVP_3GPP_ChargingId, + /* tr_AVP_3GPP_PDPType, Only in INIT */ + tr_AVP_3GPP_PDPAddress(tr_AVP_Address((IP,IP6), ?)), + tr_AVP_3GPP_SGSNAddress(tr_AVP_Address(IP, sgsn_addr)), + tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, ggsn_addr)), + tr_AVP_3GPP_CalledStationId, + tr_AVP_3GPP_SelectionMode, + tr_AVP_3GPP_ChargingCharacteristics(charging_char), + tr_AVP_3GPP_SGSNMCCMNC, + tr_AVP_3GPP_NSAPI(nsapi), + /*We don't yet send MS_Tz in CreateSessionReq: + tr_AVP_3GPP_MS_TimeZone,*/ + tr_AVP_3GPP_ULI, + tr_AVP_GI_3GPP_RatType(rat_type)/*, + We don't yet send IMEI in CreateSessionReq: + tr_AVP_UserEquipmentInfo({ + tr_AVP_UserEquipmentInfoType(IMEISV), + tr_AVP_UserEquipmentInfoValue(imeisv) + })*/ + )) + )) + )); + } + case (TERMINATION_REQUEST) { + tpl := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, + avps := superset( + tr_AVP_SessionId, + tr_AVP_OriginHost(origin_host), + tr_AVP_OriginRealm(diam_realm), + tr_AVP_DestinationRealm(diam_realm), + tr_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), + tr_AVP_ServiceContextId, + tr_AVP_CcReqType(req_type), + tr_AVP_CcReqNum(?), + tr_AVP_DestinationHost(?), + tr_AVP_EventTimestamp(?), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_IMSI), tr_AVP_SubcrIdData(imsi)}), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_E164), tr_AVP_SubcrIdData(msisdn)}), + tr_AVP_TerminationCause(?), + tr_AVP_RequestedAction(DIRECT_DEBITING), + tr_AVP_3GPP_AoCRequestType, + tr_AVP_Multiple_Services_Credit_Control(content := superset( + /* tr_AVP_Requested_Service_Unit, Only in INIT and UPDATE */ + tr_AVP_Used_Service_Unit, + tr_AVP_3GPP_Reporting_Reason(FINAL), + tr_AVP_PCC_3GPP_QoS_Information + )), + tr_AVP_3GPP_ServiceInformation(content := superset( + tr_AVP_3GPP_PSInformation(content := superset( + tr_AVP_3GPP_ChargingId, + /* tr_AVP_3GPP_PDPType, Only in INIT */ + tr_AVP_3GPP_PDPAddress(tr_AVP_Address((IP,IP6), ?)), + tr_AVP_3GPP_SGSNAddress(tr_AVP_Address(IP, sgsn_addr)), + tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, ggsn_addr)), + tr_AVP_3GPP_CalledStationId, + tr_AVP_3GPP_SelectionMode, + tr_AVP_3GPP_ChargingCharacteristics(charging_char), + tr_AVP_3GPP_SGSNMCCMNC, + tr_AVP_3GPP_NSAPI(nsapi), + /*We don't yet send MS_Tz in CreateSessionReq: + tr_AVP_3GPP_MS_TimeZone,*/ + tr_AVP_3GPP_ULI, + tr_AVP_GI_3GPP_RatType(rat_type)/*, + We don't yet send IMEI in CreateSessionReq: + tr_AVP_UserEquipmentInfo({ + tr_AVP_UserEquipmentInfoType(IMEISV), + tr_AVP_UserEquipmentInfoValue(imeisv) + })*/ + )) + )) + )); + } + } + return tpl; +} + +/* generate a send template successful/reject answer based on received request */ +function f_ts_DIA_Gy_CCA(PDU_DIAMETER rx_gy, + DIAMETER_Resultcode cca_res_code, + template (omit) uint32_t validity_time := omit) +return template (value) PDU_DIAMETER +{ + var template (value) PDU_DIAMETER tx_dia; + var template (omit) AVP avp; + var octetstring sess_id; + var AVP_Unsigned32 req_num; + var DCC_NONE_CC_Request_Type req_type; + var DIAMETER_Resultcode cca_res_code_success := DIAMETER_SUCCESS; + + avp := f_DIAMETER_get_avp(rx_gy, c_AVP_Code_BASE_NONE_Session_Id); + sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); + + avp := f_DIAMETER_get_avp(rx_gy, c_AVP_Code_DCC_NONE_CC_Request_Type); + req_type := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Type); + + avp := f_DIAMETER_get_avp(rx_gy, c_AVP_Code_DCC_NONE_CC_Request_Number); + req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number); + + if (cca_res_code != cca_res_code_success) { + tx_dia := ts_DIA_Gy_CCA(rx_gy.hop_by_hop_id, rx_gy.end_to_end_id, sess_id, + cca_res_code, req_type, req_num); + } else if (isvalue(validity_time)) { + tx_dia := ts_DIA_Gy_CCA_ValidityTime(rx_gy.hop_by_hop_id, rx_gy.end_to_end_id, sess_id, + req_type, req_num, valueof(validity_time)); + } else { + tx_dia := ts_DIA_Gy_CCA(rx_gy.hop_by_hop_id, rx_gy.end_to_end_id, sess_id, + cca_res_code, req_type, req_num); + } + return tx_dia; +} + } /* module */ diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index 9dd759b..612073b 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -383,15 +383,12 @@ private altstep as_DIA_S6b_AAR() runs on PGW_Session_CT { var PDU_DIAMETER rx_dia; [] DIAMETER[DIA_S6b].receive(tr_DIA_S6b_AAR()) -> value rx_dia { - var template (omit) AVP avp; - var octetstring sess_id; - - avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_BASE_NONE_Session_Id); - sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); - - DIAMETER[DIA_S6b].send(ts_DIA_S6b_AAA(sess_id, "aaa." & mp_diam_realm, - mp_diam_realm, mp_diam_realm, - rx_dia.hop_by_hop_id, rx_dia.end_to_end_id)); + var template (value) PDU_DIAMETER tx_dia; + tx_dia := f_ts_DIA_S6b_AAA(rx_dia, + "aaa." & mp_diam_realm, + mp_diam_realm, + mp_diam_realm); + DIAMETER[DIA_S6b].send(tx_dia); setverdict(pass); } [] DIAMETER[DIA_S6b].receive(PDU_DIAMETER:?) -> value rx_dia { @@ -404,18 +401,8 @@ private altstep as_DIA_Gx_CCR(DCC_NONE_CC_Request_Type req_type) runs on PGW_Session_CT { var PDU_DIAMETER rx_dia; [] DIAMETER[DIA_Gx].receive(tr_DIA_Gx_CCR(req_type := req_type)) -> value rx_dia { - var template (omit) AVP avp; - var octetstring sess_id; - var AVP_Unsigned32 req_num; - - avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_BASE_NONE_Session_Id); - sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); - - avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_DCC_NONE_CC_Request_Number); - req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number); - - DIAMETER[DIA_Gx].send(ts_DIA_Gx_CCA(rx_dia.hop_by_hop_id, rx_dia.end_to_end_id, sess_id, - req_type, req_num)); + var template (value) PDU_DIAMETER tx_dia := f_ts_DIA_Gx_CCA(rx_dia); + DIAMETER[DIA_Gx].send(tx_dia); } [] DIAMETER[DIA_Gx].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, @@ -427,203 +414,37 @@ function f_tr_DIA_Gy_CCR(DCC_NONE_CC_Request_Type req_type) runs on PGW_Session_CT return template (present) PDU_DIAMETER { - var template (present) PDU_DIAMETER tpl; - var charstring smf_origin_host := "smf." & mp_diam_realm; - var template (present) octetstring imsi := ?; + var octetstring imsi := char2oct(f_dec_TBCD(imsi_hex2oct(g_pars.imsi))); + var octetstring rat_type := int2oct(enum2int(g_pars.rat_type), 1); + var OCT1 nsapi := int2oct(g_pars.bearer.ebi, 1); + var OCT4 charging_char := char2oct(oct2str('0000'O)); // f_s5s8_create_session() uses hardcoded chg_car := '0000'O var template (present) octetstring msisdn := ?; - var template (present) octetstring rat_type := ?; - var template (present) OCT4 charging_char := ?; - var template (present) OCT1 nsapi := ?; - imsi := char2oct(f_dec_TBCD(imsi_hex2oct(g_pars.imsi))); - //msisdn := char2oct(f_dec_TBCD(substr(ctx_val.msisdn, 1, lengthof(ctx_val.msisdn) -1))); - rat_type := int2oct(enum2int(g_pars.rat_type), 1); - charging_char := char2oct(oct2str('0000'O)); // f_s5s8_create_session() uses hardcoded chg_car := '0000'O - nsapi := int2oct(g_pars.bearer.ebi, 1); - select (req_type) { - case (INITIAL_REQUEST) { - tpl := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, - avps := superset( - tr_AVP_SessionId, - tr_AVP_OriginHost(smf_origin_host), - tr_AVP_OriginRealm(mp_diam_realm), - tr_AVP_DestinationRealm(mp_diam_realm), - tr_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), - tr_AVP_ServiceContextId, - tr_AVP_CcReqType(req_type), - tr_AVP_CcReqNum(?), - tr_AVP_EventTimestamp(?), - tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_IMSI), tr_AVP_SubcrIdData(imsi)}), - tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_E164), tr_AVP_SubcrIdData(msisdn)}), - tr_AVP_RequestedAction(DIRECT_DEBITING), - tr_AVP_3GPP_AoCRequestType, - tr_AVP_MultipleServicesIndicator, - tr_AVP_Multiple_Services_Credit_Control(content := superset( - tr_AVP_Requested_Service_Unit, - tr_AVP_PCC_3GPP_QoS_Information - )), - tr_AVP_3GPP_ServiceInformation(content := superset( - tr_AVP_3GPP_PSInformation(content := superset( - tr_AVP_3GPP_ChargingId, - tr_AVP_3GPP_PDPType((IPv4,IPv6,IPv4v6)), - tr_AVP_3GPP_PDPAddress(tr_AVP_Address((IP,IP6), ?)), - tr_AVP_3GPP_SGSNAddress(tr_AVP_Address(IP, f_inet_addr(mp_pcrf_local_ip))), - tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, f_inet_addr(mp_pgw_hostname))), - tr_AVP_3GPP_CalledStationId, - tr_AVP_3GPP_SelectionMode, - tr_AVP_3GPP_ChargingCharacteristics(charging_char), - tr_AVP_3GPP_SGSNMCCMNC, - tr_AVP_3GPP_NSAPI(nsapi), - /*We don't yet send MS_Tz in CreateSessionReq: - tr_AVP_3GPP_MS_TimeZone,*/ - tr_AVP_3GPP_ULI, - tr_AVP_GI_3GPP_RatType(rat_type)/*, - We don't yet send IMEI in CreateSessionReq: - tr_AVP_UserEquipmentInfo({ - tr_AVP_UserEquipmentInfoType(IMEISV), - tr_AVP_UserEquipmentInfoValue(imeisv) - })*/ - )) - )) - )); - } - case (UPDATE_REQUEST) { - tpl := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, - avps := superset( - tr_AVP_SessionId, - tr_AVP_OriginHost(smf_origin_host), - tr_AVP_OriginRealm(mp_diam_realm), - tr_AVP_DestinationRealm(mp_diam_realm), - tr_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), - tr_AVP_ServiceContextId, - tr_AVP_CcReqType(req_type), - tr_AVP_CcReqNum(?), - tr_AVP_DestinationHost(?), - tr_AVP_EventTimestamp(?), - tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_IMSI), tr_AVP_SubcrIdData(imsi)}), - tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_E164), tr_AVP_SubcrIdData(msisdn)}), - tr_AVP_RequestedAction(DIRECT_DEBITING), - tr_AVP_3GPP_AoCRequestType, - tr_AVP_Multiple_Services_Credit_Control(content := superset( - tr_AVP_Requested_Service_Unit, - tr_AVP_Used_Service_Unit, - /* tr_AVP_3GPP_Reporting_Reason, can be sometimes inside UsedServiceUnit */ - tr_AVP_PCC_3GPP_QoS_Information - )), - tr_AVP_3GPP_ServiceInformation(content := superset( - tr_AVP_3GPP_PSInformation(content := superset( - tr_AVP_3GPP_ChargingId, - /* tr_AVP_3GPP_PDPType, Only in INIT */ - tr_AVP_3GPP_PDPAddress(tr_AVP_Address((IP,IP6), ?)), - tr_AVP_3GPP_SGSNAddress(tr_AVP_Address(IP, f_inet_addr(mp_pcrf_local_ip))), - tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, f_inet_addr(mp_pgw_hostname))), - tr_AVP_3GPP_CalledStationId, - tr_AVP_3GPP_SelectionMode, - tr_AVP_3GPP_ChargingCharacteristics(charging_char), - tr_AVP_3GPP_SGSNMCCMNC, - tr_AVP_3GPP_NSAPI(nsapi), - /*We don't yet send MS_Tz in CreateSessionReq: - tr_AVP_3GPP_MS_TimeZone,*/ - tr_AVP_3GPP_ULI, - tr_AVP_GI_3GPP_RatType(rat_type)/*, - We don't yet send IMEI in CreateSessionReq: - tr_AVP_UserEquipmentInfo({ - tr_AVP_UserEquipmentInfoType(IMEISV), - tr_AVP_UserEquipmentInfoValue(imeisv) - })*/ - )) - )) - )); - } - case (TERMINATION_REQUEST) { - tpl := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, - avps := superset( - tr_AVP_SessionId, - tr_AVP_OriginHost(smf_origin_host), - tr_AVP_OriginRealm(mp_diam_realm), - tr_AVP_DestinationRealm(mp_diam_realm), - tr_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), - tr_AVP_ServiceContextId, - tr_AVP_CcReqType(req_type), - tr_AVP_CcReqNum(?), - tr_AVP_DestinationHost(?), - tr_AVP_EventTimestamp(?), - tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_IMSI), tr_AVP_SubcrIdData(imsi)}), - tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_E164), tr_AVP_SubcrIdData(msisdn)}), - tr_AVP_TerminationCause(?), - tr_AVP_RequestedAction(DIRECT_DEBITING), - tr_AVP_3GPP_AoCRequestType, - tr_AVP_Multiple_Services_Credit_Control(content := superset( - /* tr_AVP_Requested_Service_Unit, Only in INIT and UPDATE */ - tr_AVP_Used_Service_Unit, - tr_AVP_3GPP_Reporting_Reason(FINAL), - tr_AVP_PCC_3GPP_QoS_Information - )), - tr_AVP_3GPP_ServiceInformation(content := superset( - tr_AVP_3GPP_PSInformation(content := superset( - tr_AVP_3GPP_ChargingId, - /* tr_AVP_3GPP_PDPType, Only in INIT */ - tr_AVP_3GPP_PDPAddress(tr_AVP_Address((IP,IP6), ?)), - tr_AVP_3GPP_SGSNAddress(tr_AVP_Address(IP, f_inet_addr(mp_pcrf_local_ip))), - tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, f_inet_addr(mp_pgw_hostname))), - tr_AVP_3GPP_CalledStationId, - tr_AVP_3GPP_SelectionMode, - tr_AVP_3GPP_ChargingCharacteristics(charging_char), - tr_AVP_3GPP_SGSNMCCMNC, - tr_AVP_3GPP_NSAPI(nsapi), - /*We don't yet send MS_Tz in CreateSessionReq: - tr_AVP_3GPP_MS_TimeZone,*/ - tr_AVP_3GPP_ULI, - tr_AVP_GI_3GPP_RatType(rat_type)/*, - We don't yet send IMEI in CreateSessionReq: - tr_AVP_UserEquipmentInfo({ - tr_AVP_UserEquipmentInfoType(IMEISV), - tr_AVP_UserEquipmentInfoValue(imeisv) - })*/ - )) - )) - )); - } - } - return tpl; -} + var charstring smf_origin_host := "smf." & mp_diam_realm; + var octetstring sgsn_addr := f_inet_addr(mp_pcrf_local_ip); + var octetstring ggsn_addr := f_inet_addr(mp_pgw_hostname); -function f_ts_DIA_Gy_CCA(PDU_DIAMETER rx_gy) -runs on PGW_Session_CT return template (value) PDU_DIAMETER -{ - var template (value) PDU_DIAMETER tx_dia; - var template (omit) AVP avp; - var octetstring sess_id; - var AVP_Unsigned32 req_num; - var DCC_NONE_CC_Request_Type req_type; - var DIAMETER_Resultcode cca_res_code_success := DIAMETER_SUCCESS; + return DIAMETER_ts32_299_Templates.f_tr_DIA_Gy_CCR(req_type, + imsi, + msisdn, + rat_type, + nsapi, + charging_char, + smf_origin_host, + mp_diam_realm, + sgsn_addr, + ggsn_addr); - avp := f_DIAMETER_get_avp(rx_gy, c_AVP_Code_BASE_NONE_Session_Id); - sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); - - avp := f_DIAMETER_get_avp(rx_gy, c_AVP_Code_DCC_NONE_CC_Request_Type); - req_type := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Type); - - avp := f_DIAMETER_get_avp(rx_gy, c_AVP_Code_DCC_NONE_CC_Request_Number); - req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number); - - if (g_pars.gy.cca_res_code != cca_res_code_success) { - tx_dia := ts_DIA_Gy_CCA(rx_gy.hop_by_hop_id, rx_gy.end_to_end_id, sess_id, - g_pars.gy.cca_res_code, req_type, req_num); - } else if (g_pars.gy.validity_time > 0) { - tx_dia := ts_DIA_Gy_CCA_ValidityTime(rx_gy.hop_by_hop_id, rx_gy.end_to_end_id, sess_id, - req_type, req_num, g_pars.gy.validity_time); - } else { - tx_dia := ts_DIA_Gy_CCA(rx_gy.hop_by_hop_id, rx_gy.end_to_end_id, sess_id, - g_pars.gy.cca_res_code, req_type, req_num); - } - return tx_dia; } private altstep as_DIA_Gy_CCR(DCC_NONE_CC_Request_Type req_type) runs on PGW_Session_CT { [] DIAMETER[DIA_Gy].receive(f_tr_DIA_Gy_CCR(req_type := req_type)) -> value g_rx_gy { var template (value) PDU_DIAMETER tx_dia; - tx_dia := f_ts_DIA_Gy_CCA(g_rx_gy); + var template (omit) integer validity_time := omit; + if (g_pars.gy.validity_time > 0) { + validity_time := g_pars.gy.validity_time; + } + tx_dia := DIAMETER_ts32_299_Templates.f_ts_DIA_Gy_CCA(g_rx_gy, g_pars.gy.cca_res_code, validity_time); DIAMETER[DIA_Gy].send(tx_dia); } [] DIAMETER[DIA_Gy].receive(PDU_DIAMETER:?) -> value g_rx_gy { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43286?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: Ifff21ed39c685406abf734b03aa2d9d17c37c4f6 Gerrit-Change-Number: 43286 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: dia2gsup: Add expected-results.xml
by pespin 19 Aug '26

19 Aug '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43294?usp=email ) Change subject: dia2gsup: Add expected-results.xml ...................................................................... dia2gsup: Add expected-results.xml Change-Id: I564ea0e3051b287d1880c3331591e1aa6078dcac --- A dia2gsup/expected-results.xml 1 file changed, 22 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/dia2gsup/expected-results.xml b/dia2gsup/expected-results.xml new file mode 100644 index 0000000..b0a5c01 --- /dev/null +++ b/dia2gsup/expected-results.xml @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<testsuite name='Titan' tests='9' failures='2' errors='0' skipped='0' inconc='0' time='MASKED'> + <testcase classname='DIA2GSUP_Tests' name='TC_authinfo_normal'/> + <testcase classname='DIA2GSUP_Tests' name='TC_authinfo_gsup_err_imsi_unknown'/> + <testcase classname='DIA2GSUP_Tests' name='TC_authinfo_gsup_err_illegal_ms'/> + <testcase classname='DIA2GSUP_Tests' name='TC_authinfo_gsup_err_plmn_not_allowed'> + <failure type='fail-verdict'>"DIA2GSUP_Tests.ttcn:MASKED : Unexpected Diameter msg rx: { version := 1, message_length := 124, RPETxxxx := '01000000'B, command_code := Authentication_Information (318), application_id := '01000023'O, hop_by_hop_id := '930CAEFE'O, end_to_end_id := '3B45A8F3'O, avps := { { avp := { avp_header := { avp_code := { vendor_id_NONE := avp_code_BASE_NONE_Session_Id (263) }, VMPxxxxx := '01000000'B, avp_length := 14, vendor_id := omit }, avp_data := { avp_BASE_NONE_Session_Id := '666F6F626172'O (\"foobar\") } } }, { avp := { avp_header := { avp_code := { vendor_id_NONE := avp_code_BASE_NONE_Auth_Session_State (277) }, VMPxxxxx := '01000000'B, avp_length := 12, vendor_id := omit }, avp_data := { avp_BASE_NONE_Auth_Session_State := NO_STATE_MAINTAINED (1) } } }, { avp := { avp_header := { avp_code := { vendor_id_NONE := avp_code_BASE_NONE_Origin_Host (264) }, VMPxxxxx := '01000000'B, avp_length := 23, vendor_id := omit }, avp_data := { avp_BASE_NONE_Origin_Host := \"hss.localdomain\" } } }, { avp := { avp_header := { avp_code := { vendor_id_NONE := avp_code_BASE_NONE_Origin_Realm (296) }, VMPxxxxx := '01000000'B, avp_length := 19, vendor_id := omit }, avp_data := { avp_BASE_NONE_Origin_Realm := \"localdomain\" } } }, { avp := { avp_header := { avp_code := { vendor_id_NONE := avp_code_BASE_NONE_Experimental_Result (297) }, VMPxxxxx := '01000000'B, avp_length := 32, vendor_id := omit }, avp_data := { avp_BASE_NONE_Experimental_Result := { { avp := { avp_header := { avp_code := { vendor_id_NONE := avp_code_BASE_NONE_Vendor_Id (266) }, VMPxxxxx := '01000000'B, avp_length := 12, vendor_id := omit }, avp_data := { avp_BASE_NONE_Vendor_Id := '000028AF'O } } }, { avp := { avp_header := { avp_code := { vendor_id_NONE := avp_code_BASE_NONE_Experimental_Result_Code (298) }, VMPxxxxx := '01000000'B, avp_length := 12, vendor_id := omit }, avp_data := { avp_BASE_NONE_Experimental_Result_Code := '0000138C'O } } } } } } } } }" + DIA2GSUP_Tests.ttcn:MASKED DIA2GSUP_Tests control part + DIA2GSUP_Tests.ttcn:MASKED TC_authinfo_gsup_err_plmn_not_allowed testcase + </failure> + </testcase> + <testcase classname='DIA2GSUP_Tests' name='TC_authinfo_gsup_err_romaning_not_allowed'> + <failure type='fail-verdict'>"DIA2GSUP_Tests.ttcn:MASKED : Unexpected Diameter msg rx: { version := 1, message_length := 104, RPETxxxx := '01000000'B, command_code := Authentication_Information (318), application_id := '01000023'O, hop_by_hop_id := '73F61785'O, end_to_end_id := 'E9149B56'O, avps := { { avp := { avp_header := { avp_code := { vendor_id_NONE := avp_code_BASE_NONE_Session_Id (263) }, VMPxxxxx := '01000000'B, avp_length := 14, vendor_id := omit }, avp_data := { avp_BASE_NONE_Session_Id := '666F6F626172'O (\"foobar\") } } }, { avp := { avp_header := { avp_code := { vendor_id_NONE := avp_code_BASE_NONE_Auth_Session_State (277) }, VMPxxxxx := '01000000'B, avp_length := 12, vendor_id := omit }, avp_data := { avp_BASE_NONE_Auth_Session_State := NO_STATE_MAINTAINED (1) } } }, { avp := { avp_header := { avp_code := { vendor_id_NONE := avp_code_BASE_NONE_Origin_Host (264) }, VMPxxxxx := '01000000'B, avp_length := 23, vendor_id := omit }, avp_data := { avp_BASE_NONE_Origin_Host := \"hss.localdomain\" } } }, { avp := { avp_header := { avp_code := { vendor_id_NONE := avp_code_BASE_NONE_Origin_Realm (296) }, VMPxxxxx := '01000000'B, avp_length := 19, vendor_id := omit }, avp_data := { avp_BASE_NONE_Origin_Realm := \"localdomain\" } } }, { avp := { avp_header := { avp_code := { vendor_id_NONE := avp_code_BASE_NONE_Result_Code (268) }, VMPxxxxx := '01000000'B, avp_length := 12, vendor_id := omit }, avp_data := { avp_BASE_NONE_Result_Code := '0000138B'O } } } } }" + DIA2GSUP_Tests.ttcn:MASKED DIA2GSUP_Tests control part + DIA2GSUP_Tests.ttcn:MASKED TC_authinfo_gsup_err_romaning_not_allowed testcase + </failure> + </testcase> + <testcase classname='DIA2GSUP_Tests' name='TC_authinfo_gsup_err_net_fail'/> + <testcase classname='DIA2GSUP_Tests' name='TC_authinfo_gsup_err_congestion'/> + <testcase classname='DIA2GSUP_Tests' name='TC_authinfo_gsup_err_auth_unacceptable'/> + <testcase classname='DIA2GSUP_Tests' name='TC_authinfo_gsup_err_proto_unspec'/> +</testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43294?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: I564ea0e3051b287d1880c3331591e1aa6078dcac Gerrit-Change-Number: 43294 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log August 2026