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

[M] Change in docker-playground[master]: ttcn3-ggsn-test/jenkins: add functions for start ggsn/testsuite

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36390?usp=email ) Change subject: ttcn3-ggsn-test/jenkins: add functions for start ggsn/testsuite ...................................................................... Patch Set 1: Code-Review+1 -- 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-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 14:39:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months

1
0
0 0

[M] Change in docker-playground[master]: ttcn3-bts-test: add env var to not run all configs

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36389?usp=email ) Change subject: ttcn3-bts-test: add env var to not run all configs ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File ttcn3-bts-test/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/36389/comment/67a7c35e_766… PS1, Line 174: if test_config_enabled "generic"; then imho it would become clearer if you put each of this in a function. -- 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-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 14:39:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: ggsn: add m_ggsn_conf modulepar

by pespin

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

3 months

1
0
0 0

[S] Change in osmo-trx[master]: ms: disabe uhd ms build

by Hoernchen

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

3 months

1
0
0 0

[S] Change in osmo-trx[master]: ms: disabe uhd ms build

by Hoernchen

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

3 months

1
0
0 0

[M] Change in docker-playground[master]: ttcn3-ggsn-test: run with multiple configurations

by osmith

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

3 months

1
0
0 0

[M] Change in docker-playground[master]: ttcn3-ggsn-test/jenkins: add functions for start ggsn/testsuite

by osmith

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

3 months

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-ggsn-test: move confgs to subdirs

by osmith

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

3 months

1
0
0 0

[M] Change in docker-playground[master]: ttcn3-bts-test: add env var to not run all configs

by osmith

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

3 months

1
0
0 0

[M] Change in docker-playground[master]: ttcn3-ggsn-test: run with multiple configurations

by osmith

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

3 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: ggsn: add m_ggsn_conf modulepar

by osmith

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

3 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sip: Get Rid of private copy of f_mgcp_addr2addrtype()

by pespin

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

