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

[M] Change in osmo-ttcn3-hacks[master]: library: Move IPCP templates GTPv1C_Templates.ttcn -> IPCP_Templates....
by pespin 21 Oct '24

21 Oct '24

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38464?usp=email ) Change subject: library: Move IPCP templates GTPv1C_Templates.ttcn -> IPCP_Templates.ttcn ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38464?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: I233292ea886e1b69a2f9aa1a159c816791b47136 Gerrit-Change-Number: 38464 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 21 Oct 2024 08:47:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ttcn3-hacks[master]: library/GTPv1C_Templates: Clean up PCO templates
by pespin 21 Oct '24

21 Oct '24

pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38463?usp=email ) Change subject: library/GTPv1C_Templates: Clean up PCO templates ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38463?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: I005a6dea0606bcb677260f85b24396b55a150153 Gerrit-Change-Number: 38463 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 21 Oct 2024 08:47:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ttcn3-hacks[master]: ggsn: README: document how to run with testenv
by osmith 21 Oct '24

21 Oct '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38458?usp=email ) Change subject: ggsn: README: document how to run with testenv ...................................................................... ggsn: README: document how to run with testenv It is possible to run the GGSN testsuite in a lot of ways (as it was ported from docker-playground, which had the same variations but with a less consistent way of running them). Document how it is typically run for development / in jenkins. This should make it easier for users, in addition to testenv already telling which configs are available if trying to run the ggsn testsuite without the -c argument, and to the general help output in "./testenv.py run -h". $ ./testenv.py run ggsn [testenv] Using testsuite ggsn_tests (via alias ggsn) [testenv] Found multiple testenv.cfg files: [testenv] * testenv_open5gs.cfg [testenv] * testenv_osmo_ggsn_all.cfg [testenv] * testenv_osmo_ggsn_v4_only.cfg [testenv] * testenv_osmo_ggsn_v4v6_only.cfg [testenv] * testenv_osmo_ggsn_v6_only.cfg [testenv] Select a specific config (e.g. '-c open5gs') or all ('-c all') Change-Id: I49421151b199fa6536da784b6c412b03f3fdbd05 --- M ggsn_tests/README.md 1 file changed, 72 insertions(+), 4 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/ggsn_tests/README.md b/ggsn_tests/README.md index 71468d5..f40c4b0 100644 --- a/ggsn_tests/README.md +++ b/ggsn_tests/README.md @@ -1,9 +1,10 @@ # GGSN_Tests.ttcn -* external interfaces - * Gp: GTP (emulates SGSN) - * Gi: IP (emulates Internet) - * VTY +## External interfaces + +* Gp: GTP (emulates SGSN) +* Gi: IP (emulates Internet) +* VTY {% dot ggsn_tests.svg digraph G { @@ -16,3 +17,70 @@ ATS -> GGSN [label="VTY"]; } %} + +## How to run + +### osmo-ggsn + +osmo-ggsn with APN config [all](osmo-ggsn/osmo-ggsn-all.confmerge): +``` +$ ./testenv.py run ggsn -c osmo_ggsn_all +``` + +osmo-ggsn with APN config [v4_only](osmo-ggsn/osmo-ggsn-v4_only.confmerge): +``` +$ ./testenv.py run ggsn -c osmo_ggsn_v4_only +``` + +osmo-ggsn with APN configs +[all](osmo-ggsn/osmo-ggsn-all.confmerge), +[v4_only](osmo-ggsn/osmo-ggsn-v4_only.confmerge), +[v6_only](osmo-ggsn/osmo-ggsn-v6_only.confmerge) and +[v4v6_only](osmo-ggsn/osmo-ggsn-v4v6_only.confmerge): +``` +$ ./testenv.py run ggsn -c 'osmo_ggsn_*' +``` + +### osmo-ggsn + kernel GTP-U + +osmo-ggsn with APN config [v4_only](osmo-ggsn/osmo-ggsn-v4_only.confmerge) +and kernel GTP-U with a custom kernel: +``` +$ wget -O .linux https://jenkins.osmocom.org/jenkins/job/build-kernel-net-next/lastSuccessfu… +$ ./testenv.py run ggsn -c osmo_ggsn_v4_only -C +``` + +osmo-ggsn with APN config [v4_only](osmo-ggsn/osmo-ggsn-v4_only.confmerge) +and kernel GTP-U with Debian kernel: +``` +$ ./testenv.py run ggsn -c osmo_ggsn_v4_only --podman -D +``` + +osmo-ggsn with APN configs +[v4_only](osmo-ggsn/osmo-ggsn-v4_only.confmerge), +[v6_only](osmo-ggsn/osmo-ggsn-v6_only.confmerge) and +[v4v6_only](osmo-ggsn/osmo-ggsn-v4v6_only.confmerge) +and kernel GTP-U with Debian kernel: +``` +$ ./testenv.py run ggsn -c 'osmo_ggsn_v*_only' --podman -D +``` + +### open5gs + +``` +$ ./testenv.py run ggsn -c open5gs +``` + +## Related Jenkins jobs + +The jenkins jobs have the testenv arguments they use in their description. + +* [ttcn3-ggsn-test](https://jenkins.osmocom.org/jenkins/job/ttcn3-ggsn-test/) +* [ttcn3-ggsn-test-latest](https://jenkins.osmocom.org/jenkins/job/ttcn3-ggsn-… +* [ttcn3-ggsn-test-kernel](https://jenkins.osmocom.org/jenkins/job/ttcn3-ggsn-… +* [ttcn3-ggsn-test-kernel-latest](https://jenkins.osmocom.org/jenkins/job/ttcn… +* [ttcn3-ggsn-test-kernel-net-next](https://jenkins.osmocom.org/jenkins/job/tt… +* [ttcn3-ggsn-test-kernel-latest-net-next](https://jenkins.osmocom.org/jenkins… +* [ttcn3-ggsn-test-kernel-torvalds](https://jenkins.osmocom.org/jenkins/job/tt… +* [ttcn3-ggsn-test-kernel-latest-torvalds](https://jenkins.osmocom.org/jenkins… +* [ttcn3-ggsn-test-ogs](https://jenkins.osmocom.org/jenkins/job/ttcn3-ggsn-tes… -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38458?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: I49421151b199fa6536da784b6c412b03f3fdbd05 Gerrit-Change-Number: 38458 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libgtpnl[master]: build: fix bashims in configure.ac
by osmith 21 Oct '24

