- gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: ggsn: add m_ggsn_conf modulepar
by pespin 22 Mar '24

22 Mar '24

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36388?usp=email ) Change subject: ggsn: add m_ggsn_conf modulepar ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: why is this needed? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36388?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6d94a8b18200fbb2119406827b74b83e912e3ecc Gerrit-Change-Number: 36388 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 14:36:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-trx[master]: ms: disabe uhd ms build
by Hoernchen 22 Mar '24

22 Mar '24

Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36377?usp=email ) Change subject: ms: disabe uhd ms build ...................................................................... ms: disabe uhd ms build This won't build, and has been in a untested non working state for a year, but might still be useful after fixing it up in the future in case someone needs it. Change-Id: I9db1740b5c399a02a41b1d07792c645cf7d1bd1b --- M Transceiver52M/Makefile.am 1 file changed, 23 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Hoernchen: Looks good to me, approved diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am index dadfde9..0b63b16 100644 --- a/Transceiver52M/Makefile.am +++ b/Transceiver52M/Makefile.am @@ -127,16 +127,16 @@ $(UHD_LIBS) osmo_trx_uhd_CPPFLAGS = $(AM_CPPFLAGS) $(UHD_CFLAGS) -if ENABLE_MS_TRX -bin_PROGRAMS += osmo-trx-ms-uhd -osmo_trx_ms_uhd_SOURCES = $(MS_LOWER_SRC) $(MS_UPPER_SRC) -osmo_trx_ms_uhd_LDADD = \ - $(builddir)/device/uhd/libdevice.la \ - $(COMMON_LDADD) \ - $(UHD_LIBS) \ - $(TRXCON_LDADD) -osmo_trx_ms_uhd_CPPFLAGS = $(AM_CPPFLAGS) $(UHD_CFLAGS) -DBUILDUHD -endif +#if ENABLE_MS_TRX +#bin_PROGRAMS += osmo-trx-ms-uhd +#osmo_trx_ms_uhd_SOURCES = $(MS_LOWER_SRC) $(MS_UPPER_SRC) +#osmo_trx_ms_uhd_LDADD = \ +# $(builddir)/device/uhd/libdevice.la \ +# $(COMMON_LDADD) \ +# $(UHD_LIBS) \ +# $(TRXCON_LDADD) +#osmo_trx_ms_uhd_CPPFLAGS = $(AM_CPPFLAGS) $(UHD_CFLAGS) -DBUILDUHD +#endif endif if DEVICE_USRP1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36377?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I9db1740b5c399a02a41b1d07792c645cf7d1bd1b Gerrit-Change-Number: 36377 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-trx[master]: ms: disabe uhd ms build
by Hoernchen 22 Mar '24

22 Mar '24

Attention is currently required from: laforge. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36377?usp=email ) Change subject: ms: disabe uhd ms build ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36377?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I9db1740b5c399a02a41b1d07792c645cf7d1bd1b Gerrit-Change-Number: 36377 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 22 Mar 2024 13:41:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in docker-playground[master]: ttcn3-ggsn-test: run with multiple configurations
by osmith 22 Mar '24

22 Mar '24

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36392?usp=email ) Change subject: ttcn3-ggsn-test: run with multiple configurations ...................................................................... Patch Set 1: Verified+1 (1 comment) Patchset: PS1: This is how it looks like (click "expand all"): * https://jenkins.osmocom.org/jenkins/job/osmith-ttcn3-ggsn-test/test_results… * https://jenkins.osmocom.org/jenkins/job/osmith-ttcn3-ggsn-test-kernel/test_… * https://jenkins.osmocom.org/jenkins/job/osmith-ttcn3-ggsn-test-kernel-pablo… -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36392?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: Ia2fe0c3ed4ccf06e72fd258d085e4a79cecd5f26 Gerrit-Change-Number: 36392 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 12:41:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in docker-playground[master]: ttcn3-ggsn-test/jenkins: add functions for start ggsn/testsuite
by osmith 22 Mar '24