3 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: Move f_addrstr2addr() to library/Misc_Helpers.ttcn

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36380?usp=email ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: Move f_addrstr2addr() to library/Misc_Helpers.ttcn ...................................................................... Move f_addrstr2addr() to library/Misc_Helpers.ttcn This function can easily be reused in other testsuites supporting both IPv4 and IPv6 addresses. Change-Id: I4243ec5551f128629b6504ccc59efeb456a6855d --- M hlr/gen_links.sh M hlr/regen_makefile.sh M library/Misc_Helpers.ttcn M sip/SIP_Tests.ttcn M sysinfo/gen_links.sh M sysinfo/regen_makefile.sh 6 files changed, 26 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/hlr/gen_links.sh b/hlr/gen_links.sh index e3a64d9..588fe08 100755 --- a/hlr/gen_links.sh +++ b/hlr/gen_links.sh @@ -44,7 +44,7 @@ gen_links $DIR $FILES DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp " +FILES="Native_Functions.ttcn Native_FunctionDefs.cc Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp " FILES+="PCO_Types.ttcn GSUP_Types.ttcn GSUP_Templates.ttcn GSUP_Emulation.ttcn " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " FILES+="Osmocom_VTY_Functions.ttcn " diff --git a/hlr/regen_makefile.sh b/hlr/regen_makefile.sh index 7cd6cf4..c5fadde 100755 --- a/hlr/regen_makefile.sh +++ b/hlr/regen_makefile.sh @@ -10,6 +10,7 @@ IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc + Native_FunctionDefs.cc MAP_EncDec.cc SS_EncDec.cc TCCConversion.cc diff --git a/library/Misc_Helpers.ttcn b/library/Misc_Helpers.ttcn index e01c170..dda2c2c 100644 --- a/library/Misc_Helpers.ttcn +++ b/library/Misc_Helpers.ttcn @@ -1,5 +1,7 @@ module Misc_Helpers { +import from Native_Functions all; + modulepar { charstring mp_osmo_repo := "nightly"; } @@ -51,4 +53,12 @@ return false; } +function f_addrstr2addr(charstring addr) return octetstring { + if (f_addr_is_ipv6(addr)) { + return f_inet6_addr(addr); + } else { + return f_inet_addr(addr); + } +} + } diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn index 208cc01..9f8f8f8 100644 --- a/sip/SIP_Tests.ttcn +++ b/sip/SIP_Tests.ttcn @@ -118,15 +118,6 @@ } return "IP4"; } - -private function f_addrstr2addr(charstring addr) return octetstring { - if (f_addr_is_ipv6(addr)) { - return f_inet6_addr(addr); - } else { - return f_inet_addr(addr); - } -} - function f_init_mncc(charstring id) runs on test_CT { id := id & "-MNCC"; var MnccOps ops := { diff --git a/sysinfo/gen_links.sh b/sysinfo/gen_links.sh index fa3cd33..c8a3ee3 100755 --- a/sysinfo/gen_links.sh +++ b/sysinfo/gen_links.sh @@ -25,7 +25,7 @@ gen_links $DIR $FILES DIR=../library -FILES="GSMTAP_PortType.ttcn GSMTAP_Types.ttcn GSM_SystemInformation.ttcn GSM_RestOctets.ttcn GSM_RR_Types.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_Types.ttcn IPL4_GSMTAP_CtrlFunct.ttcn IPL4_GSMTAP_CtrlFunctDef.cc Osmocom_Types.ttcn Misc_Helpers.ttcn General_Types.ttcn Osmocom_VTY_Functions.ttcn" +FILES="GSMTAP_PortType.ttcn GSMTAP_Types.ttcn GSM_SystemInformation.ttcn GSM_RestOctets.ttcn GSM_RR_Types.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_Types.ttcn IPL4_GSMTAP_CtrlFunct.ttcn IPL4_GSMTAP_CtrlFunctDef.cc Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc Misc_Helpers.ttcn General_Types.ttcn Osmocom_VTY_Functions.ttcn" gen_links $DIR $FILES ignore_pp_results diff --git a/sysinfo/regen_makefile.sh b/sysinfo/regen_makefile.sh index 569f406..1ed5835 100755 --- a/sysinfo/regen_makefile.sh +++ b/sysinfo/regen_makefile.sh @@ -7,6 +7,7 @@ IPL4_GSMTAP_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc + Native_FunctionDefs.cc TCCConversion.cc TCCInterface.cc TELNETasp_PT.cc -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36380?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: I4243ec5551f128629b6504ccc59efeb456a6855d Gerrit-Change-Number: 36380 Gerrit-PatchSet: 4 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

3 months

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: Move SDP templates to its own SDP_Templates.ttcn file

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36381?usp=email ) Change subject: Move SDP templates to its own SDP_Templates.ttcn file ...................................................................... Move SDP templates to its own SDP_Templates.ttcn file SDP is used in other protocols than MGCP, eg. SIP. Change-Id: I0610b4cf5533e46a3401c65e60c7cce975c85412 --- M bsc-nat/BSC_MS_ConnectionHandler.ttcn M bsc-nat/gen_links.sh M bsc/BSC_Tests_LCLS.ttcn M bsc/MSC_ConnectionHandler.ttcn M bsc/gen_links.sh M hnbgw/HNBGW_Tests.ttcn M hnbgw/gen_links.sh M library/MGCP_Templates.ttcn A library/SDP_Templates.ttcn M mgw/MGCP_Test.ttcn M mgw/gen_links.sh M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M msc/gen_links.sh M smlc/gen_links.sh 15 files changed, 184 insertions(+), 142 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/bsc-nat/BSC_MS_ConnectionHandler.ttcn b/bsc-nat/BSC_MS_ConnectionHandler.ttcn index 1a3f951..8aea74a 100644 --- a/bsc-nat/BSC_MS_ConnectionHandler.ttcn +++ b/bsc-nat/BSC_MS_ConnectionHandler.ttcn @@ -24,6 +24,7 @@ import from MGCP_Types all; import from MGCP_Templates all; import from SDP_Types all; +import from SDP_Templates all; type function void_fn_bsc_ms(charstring id) runs on BSC_MS_ConnHdlr; diff --git a/bsc-nat/gen_links.sh b/bsc-nat/gen_links.sh index 9bd1faf..395f50e 100755 --- a/bsc-nat/gen_links.sh +++ b/bsc-nat/gen_links.sh @@ -52,7 +52,7 @@ gen_links $DIR $FILES DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn BSSMAP_Templates.ttcn RAN_Emulation.ttcnpp MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc Osmocom_CTRL_Types.ttcn Osmocom_VTY_Functions.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn BSSAP_CodecPort.ttcn Native_Functions.ttcn Native_FunctionDefs.cc" +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn BSSMAP_Templates.ttcn RAN_Emulation.ttcnpp SDP_Templates.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc Osmocom_CTRL_Types.ttcn Osmocom_VTY_Functions.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn BSSAP_CodecPort.ttcn Native_Functions.ttcn Native_FunctionDefs.cc" gen_links $DIR $FILES ignore_pp_results diff --git a/bsc/BSC_Tests_LCLS.ttcn b/bsc/BSC_Tests_LCLS.ttcn index 6686a34..2b9886b 100644 --- a/bsc/BSC_Tests_LCLS.ttcn +++ b/bsc/BSC_Tests_LCLS.ttcn @@ -38,6 +38,7 @@ import from MGCP_Emulation all; import from MGCP_Templates all; import from SDP_Types all; +import from SDP_Templates all; import from Native_Functions all; import from Osmocom_CTRL_Functions all; diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index b499244..88a1b58 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -32,6 +32,7 @@ import from MGCP_Templates all; import from MGCP_Emulation all; import from SDP_Types all; +import from SDP_Templates all; import from StatsD_Checker all; diff --git a/bsc/gen_links.sh b/bsc/gen_links.sh index 538824d..cb9f12f 100755 --- a/bsc/gen_links.sh +++ b/bsc/gen_links.sh @@ -67,7 +67,7 @@ gen_links $DIR $FILES DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn RAN_Emulation.ttcnpp RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn RSL_Emulation.ttcn MGCP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc BSSAP_CodecPort.ttcn RAN_Adapter.ttcnpp Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn SCCP_Templates.ttcn IPA_Testing.ttcn GSM_SystemInformation.ttcn GSM_RestOctets.ttcn " +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn RAN_Emulation.ttcnpp RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn RSL_Emulation.ttcn MGCP_Emulation.ttcn SDP_Templates.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc BSSAP_CodecPort.ttcn RAN_Adapter.ttcnpp Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn SCCP_Templates.ttcn IPA_Testing.ttcn GSM_SystemInformation.ttcn GSM_RestOctets.ttcn " FILES+="CBSP_Types.ttcn CBSP_Templates.ttcn " FILES+="CBSP_CodecPort.ttcn CBSP_CodecPort_CtrlFunct.ttcn CBSP_CodecPort_CtrlFunctdef.cc CBSP_Adapter.ttcn " FILES+="StatsD_Types.ttcn StatsD_CodecPort.ttcn StatsD_CodecPort_CtrlFunct.ttcn StatsD_CodecPort_CtrlFunctdef.cc StatsD_Checker.ttcn " diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 15fc85f..89b243b 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -56,6 +56,7 @@ import from MGCP_Templates all; import from MGCP_CodecPort all; import from SDP_Types all; +import from SDP_Templates all; import from PFCP_Types all; import from PFCP_Emulation all; diff --git a/hnbgw/gen_links.sh b/hnbgw/gen_links.sh index b651113..62b3e44 100755 --- a/hnbgw/gen_links.sh +++ b/hnbgw/gen_links.sh @@ -98,7 +98,7 @@ DIR=../library FILES="Iuh_Types.ttcn Iuh_CodecPort.ttcn Iuh_CodecPort_CtrlFunctDef.cc Iuh_CodecPort_CtrlFunct.ttcn Iuh_Emulation.ttcn DNS_Helpers.ttcn " -FILES+="MGCP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc " +FILES+="SDP_Templates.ttcn MGCP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc " FILES+="RAN_Adapter.ttcnpp RAN_Emulation.ttcnpp BSSAP_CodecPort.ttcn SCCP_Templates.ttcn " FILES+="PFCP_CodecPort.ttcn PFCP_CodecPort_CtrlFunct.ttcn PFCP_CodecPort_CtrlFunctDef.cc PFCP_Emulation.ttcn PFCP_Templates.ttcn " FILES+="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn " diff --git a/library/MGCP_Templates.ttcn b/library/MGCP_Templates.ttcn index 747700f..85129e8 100644 --- a/library/MGCP_Templates.ttcn +++ b/library/MGCP_Templates.ttcn @@ -12,6 +12,7 @@ import from MGCP_Types all; import from SDP_Types all; +import from SDP_Templates all; function f_mgcp_par_append(inout template MgcpParameterList list, template MgcpParameter par) { var integer len := lengthof(list); @@ -288,142 +289,6 @@ sdp := * } -/* SDP Templates */ -template SDP_Origin ts_SDP_origin(charstring addr, charstring session_id, - charstring session_version := "1", - charstring addr_type := "IP4", - charstring user_name := "-") := { - user_name := user_name, - session_id := session_id, - session_version := session_version, - net_type := "IN", - addr_type := addr_type, - addr := addr -} - -template SDP_connection ts_SDP_connection_IP(charstring addr, charstring addr_type := "IP4", - template integer ttl := omit, - template integer num_of_addr := omit) :={ - net_type := "IN", - addr_type := addr_type, - conn_addr := { - addr := addr, - ttl := ttl, - num_of_addr := num_of_addr - } -} - -template SDP_connection tr_SDP_connection_IP(template charstring addr, template charstring addr_type := ?, - template integer ttl := *, - template integer num_of_addr := *) := { - net_type := "IN", - addr_type := addr_type, - conn_addr := { - addr := addr, - ttl := ttl, - num_of_addr := num_of_addr - } -} - -template SDP_time ts_SDP_time(charstring beg, charstring end) := { - time_field := { - start_time := beg, - stop_time := end - }, - time_repeat := omit -} - -template SDP_media_desc ts_SDP_media_desc(integer port_number, SDP_fmt_list fmts, - SDP_attribute_list attributes) := { - media_field := { - media := "audio", - ports := { - port_number := port_number, - num_of_ports := omit - }, - transport := "RTP/AVP", - fmts := fmts - }, - information := omit, - connections := omit, - bandwidth := omit, - key := omit, - attributes := attributes -} - -template SDP_media_desc tr_SDP_media_desc(template integer port_number := ?, - template SDP_fmt_list fmts := ?, - template SDP_attribute_list attributes := ?) := { - media_field := { - media := "audio", - ports := { - port_number := port_number, - num_of_ports := omit - }, - transport := "RTP/AVP", - fmts := fmts - }, - information := *, - connections := *, - bandwidth := *, - key := *, - attributes := attributes -} - -/* master template for generating SDP based in template arguments */ -template SDP_Message ts_SDP(charstring local_addr, charstring remote_addr, - charstring session_id, charstring session_version, - integer rtp_port, SDP_fmt_list fmts, - SDP_attribute_list attributes) := { - protocol_version := 0, - origin := ts_SDP_origin(local_addr, session_id, session_version, f_mgcp_addr2addrtype(local_addr)), - session_name := "-", - information := omit, - uri := omit, - emails := omit, - phone_numbers := omit, - connection := ts_SDP_connection_IP(remote_addr, f_mgcp_addr2addrtype(remote_addr)), - bandwidth := omit, - times := { ts_SDP_time("0","0") }, - timezone_adjustments := omit, - key := omit, - attributes := omit, - media_list := { ts_SDP_media_desc(rtp_port, fmts, attributes) } -} - -template SDP_Message tr_SDP(template charstring remote_addr := ?, template integer rtp_port := ?) := { - protocol_version := 0, - origin := ?, - session_name := ?, - information := *, - uri := *, - emails := *, - phone_numbers := *, - connection := tr_SDP_connection_IP(remote_addr, ?), - bandwidth := *, - times := ?, - timezone_adjustments := *, - key := *, - attributes := *, - media_list := { tr_SDP_media_desc(rtp_port) } -} - -template SDP_attribute ts_SDP_rtpmap(integer fmt, charstring val) := { - rtpmap := { - attr_value := int2str(fmt) & " " & val - } -} -template SDP_attribute ts_SDP_ptime(integer p) := { - ptime := { - attr_value := int2str(p) - } -} -template SDP_attribute ts_SDP_fmtp(integer fmt, charstring val) := { - fmtp := { - attr_value := int2str(fmt) & " " & val - } -} - function f_mgcp_addr2addrtype(charstring addr) return charstring { for (var integer i := 0; i < lengthof(addr); i := i + 1) { if (addr[i] == ":") { diff --git a/library/SDP_Templates.ttcn b/library/SDP_Templates.ttcn new file mode 100644 index 0000000..525da8e --- /dev/null +++ b/library/SDP_Templates.ttcn @@ -0,0 +1,159 @@ +module SDP_Templates { + +/* SDP Templates, building on top of SDP_Types from Ericsson. + * + * (C) 2017 by Harald Welte <laforge(a)gnumonks.org> + * All rights reserved. + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + */ + +import from SDP_Types all; + +/* SDP Templates */ +template SDP_Origin ts_SDP_origin(charstring addr, charstring session_id, + charstring session_version := "1", + charstring addr_type := "IP4", + charstring user_name := "-") := { + user_name := user_name, + session_id := session_id, + session_version := session_version, + net_type := "IN", + addr_type := addr_type, + addr := addr +} + +template SDP_connection ts_SDP_connection_IP(charstring addr, charstring addr_type := "IP4", + template integer ttl := omit, + template integer num_of_addr := omit) :={ + net_type := "IN", + addr_type := addr_type, + conn_addr := { + addr := addr, + ttl := ttl, + num_of_addr := num_of_addr + } +} + +template SDP_connection tr_SDP_connection_IP(template charstring addr, template charstring addr_type := ?, + template integer ttl := *, + template integer num_of_addr := *) := { + net_type := "IN", + addr_type := addr_type, + conn_addr := { + addr := addr, + ttl := ttl, + num_of_addr := num_of_addr + } +} + +template SDP_time ts_SDP_time(charstring beg, charstring end) := { + time_field := { + start_time := beg, + stop_time := end + }, + time_repeat := omit +} + +template SDP_media_desc ts_SDP_media_desc(integer port_number, SDP_fmt_list fmts, + SDP_attribute_list attributes) := { + media_field := { + media := "audio", + ports := { + port_number := port_number, + num_of_ports := omit + }, + transport := "RTP/AVP", + fmts := fmts + }, + information := omit, + connections := omit, + bandwidth := omit, + key := omit, + attributes := attributes +} + +template SDP_media_desc tr_SDP_media_desc(template integer port_number := ?, + template SDP_fmt_list fmts := ?, + template SDP_attribute_list attributes := ?) := { + media_field := { + media := "audio", + ports := { + port_number := port_number, + num_of_ports := omit + }, + transport := "RTP/AVP", + fmts := fmts + }, + information := *, + connections := *, + bandwidth := *, + key := *, + attributes := attributes +} + +/* master template for generating SDP based in template arguments */ +template SDP_Message ts_SDP(charstring local_addr, charstring remote_addr, + charstring session_id, charstring session_version, + integer rtp_port, SDP_fmt_list fmts, + SDP_attribute_list attributes) := { + protocol_version := 0, + origin := ts_SDP_origin(local_addr, session_id, session_version, f_sdp_addr2addrtype(local_addr)), + session_name := "-", + information := omit, + uri := omit, + emails := omit, + phone_numbers := omit, + connection := ts_SDP_connection_IP(remote_addr, f_sdp_addr2addrtype(remote_addr)), + bandwidth := omit, + times := { ts_SDP_time("0","0") }, + timezone_adjustments := omit, + key := omit, + attributes := omit, + media_list := { ts_SDP_media_desc(rtp_port, fmts, attributes) } +} + +template SDP_Message tr_SDP(template charstring remote_addr := ?, template integer rtp_port := ?) := { + protocol_version := 0, + origin := ?, + session_name := ?, + information := *, + uri := *, + emails := *, + phone_numbers := *, + connection := tr_SDP_connection_IP(remote_addr, ?), + bandwidth := *, + times := ?, + timezone_adjustments := *, + key := *, + attributes := *, + media_list := { tr_SDP_media_desc(rtp_port) } +} + +template SDP_attribute ts_SDP_rtpmap(integer fmt, charstring val) := { + rtpmap := { + attr_value := int2str(fmt) & " " & val + } +} +template SDP_attribute ts_SDP_ptime(integer p) := { + ptime := { + attr_value := int2str(p) + } +} +template SDP_attribute ts_SDP_fmtp(integer fmt, charstring val) := { + fmtp := { + attr_value := int2str(fmt) & " " & val + } +} + +function f_sdp_addr2addrtype(charstring addr) return charstring { + for (var integer i := 0; i < lengthof(addr); i := i + 1) { + if (addr[i] == ":") { + return "IP6"; + } + } + return "IP4"; +} + +} diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 7568ac9..b7d6b46 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -15,6 +15,7 @@ import from MGCP_Types all; import from MGCP_Templates all; import from SDP_Types all; + import from SDP_Templates all; import from MGCP_CodecPort all; import from MGCP_CodecPort_CtrlFunct all; import from RTP_CodecPort all; diff --git a/mgw/gen_links.sh b/mgw/gen_links.sh index a7b1684..2fd2b0d 100755 --- a/mgw/gen_links.sh +++ b/mgw/gen_links.sh @@ -38,7 +38,7 @@ gen_links $DIR $FILES DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn SDP_Templates.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc " FILES+="AMR_Types.ttcn " FILES+="RTP_CodecPort.ttcn RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_Emulation.ttcn IuUP_EncDec.cc " diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 92ec3b1..b3d915c 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -41,6 +41,7 @@ import from MGCP_Emulation all; import from MGCP_Templates all; import from SDP_Types all; +import from SDP_Templates all; import from MobileL3_Types all; import from MobileL3_CommonIE_Types all; diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 7f993c4..9db18d3 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -46,6 +46,7 @@ import from MGCP_Types all; import from MGCP_Templates all; import from SDP_Types all; +import from SDP_Templates all; import from GSUP_Types all; import from GSUP_Templates all; diff --git a/msc/gen_links.sh b/msc/gen_links.sh index 8463976..a15c42d 100755 --- a/msc/gen_links.sh +++ b/msc/gen_links.sh @@ -96,7 +96,7 @@ FILES+="IPA_Types.ttcn IPA_Emulation.ttcnpp IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc " FILES+="PCO_Types.ttcn GSUP_Types.ttcn GSUP_Templates.ttcn GSUP_Emulation.ttcn " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn L3_Templates.ttcn RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn L3_Common.ttcn " -FILES+="RAN_Emulation.ttcnpp BSSAP_CodecPort.ttcn BSSMAP_Templates.ttcn RAN_Adapter.ttcnpp MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_Emulation.ttcn " +FILES+="RAN_Emulation.ttcnpp BSSAP_CodecPort.ttcn BSSMAP_Templates.ttcn RAN_Adapter.ttcnpp SDP_Templates.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_Emulation.ttcn " FILES+="RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunctDef.cc " FILES+="MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunctDef.cc " FILES+="SMPP_CodecPort.ttcn SMPP_CodecPort_CtrlFunct.ttcn SMPP_CodecPort_CtrlFunctDef.cc SMPP_Emulation.ttcn SMPP_Templates.ttcn " diff --git a/smlc/gen_links.sh b/smlc/gen_links.sh index 092b963..cf715f6 100755 --- a/smlc/gen_links.sh +++ b/smlc/gen_links.sh @@ -67,7 +67,7 @@ gen_links $DIR $FILES DIR=../library -FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn BSSAP_LE_Types.ttcn RAN_Emulation.ttcnpp RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn RSL_Emulation.ttcn MGCP_Emulation.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc BSSAP_CodecPort.ttcn RAN_Adapter.ttcnpp Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn SCCP_Templates.ttcn IPA_Testing.ttcn GSM_SystemInformation.ttcn GSM_RestOctets.ttcn " +FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_Types.ttcn GSM_Types.ttcn Osmocom_VTY_Functions.ttcn Native_Functions.ttcn Native_FunctionDefs.cc IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp L3_Templates.ttcn BSSMAP_Templates.ttcn BSSAP_LE_Types.ttcn RAN_Emulation.ttcnpp RLCMAC_CSN1_Templates.ttcn RLCMAC_CSN1_Types.ttcn GSM_RR_Types.ttcn RSL_Types.ttcn RSL_Emulation.ttcn MGCP_Emulation.ttcn SDP_Templates.ttcn MGCP_Types.ttcn MGCP_Templates.ttcn MGCP_CodecPort.ttcn MGCP_CodecPort_CtrlFunct.ttcn MGCP_CodecPort_CtrlFunctDef.cc BSSAP_CodecPort.ttcn RAN_Adapter.ttcnpp Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunct.ttcn RTP_CodecPort_CtrlFunctDef.cc RTP_Emulation.ttcn IuUP_Types.ttcn IuUP_EncDec.cc IuUP_Emulation.ttcn SCCP_Templates.ttcn IPA_Testing.ttcn GSM_SystemInformation.ttcn GSM_RestOctets.ttcn " FILES+="BSSAP_LE_CodecPort.ttcn BSSAP_LE_Emulation.ttcn BSSAP_LE_Adapter.ttcn BSSLAP_Types.ttcn BSSMAP_LE_Templates.ttcn " gen_links $DIR $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36381?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: I0610b4cf5533e46a3401c65e60c7cce975c85412 Gerrit-Change-Number: 36381 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

3 months

1
0
0 0

[XL] Change in osmo-ttcn3-hacks[master]: MGCP_Templates: Avoid extra indenation for most of the whole file

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36379?usp=email ) Change subject: MGCP_Templates: Avoid extra indenation for most of the whole file ...................................................................... MGCP_Templates: Avoid extra indenation for most of the whole file Change-Id: I9338c73db94a1ed3e2945bc40a46573c4a674ba3 --- M library/MGCP_Templates.ttcn 1 file changed, 514 insertions(+), 505 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/MGCP_Templates.ttcn b/library/MGCP_Templates.ttcn index 3a5f139..747700f 100644 --- a/library/MGCP_Templates.ttcn +++ b/library/MGCP_Templates.ttcn @@ -10,565 +10,565 @@ */ - import from MGCP_Types all; - import from SDP_Types all; +import from MGCP_Types all; +import from SDP_Types all; - function f_mgcp_par_append(inout template MgcpParameterList list, template MgcpParameter par) { - var integer len := lengthof(list); - list[len] := par; - } +function f_mgcp_par_append(inout template MgcpParameterList list, template MgcpParameter par) { + var integer len := lengthof(list); + list[len] := par; +} - /* 3.2.2.6 Connection Mode (sendonly, recvonly, sendrecv, confrnce, inactive, loopback, - * conttest, netwloop, netwtest) */ - template MgcpParameter t_MgcpParConnMode(template MgcpConnectionMode mode) := { "M", mode }; +/* 3.2.2.6 Connection Mode (sendonly, recvonly, sendrecv, confrnce, inactive, loopback, + * conttest, netwloop, netwtest) */ +template MgcpParameter t_MgcpParConnMode(template MgcpConnectionMode mode) := { "M", mode }; - /* 3.2.2.2 CallId: maximum 32 hex chars */ - template MgcpParameter ts_MgcpParCallId(MgcpCallId cid) := { - code := "C", - val := hex2str(cid) - }; +/* 3.2.2.2 CallId: maximum 32 hex chars */ +template MgcpParameter ts_MgcpParCallId(MgcpCallId cid) := { + code := "C", + val := hex2str(cid) +}; - /* 3.2.2.18 RequestIdentifier: Maximum 32 hex chars */ - template MgcpParameter ts_MgcpParReqId(MgcpRequestId rid) := { - code := "X", - val := hex2str(rid) - }; +/* 3.2.2.18 RequestIdentifier: Maximum 32 hex chars */ +template MgcpParameter ts_MgcpParReqId(MgcpRequestId rid) := { + code := "X", + val := hex2str(rid) +}; - /* 3.2.1.3 SpecificEndpointId */ - template MgcpParameter ts_MgcpParSpecEP(MgcpEndpoint ep) := { - code := "Z", - val := ep - }; +/* 3.2.1.3 SpecificEndpointId */ +template MgcpParameter ts_MgcpParSpecEP(MgcpEndpoint ep) := { + code := "Z", + val := ep +}; - /* 3.2.2.10: LocalConnectionOptions (codec, packetization, bandwidth, ToS, eco, gain, silence, ...) */ - template MgcpParameter t_MgcpParLocConnOpt(template charstring lco) := { "L", lco }; +/* 3.2.2.10: LocalConnectionOptions (codec, packetization, bandwidth, ToS, eco, gain, silence, ...) */ +template MgcpParameter t_MgcpParLocConnOpt(template charstring lco) := { "L", lco }; - /* 3.2.2.5: ConnectionId: maximum 32 hex chars */ - template MgcpParameter ts_MgcpParConnectionId(MgcpConnectionId cid) := { - code := "I", - val := hex2str(cid) - }; +/* 3.2.2.5: ConnectionId: maximum 32 hex chars */ +template MgcpParameter ts_MgcpParConnectionId(MgcpConnectionId cid) := { + code := "I", + val := hex2str(cid) +}; - /* Osmocom extension: X-Osmux: {*,%u} */ - template MgcpParameter ts_MgcpParOsmuxCID(MgcpOsmuxCID osmux_cid) := { - code := "X-OSMUX", - val := f_mgcp_osmux_cid_encode(osmux_cid) - }; +/* Osmocom extension: X-Osmux: {*,%u} */ +template MgcpParameter ts_MgcpParOsmuxCID(MgcpOsmuxCID osmux_cid) := { + code := "X-OSMUX", + val := f_mgcp_osmux_cid_encode(osmux_cid) +}; - /* Osmocom extension: X-Osmux: {*,%u} */ - template MgcpParameter t_MgcpParOsmoIGN(template charstring val) := { - code := "X-OSMO-IGN", - val := val - }; +/* Osmocom extension: X-Osmux: {*,%u} */ +template MgcpParameter t_MgcpParOsmoIGN(template charstring val) := { + code := "X-OSMO-IGN", + val := val +}; - /* osmo-bsc_mgcp implements L/C/M/X only, osmo-mgw adds 'I' */ - /* SDP: osmo-bsc_mgcp implements Tx of v,o,s,c,t,m,a */ +/* osmo-bsc_mgcp implements L/C/M/X only, osmo-mgw adds 'I' */ +/* SDP: osmo-bsc_mgcp implements Tx of v,o,s,c,t,m,a */ - template (value) MgcpResponse - ts_MgcpResp_Err(template (value) MgcpTransId trans_id, - template (value) MgcpResponseCode code, - template (value) charstring string := "FAIL") := { - line := { - code := code, - trans_id := trans_id, - string := string - }, - params := {}, - sdp := omit - } - template MgcpResponse - tr_MgcpResp_Err(template (present) MgcpResponseCode code) := { - line := { - code := code, - trans_id := ?, - string := ? - }, - params := {}, - sdp := omit - } - - template MgcpCommandLine t_MgcpCmdLine(template charstring verb, template MgcpTransId trans_id, template charstring ep) := { - verb := verb, +template (value) MgcpResponse +ts_MgcpResp_Err(template (value) MgcpTransId trans_id, + template (value) MgcpResponseCode code, + template (value) charstring string := "FAIL") := { + line := { + code := code, trans_id := trans_id, - ep := ep, - ver := "1.0" - }; + string := string + }, + params := {}, + sdp := omit +} +template MgcpResponse +tr_MgcpResp_Err(template (present) MgcpResponseCode code) := { + line := { + code := code, + trans_id := ?, + string := ? + }, + params := {}, + sdp := omit +} - template MgcpCommand ts_AUEP(MgcpTransId trans_id, charstring ep) := { - line := t_MgcpCmdLine("AUEP", trans_id, ep), - params := omit, - sdp := omit - } +template MgcpCommandLine t_MgcpCmdLine(template charstring verb, template MgcpTransId trans_id, template charstring ep) := { + verb := verb, + trans_id := trans_id, + ep := ep, + ver := "1.0" +}; - template MgcpResponse tr_AUEP_ACK := { - line := { - code := "200", - trans_id := ?, - string := "OK" - }, - params:= *, - sdp := omit - } +template MgcpCommand ts_AUEP(MgcpTransId trans_id, charstring ep) := { + line := t_MgcpCmdLine("AUEP", trans_id, ep), + params := omit, + sdp := omit +} - template MgcpCommand ts_CRCX(MgcpTransId trans_id, charstring ep, MgcpConnectionMode mode, MgcpCallId call_id, template SDP_Message sdp := omit) := { - line := t_MgcpCmdLine("CRCX", trans_id, ep), - params := { - t_MgcpParConnMode(mode), - ts_MgcpParCallId(call_id), - //t_MgcpParReqId(omit), - t_MgcpParLocConnOpt("p:20, a:AMR") - }, - sdp := sdp - } +template MgcpResponse tr_AUEP_ACK := { + line := { + code := "200", + trans_id := ?, + string := "OK" + }, + params:= *, + sdp := omit +} - template MgcpCommand ts_CRCX_no_lco(MgcpTransId trans_id, charstring ep, MgcpConnectionMode mode, MgcpCallId call_id, template SDP_Message sdp := omit) := { - line := t_MgcpCmdLine("CRCX", trans_id, ep), - params := { - t_MgcpParConnMode(mode), - ts_MgcpParCallId(call_id) - }, - sdp := sdp - } +template MgcpCommand ts_CRCX(MgcpTransId trans_id, charstring ep, MgcpConnectionMode mode, MgcpCallId call_id, template SDP_Message sdp := omit) := { + line := t_MgcpCmdLine("CRCX", trans_id, ep), + params := { + t_MgcpParConnMode(mode), + ts_MgcpParCallId(call_id), + //t_MgcpParReqId(omit), + t_MgcpParLocConnOpt("p:20, a:AMR") + }, + sdp := sdp +} - template MgcpCommand ts_CRCX_osmux(MgcpTransId trans_id, charstring ep, MgcpConnectionMode mode, MgcpCallId call_id, MgcpOsmuxCID osmux_cid, template SDP_Message sdp := omit) := { - line := t_MgcpCmdLine("CRCX", trans_id, ep), - params := { - t_MgcpParConnMode(mode), - ts_MgcpParCallId(call_id), - //t_MgcpParReqId(omit), - t_MgcpParLocConnOpt("p:20, a:AMR"), - ts_MgcpParOsmuxCID(osmux_cid) - }, - sdp := sdp - } +template MgcpCommand ts_CRCX_no_lco(MgcpTransId trans_id, charstring ep, MgcpConnectionMode mode, MgcpCallId call_id, template SDP_Message sdp := omit) := { + line := t_MgcpCmdLine("CRCX", trans_id, ep), + params := { + t_MgcpParConnMode(mode), + ts_MgcpParCallId(call_id) + }, + sdp := sdp +} - template MgcpCommand tr_CRCX(template MgcpEndpoint ep := ?, template SDP_Message sdp := *) := { - line := t_MgcpCmdLine("CRCX", ?, ep), - params := *, - sdp := sdp - } +template MgcpCommand ts_CRCX_osmux(MgcpTransId trans_id, charstring ep, MgcpConnectionMode mode, MgcpCallId call_id, MgcpOsmuxCID osmux_cid, template SDP_Message sdp := omit) := { + line := t_MgcpCmdLine("CRCX", trans_id, ep), + params := { + t_MgcpParConnMode(mode), + ts_MgcpParCallId(call_id), + //t_MgcpParReqId(omit), + t_MgcpParLocConnOpt("p:20, a:AMR"), + ts_MgcpParOsmuxCID(osmux_cid) + }, + sdp := sdp +} - template MgcpResponse tr_CRCX_ACK := { - line := { - code := "200", - trans_id := ?, - string := "OK" - }, - params:= { { "I", ? }, *}, - sdp := ? - } +template MgcpCommand tr_CRCX(template MgcpEndpoint ep := ?, template SDP_Message sdp := *) := { + line := t_MgcpCmdLine("CRCX", ?, ep), + params := *, + sdp := sdp +} - template MgcpResponse tr_CRCX_ACK_osmux := { - line := { - code := "200", - trans_id := ?, - string := "OK" - }, - params:= { { "I", ? }, {"X-OSMUX", ?}, *}, - sdp := ? - } +template MgcpResponse tr_CRCX_ACK := { + line := { + code := "200", + trans_id := ?, + string := "OK" + }, + params:= { { "I", ? }, *}, + sdp := ? +} - template MgcpResponse ts_CRCX_ACK(MgcpTransId trans_id, MgcpConnectionId conn_id, template SDP_Message sdp := omit) := { - line := { - code := "200", - trans_id := trans_id, - string := "OK" - }, - params:= { ts_MgcpParConnectionId(conn_id) }, - sdp := sdp - } +template MgcpResponse tr_CRCX_ACK_osmux := { + line := { + code := "200", + trans_id := ?, + string := "OK" + }, + params:= { { "I", ? }, {"X-OSMUX", ?}, *}, + sdp := ? +} - template MgcpResponse ts_CRCX_ACK_osmux(MgcpTransId trans_id, MgcpConnectionId conn_id, MgcpOsmuxCID osmux_cid, template SDP_Message sdp := omit) := { - line := { - code := "200", - trans_id := trans_id, - string := "OK" - }, - params:= { - ts_MgcpParConnectionId(conn_id), - ts_MgcpParOsmuxCID(osmux_cid) - }, - sdp := sdp - } +template MgcpResponse ts_CRCX_ACK(MgcpTransId trans_id, MgcpConnectionId conn_id, template SDP_Message sdp := omit) := { + line := { + code := "200", + trans_id := trans_id, + string := "OK" + }, + params:= { ts_MgcpParConnectionId(conn_id) }, + sdp := sdp +} - template MgcpCommand ts_MDCX(MgcpTransId trans_id, charstring ep, MgcpConnectionMode mode, MgcpCallId call_id, MgcpConnectionId conn_id, template SDP_Message sdp := omit) := { - line := t_MgcpCmdLine("MDCX", trans_id, ep), - params := { - t_MgcpParConnMode(mode), - ts_MgcpParCallId(call_id), - ts_MgcpParConnectionId(conn_id), - //t_MgcpParReqId(omit), - t_MgcpParLocConnOpt("p:20, a:AMR") - }, - sdp := sdp - } +template MgcpResponse ts_CRCX_ACK_osmux(MgcpTransId trans_id, MgcpConnectionId conn_id, MgcpOsmuxCID osmux_cid, template SDP_Message sdp := omit) := { + line := { + code := "200", + trans_id := trans_id, + string := "OK" + }, + params:= { + ts_MgcpParConnectionId(conn_id), + ts_MgcpParOsmuxCID(osmux_cid) + }, + sdp := sdp +} - template MgcpCommand ts_MDCX_osmux(MgcpTransId trans_id, charstring ep, MgcpConnectionMode mode, MgcpCallId call_id, MgcpConnectionId conn_id, MgcpOsmuxCID osmux_cid, template SDP_Message sdp := omit) := { - line := t_MgcpCmdLine("MDCX", trans_id, ep), - params := { - t_MgcpParConnMode(mode), - ts_MgcpParCallId(call_id), - ts_MgcpParConnectionId(conn_id), - //t_MgcpParReqId(omit), - t_MgcpParLocConnOpt("p:20, a:AMR"), - ts_MgcpParOsmuxCID(osmux_cid) - }, - sdp := sdp - } +template MgcpCommand ts_MDCX(MgcpTransId trans_id, charstring ep, MgcpConnectionMode mode, MgcpCallId call_id, MgcpConnectionId conn_id, template SDP_Message sdp := omit) := { + line := t_MgcpCmdLine("MDCX", trans_id, ep), + params := { + t_MgcpParConnMode(mode), + ts_MgcpParCallId(call_id), + ts_MgcpParConnectionId(conn_id), + //t_MgcpParReqId(omit), + t_MgcpParLocConnOpt("p:20, a:AMR") + }, + sdp := sdp +} - template MgcpCommand tr_MDCX(template SDP_Message sdp := *) := { - line := t_MgcpCmdLine("MDCX", ?, ?), - params := *, - sdp := sdp - } +template MgcpCommand ts_MDCX_osmux(MgcpTransId trans_id, charstring ep, MgcpConnectionMode mode, MgcpCallId call_id, MgcpConnectionId conn_id, MgcpOsmuxCID osmux_cid, template SDP_Message sdp := omit) := { + line := t_MgcpCmdLine("MDCX", trans_id, ep), + params := { + t_MgcpParConnMode(mode), + ts_MgcpParCallId(call_id), + ts_MgcpParConnectionId(conn_id), + //t_MgcpParReqId(omit), + t_MgcpParLocConnOpt("p:20, a:AMR"), + ts_MgcpParOsmuxCID(osmux_cid) + }, + sdp := sdp +} - template MgcpResponse tr_MDCX_ACK := { - line := { - code := "200", - trans_id := ?, - string := "OK" - }, - params := *, - sdp := ? - } +template MgcpCommand tr_MDCX(template SDP_Message sdp := *) := { + line := t_MgcpCmdLine("MDCX", ?, ?), + params := *, + sdp := sdp +} - template MgcpResponse ts_MDCX_ACK(MgcpTransId trans_id, MgcpConnectionId conn_id, template SDP_Message sdp := omit) := ts_CRCX_ACK(trans_id, conn_id, sdp); - template MgcpResponse ts_MDCX_ACK_osmux(MgcpTransId trans_id, MgcpConnectionId conn_id, MgcpOsmuxCID osmux_cid, template SDP_Message sdp := omit) := ts_CRCX_ACK_osmux(trans_id, conn_id, osmux_cid, sdp); +template MgcpResponse tr_MDCX_ACK := { + line := { + code := "200", + trans_id := ?, + string := "OK" + }, + params := *, + sdp := ? +} - /* have a function that generates a template, rather than a template in order to handle - * optional parameters */ - function ts_DLCX(MgcpTransId trans_id, charstring ep, template MgcpCallId call_id := omit, - template MgcpConnectionId conn_id := omit) return template MgcpCommand { - var template MgcpCommand cmd; - cmd.line := t_MgcpCmdLine("DLCX", trans_id, ep); - cmd.params := {}; - cmd.sdp := omit; - if (isvalue(call_id)) { - f_mgcp_par_append(cmd.params, ts_MgcpParCallId(valueof(call_id))); - if (isvalue(conn_id)) { - f_mgcp_par_append(cmd.params, ts_MgcpParConnectionId(valueof(conn_id))); - } - } - return cmd; - } +template MgcpResponse ts_MDCX_ACK(MgcpTransId trans_id, MgcpConnectionId conn_id, template SDP_Message sdp := omit) := ts_CRCX_ACK(trans_id, conn_id, sdp); +template MgcpResponse ts_MDCX_ACK_osmux(MgcpTransId trans_id, MgcpConnectionId conn_id, MgcpOsmuxCID osmux_cid, template SDP_Message sdp := omit) := ts_CRCX_ACK_osmux(trans_id, conn_id, osmux_cid, sdp); - template MgcpCommand tr_DLCX(template MgcpEndpoint ep := ?) := { - line := t_MgcpCmdLine("DLCX", ?, ep), - params := *, - sdp := * - } - - template MgcpResponse tr_DLCX_ACK := { - line := { - code := ("200", "250"), - trans_id := ?, - string := "OK" - }, - params:= *, - sdp := * - } - - template MgcpResponse ts_DLCX_ACK2(MgcpTransId trans_id) := { - line := { - code := "250", - trans_id := trans_id, - string := "OK" - }, - params:= { /* list of ConnectionIDs */ }, - sdp := omit - } - - - - template MgcpResponse ts_DLCX_ACK(MgcpTransId trans_id, MgcpConnectionId conn_id, template SDP_Message sdp := omit) := ts_CRCX_ACK(trans_id, conn_id, sdp); - - template MgcpCommand tr_RSIP := { - line := t_MgcpCmdLine("RSIP", ?, ?), - params := *, - sdp := * - } - - /* SDP Templates */ - template SDP_Origin ts_SDP_origin(charstring addr, charstring session_id, - charstring session_version := "1", - charstring addr_type := "IP4", - charstring user_name := "-") := { - user_name := user_name, - session_id := session_id, - session_version := session_version, - net_type := "IN", - addr_type := addr_type, - addr := addr - } - - template SDP_connection ts_SDP_connection_IP(charstring addr, charstring addr_type := "IP4", - template integer ttl := omit, - template integer num_of_addr := omit) :={ - net_type := "IN", - addr_type := addr_type, - conn_addr := { - addr := addr, - ttl := ttl, - num_of_addr := num_of_addr +/* have a function that generates a template, rather than a template in order to handle + * optional parameters */ +function ts_DLCX(MgcpTransId trans_id, charstring ep, template MgcpCallId call_id := omit, + template MgcpConnectionId conn_id := omit) return template MgcpCommand { + var template MgcpCommand cmd; + cmd.line := t_MgcpCmdLine("DLCX", trans_id, ep); + cmd.params := {}; + cmd.sdp := omit; + if (isvalue(call_id)) { + f_mgcp_par_append(cmd.params, ts_MgcpParCallId(valueof(call_id))); + if (isvalue(conn_id)) { + f_mgcp_par_append(cmd.params, ts_MgcpParConnectionId(valueof(conn_id))); } } + return cmd; +} - template SDP_connection tr_SDP_connection_IP(template charstring addr, template charstring addr_type := ?, - template integer ttl := *, - template integer num_of_addr := *) := { - net_type := "IN", - addr_type := addr_type, - conn_addr := { - addr := addr, - ttl := ttl, - num_of_addr := num_of_addr - } +template MgcpCommand tr_DLCX(template MgcpEndpoint ep := ?) := { + line := t_MgcpCmdLine("DLCX", ?, ep), + params := *, + sdp := * +} + +template MgcpResponse tr_DLCX_ACK := { + line := { + code := ("200", "250"), + trans_id := ?, + string := "OK" + }, + params:= *, + sdp := * +} + +template MgcpResponse ts_DLCX_ACK2(MgcpTransId trans_id) := { + line := { + code := "250", + trans_id := trans_id, + string := "OK" + }, + params:= { /* list of ConnectionIDs */ }, + sdp := omit +} + + + +template MgcpResponse ts_DLCX_ACK(MgcpTransId trans_id, MgcpConnectionId conn_id, template SDP_Message sdp := omit) := ts_CRCX_ACK(trans_id, conn_id, sdp); + +template MgcpCommand tr_RSIP := { + line := t_MgcpCmdLine("RSIP", ?, ?), + params := *, + sdp := * +} + +/* SDP Templates */ +template SDP_Origin ts_SDP_origin(charstring addr, charstring session_id, + charstring session_version := "1", + charstring addr_type := "IP4", + charstring user_name := "-") := { + user_name := user_name, + session_id := session_id, + session_version := session_version, + net_type := "IN", + addr_type := addr_type, + addr := addr +} + +template SDP_connection ts_SDP_connection_IP(charstring addr, charstring addr_type := "IP4", + template integer ttl := omit, + template integer num_of_addr := omit) :={ + net_type := "IN", + addr_type := addr_type, + conn_addr := { + addr := addr, + ttl := ttl, + num_of_addr := num_of_addr } +} - template SDP_time ts_SDP_time(charstring beg, charstring end) := { - time_field := { - start_time := beg, - stop_time := end +template SDP_connection tr_SDP_connection_IP(template charstring addr, template charstring addr_type := ?, + template integer ttl := *, + template integer num_of_addr := *) := { + net_type := "IN", + addr_type := addr_type, + conn_addr := { + addr := addr, + ttl := ttl, + num_of_addr := num_of_addr + } +} + +template SDP_time ts_SDP_time(charstring beg, charstring end) := { + time_field := { + start_time := beg, + stop_time := end + }, + time_repeat := omit +} + +template SDP_media_desc ts_SDP_media_desc(integer port_number, SDP_fmt_list fmts, + SDP_attribute_list attributes) := { + media_field := { + media := "audio", + ports := { + port_number := port_number, + num_of_ports := omit }, - time_repeat := omit - } + transport := "RTP/AVP", + fmts := fmts + }, + information := omit, + connections := omit, + bandwidth := omit, + key := omit, + attributes := attributes +} - template SDP_media_desc ts_SDP_media_desc(integer port_number, SDP_fmt_list fmts, - SDP_attribute_list attributes) := { - media_field := { - media := "audio", - ports := { - port_number := port_number, - num_of_ports := omit - }, - transport := "RTP/AVP", - fmts := fmts +template SDP_media_desc tr_SDP_media_desc(template integer port_number := ?, + template SDP_fmt_list fmts := ?, + template SDP_attribute_list attributes := ?) := { + media_field := { + media := "audio", + ports := { + port_number := port_number, + num_of_ports := omit }, - information := omit, - connections := omit, - bandwidth := omit, - key := omit, - attributes := attributes - } + transport := "RTP/AVP", + fmts := fmts + }, + information := *, + connections := *, + bandwidth := *, + key := *, + attributes := attributes +} - template SDP_media_desc tr_SDP_media_desc(template integer port_number := ?, - template SDP_fmt_list fmts := ?, - template SDP_attribute_list attributes := ?) := { - media_field := { - media := "audio", - ports := { - port_number := port_number, - num_of_ports := omit - }, - transport := "RTP/AVP", - fmts := fmts - }, - information := *, - connections := *, - bandwidth := *, - key := *, - attributes := attributes - } +/* master template for generating SDP based in template arguments */ +template SDP_Message ts_SDP(charstring local_addr, charstring remote_addr, + charstring session_id, charstring session_version, + integer rtp_port, SDP_fmt_list fmts, + SDP_attribute_list attributes) := { + protocol_version := 0, + origin := ts_SDP_origin(local_addr, session_id, session_version, f_mgcp_addr2addrtype(local_addr)), + session_name := "-", + information := omit, + uri := omit, + emails := omit, + phone_numbers := omit, + connection := ts_SDP_connection_IP(remote_addr, f_mgcp_addr2addrtype(remote_addr)), + bandwidth := omit, + times := { ts_SDP_time("0","0") }, + timezone_adjustments := omit, + key := omit, + attributes := omit, + media_list := { ts_SDP_media_desc(rtp_port, fmts, attributes) } +} - /* master template for generating SDP based in template arguments */ - template SDP_Message ts_SDP(charstring local_addr, charstring remote_addr, - charstring session_id, charstring session_version, - integer rtp_port, SDP_fmt_list fmts, - SDP_attribute_list attributes) := { - protocol_version := 0, - origin := ts_SDP_origin(local_addr, session_id, session_version, f_mgcp_addr2addrtype(local_addr)), - session_name := "-", - information := omit, - uri := omit, - emails := omit, - phone_numbers := omit, - connection := ts_SDP_connection_IP(remote_addr, f_mgcp_addr2addrtype(remote_addr)), - bandwidth := omit, - times := { ts_SDP_time("0","0") }, - timezone_adjustments := omit, - key := omit, - attributes := omit, - media_list := { ts_SDP_media_desc(rtp_port, fmts, attributes) } - } +template SDP_Message tr_SDP(template charstring remote_addr := ?, template integer rtp_port := ?) := { + protocol_version := 0, + origin := ?, + session_name := ?, + information := *, + uri := *, + emails := *, + phone_numbers := *, + connection := tr_SDP_connection_IP(remote_addr, ?), + bandwidth := *, + times := ?, + timezone_adjustments := *, + key := *, + attributes := *, + media_list := { tr_SDP_media_desc(rtp_port) } +} - template SDP_Message tr_SDP(template charstring remote_addr := ?, template integer rtp_port := ?) := { - protocol_version := 0, - origin := ?, - session_name := ?, - information := *, - uri := *, - emails := *, - phone_numbers := *, - connection := tr_SDP_connection_IP(remote_addr, ?), - bandwidth := *, - times := ?, - timezone_adjustments := *, - key := *, - attributes := *, - media_list := { tr_SDP_media_desc(rtp_port) } +template SDP_attribute ts_SDP_rtpmap(integer fmt, charstring val) := { + rtpmap := { + attr_value := int2str(fmt) & " " & val } +} +template SDP_attribute ts_SDP_ptime(integer p) := { + ptime := { + attr_value := int2str(p) + } +} +template SDP_attribute ts_SDP_fmtp(integer fmt, charstring val) := { + fmtp := { + attr_value := int2str(fmt) & " " & val + } +} - template SDP_attribute ts_SDP_rtpmap(integer fmt, charstring val) := { - rtpmap := { - attr_value := int2str(fmt) & " " & val +function f_mgcp_addr2addrtype(charstring addr) return charstring { + for (var integer i := 0; i < lengthof(addr); i := i + 1) { + if (addr[i] == ":") { + return "IP6"; } } - template SDP_attribute ts_SDP_ptime(integer p) := { - ptime := { - attr_value := int2str(p) + return "IP4"; +} + +/* -1 is wildcard, positive is translated as string */ +function f_mgcp_osmux_cid_encode(MgcpOsmuxCID osmux_cid) return charstring { + if (osmux_cid == -1) { + return "*"; + } + return int2str(osmux_cid); +} + +function f_mgcp_osmux_cid_decode(charstring osmux_cid) return MgcpOsmuxCID { + if (osmux_cid == "*") { + return -1; + } + return str2int(osmux_cid); +} + +function f_mgcp_contains_par(MgcpMessage msg, MgcpInfoCode code) return boolean { + var MgcpParameterList pars; + if (ischosen(msg.command)) { + pars := msg.command.params; + } else { + pars := msg.response.params; + } + for (var integer i := 0; i < lengthof(pars); i := i + 1) { + var MgcpParameter par := pars[i]; + if (par.code == code) { + return true; } } - template SDP_attribute ts_SDP_fmtp(integer fmt, charstring val) := { - fmtp := { - attr_value := int2str(fmt) & " " & val + return false; +} + +function f_mgcp_extract_par(MgcpMessage msg, MgcpInfoCode code) return charstring { + var MgcpParameterList pars; + if (ischosen(msg.command)) { + pars := msg.command.params; + } else { + pars := msg.response.params; + } + for (var integer i := 0; i < lengthof(pars); i := i + 1) { + var MgcpParameter par := pars[i]; + if (par.code == code) { + return par.val; } } + setverdict(fail, "Could not extract parameters for code ", code); + return ""; +} - function f_mgcp_addr2addrtype(charstring addr) return charstring { - for (var integer i := 0; i < lengthof(addr); i := i + 1) { - if (addr[i] == ":") { - return "IP6"; - } +function f_MgcpResp_extract_par(MgcpResponse resp, MgcpInfoCode code) return charstring { + var MgcpMessage msg := { + response := resp + } + return f_mgcp_extract_par(msg, code); +} + +function f_MgcpCmd_extract_par(MgcpCommand cmd, MgcpInfoCode code) return charstring { + var MgcpMessage msg := { + command := cmd + } + return f_mgcp_extract_par(msg, code); +} + +function f_MgcpCmd_contains_par(MgcpCommand cmd, MgcpInfoCode code) return boolean { + var MgcpMessage msg := { + command := cmd + } + return f_mgcp_contains_par(msg, code); +} + +function f_MgcpResp_extract_conn_id(MgcpResponse resp) return MgcpConnectionId { + return str2hex(f_MgcpResp_extract_par(resp, "I")); +} + +function f_MgcpCmd_extract_call_id(MgcpCommand cmd) return MgcpCallId { + return str2hex(f_MgcpCmd_extract_par(cmd, "C")); +} + +function f_MgcpCmd_extract_conn_id(MgcpCommand cmd) return MgcpConnectionId { + return str2hex(f_MgcpCmd_extract_par(cmd, "I")); +} + +function f_MgcpCmd_extract_osmux_cid(MgcpCommand cmd) return MgcpOsmuxCID { + return f_mgcp_osmux_cid_decode(f_MgcpCmd_extract_par(cmd, "X-OSMUX")); +} + + +function f_mgcp_alloc_tid() return MgcpTransId { + return int2str(float2int(rnd()*2147483647.0)); +} + +function f_mgcp_alloc_call_id() return MgcpCallId { + return int2hex(float2int(rnd()*2147483647.0), 8); +} + +function f_mgcp_alloc_conn_id() return MgcpConnectionId { + return int2hex(float2int(rnd()*2147483647.0), 8); +} + +/* those verbs that related to a connection (and hence have ConnectionId) */ +template MgcpVerb tr_MgcpVerb_ConnectionOriented := ("CRCX", "MDCX", "DLCX", "AUCX"); +/* entire command template matching only connection oriented verbs */ +template MgcpCommand tr_MgcpCommand_CO := { + line := { + verb := tr_MgcpVerb_ConnectionOriented, + trans_id := ?, + ep := ?, + ver := ? + }, + params := *, + sdp := * +} + +function f_mgcp_find_param_entry(MgcpParameterList pars, MgcpInfoCode code, out charstring ret) +return boolean { + for (var integer i := 0; i < sizeof(pars); i := i+1) { + if (pars[i].code == code) { + ret := pars[i].val; + return true; } - return "IP4"; } + return false; +} - /* -1 is wildcard, positive is translated as string */ - function f_mgcp_osmux_cid_encode(MgcpOsmuxCID osmux_cid) return charstring { - if (osmux_cid == -1) { - return "*"; - } - return int2str(osmux_cid); +function f_mgcp_find_param(MgcpMessage msg, MgcpInfoCode code, out charstring ret) +return boolean { + var MgcpParameterList pars; + if (ischosen(msg.command)) { + pars := msg.command.params; + } else { + pars := msg.response.params; } + return f_mgcp_find_param_entry(pars, code, ret); +} - function f_mgcp_osmux_cid_decode(charstring osmux_cid) return MgcpOsmuxCID { - if (osmux_cid == "*") { - return -1; - } - return str2int(osmux_cid); - } - - function f_mgcp_contains_par(MgcpMessage msg, MgcpInfoCode code) return boolean { - var MgcpParameterList pars; - if (ischosen(msg.command)) { - pars := msg.command.params; - } else { - pars := msg.response.params; - } - for (var integer i := 0; i < lengthof(pars); i := i + 1) { - var MgcpParameter par := pars[i]; - if (par.code == code) { - return true; - } - } - return false; - } - - function f_mgcp_extract_par(MgcpMessage msg, MgcpInfoCode code) return charstring { - var MgcpParameterList pars; - if (ischosen(msg.command)) { - pars := msg.command.params; - } else { - pars := msg.response.params; - } - for (var integer i := 0; i < lengthof(pars); i := i + 1) { - var MgcpParameter par := pars[i]; - if (par.code == code) { - return par.val; - } - } - setverdict(fail, "Could not extract parameters for code ", code); - return ""; - } - - function f_MgcpResp_extract_par(MgcpResponse resp, MgcpInfoCode code) return charstring { - var MgcpMessage msg := { - response := resp - } - return f_mgcp_extract_par(msg, code); - } - - function f_MgcpCmd_extract_par(MgcpCommand cmd, MgcpInfoCode code) return charstring { - var MgcpMessage msg := { - command := cmd - } - return f_mgcp_extract_par(msg, code); - } - - function f_MgcpCmd_contains_par(MgcpCommand cmd, MgcpInfoCode code) return boolean { - var MgcpMessage msg := { - command := cmd - } - return f_mgcp_contains_par(msg, code); - } - - function f_MgcpResp_extract_conn_id(MgcpResponse resp) return MgcpConnectionId { - return str2hex(f_MgcpResp_extract_par(resp, "I")); - } - - function f_MgcpCmd_extract_call_id(MgcpCommand cmd) return MgcpCallId { - return str2hex(f_MgcpCmd_extract_par(cmd, "C")); - } - - function f_MgcpCmd_extract_conn_id(MgcpCommand cmd) return MgcpConnectionId { - return str2hex(f_MgcpCmd_extract_par(cmd, "I")); - } - - function f_MgcpCmd_extract_osmux_cid(MgcpCommand cmd) return MgcpOsmuxCID { - return f_mgcp_osmux_cid_decode(f_MgcpCmd_extract_par(cmd, "X-OSMUX")); - } - - - function f_mgcp_alloc_tid() return MgcpTransId { - return int2str(float2int(rnd()*2147483647.0)); - } - - function f_mgcp_alloc_call_id() return MgcpCallId { - return int2hex(float2int(rnd()*2147483647.0), 8); - } - - function f_mgcp_alloc_conn_id() return MgcpConnectionId { - return int2hex(float2int(rnd()*2147483647.0), 8); - } - - /* those verbs that related to a connection (and hence have ConnectionId) */ - template MgcpVerb tr_MgcpVerb_ConnectionOriented := ("CRCX", "MDCX", "DLCX", "AUCX"); - /* entire command template matching only connection oriented verbs */ - template MgcpCommand tr_MgcpCommand_CO := { - line := { - verb := tr_MgcpVerb_ConnectionOriented, - trans_id := ?, - ep := ?, - ver := ? - }, - params := *, - sdp := * - } - - function f_mgcp_find_param_entry(MgcpParameterList pars, MgcpInfoCode code, out charstring ret) - return boolean { - for (var integer i := 0; i < sizeof(pars); i := i+1) { - if (pars[i].code == code) { - ret := pars[i].val; - return true; - } - } - return false; - } - - function f_mgcp_find_param(MgcpMessage msg, MgcpInfoCode code, out charstring ret) - return boolean { - var MgcpParameterList pars; - if (ischosen(msg.command)) { - pars := msg.command.params; - } else { - pars := msg.response.params; - } - return f_mgcp_find_param_entry(pars, code, ret); - } - - /* template to determine if a MGCP endpoint is a wildcard endpoint */ - template charstring t_MGCP_EP_wildcard := (pattern "\*@*", pattern "rtpbridge/\*@*"); +/* template to determine if a MGCP endpoint is a wildcard endpoint */ +template charstring t_MGCP_EP_wildcard := (pattern "\*@*", pattern "rtpbridge/\*@*"); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36379?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: I9338c73db94a1ed3e2945bc40a46573c4a674ba3 Gerrit-Change-Number: 36379 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 months

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: Move SDP templates to its own SDP_Templates.ttcn file

by pespin

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36381?usp=email ) Change subject: Move SDP templates to its own SDP_Templates.ttcn file ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36381?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: I0610b4cf5533e46a3401c65e60c7cce975c85412 Gerrit-Change-Number: 36381 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 10:32:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months

1
0
0 0

[S] Change in osmo-trx[master]: transceiver: use log level cache

by pespin

Attention is currently required from: Hoernchen. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36386?usp=email ) Change subject: transceiver: use log level cache ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: A small description on what are the consequences of this would be great. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36386?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: Ic9f0e81c89827f2696ce046a3396f041703d6ae5 Gerrit-Change-Number: 36386 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 10:31:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 months

1
0
0 0

[XL] Change in osmo-ttcn3-hacks[master]: MGCP_Templates: Avoid extra indenation for most of the whole file

by osmith

Attention is currently required from: fixeria, jolly, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36379?usp=email ) Change subject: MGCP_Templates: Avoid extra indenation for most of the whole file ...................................................................... Patch Set 2: (1 comment) File library/MGCP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36379/comment/d8b0e09c_6d7c… PS1, Line 241: template MgcpConnectionId conn_id := omit) return template MgcpCommand { > please fix alignment here and below (it was aligned before your patch) Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36379?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: I9338c73db94a1ed3e2945bc40a46573c4a674ba3 Gerrit-Change-Number: 36379 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 10:29:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 months

1
0
0 0

[XL] Change in osmo-ttcn3-hacks[master]: MGCP_Templates: Avoid extra indenation for most of the whole file

by osmith

Attention is currently required from: fixeria, jolly, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36379?usp=email ) Change subject: MGCP_Templates: Avoid extra indenation for most of the whole file ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36379?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: I9338c73db94a1ed3e2945bc40a46573c4a674ba3 Gerrit-Change-Number: 36379 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 10:29:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: Move SDP templates to its own SDP_Templates.ttcn file

by pespin

Attention is currently required from: fixeria, laforge, pespin. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36381?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+2 by laforge, Verified+1 by Jenkins Builder The change is no longer submittable: Code-Review and Verified are unsatisfied now. Change subject: Move SDP templates to its own SDP_Templates.ttcn file ...................................................................... Move SDP templates to its own SDP_Templates.ttcn file SDP is used in other protocols than MGCP, eg. SIP. Change-Id: I0610b4cf5533e46a3401c65e60c7cce975c85412 --- M bsc-nat/BSC_MS_ConnectionHandler.ttcn M bsc-nat/gen_links.sh M bsc/BSC_Tests_LCLS.ttcn M bsc/MSC_ConnectionHandler.ttcn M bsc/gen_links.sh M hnbgw/HNBGW_Tests.ttcn M hnbgw/gen_links.sh M library/MGCP_Templates.ttcn A library/SDP_Templates.ttcn M mgw/MGCP_Test.ttcn M mgw/gen_links.sh M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M msc/gen_links.sh M smlc/gen_links.sh 15 files changed, 184 insertions(+), 142 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/81/36381/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36381?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: I0610b4cf5533e46a3401c65e60c7cce975c85412 Gerrit-Change-Number: 36381 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 months

1
0
0 0

[XL] Change in osmo-ttcn3-hacks[master]: MGCP_Templates: Avoid extra indenation for most of the whole file

by pespin

Attention is currently required from: fixeria, jolly, osmith, pespin. Hello Jenkins Builder, fixeria, jolly, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36379?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by osmith, Verified+1 by Jenkins Builder Change subject: MGCP_Templates: Avoid extra indenation for most of the whole file ...................................................................... MGCP_Templates: Avoid extra indenation for most of the whole file Change-Id: I9338c73db94a1ed3e2945bc40a46573c4a674ba3 --- M library/MGCP_Templates.ttcn 1 file changed, 514 insertions(+), 505 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/79/36379/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36379?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: I9338c73db94a1ed3e2945bc40a46573c4a674ba3 Gerrit-Change-Number: 36379 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: Move f_addrstr2addr() to library/Misc_Helpers.ttcn

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36380?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: Move f_addrstr2addr() to library/Misc_Helpers.ttcn ...................................................................... Move f_addrstr2addr() to library/Misc_Helpers.ttcn This function can easily be reused in other testsuites supporting both IPv4 and IPv6 addresses. Change-Id: I4243ec5551f128629b6504ccc59efeb456a6855d --- M hlr/gen_links.sh M hlr/regen_makefile.sh M library/Misc_Helpers.ttcn M sip/SIP_Tests.ttcn M sysinfo/gen_links.sh M sysinfo/regen_makefile.sh 6 files changed, 26 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/80/36380/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36380?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: I4243ec5551f128629b6504ccc59efeb456a6855d Gerrit-Change-Number: 36380 Gerrit-PatchSet: 4 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sip: Get Rid of private copy of f_mgcp_addr2addrtype()

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36382?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/82/36382/2 -- 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 months

1
0
0 0

[S] Change in osmo-trx[master]: ms: disabe uhd ms build

by Hoernchen

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: (1 comment) File Transceiver52M/Makefile.am: https://gerrit.osmocom.org/c/osmo-trx/+/36377/comment/ddb3addf_e18c010c PS1, Line 130: #if ENABLE_MS_TRX > might be worth adding a reason in a comment here, not just in the commit log. […] I am not a fan of duplicating VCS information, modern IDEs will show the commit messages anyway, and multiple levels of blame are just one click away... -- 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: 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 10:26:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

3 months

1
0
0 0

[S] Change in osmo-trx[master]: transceiver: use log level cache

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/36386?usp=email ) Change subject: transceiver: use log level cache ...................................................................... transceiver: use log level cache Depends: libosmocore.git I539872fc9e3c50b407e6bc388f1e091fa2c826c3 Change-Id: Ic9f0e81c89827f2696ce046a3396f041703d6ae5 --- M Transceiver52M/osmo-trx.cpp 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/86/36386/1 diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index 8f5cc85..c460e98 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -645,6 +645,7 @@ osmo_init_logging2(tall_trx_ctx, &log_info); log_enable_multithread(); + log_cache_enable(); osmo_stats_init(tall_trx_ctx); vty_init(&g_vty_info); logging_vty_add_cmds(); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36386?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: Ic9f0e81c89827f2696ce046a3396f041703d6ae5 Gerrit-Change-Number: 36386 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newchange

