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

[M] Change in libosmocore[master]: LAPD: Add support for RTS based polling and T200
by laforge 24 Nov '23

24 Nov '23

Attention is currently required from: jolly, neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34985?usp=email ) Change subject: LAPD: Add support for RTS based polling and T200 ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34985?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib961b5a44911b99b0487641533301749c0286995 Gerrit-Change-Number: 34985 Gerrit-PatchSet: 9 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 24 Nov 2023 08:36:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: pySim-shell: refuse to execute a startup script on initialization errors
by laforge 24 Nov '23

24 Nov '23

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35102?usp=email ) Change subject: pySim-shell: refuse to execute a startup script on initialization errors ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35102?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I61329988e0e9021b5b0ef8e0819fb8e23cabf38b Gerrit-Change-Number: 35102 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 24 Nov 2023 08:35:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: app: do not catch exceptions in init_card
by laforge 24 Nov '23

24 Nov '23

Attention is currently required from: dexter, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35101?usp=email ) Change subject: app: do not catch exceptions in init_card ...................................................................... Patch Set 1: (1 comment) File pySim/app.py: https://gerrit.osmocom.org/c/pysim/+/35101/comment/ab66c182_1abec21c PS1, Line 69: raise ValueError > Not sure about this particular change. […] The question is whether this worked before at all? Did anyone ever try using pysim-shell with a completely different smart card that's neither a SIM nor an UICC (with or without USIM, ISIM apps)? And is it really useful to support this, if all you can do is the "apdu" command for raw APDUs? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35101?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I581125d8273ef024f6dbf3a5db6116be15c5c95d Gerrit-Change-Number: 35101 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 24 Nov 2023 08:35:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: open5gs configs: duplicate cfgs for latest/master
by laforge 24 Nov '23

