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

[S] Change in simtrace2[master]: cardemu: add support for inverted sim presence pins

by mschramm

Attention is currently required from: lynxis lazus. mschramm has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/36441?usp=email ) Change subject: cardemu: add support for inverted sim presence pins ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: I agree that this could once become a cmd line param. - Does this change reliably solve the owhw_v7 remsim problem? If unsure: what does it need to further investigate? (for discussion on that, we don't need to continue here, but could move to e.g. SYS#6754 or another ticket) -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/36441?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I33325f763b56b297762a3fb6fe6baa7b0354de3c Gerrit-Change-Number: 36441 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: mschramm <mschramm(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 25 Mar 2024 11:59:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: Diameter Gy CCR: Expect RATType AVP in PS-Information instead of MSCC

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36444?usp=email ) Change subject: Diameter Gy CCR: Expect RATType AVP in PS-Information instead of MSCC ...................................................................... Diameter Gy CCR: Expect RATType AVP in PS-Information instead of MSCC open5gs-smfd was recently modified to send RAT-Type inside PS-Information instead of MSCC, since having it in the former is supported since older spec releases and having it in the later creates problems in some real world OCS implementation like PortaOne OCS. Related: SYS#6837 Related: open5gs.git d0b31177cca360865ebc6ab0b89eee7ee4fc8d1a, Related: open5gs.git 3b5e851f5d1328536052031e66a7b9b03c3057f6 Change-Id: I7ce77d08847a0876291f76e901e5c89c339db27d --- M ggsn_tests/GGSN_Tests.ttcn M pgw/PGW_Tests.ttcn 2 files changed, 32 insertions(+), 15 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 13edca5..e2d5fb2 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -550,8 +550,7 @@ tr_AVP_MultipleServicesIndicator, tr_AVP_Multiple_Services_Credit_Control(content := superset( tr_AVP_Requested_Service_Unit, - tr_AVP_PCC_3GPP_QoS_Information, - tr_AVP_GI_3GPP_RatType(rat_type) + tr_AVP_PCC_3GPP_QoS_Information )), tr_AVP_3GPP_ServiceInformation(content := superset( tr_AVP_3GPP_PSInformation(content := superset( @@ -567,6 +566,7 @@ tr_AVP_3GPP_NSAPI(nsapi), tr_AVP_3GPP_MS_TimeZone, tr_AVP_3GPP_ULI, + tr_AVP_GI_3GPP_RatType(rat_type), tr_AVP_UserEquipmentInfo({ tr_AVP_UserEquipmentInfoType(IMEISV), tr_AVP_UserEquipmentInfoValue(imeisv) @@ -596,8 +596,7 @@ tr_AVP_Requested_Service_Unit, tr_AVP_Used_Service_Unit, /* tr_AVP_3GPP_Reporting_Reason, can be sometimes inside UsedServiceUnit */ - tr_AVP_PCC_3GPP_QoS_Information, - tr_AVP_GI_3GPP_RatType(rat_type) + tr_AVP_PCC_3GPP_QoS_Information )), tr_AVP_3GPP_ServiceInformation(content := superset( tr_AVP_3GPP_PSInformation(content := superset( @@ -613,6 +612,7 @@ tr_AVP_3GPP_NSAPI(nsapi), tr_AVP_3GPP_MS_TimeZone, tr_AVP_3GPP_ULI, + tr_AVP_GI_3GPP_RatType(rat_type), tr_AVP_UserEquipmentInfo({ tr_AVP_UserEquipmentInfoType(IMEISV), tr_AVP_UserEquipmentInfoValue(imeisv) @@ -643,8 +643,7 @@ /* tr_AVP_Requested_Service_Unit, Only in INIT and UPDATE */ tr_AVP_Used_Service_Unit, tr_AVP_3GPP_Reporting_Reason(FINAL), - tr_AVP_PCC_3GPP_QoS_Information, - tr_AVP_GI_3GPP_RatType(rat_type) + tr_AVP_PCC_3GPP_QoS_Information )), tr_AVP_3GPP_ServiceInformation(content := superset( tr_AVP_3GPP_PSInformation(content := superset( @@ -660,6 +659,7 @@ tr_AVP_3GPP_NSAPI(nsapi), tr_AVP_3GPP_MS_TimeZone, tr_AVP_3GPP_ULI, + tr_AVP_GI_3GPP_RatType(rat_type), tr_AVP_UserEquipmentInfo({ tr_AVP_UserEquipmentInfoType(IMEISV), tr_AVP_UserEquipmentInfoValue(imeisv) diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index 3c4bef2..a1850a0 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -457,8 +457,7 @@ tr_AVP_MultipleServicesIndicator, tr_AVP_Multiple_Services_Credit_Control(content := superset( tr_AVP_Requested_Service_Unit, - tr_AVP_PCC_3GPP_QoS_Information, - tr_AVP_GI_3GPP_RatType(rat_type) + tr_AVP_PCC_3GPP_QoS_Information )), tr_AVP_3GPP_ServiceInformation(content := superset( tr_AVP_3GPP_PSInformation(content := superset( @@ -474,7 +473,8 @@ tr_AVP_3GPP_NSAPI(nsapi), /*We don't yet send MS_Tz in CreateSessionReq: tr_AVP_3GPP_MS_TimeZone,*/ - tr_AVP_3GPP_ULI/*, + tr_AVP_3GPP_ULI, + tr_AVP_GI_3GPP_RatType(rat_type)/*, We don't yet send IMEI in CreateSessionReq: tr_AVP_UserEquipmentInfo({ tr_AVP_UserEquipmentInfoType(IMEISV), @@ -505,8 +505,7 @@ tr_AVP_Requested_Service_Unit, tr_AVP_Used_Service_Unit, /* tr_AVP_3GPP_Reporting_Reason, can be sometimes inside UsedServiceUnit */ - tr_AVP_PCC_3GPP_QoS_Information, - tr_AVP_GI_3GPP_RatType(rat_type) + tr_AVP_PCC_3GPP_QoS_Information )), tr_AVP_3GPP_ServiceInformation(content := superset( tr_AVP_3GPP_PSInformation(content := superset( @@ -522,7 +521,8 @@ tr_AVP_3GPP_NSAPI(nsapi), /*We don't yet send MS_Tz in CreateSessionReq: tr_AVP_3GPP_MS_TimeZone,*/ - tr_AVP_3GPP_ULI/*, + tr_AVP_3GPP_ULI, + tr_AVP_GI_3GPP_RatType(rat_type)/*, We don't yet send IMEI in CreateSessionReq: tr_AVP_UserEquipmentInfo({ tr_AVP_UserEquipmentInfoType(IMEISV), @@ -554,8 +554,7 @@ /* tr_AVP_Requested_Service_Unit, Only in INIT and UPDATE */ tr_AVP_Used_Service_Unit, tr_AVP_3GPP_Reporting_Reason(FINAL), - tr_AVP_PCC_3GPP_QoS_Information, - tr_AVP_GI_3GPP_RatType(rat_type) + tr_AVP_PCC_3GPP_QoS_Information )), tr_AVP_3GPP_ServiceInformation(content := superset( tr_AVP_3GPP_PSInformation(content := superset( @@ -571,7 +570,8 @@ tr_AVP_3GPP_NSAPI(nsapi), /*We don't yet send MS_Tz in CreateSessionReq: tr_AVP_3GPP_MS_TimeZone,*/ - tr_AVP_3GPP_ULI/*, + tr_AVP_3GPP_ULI, + tr_AVP_GI_3GPP_RatType(rat_type)/*, We don't yet send IMEI in CreateSessionReq: tr_AVP_UserEquipmentInfo({ tr_AVP_UserEquipmentInfoType(IMEISV), -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36444?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: I7ce77d08847a0876291f76e901e5c89c339db27d Gerrit-Change-Number: 36444 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: Diameter Gy CCR: Expect RATType AVP in PS-Information instead of MSCC

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36444?usp=email ) Change subject: Diameter Gy CCR: Expect RATType AVP in PS-Information instead of MSCC ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36444?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: I7ce77d08847a0876291f76e901e5c89c339db27d Gerrit-Change-Number: 36444 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 11:46:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: Diameter Gy CCR: Expect RATType AVP in PS-Information instead of MSCC

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36444?usp=email ) Change subject: Diameter Gy CCR: Expect RATType AVP in PS-Information instead of MSCC ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: not backwards compatible, but since we don't test open5gs latest right now it's fine -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36444?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: I7ce77d08847a0876291f76e901e5c89c339db27d Gerrit-Change-Number: 36444 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 11:45:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

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