3 months

1
0
0 0

[S] Change in osmo-ci[master]: gerrit-verifications: execute 'distcheck' job for pysim

by osmith

Attention is currently required from: fixeria, laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36384?usp=email ) Change subject: gerrit-verifications: execute 'distcheck' job for pysim ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36384?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9d4d9e9de2b16a4b745791f3c9c93507f43bfa6d Gerrit-Change-Number: 36384 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: char <osmocom(a)hypodyne.net> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 10:10:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months

1
0
0 0

[S] Change in pysim[master]: contrib/jenkins.sh: add 'distcheck' job to check package integrity

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36383?usp=email ) Change subject: contrib/jenkins.sh: add 'distcheck' job to check package integrity ...................................................................... Patch Set 2: Code-Review+2 (2 comments) File contrib/jenkins.sh: https://gerrit.osmocom.org/c/pysim/+/36383/comment/9507cfd1_3603b162 PS2, Line 35: "distcheck") > Well, it's a distribution integrity check. Yes, it's not exactly identical to what automake is doing when running make check, but still I see nothing wrong calling it this way. Can rename to smoketest if you guys like. I'm fine with both, just was slightly confused initially that it is called distcheck. > No, I am not planning to extend it. I just thought it would be cleaner to have a separate job for this additional check, so that one could quickly see what exactly is causing the build verification failure. The existing test is already doing few things: running unit tests, SIM programming tests, and pySim-trace tests. Likewise, if you think it's better to run the smoketest there, I can amend the patch. That is a good argument for having it in a separate job. https://gerrit.osmocom.org/c/pysim/+/36383/comment/ea9ee76e_392a3b04 PS2, Line 43: $prog --help > /dev/null > Not sure if printing help would this be useful, we're mostly interested to catch errors here. […] Ack. This isn't important enough to block the patch, we can also remove it later on if we would find it more useful. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36383?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: Ic72d58494e8fd0cab8d66ce60f7b70593b770872 Gerrit-Change-Number: 36383 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: char <osmocom(a)hypodyne.net> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 10:09:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 months