24 Nov '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35104?usp=email ) Change subject: open5gs configs: duplicate cfgs for latest/master ...................................................................... open5gs configs: duplicate cfgs for latest/master The config format just changed significantly in main/master. Duplicate the configs, so we can run latest with the old versions. Related: OS#6267 Change-Id: I2446695172b92ccf75305f878cb932a82e44fdd2 --- M ttcn3-ggsn-test/jenkins-ogs.sh R ttcn3-ggsn-test/ogs/open5gs-smf-latest.yaml C ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml R ttcn3-ggsn-test/ogs/open5gs-upf-latest.yaml C ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml M ttcn3-hss-test-ogs/jenkins.sh R ttcn3-hss-test-ogs/ogs/open5gs-hss-latest.yaml C ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml M ttcn3-mme-test-ogs/jenkins.sh R ttcn3-mme-test-ogs/ogs/open5gs-mme-latest.yaml C ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml M ttcn3-pgw-test/jenkins.sh R ttcn3-pgw-test/open5gs-nrf-latest.yaml C ttcn3-pgw-test/open5gs-nrf-master.yaml R ttcn3-pgw-test/open5gs-smf-latest.yaml C ttcn3-pgw-test/open5gs-smf-master.yaml R ttcn3-pgw-test/open5gs-upf-latest.yaml C ttcn3-pgw-test/open5gs-upf-master.yaml 18 files changed, 27 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/ttcn3-ggsn-test/jenkins-ogs.sh b/ttcn3-ggsn-test/jenkins-ogs.sh index 5875b75..07952bc 100755 --- a/ttcn3-ggsn-test/jenkins-ogs.sh +++ b/ttcn3-ggsn-test/jenkins-ogs.sh @@ -16,7 +16,7 @@ write_mp_osmo_repo "$VOL_BASE_DIR/ggsn-tester/GGSN_Tests.cfg" mkdir $VOL_BASE_DIR/ggsn -cp ogs/open5gs-*.yaml $VOL_BASE_DIR/ggsn/ +cp ogs/open5gs-*-$IMAGE_SUFFIX.yaml $VOL_BASE_DIR/ggsn/ cp ogs/freediameter.conf $VOL_BASE_DIR/ggsn/ cp ogs/upfd.sh $VOL_BASE_DIR/ggsn/ cp ogs/upfd-setup.sh $VOL_BASE_DIR/ggsn/ @@ -35,9 +35,9 @@ $DOCKER_ARGS \ $(docker_network_params $SUBNET 201) \ $REPO_USER/open5gs-$IMAGE_SUFFIX \ - /bin/sh -c "open5gs-smfd -c /data/open5gs-smf.yaml >/data/open5gs-smfd.out 2>&1" - #/bin/sh -c "gdb -ex 'handle SIG32 pass nostop noprint' -ex 'run' -ex 'bt' --arg open5gs-smfd -c /data/open5gs-smf.yaml >/data/open5gs-smfd.out 2>&1" - #/bin/sh -c "valgrind --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=20 --track-fds=yes open5gs-smfd -c /data/open5gs-smf.yaml >/data/open5gs-smfd.out 2>&1" + /bin/sh -c "open5gs-smfd -c /data/open5gs-smf-$IMAGE_SUFFIX.yaml >/data/open5gs-smfd.out 2>&1" + #/bin/sh -c "gdb -ex 'handle SIG32 pass nostop noprint' -ex 'run' -ex 'bt' --arg open5gs-smfd -c /data/open5gs-smf-$IMAGE_SUFFIX.yaml >/data/open5gs-smfd.out 2>&1" + #/bin/sh -c "valgrind --tool=memcheck --leak-check=yes --show-reachable=yes --num-callers=20 --track-fds=yes open5gs-smfd -c /data/open5gs-smf-$IMAGE_SUFFIX.yaml >/data/open5gs-smfd.out 2>&1" docker run --cap-add=NET_ADMIN \ --device /dev/net/tun:/dev/net/tun \ @@ -49,7 +49,7 @@ $DOCKER_ARGS \ $(docker_network_params $SUBNET 222) \ $REPO_USER/open5gs-$IMAGE_SUFFIX \ - /bin/sh -c "/data/upfd.sh -c /data/open5gs-upf.yaml >/data/open5gs-upfd.out 2>&1" + /bin/sh -c "/data/upfd.sh -c /data/open5gs-upf-$IMAGE_SUFFIX.yaml >/data/open5gs-upfd.out 2>&1" # start docker container with testsuite in foreground docker run --rm \ diff --git a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml b/ttcn3-ggsn-test/ogs/open5gs-smf-latest.yaml similarity index 100% rename from ttcn3-ggsn-test/ogs/open5gs-smf.yaml rename to ttcn3-ggsn-test/ogs/open5gs-smf-latest.yaml diff --git a/ttcn3-ggsn-test/ogs/open5gs-smf.yaml b/ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml similarity index 100% copy from ttcn3-ggsn-test/ogs/open5gs-smf.yaml copy to ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml diff --git a/ttcn3-ggsn-test/ogs/open5gs-upf.yaml b/ttcn3-ggsn-test/ogs/open5gs-upf-latest.yaml similarity index 100% rename from ttcn3-ggsn-test/ogs/open5gs-upf.yaml rename to ttcn3-ggsn-test/ogs/open5gs-upf-latest.yaml diff --git a/ttcn3-ggsn-test/ogs/open5gs-upf.yaml b/ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml similarity index 100% copy from ttcn3-ggsn-test/ogs/open5gs-upf.yaml copy to ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml diff --git a/ttcn3-hss-test-ogs/jenkins.sh b/ttcn3-hss-test-ogs/jenkins.sh index 0eacaf9..eb60835 100755 --- a/ttcn3-hss-test-ogs/jenkins.sh +++ b/ttcn3-hss-test-ogs/jenkins.sh @@ -18,7 +18,7 @@ write_mp_osmo_repo "$VOL_BASE_DIR/hss-tester/HSS_Tests.cfg" mkdir $VOL_BASE_DIR/hss -cp ogs/open5gs-*.yaml $VOL_BASE_DIR/hss/ +cp ogs/open5gs-*-$IMAGE_SUFFIX.yaml $VOL_BASE_DIR/hss/ cp ogs/freediameter.conf $VOL_BASE_DIR/hss/ network_create @@ -64,7 +64,7 @@ $DOCKER_ARGS \ $(docker_network_params $SUBNET 201) \ $REPO_USER/open5gs-$IMAGE_SUFFIX \ - /bin/sh -c "open5gs-hssd -c /data/open5gs-hss.yaml >/data/open5gs-hssd.out 2>&1" + /bin/sh -c "open5gs-hssd -c /data/open5gs-hss-$IMAGE_SUFFIX.yaml >/data/open5gs-hssd.out 2>&1" # start docker container with testsuite in foreground docker run --rm \ diff --git a/ttcn3-hss-test-ogs/ogs/open5gs-hss.yaml b/ttcn3-hss-test-ogs/ogs/open5gs-hss-latest.yaml similarity index 100% rename from ttcn3-hss-test-ogs/ogs/open5gs-hss.yaml rename to ttcn3-hss-test-ogs/ogs/open5gs-hss-latest.yaml diff --git a/ttcn3-hss-test-ogs/ogs/open5gs-hss.yaml b/ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml similarity index 100% copy from ttcn3-hss-test-ogs/ogs/open5gs-hss.yaml copy to ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml diff --git a/ttcn3-mme-test-ogs/jenkins.sh b/ttcn3-mme-test-ogs/jenkins.sh index 164123a..069b990 100755 --- a/ttcn3-mme-test-ogs/jenkins.sh +++ b/ttcn3-mme-test-ogs/jenkins.sh @@ -15,7 +15,7 @@ write_mp_osmo_repo "$VOL_BASE_DIR/mme-tester/MME_Tests.cfg" mkdir $VOL_BASE_DIR/mme -cp ogs/open5gs-*.yaml $VOL_BASE_DIR/mme/ +cp ogs/open5gs-*-$IMAGE_SUFFIX.yaml $VOL_BASE_DIR/mme/ cp ogs/freediameter.conf $VOL_BASE_DIR/mme/ cp ogs/mme.sh $VOL_BASE_DIR/mme/ @@ -31,7 +31,7 @@ $DOCKER_ARGS \ $(docker_network_params $SUBNET 201) \ $REPO_USER/open5gs-$IMAGE_SUFFIX \ - /bin/sh -c "open5gs-mmed -c /data/open5gs-mme.yaml >/data/open5gs-mmed.out 2>&1" + /bin/sh -c "open5gs-mmed -c /data/open5gs-mme-$IMAGE_SUFFIX.yaml >/data/open5gs-mmed.out 2>&1" # start docker container with testsuite in foreground docker run --rm \ diff --git a/ttcn3-mme-test-ogs/ogs/open5gs-mme.yaml b/ttcn3-mme-test-ogs/ogs/open5gs-mme-latest.yaml similarity index 100% rename from ttcn3-mme-test-ogs/ogs/open5gs-mme.yaml rename to ttcn3-mme-test-ogs/ogs/open5gs-mme-latest.yaml diff --git a/ttcn3-mme-test-ogs/ogs/open5gs-mme.yaml b/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml similarity index 100% copy from ttcn3-mme-test-ogs/ogs/open5gs-mme.yaml copy to ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml diff --git a/ttcn3-pgw-test/jenkins.sh b/ttcn3-pgw-test/jenkins.sh index 8311bac..3e10a13 100755 --- a/ttcn3-pgw-test/jenkins.sh +++ b/ttcn3-pgw-test/jenkins.sh @@ -15,7 +15,7 @@ mkdir $VOL_BASE_DIR/pgw cp freeDiameter-smf.conf $VOL_BASE_DIR/pgw/ -cp open5gs-*.yaml $VOL_BASE_DIR/pgw/ +cp open5gs-*-$IMAGE_SUFFIX.yaml $VOL_BASE_DIR/pgw/ cp upfd.sh $VOL_BASE_DIR/pgw/ cp upfd-setup.sh $VOL_BASE_DIR/pgw/ @@ -33,7 +33,7 @@ --name ${BUILD_TAG}-nrf -d \ $DOCKER_ARGS \ $REPO_USER/open5gs-$IMAGE_SUFFIX \ - /bin/sh -c "open5gs-nrfd -c /data/open5gs-nrf.yaml >/data/open5gs-nrf.out 2>&1" + /bin/sh -c "open5gs-nrfd -c /data/open5gs-nrf-$IMAGE_SUFFIX.yaml >/data/open5gs-nrf.out 2>&1" # start container with open5gs-upfd in background docker run --cap-add=NET_ADMIN \ @@ -46,7 +46,7 @@ --name ${BUILD_TAG}-upf -d \ $DOCKER_ARGS \ $REPO_USER/open5gs-$IMAGE_SUFFIX \ - /bin/sh -c "/data/upfd.sh -c /data/open5gs-upf.yaml >/data/open5gs-upfd.out 2>&1" + /bin/sh -c "/data/upfd.sh -c /data/open5gs-upf-$IMAGE_SUFFIX.yaml >/data/open5gs-upfd.out 2>&1" # start container with open5gs-smfd in background docker run --cap-add=NET_ADMIN \ @@ -59,8 +59,8 @@ --name ${BUILD_TAG}-smf -d \ $DOCKER_ARGS \ $REPO_USER/open5gs-$IMAGE_SUFFIX \ - /bin/sh -c "open5gs-smfd -c /data/open5gs-smf.yaml >/data/open5gs-smfd.out 2>&1" - #/bin/sh -c "gdb -ex 'handle SIG32 pass nostop noprint' -ex 'run' -ex 'bt' --arg open5gs-smfd -c /data/open5gs-smf.yaml >/data/open5gs-smfd.out 2>&1" + /bin/sh -c "open5gs-smfd -c /data/open5gs-smf-$IMAGE_SUFFIX.yaml >/data/open5gs-smfd.out 2>&1" + #/bin/sh -c "gdb -ex 'handle SIG32 pass nostop noprint' -ex 'run' -ex 'bt' --arg open5gs-smfd -c /data/open5gs-smf-$IMAGE_SUFFIX.yaml >/data/open5gs-smfd.out 2>&1" # start container with osmo-ugcups-daemon in background; SYS_ADMIN required for CLONE_NEWNS docker run --cap-add=NET_ADMIN --cap-add=SYS_ADMIN \ diff --git a/ttcn3-pgw-test/open5gs-nrf.yaml b/ttcn3-pgw-test/open5gs-nrf-latest.yaml similarity index 100% rename from ttcn3-pgw-test/open5gs-nrf.yaml rename to ttcn3-pgw-test/open5gs-nrf-latest.yaml diff --git a/ttcn3-pgw-test/open5gs-nrf.yaml b/ttcn3-pgw-test/open5gs-nrf-master.yaml similarity index 100% copy from ttcn3-pgw-test/open5gs-nrf.yaml copy to ttcn3-pgw-test/open5gs-nrf-master.yaml diff --git a/ttcn3-pgw-test/open5gs-smf.yaml b/ttcn3-pgw-test/open5gs-smf-latest.yaml similarity index 100% rename from ttcn3-pgw-test/open5gs-smf.yaml rename to ttcn3-pgw-test/open5gs-smf-latest.yaml diff --git a/ttcn3-pgw-test/open5gs-smf.yaml b/ttcn3-pgw-test/open5gs-smf-master.yaml similarity index 100% copy from ttcn3-pgw-test/open5gs-smf.yaml copy to ttcn3-pgw-test/open5gs-smf-master.yaml diff --git a/ttcn3-pgw-test/open5gs-upf.yaml b/ttcn3-pgw-test/open5gs-upf-latest.yaml similarity index 100% rename from ttcn3-pgw-test/open5gs-upf.yaml rename to ttcn3-pgw-test/open5gs-upf-latest.yaml diff --git a/ttcn3-pgw-test/open5gs-upf.yaml b/ttcn3-pgw-test/open5gs-upf-master.yaml similarity index 100% copy from ttcn3-pgw-test/open5gs-upf.yaml copy to ttcn3-pgw-test/open5gs-upf-master.yaml -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35104?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2446695172b92ccf75305f878cb932a82e44fdd2 Gerrit-Change-Number: 35104 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[L] Change in docker-playground[master]: open5gs configs: update to current format
by laforge 24 Nov '23