by osmith

osmith has submitted this change. ( 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/v4_only/osmo-ggsn.cfg R ttcn3-ggsn-test/osmo-ggsn-kernel/v4v6_only/osmo-ggsn.cfg C ttcn3-ggsn-test/osmo-ggsn-kernel/v6_only/osmo-ggsn.cfg R ttcn3-ggsn-test/osmo-ggsn/all/osmo-ggsn.cfg C ttcn3-ggsn-test/osmo-ggsn/v4_only/osmo-ggsn.cfg C ttcn3-ggsn-test/osmo-ggsn/v4v6_only/osmo-ggsn.cfg A ttcn3-ggsn-test/osmo-ggsn/v6_only/osmo-ggsn.cfg R ttcn3-ggsn-test/ttcn3/all/GGSN_Tests.cfg C ttcn3-ggsn-test/ttcn3/v4_only/GGSN_Tests.cfg C ttcn3-ggsn-test/ttcn3/v4v6_only/GGSN_Tests.cfg C ttcn3-ggsn-test/ttcn3/v6_only/GGSN_Tests.cfg 13 files changed, 170 insertions(+), 71 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile index 137a4cd..e1da704 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/all/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 3f1eaf3..f9e7a47 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/"$i"/GGSN_Tests.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"/"$i"/osmo-ggsn.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/v4_only/osmo-ggsn.cfg similarity index 63% copy from ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg copy to ttcn3-ggsn-test/osmo-ggsn-kernel/v4_only/osmo-ggsn.cfg index afa36d6..d8b67a2 100644 --- a/ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg +++ b/ttcn3-ggsn-test/osmo-ggsn-kernel/v4_only/osmo-ggsn.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/v4v6_only/osmo-ggsn.cfg similarity index 77% rename from ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg rename to ttcn3-ggsn-test/osmo-ggsn-kernel/v4v6_only/osmo-ggsn.cfg index afa36d6..c3f32f7 100644 --- a/ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg +++ b/ttcn3-ggsn-test/osmo-ggsn-kernel/v4v6_only/osmo-ggsn.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/v6_only/osmo-ggsn.cfg similarity index 64% copy from ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg copy to ttcn3-ggsn-test/osmo-ggsn-kernel/v6_only/osmo-ggsn.cfg index afa36d6..9de035f 100644 --- a/ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg +++ b/ttcn3-ggsn-test/osmo-ggsn-kernel/v6_only/osmo-ggsn.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/all/osmo-ggsn.cfg similarity index 100% rename from ttcn3-ggsn-test/osmo-ggsn/osmo-ggsn.cfg rename to ttcn3-ggsn-test/osmo-ggsn/all/osmo-ggsn.cfg diff --git a/ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg b/ttcn3-ggsn-test/osmo-ggsn/v4_only/osmo-ggsn.cfg similarity index 60% copy from ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg copy to ttcn3-ggsn-test/osmo-ggsn/v4_only/osmo-ggsn.cfg index afa36d6..7a94b59 100644 --- a/ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg +++ b/ttcn3-ggsn-test/osmo-ggsn/v4_only/osmo-ggsn.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/v4v6_only/osmo-ggsn.cfg similarity index 69% copy from ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg copy to ttcn3-ggsn-test/osmo-ggsn/v4v6_only/osmo-ggsn.cfg index afa36d6..f63b0d5 100644 --- a/ttcn3-ggsn-test/osmo-ggsn-kernel/osmo-ggsn.cfg +++ b/ttcn3-ggsn-test/osmo-ggsn/v4v6_only/osmo-ggsn.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/v6_only/osmo-ggsn.cfg b/ttcn3-ggsn-test/osmo-ggsn/v6_only/osmo-ggsn.cfg new file mode 100644 index 0000000..bca3f57 --- /dev/null +++ b/ttcn3-ggsn-test/osmo-ggsn/v6_only/osmo-ggsn.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/all/GGSN_Tests.cfg similarity index 94% rename from ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg rename to ttcn3-ggsn-test/ttcn3/all/GGSN_Tests.cfg index cb548b3..f715d9f 100644 --- a/ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg +++ b/ttcn3-ggsn-test/ttcn3/all/GGSN_Tests.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/v4_only/GGSN_Tests.cfg similarity index 93% copy from ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg copy to ttcn3-ggsn-test/ttcn3/v4_only/GGSN_Tests.cfg index cb548b3..fc21c72 100644 --- a/ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg +++ b/ttcn3-ggsn-test/ttcn3/v4_only/GGSN_Tests.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/v4v6_only/GGSN_Tests.cfg similarity index 93% copy from ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg copy to ttcn3-ggsn-test/ttcn3/v4v6_only/GGSN_Tests.cfg index cb548b3..c2c8b4a 100644 --- a/ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg +++ b/ttcn3-ggsn-test/ttcn3/v4v6_only/GGSN_Tests.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/v6_only/GGSN_Tests.cfg similarity index 93% copy from ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg copy to ttcn3-ggsn-test/ttcn3/v6_only/GGSN_Tests.cfg index cb548b3..7666438 100644 --- a/ttcn3-ggsn-test/ttcn3/GGSN_Tests.cfg +++ b/ttcn3-ggsn-test/ttcn3/v6_only/GGSN_Tests.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: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

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

by osmith

Attention is currently required from: laforge, pespin. 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 2: Code-Review+2 (1 comment) Patchset: PS2: re-applying laforge's +1 after moving configs to subdir -- 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: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 11:25:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: Diameter Gy CCR: Expect RATType AVP in PS-Information instead of MSCC

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36444?usp=email ) Change subject: Diameter Gy CCR: Expect RATType AVP in PS-Information instead of MSCC ...................................................................... Diameter Gy CCR: Expect RATType AVP in PS-Information instead of MSCC open5gs-smfd was recently modified to send RAT-Type inside PS-Information instead of MSCC, since having it in the former is supported since older spec releases and having it in the later creates problems in some real world OCS implementation like PortaOne OCS. Related: SYS#6837 Related: open5gs.git d0b31177cca360865ebc6ab0b89eee7ee4fc8d1a, Related: open5gs.git 3b5e851f5d1328536052031e66a7b9b03c3057f6 Change-Id: I7ce77d08847a0876291f76e901e5c89c339db27d --- M ggsn_tests/GGSN_Tests.ttcn M pgw/PGW_Tests.ttcn 2 files changed, 32 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/44/36444/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 13edca5..e2d5fb2 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -550,8 +550,7 @@ tr_AVP_MultipleServicesIndicator, tr_AVP_Multiple_Services_Credit_Control(content := superset( tr_AVP_Requested_Service_Unit, - tr_AVP_PCC_3GPP_QoS_Information, - tr_AVP_GI_3GPP_RatType(rat_type) + tr_AVP_PCC_3GPP_QoS_Information )), tr_AVP_3GPP_ServiceInformation(content := superset( tr_AVP_3GPP_PSInformation(content := superset( @@ -567,6 +566,7 @@ tr_AVP_3GPP_NSAPI(nsapi), tr_AVP_3GPP_MS_TimeZone, tr_AVP_3GPP_ULI, + tr_AVP_GI_3GPP_RatType(rat_type), tr_AVP_UserEquipmentInfo({ tr_AVP_UserEquipmentInfoType(IMEISV), tr_AVP_UserEquipmentInfoValue(imeisv) @@ -596,8 +596,7 @@ tr_AVP_Requested_Service_Unit, tr_AVP_Used_Service_Unit, /* tr_AVP_3GPP_Reporting_Reason, can be sometimes inside UsedServiceUnit */ - tr_AVP_PCC_3GPP_QoS_Information, - tr_AVP_GI_3GPP_RatType(rat_type) + tr_AVP_PCC_3GPP_QoS_Information )), tr_AVP_3GPP_ServiceInformation(content := superset( tr_AVP_3GPP_PSInformation(content := superset( @@ -613,6 +612,7 @@ tr_AVP_3GPP_NSAPI(nsapi), tr_AVP_3GPP_MS_TimeZone, tr_AVP_3GPP_ULI, + tr_AVP_GI_3GPP_RatType(rat_type), tr_AVP_UserEquipmentInfo({ tr_AVP_UserEquipmentInfoType(IMEISV), tr_AVP_UserEquipmentInfoValue(imeisv) @@ -643,8 +643,7 @@ /* tr_AVP_Requested_Service_Unit, Only in INIT and UPDATE */ tr_AVP_Used_Service_Unit, tr_AVP_3GPP_Reporting_Reason(FINAL), - tr_AVP_PCC_3GPP_QoS_Information, - tr_AVP_GI_3GPP_RatType(rat_type) + tr_AVP_PCC_3GPP_QoS_Information )), tr_AVP_3GPP_ServiceInformation(content := superset( tr_AVP_3GPP_PSInformation(content := superset( @@ -660,6 +659,7 @@ tr_AVP_3GPP_NSAPI(nsapi), tr_AVP_3GPP_MS_TimeZone, tr_AVP_3GPP_ULI, + tr_AVP_GI_3GPP_RatType(rat_type), tr_AVP_UserEquipmentInfo({ tr_AVP_UserEquipmentInfoType(IMEISV), tr_AVP_UserEquipmentInfoValue(imeisv) diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index 3c4bef2..a1850a0 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -457,8 +457,7 @@ tr_AVP_MultipleServicesIndicator, tr_AVP_Multiple_Services_Credit_Control(content := superset( tr_AVP_Requested_Service_Unit, - tr_AVP_PCC_3GPP_QoS_Information, - tr_AVP_GI_3GPP_RatType(rat_type) + tr_AVP_PCC_3GPP_QoS_Information )), tr_AVP_3GPP_ServiceInformation(content := superset( tr_AVP_3GPP_PSInformation(content := superset( @@ -474,7 +473,8 @@ tr_AVP_3GPP_NSAPI(nsapi), /*We don't yet send MS_Tz in CreateSessionReq: tr_AVP_3GPP_MS_TimeZone,*/ - tr_AVP_3GPP_ULI/*, + tr_AVP_3GPP_ULI, + tr_AVP_GI_3GPP_RatType(rat_type)/*, We don't yet send IMEI in CreateSessionReq: tr_AVP_UserEquipmentInfo({ tr_AVP_UserEquipmentInfoType(IMEISV), @@ -505,8 +505,7 @@ tr_AVP_Requested_Service_Unit, tr_AVP_Used_Service_Unit, /* tr_AVP_3GPP_Reporting_Reason, can be sometimes inside UsedServiceUnit */ - tr_AVP_PCC_3GPP_QoS_Information, - tr_AVP_GI_3GPP_RatType(rat_type) + tr_AVP_PCC_3GPP_QoS_Information )), tr_AVP_3GPP_ServiceInformation(content := superset( tr_AVP_3GPP_PSInformation(content := superset( @@ -522,7 +521,8 @@ tr_AVP_3GPP_NSAPI(nsapi), /*We don't yet send MS_Tz in CreateSessionReq: tr_AVP_3GPP_MS_TimeZone,*/ - tr_AVP_3GPP_ULI/*, + tr_AVP_3GPP_ULI, + tr_AVP_GI_3GPP_RatType(rat_type)/*, We don't yet send IMEI in CreateSessionReq: tr_AVP_UserEquipmentInfo({ tr_AVP_UserEquipmentInfoType(IMEISV), @@ -554,8 +554,7 @@ /* tr_AVP_Requested_Service_Unit, Only in INIT and UPDATE */ tr_AVP_Used_Service_Unit, tr_AVP_3GPP_Reporting_Reason(FINAL), - tr_AVP_PCC_3GPP_QoS_Information, - tr_AVP_GI_3GPP_RatType(rat_type) + tr_AVP_PCC_3GPP_QoS_Information )), tr_AVP_3GPP_ServiceInformation(content := superset( tr_AVP_3GPP_PSInformation(content := superset( @@ -571,7 +570,8 @@ tr_AVP_3GPP_NSAPI(nsapi), /*We don't yet send MS_Tz in CreateSessionReq: tr_AVP_3GPP_MS_TimeZone,*/ - tr_AVP_3GPP_ULI/*, + tr_AVP_3GPP_ULI, + tr_AVP_GI_3GPP_RatType(rat_type)/*, We don't yet send IMEI in CreateSessionReq: tr_AVP_UserEquipmentInfo({ tr_AVP_UserEquipmentInfoType(IMEISV), -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36444?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: I7ce77d08847a0876291f76e901e5c89c339db27d Gerrit-Change-Number: 36444 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[M] Change in docker-playground[master]: ttcn3-bts-test: use start_config functions

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36443?usp=email ) Change subject: ttcn3-bts-test: use start_config functions ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36443?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: If3cb7dbe585c03d21e5ec6353fd25575ccac7af0 Gerrit-Change-Number: 36443 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: Mon, 25 Mar 2024 11:24:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

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

by pespin

Attention is currently required from: laforge, pespin. pespin 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 2: Code-Review+1 -- 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: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 11:24:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

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

by osmith

osmith has submitted this change. ( 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(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified 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: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2024