1
0
0 0

[S] Change in pysim[master]: contrib/jenkins.sh: add 'distcheck' job to check package integrity

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36383?usp=email ) Change subject: contrib/jenkins.sh: add 'distcheck' job to check package integrity ...................................................................... Patch Set 2: (2 comments) File contrib/jenkins.sh: https://gerrit.osmocom.org/c/pysim/+/36383/comment/01851ff7_7dfd4a6d PS2, Line 35: "distcheck") > I'm not sure if we should call it "distcheck". It sounds like "make distcheck" from autotools, but it does something else here. Maybe smoketest? Well, it's a distribution integrity check. Yes, it's not exactly identical to what automake is doing when running `make check`, but still I see nothing wrong calling it this way. Can rename to `smoketest` if you guys like. > If you just want to print --help, maybe just add it at the end of the regular test job (since it will almost take no extra time, and then you can avoid having the test setup time)? Or is the idea to extend it later on and do more? No, I am not planning to extend it. I just thought it would be cleaner to have a separate job for this additional check, so that one could quickly see what exactly is causing the build verification failure. The existing `test` is already doing few things: running unit tests, SIM programming tests, and pySim-trace tests. Likewise, if you think it's better to run the smoketest there, I can amend the patch. https://gerrit.osmocom.org/c/pysim/+/36383/comment/4fdb1618_967be187 PS2, Line 43: $prog --help > /dev/null > why >/dev/null, wouldn't it be useful to have the output in jenkins, so one can take a look at it? Not sure if printing help would this be useful, we're mostly interested to catch errors here. If others find it useful, I can remove the `/dev/null` redirection then. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36383?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: Ic72d58494e8fd0cab8d66ce60f7b70593b770872 Gerrit-Change-Number: 36383 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: char <osmocom(a)hypodyne.net> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 10:03:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