24 Nov '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35105?usp=email ) Change subject: open5gs configs: update to current format ...................................................................... open5gs configs: update to current format Adjust open5gs configs to the new formats from: https://github.com/open5gs/open5gs/pull/2739 This fixes all open5gs programs from crashing on startup with various errors such as: 11/21 07:39:25.971: [core] FATAL: epoll_init: Assertion `context->epfd >= 0' failed. (../lib/core/ogs-epoll.c:77) Related: OS#6267 Change-Id: Idf2706f3904eb06e94cee0728faa17e72a6cf1f6 --- M ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml M ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml M ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml M ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml M ttcn3-pgw-test/open5gs-nrf-master.yaml M ttcn3-pgw-test/open5gs-smf-master.yaml M ttcn3-pgw-test/open5gs-upf-master.yaml 7 files changed, 158 insertions(+), 116 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml b/ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml index afb5cf2..4b5891e 100644 --- a/ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml +++ b/ttcn3-ggsn-test/ogs/open5gs-smf-master.yaml @@ -3,6 +3,10 @@ logger: level: info +global: + max: + ue: 1024 + sbi: server: no_tls: true @@ -17,30 +21,43 @@ smf: sbi: - - addr: 172.18.3.201 + server: + - address: 172.18.3.201 port: 7777 + client: + nrf: + - uri: http://172.18.3.201:7777 + scp: + - uri: http://127.0.1.10:7777 pfcp: - - addr: 172.18.3.201 + server: + - address: 172.18.3.201 + client: + upf: + - address: 172.18.3.222 gtpc: - - addr: 172.18.3.201 - option: - so_bindtodevice: eth0 + server: + - address: 172.18.3.201 + option: + so_bindtodevice: eth0 gtpu: - - addr: 172.18.3.201 - port: 2152 - option: - so_bindtodevice: eth0 + server: + - address: 172.18.3.201 + port: 2152 + option: + so_bindtodevice: eth0 metrics: - addr: 172.18.3.201 - port: 9090 - subnet: - - addr: 176.16.16.1/20 + server: + - address: 172.18.3.201 + port: 9090 + session: + - subnet: 176.16.16.1/20 dnn: internet - - addr: 2001:780:44:2000:0:0:0:1/56 + - subnet: 2001:780:44:2000:0:0:0:1/56 dnn: inet6 - - addr: 176.16.32.1/20 + - subnet: 176.16.32.1/20 dnn: inet46 - - addr: 2001:780:44:2100:0:0:0:1/56 + - subnet: 2001:780:44:2100:0:0:0:1/56 dnn: inet46 dns: - 172.18.3.222 @@ -52,21 +69,6 @@ enabled: auto freeDiameter: /data/freediameter.conf -scp: - sbi: - - addr: 127.0.1.10 - port: 7777 - -nrf: - sbi: - - addr: - - 172.18.3.201 - port: 7777 - -upf: - pfcp: - - addr: 172.18.3.222 - parameter: max: diff --git a/ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml b/ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml index 73e1bac..81afc6e 100644 --- a/ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml +++ b/ttcn3-ggsn-test/ogs/open5gs-upf-master.yaml @@ -3,31 +3,37 @@ logger: level: info +global: + max: + ue: 1024 + upf: pfcp: - - addr: 172.18.3.222 + server: + - address: 172.18.3.222 gtpu: - - addr: 172.18.3.222 - port: 2152 - option: - so_bindtodevice: eth0 - subnet: - - addr: 176.16.16.1/20 + server: + - address: 172.18.3.222 + port: 2152 + option: + so_bindtodevice: eth0 + session: + - subnet: 176.16.16.1/20 dnn: internet dev: ogstun4 - - addr: 2001:780:44:2000:0:0:0:1/56 + - subnet: 2001:780:44:2000:0:0:0:1/56 dnn: inet6 dev: ogstun6 - - addr: 176.16.32.1/20 + - subnet: 176.16.32.1/20 dnn: inet46 dev: ogstun46 - - addr: 2001:780:44:2100:0:0:0:1/56 + - subnet: 2001:780:44:2100:0:0:0:1/56 dnn: inet46 dev: ogstun46 smf: pfcp: - - addr: 172.18.3.201 + - address: 172.18.3.201 parameter: diff --git a/ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml b/ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml index 8d1f42e..df92b6f 100644 --- a/ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml +++ b/ttcn3-hss-test-ogs/ogs/open5gs-hss-master.yaml @@ -5,6 +5,10 @@ logger: level: trace +global: + max: + ue: 1024 + hss: freeDiameter: /data/freediameter.conf diff --git a/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml b/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml index 35b718d..520a0b5 100644 --- a/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml +++ b/ttcn3-mme-test-ogs/ogs/open5gs-mme-master.yaml @@ -3,26 +3,52 @@ logger: level: info +global: + max: + ue: 1024 + mme: freeDiameter: /data/freediameter.conf s1ap: - - addr: 172.18.3.201 + server: + - address: 172.18.3.201 gtpc: - - addr: 172.18.3.201 + server: + - address: 172.18.3.201 + client: + sgwc: + - address: 172.18.3.202 + smf: + - address: 172.18.3.201 + - address: ::1 + sgsn: + - address: + - 172.18.3.202 + port: 2124 + routes: + - rai: + lai: + plmn_id: + mcc: 262 + mnc: 42 + lac: 43690 + rac: 187 + ci: 1223 metrics: - - addr: 172.18.3.201 - port: 9090 + server: + - address: 172.18.3.201 + port: 9090 gummei: - plmn_id: - mcc: 001 - mnc: 01 - mme_gid: 2 - mme_code: 1 + - plmn_id: + mcc: 001 + mnc: 01 + mme_gid: 2 + mme_code: 1 tai: - plmn_id: - mcc: 001 - mnc: 01 - tac: 12345 + - plmn_id: + mcc: 001 + mnc: 01 + tac: 12345 security: integrity_order : [ EIA2, EIA1, EIA0 ] ciphering_order : [ EEA0, EEA1, EEA2 ] @@ -30,31 +56,6 @@ full: Open5GS mme_name: open5gs-mme0 -sgwc: - gtpc: - - addr: 172.18.3.202 - -smf: - gtpc: - - addr: - - 172.18.3.201 - - ::1 - -sgsn: - - gtpc: - addr: - - 172.18.3.202 - port: 2124 - routes: - - rai: - lai: - plmn_id: - mcc: 262 - mnc: 42 - lac: 43690 - rac: 187 - ci: 1223 - parameter: max: diff --git a/ttcn3-pgw-test/open5gs-nrf-master.yaml b/ttcn3-pgw-test/open5gs-nrf-master.yaml index b37ec0d..45c3340 100644 --- a/ttcn3-pgw-test/open5gs-nrf-master.yaml +++ b/ttcn3-pgw-test/open5gs-nrf-master.yaml @@ -5,6 +5,10 @@ logger: level: info +global: + max: + ue: 1024 + sbi: server: no_tls: true @@ -19,9 +23,9 @@ nrf: sbi: - addr: - - 172.18.18.10 - port: 7777 + server: + - address: 172.18.18.10 + port: 7777 scp: sbi: diff --git a/ttcn3-pgw-test/open5gs-smf-master.yaml b/ttcn3-pgw-test/open5gs-smf-master.yaml index 622618b..3448aba 100644 --- a/ttcn3-pgw-test/open5gs-smf-master.yaml +++ b/ttcn3-pgw-test/open5gs-smf-master.yaml @@ -3,6 +3,10 @@ logger: level: info +global: + max: + ue: 1024 + sbi: server: no_tls: true @@ -17,21 +21,34 @@ smf: sbi: - - addr: 172.18.18.4 - port: 7777 + server: + - address: 172.18.18.4 + port: 7777 + client: + nrf: + - uri: http://172.18.18.10:7777 + scp: + - uri: http://127.0.1.10:7777 pfcp: - - addr: 172.18.18.4 + server: + - address: 172.18.18.4 + client: + upf: + - address: 172.18.18.7 gtpc: - - addr: 172.18.18.4 + server: + - address: 172.18.18.4 gtpu: - - addr: 172.18.18.4 + server: + - address: 172.18.18.4 metrics: - addr: 172.18.18.4 - port: 9090 - subnet: - - addr: 10.45.0.1/16 + server: + - address: 172.18.18.4 + port: 9090 + session: + - subnet: 10.45.0.1/16 dnn: internet - - addr: cafe::1/64 + - subnet: cafe::1/64 dnn: internet dns: - 8.8.8.8 @@ -43,20 +60,6 @@ enabled: auto freeDiameter: /data/freeDiameter-smf.conf -scp: - sbi: - - addr: 127.0.1.10 - port: 7777 -nrf: - sbi: - - addr: - - 172.18.18.10 - port: 7777 - -upf: - pfcp: - - addr: 172.18.18.7 - parameter: max: diff --git a/ttcn3-pgw-test/open5gs-upf-master.yaml b/ttcn3-pgw-test/open5gs-upf-master.yaml index fec9fc7..9e9280a 100644 --- a/ttcn3-pgw-test/open5gs-upf-master.yaml +++ b/ttcn3-pgw-test/open5gs-upf-master.yaml @@ -3,23 +3,28 @@ logger: level: info +global: + max: + ue: 1024 + upf: pfcp: - - addr: 172.18.18.7 + server: + - address: 172.18.18.7 + client: + smf: + - address: 172.18.18.4 gtpu: - - addr: 172.18.18.7 - subnet: - - addr: 10.45.0.1/16 + server: + - address: 172.18.18.7 + session: + - subnet: 10.45.0.1/16 dnn: internet dev: ogstun46 - - addr: cafe::1/64 + - subnet: cafe::1/64 dnn: internet dev: ogstun46 -smf: - pfcp: - addr: 172.18.18.4 - parameter: max: -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35105?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Idf2706f3904eb06e94cee0728faa17e72a6cf1f6 Gerrit-Change-Number: 35105 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[L] Change in docker-playground[master]: open5gs configs: update to current format
by laforge 24 Nov '23