22 Mar '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36390?usp=email ) Change subject: ttcn3-ggsn-test/jenkins: add functions for start ggsn/testsuite ...................................................................... ttcn3-ggsn-test/jenkins: add functions for start ggsn/testsuite Prepare to run start_ggsn and start_testsuite multiple times with different configurations in a follow-up patch. Related: OS#6096 Change-Id: I0754b0df5f1b0b162732c3db0797f65676553ab0 --- M ttcn3-ggsn-test/jenkins.sh 1 file changed, 78 insertions(+), 59 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/90/36390/1 diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index 3909036..1ea9d91 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -11,6 +11,69 @@ set_clean_up_trap set -e +# Start container with ggsn in background +start_ggsn() { + GGSN_CMD="osmo-ggsn -c /data/osmo-ggsn.cfg" + GGSN_DOCKER_ARGS="" + if [ "$KERNEL_TEST" = "1" ]; then + cp osmo-ggsn-kernel-gtp.cfg $VOL_BASE_DIR/ggsn/osmo-ggsn.cfg + cp initrd-ggsn.sh $VOL_BASE_DIR/ggsn/ + network_replace_subnet_in_configs + + kernel_test_prepare \ + "defconfig" \ + "fragment.config" \ + "$VOL_BASE_DIR/ggsn/initrd-ggsn.sh" \ + "$REPO_USER/osmo-ggsn-$IMAGE_SUFFIX" \ + -v $VOL_BASE_DIR/ggsn:/data + + GGSN_CMD="/kernel-test/run-qemu.sh" + GGSN_DOCKER_ARGS=" + $(docker_network_params $SUBNET 200) + $(docker_kvm_param) + -v "$KERNEL_TEST_DIR:/kernel-test:ro" + -v "$CACHE_DIR:/cache" + " + OSMO_SUT_HOST="172.18.$SUBNET.200" + else + cp osmo-ggsn.cfg $VOL_BASE_DIR/ggsn/ + network_replace_subnet_in_configs + + GGSN_DOCKER_ARGS=" + $(docker_network_params $SUBNET 201) + " + OSMO_SUT_HOST="172.18.$SUBNET.201" + fi + docker run --rm \ + --cap-add=NET_ADMIN \ + --device /dev/net/tun:/dev/net/tun \ + --sysctl net.ipv6.conf.all.disable_ipv6=0 \ + --ulimit core=-1 \ + -v $VOL_BASE_DIR/ggsn:/data \ + --name ${BUILD_TAG}-ggsn -d \ + $DOCKER_ARGS \ + $GGSN_DOCKER_ARGS \ + $REPO_USER/osmo-ggsn-$IMAGE_SUFFIX \ + /bin/sh -c "$GGSN_CMD >/data/osmo-ggsn.log 2>&1" + + kernel_test_wait_for_vm "$VOL_BASE_DIR/ggsn/osmo-ggsn.log" +} + +# Start docker container with testsuite in foreground +start_testsuite() { + docker run --rm \ + --sysctl net.ipv6.conf.all.disable_ipv6=0 \ + $(docker_network_params $SUBNET 202) \ + --ulimit core=-1 \ + -v $VOL_BASE_DIR/ggsn-tester:/data \ + -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=$OSMO_SUT_HOST" \ + -e "OSMO_SUT_PORT=4260" \ + --name ${BUILD_TAG}-ggsn-test \ + $DOCKER_ARGS \ + $REPO_USER/ttcn3-ggsn-test +} + mkdir $VOL_BASE_DIR/ggsn-tester cp GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/ggsn-tester/GGSN_Tests.cfg" @@ -18,62 +81,5 @@ mkdir $VOL_BASE_DIR/ggsn network_create - -# start container with ggsn in background -GGSN_CMD="osmo-ggsn -c /data/osmo-ggsn.cfg" -GGSN_DOCKER_ARGS="" -if [ "$KERNEL_TEST" = "1" ]; then - cp osmo-ggsn-kernel-gtp.cfg $VOL_BASE_DIR/ggsn/osmo-ggsn.cfg - cp initrd-ggsn.sh $VOL_BASE_DIR/ggsn/ - network_replace_subnet_in_configs - - kernel_test_prepare \ - "defconfig" \ - "fragment.config" \ - "$VOL_BASE_DIR/ggsn/initrd-ggsn.sh" \ - "$REPO_USER/osmo-ggsn-$IMAGE_SUFFIX" \ - -v $VOL_BASE_DIR/ggsn:/data - - GGSN_CMD="/kernel-test/run-qemu.sh" - GGSN_DOCKER_ARGS=" - $(docker_network_params $SUBNET 200) - $(docker_kvm_param) - -v "$KERNEL_TEST_DIR:/kernel-test:ro" - -v "$CACHE_DIR:/cache" - " - OSMO_SUT_HOST="172.18.$SUBNET.200" -else - cp osmo-ggsn.cfg $VOL_BASE_DIR/ggsn/ - network_replace_subnet_in_configs - - GGSN_DOCKER_ARGS=" - $(docker_network_params $SUBNET 201) - " - OSMO_SUT_HOST="172.18.$SUBNET.201" -fi -docker run --rm \ - --cap-add=NET_ADMIN \ - --device /dev/net/tun:/dev/net/tun \ - --sysctl net.ipv6.conf.all.disable_ipv6=0 \ - --ulimit core=-1 \ - -v $VOL_BASE_DIR/ggsn:/data \ - --name ${BUILD_TAG}-ggsn -d \ - $DOCKER_ARGS \ - $GGSN_DOCKER_ARGS \ - $REPO_USER/osmo-ggsn-$IMAGE_SUFFIX \ - /bin/sh -c "$GGSN_CMD >/data/osmo-ggsn.log 2>&1" - -kernel_test_wait_for_vm "$VOL_BASE_DIR/ggsn/osmo-ggsn.log" - -# start docker container with testsuite in foreground -docker run --rm \ - --sysctl net.ipv6.conf.all.disable_ipv6=0 \ - $(docker_network_params $SUBNET 202) \ - --ulimit core=-1 \ - -v $VOL_BASE_DIR/ggsn-tester:/data \ - -e "TTCN3_PCAP_PATH=/data" \ - -e "OSMO_SUT_HOST=$OSMO_SUT_HOST" \ - -e "OSMO_SUT_PORT=4260" \ - --name ${BUILD_TAG}-ggsn-test \ - $DOCKER_ARGS \ - $REPO_USER/ttcn3-ggsn-test +start_ggsn +start_testsuite -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36390?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: I0754b0df5f1b0b162732c3db0797f65676553ab0 Gerrit-Change-Number: 36390 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in docker-playground[master]: ttcn3-ggsn-test: move confgs to subdirs
by osmith 22 Mar '24

22 Mar '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36391?usp=email ) Change subject: ttcn3-ggsn-test: move confgs to subdirs ...................................................................... ttcn3-ggsn-test: move confgs to subdirs Prepare to add variations of the configs: move them to subdirs, so we don't cullter the main directory. Related: OS#6096 Change-Id: I03a06f9f516922c47e3092ff7d7c2c68b0852c1b --- M ttcn3-ggsn-test/Dockerfile M ttcn3-ggsn-test/jenkins.sh R ttcn3-ggsn-test/osmo-ggsn-kernel/fragment.config R ttcn3-ggsn-test/osmo-ggsn-kernel/initrd-ggsn.sh R ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg R ttcn3-ggsn-test/osmo-ggsn/osmo-ggsn.cfg R ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg 7 files changed, 27 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/91/36391/1 diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile index 447ddeb..137a4cd 100644 --- a/ttcn3-ggsn-test/Dockerfile +++ b/ttcn3-ggsn-test/Dockerfile @@ -8,6 +8,6 @@ VOLUME /data -COPY GGSN_Tests.cfg /data/GGSN_Tests.cfg +COPY ttcn3/GGSN_Tests.cfg /data/GGSN_Tests.cfg CMD ttcn3-docker-run ggsn_tests GGSN_Tests diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index 1ea9d91..3f1eaf3 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -16,13 +16,12 @@ GGSN_CMD="osmo-ggsn -c /data/osmo-ggsn.cfg" GGSN_DOCKER_ARGS="" if [ "$KERNEL_TEST" = "1" ]; then - cp osmo-ggsn-kernel-gtp.cfg $VOL_BASE_DIR/ggsn/osmo-ggsn.cfg - cp initrd-ggsn.sh $VOL_BASE_DIR/ggsn/ + cp osmo-ggsn-kernel/initrd-ggsn.sh $VOL_BASE_DIR/ggsn/ network_replace_subnet_in_configs kernel_test_prepare \ "defconfig" \ - "fragment.config" \ + "osmo-ggsn-kernel/fragment.config" \ "$VOL_BASE_DIR/ggsn/initrd-ggsn.sh" \ "$REPO_USER/osmo-ggsn-$IMAGE_SUFFIX" \ -v $VOL_BASE_DIR/ggsn:/data @@ -36,8 +35,6 @@ " OSMO_SUT_HOST="172.18.$SUBNET.200" else - cp osmo-ggsn.cfg $VOL_BASE_DIR/ggsn/ - network_replace_subnet_in_configs GGSN_DOCKER_ARGS=" $(docker_network_params $SUBNET 201) @@ -75,11 +72,21 @@ } mkdir $VOL_BASE_DIR/ggsn-tester -cp GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/ +cp ttcn3/GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/ggsn-tester/GGSN_Tests.cfg" mkdir $VOL_BASE_DIR/ggsn network_create + +if [ "$KERNEL_TEST" = 1 ]; then + CONFIGS_DIR="osmo-ggsn-kernel" +else + CONFIGS_DIR="osmo-ggsn" +fi + +cp "$CONFIGS_DIR"/osmo-ggsn.cfg $VOL_BASE_DIR/ggsn/osmo-ggsn.cfg +network_replace_subnet_in_configs + start_ggsn start_testsuite diff --git a/ttcn3-ggsn-test/fragment.config b/ttcn3-ggsn-test/osmo-ggsn-kernel/fragment.config similarity index 100% rename from ttcn3-ggsn-test/fragment.config rename to ttcn3-ggsn-test/osmo-ggsn-kernel/fragment.config diff --git a/ttcn3-ggsn-test/initrd-ggsn.sh b/ttcn3-ggsn-test/osmo-ggsn-kernel/initrd-ggsn.sh similarity index 100% rename from ttcn3-ggsn-test/initrd-ggsn.sh rename to ttcn3-ggsn-test/osmo-ggsn-kernel/initrd-ggsn.sh diff --git a/ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg b/ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg similarity index 100% rename from ttcn3-ggsn-test/osmo-ggsn-kernel-gtp.cfg rename to ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg diff --git a/ttcn3-ggsn-test/osmo-ggsn.cfg b/ttcn3-ggsn-test/osmo-ggsn/osmo-ggsn.cfg similarity index 100% rename from ttcn3-ggsn-test/osmo-ggsn.cfg rename to ttcn3-ggsn-test/osmo-ggsn/osmo-ggsn.cfg diff --git a/ttcn3-ggsn-test/GGSN_Tests.cfg b/ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg similarity index 100% rename from ttcn3-ggsn-test/GGSN_Tests.cfg rename to ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36391?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: I03a06f9f516922c47e3092ff7d7c2c68b0852c1b Gerrit-Change-Number: 36391 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in docker-playground[master]: ttcn3-bts-test: add env var to not run all configs
by osmith 22 Mar '24