3 months

1
0
0 0

[S] Change in osmo-ci[master]: gerrit-verifications: execute 'distcheck' job for pysim

by fixeria

Attention is currently required from: laforge, osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36384?usp=email ) Change subject: gerrit-verifications: execute 'distcheck' job for pysim ...................................................................... Patch Set 2: (1 comment) File jobs/gerrit-verifications.yml: https://gerrit.osmocom.org/c/osmo-ci/+/36384/comment/10aa747a_2bfb2840 PS1, Line 405: simtester > agreed, I suggest using osmocom-gerrit instead Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36384?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9d4d9e9de2b16a4b745791f3c9c93507f43bfa6d Gerrit-Change-Number: 36384 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: char <osmocom(a)hypodyne.net> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 22 Mar 2024 09:49:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 months

1
0
0 0

[S] Change in osmo-ci[master]: gerrit-verifications: execute 'distcheck' job for pysim

by fixeria

Attention is currently required from: fixeria, laforge. Hello Jenkins Builder, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/36384?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: gerrit-verifications: execute 'distcheck' job for pysim ...................................................................... gerrit-verifications: execute 'distcheck' job for pysim Change-Id: I9d4d9e9de2b16a4b745791f3c9c93507f43bfa6d Related: pysim.git Ic72d58494e8fd0cab8d66ce60f7b70593b770872 --- M jobs/gerrit-verifications.yml 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/84/36384/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36384?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9d4d9e9de2b16a4b745791f3c9c93507f43bfa6d Gerrit-Change-Number: 36384 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: char <osmocom(a)hypodyne.net> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 months