21 Oct '24

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/libgtpnl/+/38474?usp=email ) Change subject: build: fix bashims in configure.ac ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/38474?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I2c0a62ab80f480502dd2a1bcf4aef71e70152ea6 Gerrit-Change-Number: 38474 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 21 Oct 2024 08:37:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libgtpnl[master]: Revert `configure: regular_C(PP)FLAGS -> C(PP)FLAGS`
by osmith 21 Oct '24

21 Oct '24

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/libgtpnl/+/38473?usp=email ) Change subject: Revert `configure: regular_C(PP)FLAGS -> C(PP)FLAGS` ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/38473?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I5cc30885cec564346997269b51decbbe49548ddf Gerrit-Change-Number: 38473 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 21 Oct 2024 08:37:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in libgtpnl[master]: build: fix bashims in configure.ac
by osmith 21 Oct '24

21 Oct '24

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/libgtpnl/+/38474?usp=email ) Change subject: build: fix bashims in configure.ac ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Jan sent this patch to me via e-mail. -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/38474?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I2c0a62ab80f480502dd2a1bcf4aef71e70152ea6 Gerrit-Change-Number: 38474 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 21 Oct 2024 08:36:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[S] Change in libgtpnl[master]: Revert `configure: regular_C(PP)FLAGS -> C(PP)FLAGS`
by osmith 21 Oct '24