24 Nov '23

Attention is currently required from: daniel, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35105?usp=email ) Change subject: open5gs configs: update to current format ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35105?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Idf2706f3904eb06e94cee0728faa17e72a6cf1f6 Gerrit-Change-Number: 35105 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 24 Nov 2023 08:33:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: open5gs configs: duplicate cfgs for latest/master
by laforge 24 Nov '23

24 Nov '23

Attention is currently required from: daniel, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35104?usp=email ) Change subject: open5gs configs: duplicate cfgs for latest/master ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35104?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2446695172b92ccf75305f878cb932a82e44fdd2 Gerrit-Change-Number: 35104 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 24 Nov 2023 08:33:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-sgsn[master]: libgtp: Check for all successful create_pdp_conf causes
by laforge 24 Nov '23

24 Nov '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email ) Change subject: libgtp: Check for all successful create_pdp_conf causes ...................................................................... libgtp: Check for all successful create_pdp_conf causes Related: OS#6268 Change-Id: I11ce72908c2dfb983887e6c1db316fd7de42f027 --- M TODO-RELEASE M src/sgsn/sgsn_libgtp.c 2 files changed, 12 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/TODO-RELEASE b/TODO-RELEASE index 1c5d61f..bb4f900 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1 +1,2 @@ #component what description / commit summary line +libgtp > 1.10 use gtp_cause_successful() diff --git a/src/sgsn/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c index 0b6da62..9edd0c6 100644 --- a/src/sgsn/sgsn_libgtp.c +++ b/src/sgsn/sgsn_libgtp.c @@ -417,7 +417,7 @@ } /* Check for cause value if it was really successful */ - if (cause != GTPCAUSE_ACC_REQ) { + if (!gtp_cause_successful(cause)) { reject_cause = cause_map(gtp2sm_cause_map, cause, GSM_CAUSE_ACT_REJ_GGSN); goto reject; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I11ce72908c2dfb983887e6c1db316fd7de42f027 Gerrit-Change-Number: 35094 Gerrit-PatchSet: 3 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-sgsn[master]: libgtp: Check for all successful create_pdp_conf causes
by laforge 24 Nov '23

24 Nov '23

Attention is currently required from: daniel, lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email ) Change subject: libgtp: Check for all successful create_pdp_conf causes ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I11ce72908c2dfb983887e6c1db316fd7de42f027 Gerrit-Change-Number: 35094 Gerrit-PatchSet: 3 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 24 Nov 2023 08:33:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-sgsn[master]: libgtp: Check for all successful create_pdp_conf causes
by osmith 24 Nov '23

24 Nov '23

Attention is currently required from: daniel, laforge, lynxis lazus. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email ) Change subject: libgtp: Check for all successful create_pdp_conf causes ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/35094?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I11ce72908c2dfb983887e6c1db316fd7de42f027 Gerrit-Change-Number: 35094 Gerrit-PatchSet: 3 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 24 Nov 2023 08:18:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0