1
0
0 0

[S] Change in pysim[master]: contrib/jenkins.sh: add 'distcheck' job to check package integrity

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36383?usp=email ) Change subject: contrib/jenkins.sh: add 'distcheck' job to check package integrity ...................................................................... Patch Set 2: (2 comments) File contrib/jenkins.sh: https://gerrit.osmocom.org/c/pysim/+/36383/comment/0a11ba60_9c520a53 PS2, Line 35: "distcheck") I'm not sure if we should call it "distcheck". It sounds like "make distcheck" from autotools, but it does something else here. Maybe smoketest? If you just want to print --help, maybe just add it at the end of the regular test job (since it will almost take no extra time, and then you can avoid having the test setup time)? Or is the idea to extend it later on and do more? https://gerrit.osmocom.org/c/pysim/+/36383/comment/1dc55eb1_c2b6502d PS2, Line 43: $prog --help > /dev/null why >/dev/null, wouldn't it be useful to have the output in jenkins, so one can take a look at it? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36383?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: Ic72d58494e8fd0cab8d66ce60f7b70593b770872 Gerrit-Change-Number: 36383 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: char <osmocom(a)hypodyne.net> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 09:44:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 months

1
0
0 0

[S] Change in osmo-ci[master]: gerrit-verifications: execute 'distcheck' job for pysim