22 Mar '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36389?usp=email ) Change subject: ttcn3-bts-test: add env var to not run all configs ...................................................................... ttcn3-bts-test: add env var to not run all configs Make it possible to e.g. run only one of the generic/oml/hopping configurations. I made a version of this patch a few weeks ago for testing OS#6375, and I'm submitting it now so I can add multiple configurations for ttcn3-ggsn-test in the next patch with the same logic. Change-Id: I1dce5e6aa4b5d67f9f8c96ced611ab2875c353c8 --- M README.md M jenkins-common.sh M ttcn3-bts-test/jenkins.sh 3 files changed, 150 insertions(+), 45 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/89/36389/1 diff --git a/README.md b/README.md index 436fdd0..4c6c40a 100644 --- a/README.md +++ b/README.md @@ -28,15 +28,29 @@ containers (see "caching" below) * `DOCKER_ARGS`: pass extra arguments to docker, e.g. to mount local sources for building as done in osmo-dev.git/ttcn3/ttcn3.sh +* `TEST_CONFIGS`: for tests that can run with multiple config sets (e.g. + `ttcn3-bts-test`), run only some of them. See `TEST_CONFIGS_ALL` in the + `jenkins.sh` for possible values. ### Run only one test +Run only `TC_gsup_sai` in `ttcn3-hlr-test`: + ``` $ cd ttcn3-hlr-test $ export DOCKER_ARGS="-e TEST_NAME=TC_gsup_sai" $ ./jenkins.sh ``` +Run only `TC_est_dchan` in `ttcn3-bts-test`, with the `generic` configuration: + +``` +$ cd ttcn3-bts-test +$ export DOCKER_ARGS="-e TEST_NAME=TC_est_dchan" +$ export TEST_CONFIGS="generic" +$ ./jenkins.sh +``` + ### Using nightly packages from a different date Pick a date from [here](https://downloads.osmocom.org/obs-mirror/) and use it: diff --git a/jenkins-common.sh b/jenkins-common.sh index 7978749..b4956bd 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -569,6 +569,49 @@ "$config" } +# Output the name of the test config and check if it is enabled. Use this +# function in jenkins.sh, after setting TEST_CONFIGS_ALL, e.g.: +# TEST_CONFIGS_ALL="generic oml hopping" +# The user can then set TEST_CONFIGS to only run one of the test +# configurations. +# $1: one of TEST_CONFIGS_ALL, e.g. "classic" +test_config_enabled() { + local config="$1" + local i + local valid=0 + + set +x + echo + echo "### Test configuration: $1 ###" + echo + set -x + + for i in $TEST_CONFIGS_ALL; do + if [ "$config" = "$i" ]; then + valid=1 + break + fi + done + + if [ "$valid" != "1" ]; then + set +x + echo "ERROR: config name '$config' is not one of '$TEST_CONFIGS_ALL'" + exit 1 + fi + + if [ -z "$TEST_CONFIGS" ]; then + return 0 + fi + + for i in $TEST_CONFIGS; do + if [ "$config" = "$i" ]; then + return 0 + fi + done + + return 1 +} + set -x # non-jenkins execution: assume local user name diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index f932b4a..0e9fd3e 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -1,4 +1,6 @@ #!/bin/sh +TEST_CONFIGS_ALL="generic virtphy oml hopping" +TEST_CONFIGS="${TEST_CONFIGS:-"generic oml hopping"}" . ../jenkins-common.sh IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" @@ -13,12 +15,14 @@ set -e clean_up() { - # append ':hopping' to the classnames, - # e.g. "classname='BTS_Tests'" => "classname='BTS_Tests:hopping'" - # e.g. "classname='BTS_Tests_SMSCB'" => "classname='BTS_Tests_SMSCB:hopping'" - # so the hopping test cases would not interfere with non-hopping ones in Jenkins - sed -i "s/classname='$[^']\+$'/classname='\1:hopping'/g" \ - $VOL_BASE_DIR/bts-tester-hopping/junit-xml-hopping-*.log + if test_config_enabled "hopping"; then + # append ':hopping' to the classnames, + # e.g. "classname='BTS_Tests'" => "classname='BTS_Tests:hopping'" + # e.g. "classname='BTS_Tests_SMSCB'" => "classname='BTS_Tests_SMSCB:hopping'" + # so the hopping test cases would not interfere with non-hopping ones in Jenkins + sed -i "s/classname='$[^']\+$'/classname='\1:hopping'/g" \ + $VOL_BASE_DIR/bts-tester-hopping/junit-xml-hopping-*.log + fi } start_bsc() { @@ -167,49 +171,77 @@ mkdir $VOL_BASE_DIR/virtphy # 1) classic test suite with BSC for OML and trxcon+fake_trx -network_replace_subnet_in_configs -start_bsc -start_bts trx 1 -start_fake_trx -start_trxcon -start_testsuite generic +if test_config_enabled "generic"; then + network_replace_subnet_in_configs + + start_bsc + start_bts trx 1 + start_fake_trx + start_trxcon + + start_testsuite generic + + docker_kill_wait ${BUILD_TAG}-trxcon + docker_kill_wait ${BUILD_TAG}-fake_trx + docker_kill_wait ${BUILD_TAG}-bts + docker_kill_wait ${BUILD_TAG}-bsc +fi # 2) some GPRS tests require virt_phy -echo "Changing to virtphy configuration" -# switch from osmo-bts-trx + trxcon + faketrx to virtphy + osmo-bts-virtual -docker_kill_wait ${BUILD_TAG}-trxcon -docker_kill_wait ${BUILD_TAG}-fake_trx -docker_kill_wait ${BUILD_TAG}-bts -cp virtphy/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/ -network_replace_subnet_in_configs -# FIXME: multicast to/from a docker bridge network is currently not possible. -# See https://github.com/moby/libnetwork/issues/2397. -echo "XXX: not running the virtphy configuration" -#start_bts virtual 0 -#start_virtphy -# ... and execute the testsuite again with different cfg -#start_testsuite virtphy +if test_config_enabled "virtphy"; then + # FIXME: multicast to/from a docker bridge network is currently not possible. + # See https://github.com/moby/libnetwork/issues/2397. + set +x + echo "ERROR: not running the virtphy configuration" + exit 1 + + cp virtphy/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/ + network_replace_subnet_in_configs + + start_bsc + start_bts virtual 0 + start_virtphy + + start_testsuite virtphy + + docker_kill_wait ${BUILD_TAG}-virtphy + docker_kill_wait ${BUILD_TAG}-bts + docker_kill_wait ${BUILD_TAG}-bsc +fi # 3) OML tests require us to run without BSC -docker_kill_wait ${BUILD_TAG}-bsc -# switch back from virtphy + osmo-bts-virtual to osmo-bts-trx -#docker_kill_wait ${BUILD_TAG}-virtphy -#docker_kill_wait ${BUILD_TAG}-bts +if test_config_enabled "oml"; then + cp oml/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/ + network_replace_subnet_in_configs -cp oml/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/ -network_replace_subnet_in_configs -start_bts trx 1 -start_fake_trx -start_trxcon -# ... and execute the testsuite again with different cfg -start_testsuite oml + start_bsc + start_bts trx 1 + start_fake_trx + start_trxcon + + start_testsuite oml + + docker_kill_wait ${BUILD_TAG}-trxcon + docker_kill_wait ${BUILD_TAG}-fake_trx + docker_kill_wait ${BUILD_TAG}-bts + docker_kill_wait ${BUILD_TAG}-bsc +fi # 4) Frequency hopping tests require different configuration files -cp fh/osmo-bsc.gen.cfg $VOL_BASE_DIR/bsc/ -cp generic/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/ -# restart the BSC/BTS and run the testsuite again -docker_kill_wait ${BUILD_TAG}-bts -network_replace_subnet_in_configs -start_bsc -start_bts trx 1 -start_testsuite hopping +if test_config_enabled "hopping"; then + cp fh/osmo-bsc.gen.cfg $VOL_BASE_DIR/bsc/ + cp generic/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/ + network_replace_subnet_in_configs + + start_bsc + start_bts trx 1 + start_fake_trx + start_trxcon + + start_testsuite hopping + + docker_kill_wait ${BUILD_TAG}-trxcon + docker_kill_wait ${BUILD_TAG}-fake_trx + docker_kill_wait ${BUILD_TAG}-bsc + docker_kill_wait ${BUILD_TAG}-bts +fi -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36389?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: I1dce5e6aa4b5d67f9f8c96ced611ab2875c353c8 Gerrit-Change-Number: 36389 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in docker-playground[master]: ttcn3-ggsn-test: run with multiple configurations
by osmith 22 Mar '24