21 Oct '24

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/libgtpnl/+/38473?usp=email ) Change subject: Revert `configure: regular_C(PP)FLAGS -> C(PP)FLAGS` ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Jan sent this patch to me via e-mail. It reverts https://gerrit.osmocom.org/c/libgtpnl/+/34826. I've verified that --enable-werror still works with this patch. -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/38473?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I5cc30885cec564346997269b51decbbe49548ddf Gerrit-Change-Number: 38473 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 21 Oct 2024 08:36:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[XS] Change in libgtpnl[master]: build: fix bashims in configure.ac
by osmith 21 Oct '24

21 Oct '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libgtpnl/+/38474?usp=email ) Change subject: build: fix bashims in configure.ac ...................................................................... build: fix bashims in configure.ac $ foo=bar $ foo+=zzz dash: 2: foo+=zzz: not found Fixes: 1.2.5-6-g0bd1e0d Change-Id: I2c0a62ab80f480502dd2a1bcf4aef71e70152ea6 --- M configure.ac 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/74/38474/1 diff --git a/configure.ac b/configure.ac index 6eabd32..24658a4 100644 --- a/configure.ac +++ b/configure.ac @@ -71,9 +71,9 @@ if test x"$werror" = x"yes" then WERROR_FLAGS="-Werror" - WERROR_FLAGS+=" -Werror=implicit-int -Werror=int-conversion -Werror=old-style-definition" - WERROR_FLAGS+=" -Wno-error=deprecated -Wno-error=deprecated-declarations" - WERROR_FLAGS+=" -Wno-error=cpp" # "#warning" + WERROR_FLAGS="$WERROR_FLAGS -Werror=implicit-int -Werror=int-conversion -Werror=old-style-definition" + WERROR_FLAGS="$WERROR_FLAGS -Wno-error=deprecated -Wno-error=deprecated-declarations" + WERROR_FLAGS="$WERROR_FLAGS -Wno-error=cpp" # "#warning" regular_CFLAGS="$WERROR_FLAGS" regular_CPPFLAGS="$WERROR_FLAGS" fi -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/38474?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I2c0a62ab80f480502dd2a1bcf4aef71e70152ea6 Gerrit-Change-Number: 38474 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in libgtpnl[master]: Revert `configure: regular_C(PP)FLAGS -> C(PP)FLAGS`
by osmith 21 Oct '24