by osmith

Attention is currently required from: fixeria, laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36384?usp=email ) Change subject: gerrit-verifications: execute 'distcheck' job for pysim ...................................................................... Patch Set 1: (1 comment) File jobs/gerrit-verifications.yml: https://gerrit.osmocom.org/c/osmo-ci/+/36384/comment/0140d36c_ec95c469 PS1, Line 405: simtester > I don't like that, as I fear it makes the pre-commit tests take even longer. […] agreed, I suggest using osmocom-gerrit instead -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36384?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9d4d9e9de2b16a4b745791f3c9c93507f43bfa6d Gerrit-Change-Number: 36384 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: char <osmocom(a)hypodyne.net> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 09:38:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 months

1
0
0 0

[XL] Change in osmo-ttcn3-hacks[master]: MGCP_Templates: Avoid extra indenation for most of the whole file

by osmith

Attention is currently required from: jolly, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36379?usp=email ) Change subject: MGCP_Templates: Avoid extra indenation for most of the whole file ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36379?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: I9338c73db94a1ed3e2945bc40a46573c4a674ba3 Gerrit-Change-Number: 36379 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 09:36:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months

1
0
0 0

[S] Change in osmo-bsc[master]: test: adjust for libosmocore loglevel cache

by Hoernchen

Hoernchen has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35549?usp=email ) Change subject: test: adjust for libosmocore loglevel cache ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35549?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If52bcb522d41918db9e0755ead58abdcb8f0209b Gerrit-Change-Number: 35549 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: abandon

3 months

1
0
0 0

[S] Change in osmo-bts[master]: test: adjust for libosmocore loglevel cache

by Hoernchen

Hoernchen has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35550?usp=email ) Change subject: test: adjust for libosmocore loglevel cache ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35550?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie9c546210bc554843b1029afa20965bde1d7f228 Gerrit-Change-Number: 35550 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: abandon

3 months

1
0
0 0

[M] Change in libosmocore[master]: Revert "Revert "logging: add log level cache""

by Hoernchen

Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35525?usp=email ) Change subject: Revert "Revert "logging: add log level cache"" ...................................................................... Revert "Revert "logging: add log level cache"" This reverts commit 7f1fb3ea817578f3f2f63e8065aa50f8355caa3b - slightly amended with the new log_cache_enalbe() function. The cache is hence disabled by default, and applications can enable it, if they wish to benefit from it. Reason for the original revert was: some fallout expected due to log manipulation in test code Change-Id: I539872fc9e3c50b407e6bc388f1e091fa2c826c3 --- M include/osmocom/core/logging.h M src/core/libosmocore.map M src/core/logging.c M src/vty/logging_vty.c 4 files changed, 163 insertions(+), 1 deletion(-) Approvals: Hoernchen: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index e8433a1..82e686f 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -409,7 +409,8 @@ /* filter on the targets */ void log_set_all_filter(struct log_target *target, int); - +int log_cache_enable(void); +void log_cache_update(int mapped_subsys, uint8_t enabled, uint8_t level); void log_set_use_color(struct log_target *target, int); void log_set_print_extended_timestamp(struct log_target *target, int); void log_set_print_timestamp(struct log_target *target, int); diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index 072efee..fb294ba 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -58,6 +58,8 @@ log_add_target; log_category_name; log_check_level; +log_cache_enable; +log_cache_update; log_del_target; log_enable_multithread; log_fini; diff --git a/src/core/logging.c b/src/core/logging.c index 6941f9b..e172124 100644 --- a/src/core/logging.c +++ b/src/core/logging.c @@ -93,6 +93,80 @@ static __thread long int logging_tid; #if (!EMBEDDED) +/*! One global copy that contains the union of log levels for all targets +* for all categories, used for quick lock free checks of log targets. */ +static volatile uint8_t *log_level_lookup_cache; + +/*! Updates cache for all targets for all categies, caller must hold osmo_log_tgt_mutex. */ +static void log_cache_update_all(void) +{ + struct log_target *tgt; + uint8_t tmp_en[osmo_log_info->num_cat]; + uint8_t tmp_level[osmo_log_info->num_cat]; + + if (!log_level_lookup_cache) + return; + + memset(tmp_en, 0, osmo_log_info->num_cat); + memset(tmp_level, UINT8_MAX, osmo_log_info->num_cat); + + /* values can also decrease.. */ + llist_for_each_entry(tgt, &osmo_log_target_list, entry) { + for (int i = 0; i < osmo_log_info->num_cat; i++) { + struct log_category *cat = &tgt->categories[i]; + tmp_en[i] = OSMO_MAX(tmp_en[i], cat->enabled); + tmp_level[i] = OSMO_MIN(tmp_level[i], cat->loglevel); + tmp_level[i] = tgt->loglevel ? OSMO_MIN(tmp_level[i], tgt->loglevel) : tmp_level[i]; + } + } + + for (int i = 0; i < osmo_log_info->num_cat; i++) + log_level_lookup_cache[i] = tmp_en[i] ? tmp_level[i] : UINT8_MAX; +} + +/*! Updates single cache entry, caller must hold osmo_log_tgt_mutex. + * + * \param[in] mapped_subsys plain category index (after mapping) + * \param[in] enabled log category enabled? + * \param[in] level log level + */ +void log_cache_update(int mapped_subsys, uint8_t enabled, uint8_t level) +{ + struct log_target *tgt; + struct log_category tmp = { UINT8_MAX, 0 }; + + if (!log_level_lookup_cache) + return; + + /* values can also decrease.. */ + llist_for_each_entry(tgt, &osmo_log_target_list, entry) { + struct log_category *cat = &tgt->categories[mapped_subsys]; + tmp.enabled = OSMO_MAX(tmp.enabled, cat->enabled); + tmp.loglevel = OSMO_MIN(tmp.loglevel, cat->loglevel); + tmp.loglevel = tgt->loglevel ? OSMO_MIN(tmp.loglevel, tgt->loglevel) : tmp.loglevel; + } + tmp.enabled = OSMO_MAX(tmp.enabled, enabled); + tmp.loglevel = OSMO_MIN(tmp.loglevel, level); + + log_level_lookup_cache[mapped_subsys] = tmp.enabled ? tmp.loglevel : UINT8_MAX; +} + +/*! Queries log level cache. + * + * \param[in] mapped_subsys plain category index (after mapping) + * \param[in] level log level + * \returns true if logging should happen for at least one log target +*/ +static bool log_cache_check(int mapped_subsys, int level) +{ + if (!log_level_lookup_cache) { + /* log-cache is not enabled, so we simply behave like we did before the cache */ + return true; + } + + return (level < log_level_lookup_cache[mapped_subsys]) ? false : true; +} + /*! This mutex must be held while using osmo_log_target_list or any of its log_targets in a multithread program. Prevents race conditions between threads like producing unordered timestamps or VTY deleting a target while another @@ -426,6 +500,10 @@ } } while ((category_token = strtok(NULL, ":"))); +#if !defined(EMBEDDED) + log_cache_update_all(); +#endif + free(mask); } @@ -680,6 +758,11 @@ subsys = map_subsys(subsys); +#if !defined(EMBEDDED) + if (!log_cache_check(subsys, level)) + return; +#endif + log_tgt_mutex_lock(); llist_for_each_entry(tar, &osmo_log_target_list, entry) { @@ -754,6 +837,9 @@ void log_add_target(struct log_target *target) { llist_add_tail(&target->entry, &osmo_log_target_list); +#if (!EMBEDDED) + log_cache_update_all(); +#endif } /*! Unregister a log target from the logging core @@ -762,6 +848,9 @@ void log_del_target(struct log_target *target) { llist_del(&target->entry); +#if (!EMBEDDED) + log_cache_update_all(); +#endif } /*! Reset (clear) the logging context */ @@ -922,6 +1011,9 @@ void log_set_log_level(struct log_target *target, int log_level) { target->loglevel = log_level; +#if !defined(EMBEDDED) + log_cache_update_all(); +#endif } /*! Set a category filter on a given log target @@ -938,6 +1030,10 @@ category = map_subsys(category); target->categories[category].enabled = !!enable; target->categories[category].loglevel = level; + +#if !defined(EMBEDDED) + log_cache_update(category, !!enable, level); +#endif } #if (!EMBEDDED) @@ -1046,6 +1142,15 @@ /* global log level */ target->loglevel = 0; + +#if !defined(EMBEDDED) + /* update cache */ + for (i = 0; i < osmo_log_info->num_cat; i++) { + const struct log_info_cat *c = &osmo_log_info->cat[i]; + log_cache_update(i, c->enabled, c->loglevel); + } +#endif + return target; } @@ -1393,6 +1498,31 @@ return rc; } +/*! Enable the log level lookup cache to bypass string formatting and other code for log statements which are + * not actually enabled/needed by any existing log target. + * \retruns 0 in case of success, negative -errno in case of error. */ +int log_cache_enable(void) +{ +#if !defined(EMBEDDED) + if (log_level_lookup_cache) + return -EEXIST; + + log_level_lookup_cache = talloc_zero_array(osmo_log_info, uint8_t, osmo_log_info->num_cat); + if (!log_level_lookup_cache) + return -ENOMEM; + + /* copy everything for level lookup cache */ + log_tgt_mutex_lock(); + log_cache_update_all(); + log_tgt_mutex_unlock(); + + return 0; +#else + return -ENOTSUP; +#endif +} + + /*! Initialize the Osmocom logging core * \param[in] inf Information regarding logging categories, could be NULL * \param[in] ctx talloc context for logging allocations @@ -1486,6 +1616,11 @@ subsys = map_subsys(subsys); +#if !defined(EMBEDDED) + if (!log_cache_check(subsys, level)) + return 0; +#endif + /* TODO: The following could/should be cached (update on config) */ log_tgt_mutex_lock(); diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 2a07422..678ae68 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -382,6 +382,10 @@ tgt->categories[category].enabled = 1; tgt->categories[category].loglevel = level; +#if !defined(EMBEDDED) + log_cache_update(category, 1, level); +#endif + RET_WITH_UNLOCK(CMD_SUCCESS); } @@ -406,6 +410,9 @@ cat->enabled = 1; cat->loglevel = level; +#if !defined(EMBEDDED) + log_cache_update(i, 1, level); +#endif } RET_WITH_UNLOCK(CMD_SUCCESS); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35525?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: I539872fc9e3c50b407e6bc388f1e091fa2c826c3 Gerrit-Change-Number: 35525 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 months