22 Mar '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36392?usp=email ) Change subject: ttcn3-ggsn-test: run with multiple configurations ...................................................................... ttcn3-ggsn-test: run with multiple configurations The kernel ttcn3-ggsn-tests have been failing since the osmo-ggsn config for kernel-gtp has been adjusted for v4v6 instead of v4 only. This new configuration caused a regression with: * linux kernel without Pablo's GTP IPv6 patches * latest stable release of osmo-ggsn, which does not support IPv6 As the kernel patches aren't merged yet, this caused all tests to fail. Avoid this by running the ttcn3-ggsn-test with multiple configurations: * v4_only: one APN with v4 * v6_only: one APN with v6 * v4v6_only: one APN with v4v6 * all: multiple APNs with all of the above With this change, the tests running in the v4_only configuration will pass again with the stable versions of osmo-ggsn, libgtpnl and kernel. And with new versions, most test in the other configurations will pass too. As discussed with Harald, this does not only split up the configuration for osmo-ggsn with kernel gtp-u, but also with the userspace implementation. The "all" config currently only works with the userspace gtp implementation (OS#6106). Related: OS#6096 Depends: osmo-ttcn3-hacks I6d94a8b18200fbb2119406827b74b83e912e3ecc Fixes: e24442f9 ("ttcn3-ggsn-test: kernel-gtp: add ipv6") Change-Id: Ia2fe0c3ed4ccf06e72fd258d085e4a79cecd5f26 --- M ttcn3-ggsn-test/Dockerfile M ttcn3-ggsn-test/jenkins.sh C ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn-v4_only.cfg R ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn-v4v6_only.cfg C ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn-v6_only.cfg R ttcn3-ggsn-test/osmo-ggsn/osmo-ggsn-all.cfg C ttcn3-ggsn-test/osmo-ggsn/osmo-ggsn-v4_only.cfg C ttcn3-ggsn-test/osmo-ggsn/osmo-ggsn-v4v6_only.cfg A ttcn3-ggsn-test/osmo-ggsn/osmo-ggsn-v6_only.cfg R ttcn3-ggsn-test/ttcn3/GGSN_Tests-all.cfg C ttcn3-ggsn-test/ttcn3/GGSN_Tests-v4_only.cfg C ttcn3-ggsn-test/ttcn3/GGSN_Tests-v4v6_only.cfg C ttcn3-ggsn-test/ttcn3/GGSN_Tests-v6_only.cfg 13 files changed, 170 insertions(+), 71 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/92/36392/1 diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile index 137a4cd..124adf3 100644 --- a/ttcn3-ggsn-test/Dockerfile +++ b/ttcn3-ggsn-test/Dockerfile @@ -8,6 +8,6 @@ VOLUME /data -COPY ttcn3/GGSN_Tests.cfg /data/GGSN_Tests.cfg +COPY ttcn3/GGSN_Tests-all.cfg /data/GGSN_Tests.cfg CMD ttcn3-docker-run ggsn_tests GGSN_Tests diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index 3f1eaf3..5db5d17 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -1,5 +1,12 @@ #!/bin/sh -# Environment variables: see "Kernel test" section in README.md +# Environment variables: see README.md +# Possible test configurations: +# * v4_only: one APN with v4 +# * v6_only: one APN with v6 +# * v4v6_only: one APN with v4v6 +# * all: multiple APNs with all of the above +TEST_CONFIGS_ALL="all v4_only v6_only v4v6_only" +TEST_CONFIGS="${TEST_CONFIGS:-$TEST_CONFIGS_ALL}" . ../jenkins-common.sh KERNEL_TEST="${KERNEL_TEST:-0}" @@ -11,20 +18,41 @@ set_clean_up_trap set -e +clean_up() { + local i + local log + + # Add a suffix to the class names in the junit-xml log + for i in $TEST_CONFIGS; do + if [ "$i" = "all" ]; then + continue + fi + + for log in "$VOL_BASE_DIR"/ggsn-tester-"$i"/junit-xml-*.log; do + if ! [ -e "$log" ]; then + continue + fi + sed -i "s/classname='$[^']\+$'/classname='\1_$i'/g" "$log" + done + done +} + # Start container with ggsn in background start_ggsn() { + local test_config="$1" + GGSN_CMD="osmo-ggsn -c /data/osmo-ggsn.cfg" GGSN_DOCKER_ARGS="" if [ "$KERNEL_TEST" = "1" ]; then - cp osmo-ggsn-kernel/initrd-ggsn.sh $VOL_BASE_DIR/ggsn/ + cp osmo-ggsn-kernel/initrd-ggsn.sh $VOL_BASE_DIR/ggsn-"$test_config"/ network_replace_subnet_in_configs kernel_test_prepare \ "defconfig" \ "osmo-ggsn-kernel/fragment.config" \ - "$VOL_BASE_DIR/ggsn/initrd-ggsn.sh" \ + "$VOL_BASE_DIR/ggsn-$test_config/initrd-ggsn.sh" \ "$REPO_USER/osmo-ggsn-$IMAGE_SUFFIX" \ - -v $VOL_BASE_DIR/ggsn:/data + -v $VOL_BASE_DIR/ggsn-"$test_config":/data GGSN_CMD="/kernel-test/run-qemu.sh" GGSN_DOCKER_ARGS=" @@ -46,23 +74,25 @@ --device /dev/net/tun:/dev/net/tun \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ --ulimit core=-1 \ - -v $VOL_BASE_DIR/ggsn:/data \ + -v $VOL_BASE_DIR/ggsn-"$test_config":/data \ --name ${BUILD_TAG}-ggsn -d \ $DOCKER_ARGS \ $GGSN_DOCKER_ARGS \ $REPO_USER/osmo-ggsn-$IMAGE_SUFFIX \ /bin/sh -c "$GGSN_CMD >/data/osmo-ggsn.log 2>&1" - kernel_test_wait_for_vm "$VOL_BASE_DIR/ggsn/osmo-ggsn.log" + kernel_test_wait_for_vm "$VOL_BASE_DIR/ggsn-$test_config/osmo-ggsn.log" } # Start docker container with testsuite in foreground start_testsuite() { + local test_config="$1" + docker run --rm \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ $(docker_network_params $SUBNET 202) \ --ulimit core=-1 \ - -v $VOL_BASE_DIR/ggsn-tester:/data \ + -v $VOL_BASE_DIR/ggsn-tester-"$test_config":/data \ -e "TTCN3_PCAP_PATH=/data" \ -e "OSMO_SUT_HOST=$OSMO_SUT_HOST" \ -e "OSMO_SUT_PORT=4260" \ @@ -71,12 +101,6 @@ $REPO_USER/ttcn3-ggsn-test } -mkdir $VOL_BASE_DIR/ggsn-tester -cp ttcn3/GGSN_Tests.cfg $VOL_BASE_DIR/ggsn-tester/ -write_mp_osmo_repo "$VOL_BASE_DIR/ggsn-tester/GGSN_Tests.cfg" - -mkdir $VOL_BASE_DIR/ggsn - network_create if [ "$KERNEL_TEST" = 1 ]; then @@ -85,8 +109,28 @@ CONFIGS_DIR="osmo-ggsn" fi -cp "$CONFIGS_DIR"/osmo-ggsn.cfg $VOL_BASE_DIR/ggsn/osmo-ggsn.cfg -network_replace_subnet_in_configs +for i in $TEST_CONFIGS_ALL; do + if ! test_config_enabled "$i"; then + continue + fi -start_ggsn -start_testsuite + # OS#6106: Currently it is not possible to configure multiple APNs with + # gtpu-mode kernel-gtp in OsmoGGSN, because it cannot share the GTP-U + # bind socket between tunnels. + if [ "$i" = "all" ] && [ "$KERNEL_TEST" = "1" ]; then + continue + fi + + mkdir $VOL_BASE_DIR/ggsn-tester-"$i" + cp ttcn3/GGSN_Tests-"$i".cfg $VOL_BASE_DIR/ggsn-tester-"$i"/GGSN_Tests.cfg + write_mp_osmo_repo "$VOL_BASE_DIR/ggsn-tester-$i/GGSN_Tests.cfg" + + mkdir $VOL_BASE_DIR/ggsn-"$i" + cp "$CONFIGS_DIR"/osmo-ggsn-"$i".cfg "$VOL_BASE_DIR"/ggsn-"$i"/osmo-ggsn.cfg + network_replace_subnet_in_configs + + start_ggsn "$i" + start_testsuite "$i" + + docker_kill_wait "$BUILD_TAG"-ggsn +done diff --git a/ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg b/ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn-v4_only.cfg similarity index 62% copy from ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg copy to ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn-v4_only.cfg index afa36d6..d8b67a2 100644 --- a/ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg +++ b/ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn-v4_only.cfg @@ -25,23 +25,14 @@ ggsn ggsn0 gtp state-dir /tmp gtp bind-ip 172.18.3.201 - # OS#6106: Currently it is not possible to configure multiple APNs with - # gtpu-mode kernel-gtp in OsmoGGSN, because it cannot share the GTP-U bind - # socket between tunnels. apn internet gtpu-mode kernel-gtp - tun-device tun46 - type-support v4v6 + tun-device tun4 + type-support v4 ip prefix dynamic 176.16.16.0/20 ip dns 0 172.18.3.201 ip dns 1 8.8.8.8 ip ifconfig 176.16.16.0/20 - ipv6 prefix dynamic 2001:780:44:2100:0:0:0:0/56 - ipv6 dns 0 fd02:db8:3::201 - ipv6 dns 1 2001:4860:4860::8844 - ipv6 ifconfig 2001:780:44:2100:0:0:0:0/56 no shutdown -# apn inet6 -# apn inet46 default-apn internet no shutdown ggsn diff --git a/ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg b/ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn-v4v6_only.cfg similarity index 77% rename from ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg rename to ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn-v4v6_only.cfg index afa36d6..c3f32f7 100644 --- a/ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg +++ b/ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn-v4v6_only.cfg @@ -25,10 +25,7 @@ ggsn ggsn0 gtp state-dir /tmp gtp bind-ip 172.18.3.201 - # OS#6106: Currently it is not possible to configure multiple APNs with - # gtpu-mode kernel-gtp in OsmoGGSN, because it cannot share the GTP-U bind - # socket between tunnels. - apn internet + apn inet46 gtpu-mode kernel-gtp tun-device tun46 type-support v4v6 @@ -41,7 +38,5 @@ ipv6 dns 1 2001:4860:4860::8844 ipv6 ifconfig 2001:780:44:2100:0:0:0:0/56 no shutdown -# apn inet6 -# apn inet46 - default-apn internet + default-apn inet46 no shutdown ggsn diff --git a/ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg b/ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn-v6_only.cfg similarity index 64% copy from ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg copy to ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn-v6_only.cfg index afa36d6..9de035f 100644 --- a/ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg +++ b/ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn-v6_only.cfg @@ -25,23 +25,14 @@ ggsn ggsn0 gtp state-dir /tmp gtp bind-ip 172.18.3.201 - # OS#6106: Currently it is not possible to configure multiple APNs with - # gtpu-mode kernel-gtp in OsmoGGSN, because it cannot share the GTP-U bind - # socket between tunnels. - apn internet + apn inet6 gtpu-mode kernel-gtp - tun-device tun46 - type-support v4v6 - ip prefix dynamic 176.16.16.0/20 - ip dns 0 172.18.3.201 - ip dns 1 8.8.8.8 - ip ifconfig 176.16.16.0/20 + tun-device tun6 + type-support v6 ipv6 prefix dynamic 2001:780:44:2100:0:0:0:0/56 ipv6 dns 0 fd02:db8:3::201 ipv6 dns 1 2001:4860:4860::8844 ipv6 ifconfig 2001:780:44:2100:0:0:0:0/56 no shutdown -# apn inet6 -# apn inet46 - default-apn internet + default-apn inet6 no shutdown ggsn diff --git a/ttcn3-ggsn-test/osmo-ggsn/osmo-ggsn.cfg b/ttcn3-ggsn-test/osmo-ggsn/osmo-ggsn-all.cfg similarity index 100% rename from ttcn3-ggsn-test/osmo-ggsn/osmo-ggsn.cfg rename to ttcn3-ggsn-test/osmo-ggsn/osmo-ggsn-all.cfg diff --git a/ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg b/ttcn3-ggsn-test/osmo-ggsn/osmo-ggsn-v4_only.cfg similarity index 60% copy from ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg copy to ttcn3-ggsn-test/osmo-ggsn/osmo-ggsn-v4_only.cfg index afa36d6..7a94b59 100644 --- a/ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg +++ b/ttcn3-ggsn-test/osmo-ggsn/osmo-ggsn-v4_only.cfg @@ -25,23 +25,17 @@ ggsn ggsn0 gtp state-dir /tmp gtp bind-ip 172.18.3.201 - # OS#6106: Currently it is not possible to configure multiple APNs with - # gtpu-mode kernel-gtp in OsmoGGSN, because it cannot share the GTP-U bind - # socket between tunnels. + timer gtp T3 1 + timer gtp T1003 2 + timer gtp X3 2 apn internet - gtpu-mode kernel-gtp - tun-device tun46 - type-support v4v6 + gtpu-mode tun + tun-device tun4 + type-support v4 ip prefix dynamic 176.16.16.0/20 ip dns 0 172.18.3.201 ip dns 1 8.8.8.8 ip ifconfig 176.16.16.0/20 - ipv6 prefix dynamic 2001:780:44:2100:0:0:0:0/56 - ipv6 dns 0 fd02:db8:3::201 - ipv6 dns 1 2001:4860:4860::8844 - ipv6 ifconfig 2001:780:44:2100:0:0:0:0/56 no shutdown -# apn inet6 -# apn inet46 default-apn internet no shutdown ggsn diff --git a/ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg b/ttcn3-ggsn-test/osmo-ggsn/osmo-ggsn-v4v6_only.cfg similarity index 69% copy from ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg copy to ttcn3-ggsn-test/osmo-ggsn/osmo-ggsn-v4v6_only.cfg index afa36d6..f63b0d5 100644 --- a/ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg +++ b/ttcn3-ggsn-test/osmo-ggsn/osmo-ggsn-v4v6_only.cfg @@ -25,23 +25,21 @@ ggsn ggsn0 gtp state-dir /tmp gtp bind-ip 172.18.3.201 - # OS#6106: Currently it is not possible to configure multiple APNs with - # gtpu-mode kernel-gtp in OsmoGGSN, because it cannot share the GTP-U bind - # socket between tunnels. - apn internet - gtpu-mode kernel-gtp + timer gtp T3 1 + timer gtp T1003 2 + timer gtp X3 2 + apn inet46 + gtpu-mode tun tun-device tun46 type-support v4v6 - ip prefix dynamic 176.16.16.0/20 + ip prefix dynamic 176.16.32.0/20 ip dns 0 172.18.3.201 ip dns 1 8.8.8.8 - ip ifconfig 176.16.16.0/20 + ip ifconfig 176.16.32.0/20 ipv6 prefix dynamic 2001:780:44:2100:0:0:0:0/56 ipv6 dns 0 fd02:db8:3::201 ipv6 dns 1 2001:4860:4860::8844 ipv6 ifconfig 2001:780:44:2100:0:0:0:0/56 no shutdown -# apn inet6 -# apn inet46 - default-apn internet + default-apn inet46 no shutdown ggsn diff --git a/ttcn3-ggsn-test/osmo-ggsn/osmo-ggsn-v6_only.cfg b/ttcn3-ggsn-test/osmo-ggsn/osmo-ggsn-v6_only.cfg new file mode 100644 index 0000000..bca3f57 --- /dev/null +++ b/ttcn3-ggsn-test/osmo-ggsn/osmo-ggsn-v6_only.cfg @@ -0,0 +1,41 @@ +! +! OpenGGSN (0.94.1-adac) configuration saved from vty +!! +! +log gsmtap 172.18.3.202 + logging level set-all debug + logging filter all 1 +! +log stderr + logging filter all 1 + logging color 1 + logging print level 1 + logging print category 1 + logging print category-hex 0 + logging print file basename last + logging print extended-timestamp 1 + logging level set-all info +! +stats interval 5 +! +line vty + no login + bind 0.0.0.0 +! +ggsn ggsn0 + gtp state-dir /tmp + gtp bind-ip 172.18.3.201 + timer gtp T3 1 + timer gtp T1003 2 + timer gtp X3 2 + apn inet6 + gtpu-mode tun + tun-device tun6 + type-support v6 + ipv6 prefix dynamic 2001:780:44:2000:0:0:0:0/56 + ipv6 dns 0 fd02:db8:3::201 + ipv6 dns 1 2001:4860:4860::8844 + ipv6 ifconfig 2001:780:44:2000:0:0:0:0/56 + no shutdown + default-apn inet6 + no shutdown ggsn diff --git a/ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg b/ttcn3-ggsn-test/ttcn3/GGSN_Tests-all.cfg similarity index 94% rename from ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg rename to ttcn3-ggsn-test/ttcn3/GGSN_Tests-all.cfg index cb548b3..f715d9f 100644 --- a/ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg +++ b/ttcn3-ggsn-test/ttcn3/GGSN_Tests-all.cfg @@ -24,5 +24,7 @@ # local N3-REQUESTS counter: GGSN_Tests.mp_n3_requests := 2 +GGSN_Tests.m_ggsn_conf := GGSN_CONF_ALL + [EXECUTE] GGSN_Tests.control diff --git a/ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg b/ttcn3-ggsn-test/ttcn3/GGSN_Tests-v4_only.cfg similarity index 93% copy from ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg copy to ttcn3-ggsn-test/ttcn3/GGSN_Tests-v4_only.cfg index cb548b3..fc21c72 100644 --- a/ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg +++ b/ttcn3-ggsn-test/ttcn3/GGSN_Tests-v4_only.cfg @@ -24,5 +24,7 @@ # local N3-REQUESTS counter: GGSN_Tests.mp_n3_requests := 2 +GGSN_Tests.m_ggsn_conf := GGSN_CONF_V4_ONLY + [EXECUTE] GGSN_Tests.control diff --git a/ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg b/ttcn3-ggsn-test/ttcn3/GGSN_Tests-v4v6_only.cfg similarity index 93% copy from ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg copy to ttcn3-ggsn-test/ttcn3/GGSN_Tests-v4v6_only.cfg index cb548b3..c2c8b4a 100644 --- a/ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg +++ b/ttcn3-ggsn-test/ttcn3/GGSN_Tests-v4v6_only.cfg @@ -24,5 +24,7 @@ # local N3-REQUESTS counter: GGSN_Tests.mp_n3_requests := 2 +GGSN_Tests.m_ggsn_conf := GGSN_CONF_V4V6_ONLY + [EXECUTE] GGSN_Tests.control diff --git a/ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg b/ttcn3-ggsn-test/ttcn3/GGSN_Tests-v6_only.cfg similarity index 93% copy from ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg copy to ttcn3-ggsn-test/ttcn3/GGSN_Tests-v6_only.cfg index cb548b3..7666438 100644 --- a/ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg +++ b/ttcn3-ggsn-test/ttcn3/GGSN_Tests-v6_only.cfg @@ -24,5 +24,7 @@ # local N3-REQUESTS counter: GGSN_Tests.mp_n3_requests := 2 +GGSN_Tests.m_ggsn_conf := GGSN_CONF_V6_ONLY + [EXECUTE] GGSN_Tests.control -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36392?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: Ia2fe0c3ed4ccf06e72fd258d085e4a79cecd5f26 Gerrit-Change-Number: 36392 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: ggsn: add m_ggsn_conf modulepar
by osmith 22 Mar '24