21 Oct '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/libgtpnl/+/38473?usp=email ) Change subject: Revert `configure: regular_C(PP)FLAGS -> C(PP)FLAGS` ...................................................................... Revert `configure: regular_C(PP)FLAGS -> C(PP)FLAGS` This commit reverts dd335ef8fc41567e324a3d26f1ec30d04c69a0bb. Observed: ``` $ configure && make CPPFLAGS=-DNDEBUG gcc -DHAVE_CONFIG_H -I. -I.. -DNDEBUG -I../include -I/usr/include/libmnl -DNDEBUG -Wall -Waggregate-return -Wmissing-declarations -Wmissing-prototypes -Wshadow -Wstrict-prototypes -Wformat=2 -pipe -std=gnu11 -fvisibility=hidden -Wall -Waggregate-return -Wmissing-declarations -Wmissing-prototypes -Wshadow -Wstrict-prototypes -Wformat=2 -pipe -std=gnu11 -MT gtp-tunnel.o -MD -MP -MF $depbase.Tpo -c -o gtp-tunnel.o gtp-tunnel.c &&\ ``` Expected: ``` gcc -DHAVE_CONFIG_H -I. -I.. -D_FILE_OFFSET_BITS=64 -D_REENTRANT -I../include -I/usr/include/libmnl -D_FILE_OFFSET_BITS=64 -D_REENTRANT -Wall -Waggregate-return -Wmissing-declarations -Wmissing-prototypes -Wshadow -Wstrict-prototypes -Wformat=2 -pipe -std=gnu11 -fvisibility=hidden -Wall -Waggregate-return -Wmissing-declarations -Wmissing-prototypes -Wshadow -Wstrict-prototypes -Wformat=2 -pipe -std=gnu11 -MT gtp-tunnel.o -MD -MP -MF $depbase.Tpo -c -o gtp-tunnel.o gtp-tunnel.c &&\ ``` Including ${CFLAGS} in AM_CFLAGS (which is totally wrong) is the cause for the double apperance of -DNDEBUG. _FILE_OFFSET_BITS is lost because dd335 violated one core principle of autoconf/automake: configure MUST run idempotent and not touch CPPFLAGS and CFLAGS, pursuant to automake.info §3.6 "User variables". Change-Id: I5cc30885cec564346997269b51decbbe49548ddf --- M Make_global.am M configure.ac 2 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/73/38473/1 diff --git a/Make_global.am b/Make_global.am index 9a3d5b2..f2cb36c 100644 --- a/Make_global.am +++ b/Make_global.am @@ -1,2 +1,2 @@ -AM_CPPFLAGS = ${CPPFLAGS} -I${top_srcdir}/include ${LIBMNL_CFLAGS} -AM_CFLAGS = ${CFLAGS} ${GCC_FVISIBILITY_HIDDEN} +AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_srcdir}/include ${LIBMNL_CFLAGS} +AM_CFLAGS = ${regular_CFLAGS} ${GCC_FVISIBILITY_HIDDEN} diff --git a/configure.ac b/configure.ac index 90e4dce..6eabd32 100644 --- a/configure.ac +++ b/configure.ac @@ -9,8 +9,8 @@ AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([foreign tar-pax no-dist-gzip dist-bzip2 1.6 subdir-objects]) -CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64 -D_REENTRANT" -CFLAGS="$CFLAGS -Wall -Waggregate-return -Wmissing-declarations \ +regular_CPPFLAGS="-D_FILE_OFFSET_BITS=64 -D_REENTRANT" +regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \ -Wmissing-prototypes -Wshadow -Wstrict-prototypes \ -Wformat=2 -pipe" @@ -55,8 +55,8 @@ [sanitize=$enableval], [sanitize="no"]) if test x"$sanitize" = x"yes" then - CFLAGS="$CFLAGS -fsanitize=address -fsanitize=undefined" - CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined" + regular_CFLAGS="-fsanitize=address -fsanitize=undefined" + regular_CPPFLAGS="-fsanitize=address -fsanitize=undefined" fi AC_ARG_ENABLE(werror, @@ -74,8 +74,8 @@ WERROR_FLAGS+=" -Werror=implicit-int -Werror=int-conversion -Werror=old-style-definition" WERROR_FLAGS+=" -Wno-error=deprecated -Wno-error=deprecated-declarations" WERROR_FLAGS+=" -Wno-error=cpp" # "#warning" - CFLAGS="$CFLAGS $WERROR_FLAGS" - CPPFLAGS="$CPPFLAGS $WERROR_FLAGS" + regular_CFLAGS="$WERROR_FLAGS" + regular_CPPFLAGS="$WERROR_FLAGS" fi AC_ARG_ENABLE(qemu_tests, @@ -91,8 +91,8 @@ AC_MSG_ERROR([missing programs for --enable-qemu-tests]) fi -AC_SUBST([CPPFLAGS]) -AC_SUBST([CFLAGS]) +AC_SUBST([regular_CPPFLAGS]) +AC_SUBST([regular_CFLAGS]) AC_CONFIG_FILES([ Makefile include/Makefile -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/38473?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I5cc30885cec564346997269b51decbbe49548ddf Gerrit-Change-Number: 38473 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: ggsn: README: document how to run with testenv
by fixeria 21 Oct '24

21 Oct '24

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38458?usp=email ) Change subject: ggsn: README: document how to run with testenv ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38458?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: I49421151b199fa6536da784b6c412b03f3fdbd05 Gerrit-Change-Number: 38458 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-Comment-Date: Mon, 21 Oct 2024 08:09:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0