1
0
0 0

[M] Change in libosmocore[master]: Revert "Revert "logging: add log level cache""

by Hoernchen

Attention is currently required from: laforge. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35525?usp=email ) Change subject: Revert "Revert "logging: add log level cache"" ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35525?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: I539872fc9e3c50b407e6bc388f1e091fa2c826c3 Gerrit-Change-Number: 35525 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 22 Mar 2024 09:08:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: sip: Get Rid of private copy of f_mgcp_addr2addrtype()

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36382?usp=email ) Change subject: sip: Get Rid of private copy of f_mgcp_addr2addrtype() ...................................................................... Patch Set 1: Code-Review+2 -- 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: 1 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 07:36:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: Move SDP templates to its own SDP_Templates.ttcn file

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36381?usp=email ) Change subject: Move SDP templates to its own SDP_Templates.ttcn file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36381?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: I0610b4cf5533e46a3401c65e60c7cce975c85412 Gerrit-Change-Number: 36381 Gerrit-PatchSet: 1 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 07:35:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: Move f_addrstr2addr() to library/Misc_Helpers.ttcn

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36380?usp=email ) Change subject: Move f_addrstr2addr() to library/Misc_Helpers.ttcn ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36380?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: I4243ec5551f128629b6504ccc59efeb456a6855d Gerrit-Change-Number: 36380 Gerrit-PatchSet: 3 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 07:35:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months

1
0
0 0

[M] Change in libosmocore[master]: Revert "Revert "logging: add log level cache""

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35525?usp=email ) Change subject: Revert "Revert "logging: add log level cache"" ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35525?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: I539872fc9e3c50b407e6bc388f1e091fa2c826c3 Gerrit-Change-Number: 35525 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 07:34:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months

1
0
0 0

[S] Change in libosmo-netif[master]: stream_cli.c: Handle read / recvfrom error and close connection

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36354?usp=email ) Change subject: stream_cli.c: Handle read / recvfrom error and close connection ...................................................................... stream_cli.c: Handle read / recvfrom error and close connection If read or recvfrom fails or returns 0, the connection must be closed. This is already done when a write / send fails. In both cases the disconnect callback is called to notify the user's client. Not handling the error may cause an infinite loop of read or recvfrom failures. Related: OS#6405 Change-Id: I55426de6b49cb4cb0797e50dfeae11f2efc29b15 --- M src/stream_cli.c 1 file changed, 28 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/stream_cli.c b/src/stream_cli.c index fa43a22..11c88ae 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -449,9 +449,13 @@ stream_cli_handle_connecting(cli, res); break; case STREAM_CLI_STATE_CONNECTED: - if (res == 0) + if (res <= 0) { + LOGSCLI(cli, LOGL_NOTICE, "received result %d in response to read\n", res); osmo_stream_cli_reconnect(cli); - else if (cli->iofd_read_cb) + msgb_free(msg); + break; + } + if (cli->iofd_read_cb) cli->iofd_read_cb(cli, msg); else msgb_free(msg); @@ -500,8 +504,12 @@ stream_cli_handle_connecting(cli, res); break; case STREAM_CLI_STATE_CONNECTED: - if (res == 0) + if (res <= 0) { + LOGSCLI(cli, LOGL_NOTICE, "received result %d in response to recvmsg\n", res); osmo_stream_cli_reconnect(cli); + msgb_free(msg); + break; + } /* Forward message to read callback, also if the connection failed. */ if (cli->iofd_read_cb) cli->iofd_read_cb(cli, msg); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36354?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I55426de6b49cb4cb0797e50dfeae11f2efc29b15 Gerrit-Change-Number: 36354 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 months

1
0
0 0

[S] Change in libosmo-netif[master]: stream_cli.c: Handle read / recvfrom error and close connection

by laforge

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36354?usp=email ) Change subject: stream_cli.c: Handle read / recvfrom error and close connection ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36354?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I55426de6b49cb4cb0797e50dfeae11f2efc29b15 Gerrit-Change-Number: 36354 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Fri, 22 Mar 2024 07:34:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months

1
0
0 0

[S] Change in osmo-trx[master]: ms: prune ancient, unused code parts

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36375?usp=email ) Change subject: ms: prune ancient, unused code parts ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36375?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: I36dcb7ba9364b1eafbaa7267cde3574d82da5dd2 Gerrit-Change-Number: 36375 Gerrit-PatchSet: 4 Gerrit-Owner: 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: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 07:33:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months

1
0
0 0

[S] Change in osmo-trx[master]: ms: fix shutdown issues

by laforge

Attention is currently required from: Hoernchen. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36374?usp=email ) Change subject: ms: fix shutdown issues ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36374?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: I02e668a55dece96e421c82706b76bbb411ea6712 Gerrit-Change-Number: 36374 Gerrit-PatchSet: 4 Gerrit-Owner: 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: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 07:33:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months

1
0
0 0

[L] Change in osmo-trx[master]: ms: make app configurable

by laforge

Attention is currently required from: Hoernchen, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36373?usp=email ) Change subject: ms: make app configurable ...................................................................... Patch Set 4: (1 comment) File Transceiver52M/ms/ms_upper.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/36373/comment/331c274e_ab0f82cf PS4, Line 209: // pow = energyDetect(sv, 20 * 4 /*sps*/); > This is related to the build failure, it doesn't matter right now, that code might be reintroduced a […] I don't see how "it doesn't matter right now" is a valid argumetn for mixing differnt orthogonal topics in one patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36373?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: Ibd432f7abbd00065a59104d2c006b676d5db7b47 Gerrit-Change-Number: 36373 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 07:33:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Hoernchen <ewild(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 months

1
0
0 0

[S] Change in osmo-trx[master]: ms: disabe uhd ms build

by laforge

Attention is currently required from: Hoernchen. laforge 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+1 (1 comment) File Transceiver52M/Makefile.am: https://gerrit.osmocom.org/c/osmo-trx/+/36377/comment/90c673ee_969bd621 PS1, Line 130: #if ENABLE_MS_TRX might be worth adding a reason in a comment here, not just in the commit log. This way a potential future reader of the file knows why it is disabled without having to go to git blame or git log. -- 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: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 07:30:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months

1
0
0 0

[S] Change in pysim[master]: add missing modules to setup.py

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/36376?usp=email ) Change subject: add missing modules to setup.py ...................................................................... add missing modules to setup.py Change-Id: I330d5e35e5f1b508c6209b6894009b5fdd35d660 --- M setup.py 1 file changed, 18 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/setup.py b/setup.py index 620e246..1a41d4f 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,15 @@ setup( name='pySim', version='1.0', - packages=['pySim', 'pySim.legacy', 'pySim.transport', 'pySim.apdu', 'pySim.apdu_source'], + packages=[ + 'pySim', + 'pySim.apdu', + 'pySim.apdu_source', + 'pySim.esim', + 'pySim.global_platform', + 'pySim.legacy', + 'pySim.transport', + ], url='https://osmocom.org/projects/pysim/wiki', license='GPLv2', author_email='simtrace(a)lists.osmocom.org', -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36376?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: I330d5e35e5f1b508c6209b6894009b5fdd35d660 Gerrit-Change-Number: 36376 Gerrit-PatchSet: 2 Gerrit-Owner: char <osmocom(a)hypodyne.net> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 months

1
0
0 0

[S] Change in pysim[master]: contrib/jenkins.sh: add 'distcheck' job to check package integrity

by laforge

Attention is currently required from: fixeria, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36383?usp=email ) Change subject: contrib/jenkins.sh: add 'distcheck' job to check package integrity ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36383?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: Ic72d58494e8fd0cab8d66ce60f7b70593b770872 Gerrit-Change-Number: 36383 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: char <osmocom(a)hypodyne.net> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Mar 2024 07:29:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months

1
0
0 0

[S] Change in pysim[master]: add missing modules to setup.py

by laforge

Attention is currently required from: char. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/36376?usp=email ) Change subject: add missing modules to setup.py ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/36376?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: I330d5e35e5f1b508c6209b6894009b5fdd35d660 Gerrit-Change-Number: 36376 Gerrit-PatchSet: 2 Gerrit-Owner: char <osmocom(a)hypodyne.net> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: char <osmocom(a)hypodyne.net> Gerrit-Comment-Date: Fri, 22 Mar 2024 07:29:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 months

1
0
0 0

2024

2023

2022

gerrit-log March 2024