22 Mar '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36388?usp=email ) Change subject: ggsn: add m_ggsn_conf modulepar ...................................................................... ggsn: add m_ggsn_conf modulepar Prepare to run the GGSN tests in different configurations: * v4_only: one APN with v4 * v6_only: one APN with v6 * v4v6_only: one APN with v4v6 * all: multiple APNs with all of the above Related: OS#6096 Related: docker-playground Ia2fe0c3ed4ccf06e72fd258d085e4a79cecd5f26 Change-Id: I6d94a8b18200fbb2119406827b74b83e912e3ecc --- M ggsn_tests/GGSN_Tests.ttcn 1 file changed, 77 insertions(+), 38 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/36388/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 74c2e8c..75962eb 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -55,6 +55,13 @@ GGSN_IMPL_OPEN5GS }; + type enumerated GGSN_Conf { + GGSN_CONF_ALL, + GGSN_CONF_V4_ONLY, + GGSN_CONF_V6_ONLY, + GGSN_CONF_V4V6_ONLY + }; + modulepar { /* Default IP addresses. May be overridden by GGSN_Tests configuration files. */ @@ -89,6 +96,7 @@ integer mp_n3_requests := 3; /* local N3-REQUESTS counter */ GGSN_Impl m_ggsn_impl := GGSN_IMPL_OSMOCOM; + GGSN_Conf m_ggsn_conf := GGSN_CONF_ALL; } type set PdpContext { @@ -2210,51 +2218,65 @@ } control { - execute(TC_pdp4_act_deact()); - execute(TC_pdp4_act_deact_ipcp()); - execute(TC_pdp4_act_deact_ipcp_pap_broken()); - execute(TC_pdp4_act_deact_pcodns()); - execute(TC_pdp4_act_deact_gtpu_access()); - execute(TC_pdp4_act_deact_gtpu_access_wrong_saddr()); - execute(TC_pdp4_act_deact_gtpu_access_ipv6_apn4()); - execute(TC_pdp4_clients_interact_with_txseq()); - execute(TC_pdp4_clients_interact_without_txseq()); - execute(TC_pdp4_act_deact_with_single_dns()); - execute(TC_pdp4_act_deact_with_separate_dns()); - execute(TC_pdp4_act_update_teic()); - execute(TC_pdp4_act_update_teid()); + if (m_ggsn_conf != GGSN_CONF_V6_ONLY) { + execute(TC_pdp4_act_deact()); + execute(TC_pdp4_act_deact_ipcp()); + execute(TC_pdp4_act_deact_ipcp_pap_broken()); + execute(TC_pdp4_act_deact_pcodns()); + execute(TC_pdp4_act_deact_gtpu_access()); + execute(TC_pdp4_act_deact_gtpu_access_wrong_saddr()); + execute(TC_pdp4_act_deact_gtpu_access_ipv6_apn4()); + execute(TC_pdp4_clients_interact_with_txseq()); + execute(TC_pdp4_clients_interact_without_txseq()); + execute(TC_pdp4_act_deact_with_single_dns()); + execute(TC_pdp4_act_deact_with_separate_dns()); + execute(TC_pdp4_act_update_teic()); + execute(TC_pdp4_act_update_teid()); + } - execute(TC_pdp6_act_deact()); - execute(TC_pdp6_act_deact_pcodns()); - execute(TC_pdp6_act_deact_icmp6()); - execute(TC_pdp6_act_deact_gtpu_access()); - execute(TC_pdp6_act_deact_gtpu_access_wrong_ll_saddr()); - execute(TC_pdp6_act_deact_gtpu_access_wrong_global_saddr()); - execute(TC_pdp6_act_deact_gtpu_access_ipv4_apn6()); - execute(TC_pdp6_clients_interact()); + if (m_ggsn_conf != GGSN_CONF_V4_ONLY) { + execute(TC_pdp6_act_deact()); + execute(TC_pdp6_act_deact_pcodns()); + execute(TC_pdp6_act_deact_icmp6()); + execute(TC_pdp6_act_deact_gtpu_access()); + execute(TC_pdp6_act_deact_gtpu_access_wrong_ll_saddr()); + execute(TC_pdp6_act_deact_gtpu_access_wrong_global_saddr()); + execute(TC_pdp6_act_deact_gtpu_access_ipv4_apn6()); + execute(TC_pdp6_clients_interact()); + } - execute(TC_pdp46_act_deact()); - execute(TC_pdp46_act_deact_ipcp()); - execute(TC_pdp46_act_deact_icmp6()); - execute(TC_pdp46_act_deact_pcodns4()); - execute(TC_pdp46_act_deact_pcodns6()); - execute(TC_pdp46_act_deact_gtpu_access()); - execute(TC_pdp46_act_deact_gtpu_access_wrong_saddr_ipv4()); - execute(TC_pdp46_act_deact_gtpu_access_wrong_ll_saddr_ipv6()); - execute(TC_pdp46_act_deact_gtpu_access_wrong_global_saddr_ipv6()); - execute(TC_pdp46_clients_interact()); - execute(TC_pdp46_act_deact_apn4()); + if (m_ggsn_conf != GGSN_CONF_V4_ONLY and m_ggsn_conf != GGSN_CONF_V6_ONLY) { + execute(TC_pdp46_act_deact()); + execute(TC_pdp46_act_deact_ipcp()); + execute(TC_pdp46_act_deact_icmp6()); + execute(TC_pdp46_act_deact_pcodns4()); + execute(TC_pdp46_act_deact_pcodns6()); + execute(TC_pdp46_act_deact_gtpu_access()); + execute(TC_pdp46_act_deact_gtpu_access_wrong_saddr_ipv4()); + execute(TC_pdp46_act_deact_gtpu_access_wrong_ll_saddr_ipv6()); + execute(TC_pdp46_act_deact_gtpu_access_wrong_global_saddr_ipv6()); + execute(TC_pdp46_clients_interact()); + } + + if (m_ggsn_conf == GGSN_CONF_ALL) { + execute(TC_pdp46_act_deact_apn4()); + } execute(TC_echo_req_resp()); execute(TC_echo_req_resp_gtpu()); - execute(TC_pdp_act2_recovery()); - execute(TC_act_deact_retrans_duplicate()); - execute(TC_pdp_act_restart_ctr_echo()); + if (m_ggsn_conf == GGSN_CONF_V4_ONLY) { + execute(TC_pdp_act2_recovery()); + execute(TC_act_deact_retrans_duplicate()); + } - execute(TC_lots_of_concurrent_pdp_ctx()); - /* Keep at the end, crashes older osmo-ggsn versions (OS#5469): */ - execute(TC_addr_pool_exhaustion()); + if (m_ggsn_conf != GGSN_CONF_V6_ONLY) { + execute(TC_pdp_act_restart_ctr_echo()); + + execute(TC_lots_of_concurrent_pdp_ctx()); + /* Keep at the end, crashes older osmo-ggsn versions (OS#5469): */ + execute(TC_addr_pool_exhaustion()); + } /* open5gs specific tests: */ if (m_ggsn_impl == GGSN_IMPL_OPEN5GS) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36388?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6d94a8b18200fbb2119406827b74b83e912e3ecc Gerrit-Change-Number: 36388 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: sip: Get Rid of private copy of f_mgcp_addr2addrtype()
by pespin 22 Mar '24

22 Mar '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36382?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: sip: Get Rid of private copy of f_mgcp_addr2addrtype() ...................................................................... sip: Get Rid of private copy of f_mgcp_addr2addrtype() The function was copied from MGCP_Templates.ttcn since the logic is the same for SDP, but copied in order to avoid depending on whole MGCP file. Since now SDP logic has been moved to its own SDP_Templates and a new f_sdp_addr2addrtype() was added, use that one. Change-Id: I27ce46b6d23ba0f2704dd0cee290ed519dec278e --- M sip/SIP_Tests.ttcn M sip/gen_links.sh 2 files changed, 23 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn index 9f8f8f8..9d92b87 100644 --- a/sip/SIP_Tests.ttcn +++ b/sip/SIP_Tests.ttcn @@ -26,6 +26,7 @@ import from MNCC_Types all; import from SDP_Types all; +import from SDP_Templates all; import from SIP_Emulation all; import from SIPmsg_Types all; @@ -110,14 +111,6 @@ cp.comp.sip_body := ""; } -private function f_mgcp_addr2addrtype(charstring addr) return charstring { - for (var integer i := 0; i < lengthof(addr); i := i + 1) { - if (addr[i] == ":") { - return "IP6"; - } - } - return "IP4"; -} function f_init_mncc(charstring id) runs on test_CT { id := id & "-MNCC"; var MnccOps ops := { @@ -304,7 +297,7 @@ /* MSC -> OSC: SDP that the MSC will send via MNCC */ var charstring cn_sdp := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & - f_mgcp_addr2addrtype(cp.cn_rtp_addr) & " " & cp.cn_rtp_addr & + f_sdp_addr2addrtype(cp.cn_rtp_addr) & " " & cp.cn_rtp_addr & "\r\nt=0 0\r\nm=audio " & int2str(cp.cn_rtp_port) & " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; /* OSC -> SIP: what SDP to expect in SIP from osmo-sip-connector */ @@ -396,7 +389,7 @@ */ var charstring cn_sdp := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & - f_mgcp_addr2addrtype(cp.cn_rtp_addr) & " " & cp.cn_rtp_addr & + f_sdp_addr2addrtype(cp.cn_rtp_addr) & " " & cp.cn_rtp_addr & "\r\nt=0 0\r\nm=audio " & int2str(cp.cn_rtp_port) & " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; @@ -518,7 +511,7 @@ var CallPars cp := g_pars.g_cp; f_CallPars_compute(cp); cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & - f_mgcp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & + f_sdp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & "\r\nt=0 0\r\nm=audio " & int2str(cp.sip_rtp_port) & " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; f_sleep(3.0) @@ -555,7 +548,7 @@ var CallPars cp := g_pars.g_cp; f_CallPars_compute(cp); cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & - f_mgcp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & + f_sdp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & "\r\nt=0 0\r\nm=audio " & int2str(cp.sip_rtp_port) & " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; f_sleep(3.0) @@ -582,7 +575,7 @@ var CallPars cp := g_pars.g_cp; f_CallPars_compute(cp); cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & - f_mgcp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & + f_sdp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & "\r\nt=0 0\r\nm=audio " & int2str(cp.sip_rtp_port) & " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; f_sleep(3.0) @@ -619,7 +612,7 @@ var CallPars cp := g_pars.g_cp; f_CallPars_compute(cp); cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & - f_mgcp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & + f_sdp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & "\r\nt=0 0\r\nm=audio " & int2str(cp.sip_rtp_port) & " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; f_sleep(3.0) @@ -645,7 +638,7 @@ var CallPars cp := g_pars.g_cp; f_CallPars_compute(cp); cp.comp.sip_body := "v=0\r\no=Osmocom 0 0 IN IP4 1.1.1.1\r\ns=GSM Call\r\nc=IN " & - f_mgcp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & + f_sdp_addr2addrtype(cp.sip_rtp_addr) & " " & cp.sip_rtp_addr & "\r\nt=0 0\r\nm=audio " & int2str(cp.sip_rtp_port) & " RTP/AVP 0\r\na=rtpmap:0 GSM/8000\r\n"; f_sleep(3.0); diff --git a/sip/gen_links.sh b/sip/gen_links.sh index cf09731..81c1578 100755 --- a/sip/gen_links.sh +++ b/sip/gen_links.sh @@ -43,6 +43,7 @@ FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " FILES+="RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunctDef.cc " +FILES+="SDP_Templates.ttcn " FILES+="SIP_Emulation.ttcn SIP_Templates.ttcn " gen_links $DIR $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36382?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I27ce46b6d23ba0f2704dd0cee290ed519dec278e Gerrit-Change-Number: 36382 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log