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

[S] Change in docker-playground[master]: ttcn3-bts-test: abort if missing osmo-config-merge

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36446?usp=email ) Change subject: ttcn3-bts-test: abort if missing osmo-config-merge ...................................................................... Patch Set 1: (1 comment) File ttcn3-bts-test/Makefile: https://gerrit.osmocom.org/c/docker-playground/+/36446/comment/ac32e43d_51d… PS1, Line 15: cfg req-osmo-config-merge > `cfg` already depends on `req-osmo-config-merge` below, do we also need it here? PHONY only means that these are not real targets. The order doesn't matter here, but I guess it's slightly nicer to also have rq-osmo-config-merge here first. I've updated it. https://www.gnu.org/software/make/manual/html_node/Phony-Targets.html -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36446?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: I9cea4affac0b3981c88078581a070f98649da667 Gerrit-Change-Number: 36446 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 13:13:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 months, 1 week

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-bts-test: abort if missing osmo-config-merge

by osmith

Attention is currently required from: fixeria, osmith. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/36446?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Verified+1 by Jenkins Builder Change subject: ttcn3-bts-test: abort if missing osmo-config-merge ...................................................................... ttcn3-bts-test: abort if missing osmo-config-merge Change-Id: I9cea4affac0b3981c88078581a070f98649da667 --- M ttcn3-bts-test/Makefile 1 file changed, 13 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/46/36446/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36446?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: I9cea4affac0b3981c88078581a070f98649da667 Gerrit-Change-Number: 36446 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 months, 1 week

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-bts-test: abort if missing osmo-config-merge

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36446?usp=email ) Change subject: ttcn3-bts-test: abort if missing osmo-config-merge ...................................................................... Patch Set 1: (1 comment) File ttcn3-bts-test/Makefile: https://gerrit.osmocom.org/c/docker-playground/+/36446/comment/33e9ef23_22b… PS1, Line 15: cfg req-osmo-config-merge `cfg` already depends on `req-osmo-config-merge` below, do we also need it here? -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36446?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: I9cea4affac0b3981c88078581a070f98649da667 Gerrit-Change-Number: 36446 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 13:10:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 months, 1 week

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-bts-test: abort if missing osmo-config-merge

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36446?usp=email ) Change subject: ttcn3-bts-test: abort if missing osmo-config-merge ...................................................................... Patch Set 1: (1 comment) File ttcn3-bts-test/Makefile: https://gerrit.osmocom.org/c/docker-playground/+/36446/comment/39a65e50_6e3… PS1, Line 15: .PHONY: cfg req-osmo-config-merge Shouldn't req-osmo-config-merge be put before calling it through cfg? -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36446?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: I9cea4affac0b3981c88078581a070f98649da667 Gerrit-Change-Number: 36446 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 13:10:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 months, 1 week

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-bts-test: abort if missing osmo-config-merge

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36446?usp=email ) Change subject: ttcn3-bts-test: abort if missing osmo-config-merge ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36446?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: I9cea4affac0b3981c88078581a070f98649da667 Gerrit-Change-Number: 36446 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 13:05:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 1 week

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-ggsn-test: ignore failure to kill osmo-ggsn

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36447?usp=email ) Change subject: ttcn3-ggsn-test: ignore failure to kill osmo-ggsn ...................................................................... ttcn3-ggsn-test: ignore failure to kill osmo-ggsn Don't fail if osmo-ggsn can't be killed at the end of a testsuite run. This happens currently with ttcn3-ggsn-test-kernel-latest-* jobs, in the v6_only configurations, because osmo-ggsn latest doesn't support ipv6 yet and exits. The jenkins.sh should keep going and try other combinations, and exit without error in the end. Fixes: d8c51cce ("ttcn3-ggsn-test: run with multiple configurations") Change-Id: I6f3154a9ef114f31bcb5868ee09d1ebc10f35d07 --- M ttcn3-ggsn-test/jenkins.sh 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/47/36447/1 diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index f9e7a47..7c9c7ac 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -132,5 +132,5 @@ start_ggsn "$i" start_testsuite "$i" - docker_kill_wait "$BUILD_TAG"-ggsn + docker_kill_wait "$BUILD_TAG"-ggsn || true done -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36447?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: I6f3154a9ef114f31bcb5868ee09d1ebc10f35d07 Gerrit-Change-Number: 36447 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 months, 1 week

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-bts-test: abort if missing osmo-config-merge

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36446?usp=email ) Change subject: ttcn3-bts-test: abort if missing osmo-config-merge ...................................................................... ttcn3-bts-test: abort if missing osmo-config-merge Change-Id: I9cea4affac0b3981c88078581a070f98649da667 --- M ttcn3-bts-test/Makefile 1 file changed, 13 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/46/36446/1 diff --git a/ttcn3-bts-test/Makefile b/ttcn3-bts-test/Makefile index a6fc200..3709ceb 100644 --- a/ttcn3-bts-test/Makefile +++ b/ttcn3-bts-test/Makefile @@ -12,8 +12,10 @@ oml/osmo-bts.gen.cfg \ fh/osmo-bsc.gen.cfg -.PHONY: cfg -cfg: $(CFG_SRC_FILES) $(CFG_GEN_FILES) +.PHONY: cfg req-osmo-config-merge +req-osmo-config-merge: + command -v osmo-config-merge +cfg: req-osmo-config-merge $(CFG_SRC_FILES) $(CFG_GEN_FILES) # Ensure that we always fetch up-to-date configuration files. # See https://www.gnu.org/software/make/manual/make.html#Force-Targets -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36446?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: I9cea4affac0b3981c88078581a070f98649da667 Gerrit-Change-Number: 36446 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 months, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: jobs/ttcn3: add ttcn3-ggsn-test-kernel-pablo-gtp

by pespin

Attention is currently required from: Hoernchen, fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36445?usp=email ) Change subject: jobs/ttcn3: add ttcn3-ggsn-test-kernel-pablo-gtp ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36445?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: Idf0e3fd5ba81565ce1626dfdf186c88280232550 Gerrit-Change-Number: 36445 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 12:22:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: jobs/ttcn3: add ttcn3-ggsn-test-kernel-pablo-gtp

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/36445?usp=email ) Change subject: jobs/ttcn3: add ttcn3-ggsn-test-kernel-pablo-gtp ...................................................................... jobs/ttcn3: add ttcn3-ggsn-test-kernel-pablo-gtp Add a temporary job to run against the IPv6 patches, until they are upstreamed. Related: OS#1952 Change-Id: Idf0e3fd5ba81565ce1626dfdf186c88280232550 --- M jobs/ttcn3-testsuites.yml 1 file changed, 30 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/45/36445/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 74c0a22..8a17e04 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -30,6 +30,14 @@ timer: H 04 * * * description: | Test osmo-ggsn master with the Debian kernel. + - ttcn3-ggsn-test-kernel-pablo-gtp: + timer: H 04 * * * + description: | + Test osmo-ggsn master with the Linux kernel built from main of + <a href="https://git.kernel.org/pub/scm/linux/kernel/git/pablo/gtp.git/">pablo/gtp.git</a>. + <br> + This is a temporary job, to be removed once the IPv6 related GTP + patches are upstreamed (OS#1952). - ttcn3-ggsn-test-kernel-latest: timer: H 04 * * * description: | @@ -254,6 +262,15 @@ # Run against debian's kernel export KERNEL_TEST=1 ;; + ttcn3-ggsn-test-kernel-pablo-gtp) + DIR="ttcn3-ggsn-test" + export IMAGE_SUFFIX="master" + export KERNEL_TEST=1 + export KERNEL_BUILD=1 + export KERNEL_URL="https://git.kernel.org/pub/scm/linux/kernel/git/pablo/gtp.git" + export KERNEL_REMOTE_NAME="pablo-gtp" + export KERNEL_BRANCH="main" + ;; ttcn3-ggsn-test-kernel-latest) DIR="ttcn3-ggsn-test" export IMAGE_SUFFIX="latest" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36445?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: Idf0e3fd5ba81565ce1626dfdf186c88280232550 Gerrit-Change-Number: 36445 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 months, 1 week

1
0
0 0

[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

2 months, 1 week

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

2 months, 1 week

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

2 months, 1 week

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

2 months, 1 week

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

2 months, 1 week

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

2 months, 1 week

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

2 months, 1 week

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

2 months, 1 week

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

2 months, 1 week

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

2 months, 1 week

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 submitted 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 ...................................................................... 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, 144 insertions(+), 45 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve 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..59224a0 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -569,6 +569,43 @@ "$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 + + 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: 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

2 months, 1 week

1
0
0 0

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

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36390?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: 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(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved 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: 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

2 months, 1 week

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: (1 comment) Patchset: PS1: > Or if you want, the other way around, but I mean having another dir level: […] done -- 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:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 months, 1 week

1
0
0 0

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

by osmith

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36391?usp=email ) Change subject: ttcn3-ggsn-test: move confgs to subdirs ...................................................................... Patch Set 2: Code-Review+2 -- 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-Comment-Date: Mon, 25 Mar 2024 11:23:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 1 week

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: laforge. 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 2: Code-Review+1 -- 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: 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-Comment-Date: Mon, 25 Mar 2024 11:23:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 1 week

1
0
0 0

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

by osmith

Attention is currently required from: laforge, pespin. osmith 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 2: Code-Review+2 (1 comment) File ttcn3-bts-test/jenkins.sh: https://gerrit.osmocom.org/c/docker-playground/+/36389/comment/4f2d6e36_f6d… PS1, Line 174: if test_config_enabled "generic"; then > imho it would become clearer if you put each of this in a function. done in follow-up patch: https://gerrit.osmocom.org/c/docker-playground/+/36443/1 -- 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: 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:23:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 months, 1 week

1
0
0 0

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

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36443?usp=email ) Change subject: ttcn3-bts-test: use start_config functions ...................................................................... ttcn3-bts-test: use start_config functions As suggested by Pau in code review, refactor the file to use functions for starting the testsuites, SUT and related containers with specific configurations. Related: https://gerrit.osmocom.org/c/docker-playground/+/36389/comment/67a7c35e_766… Change-Id: If3cb7dbe585c03d21e5ec6353fd25575ccac7af0 --- M ttcn3-bts-test/jenkins.sh 1 file changed, 110 insertions(+), 75 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/43/36443/1 diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 0e9fd3e..ed4ae37 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -131,6 +131,98 @@ fi } +# Classic test suite with BSC for OML and trxcon+fake_trx +start_config_generic() { + if ! test_config_enabled "generic"; then + return + fi + + 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 +} + +# Some GPRS tests require virt_phy +start_config_virtphy() { + if ! test_config_enabled "virtphy"; then + return + fi + + # 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 +} + +# OML tests require us to run without BSC +start_config_oml() { + if ! test_config_enabled "oml"; then + return + fi + + cp oml/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 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 +} + +# Frequency hopping tests require different configuration files +start_config_hopping() { + if ! test_config_enabled "hopping"; then + return + fi + + 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 +} + network_create mkdir $VOL_BASE_DIR/bts-tester-generic @@ -170,78 +262,7 @@ mkdir $VOL_BASE_DIR/trxcon mkdir $VOL_BASE_DIR/virtphy -# 1) classic test suite with BSC for OML and trxcon+fake_trx -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 -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 -if test_config_enabled "oml"; then - cp oml/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 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 -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 +start_config_generic +start_config_virtphy +start_config_oml +start_config_hopping -- 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-MessageType: newchange

2 months, 1 week

1
0
0 0

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

by osmith

Attention is currently required from: osmith. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/36390?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: 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/2 -- 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: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 months, 1 week

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, osmith. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/36392?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder, Verified+1 by osmith 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(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/92/36392/2 -- 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 months, 1 week

1
0
0 0

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

by osmith

Attention is currently required from: laforge, osmith, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/36389?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by pespin, Verified+1 by Jenkins Builder 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, 144 insertions(+), 45 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/89/36389/2 -- 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: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: osmo-msc.cfg: move MGW params to 'mgw' node

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36442?usp=email ) Change subject: msc: osmo-msc.cfg: move MGW params to 'mgw' node ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36442?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: I724ec44ea37bb61b457361befee3e6e92c886c0d Gerrit-Change-Number: 36442 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 11:03:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: osmo-msc.cfg: move MGW params to 'mgw' node

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36442?usp=email ) Change subject: msc: osmo-msc.cfg: move MGW params to 'mgw' node ...................................................................... msc: osmo-msc.cfg: move MGW params to 'mgw' node This fixes deprecation warnings printed by recent osmo-msc. Change-Id: I724ec44ea37bb61b457361befee3e6e92c886c0d Related: osmo-mgw.git I95f717a0fcd3c4ca622e3989baa28fac1f7ec1ca --- M msc/osmo-msc.cfg 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/42/36442/1 diff --git a/msc/osmo-msc.cfg b/msc/osmo-msc.cfg index d05e400..a886565 100644 --- a/msc/osmo-msc.cfg +++ b/msc/osmo-msc.cfg @@ -57,11 +57,12 @@ authentication optional rrlp mode none mm info 0 + mgw 0 + remote-ip 127.0.0.1 msc assign-tmsi cs7-instance-a 0 cs7-instance-iu 0 - mgw remote-ip 127.0.0.1 emergency-call route-to-msisdn 112 mncc external /tmp/mncc.sock mncc-int -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36442?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: I724ec44ea37bb61b457361befee3e6e92c886c0d Gerrit-Change-Number: 36442 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 months, 1 week

1
0
0 0

[M] Change in libosmo-pfcp[master]: add osmo_pfcp_ip_addrs_get

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/36348?usp=email ) Change subject: add osmo_pfcp_ip_addrs_get ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/36348?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I4338a83f26ef2443f90cf835621e73aed5eac521 Gerrit-Change-Number: 36348 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 10:35:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 1 week

1
0
0 0

[S] Change in osmo-hnbgw[master]: fix null deref on hnb_context_release

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36416?usp=email ) Change subject: fix null deref on hnb_context_release ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36416?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I77ddd627ebfe96c7674c6a197af8b2c4b1a4024c Gerrit-Change-Number: 36416 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 10:32:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 1 week

1
0
0 0

[S] Change in libasn1c[master]: Add README.md to explain what this is all about

by osmith

Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libasn1c/+/36419?usp=email ) Change subject: Add README.md to explain what this is all about ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File README.md: https://gerrit.osmocom.org/c/libasn1c/+/36419/comment/9a53232f_c5c605f9 PS2, Line 8: woudl would -- To view, visit https://gerrit.osmocom.org/c/libasn1c/+/36419?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Change-Id: Idb8b7ac9ee93e93971376644444e434c41aa18fa Gerrit-Change-Number: 36419 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 25 Mar 2024 10:21:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 1 week

1
0
0 0

[S] Change in libasn1c[master]: Add README.md to explain what this is all about

by osmith

Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libasn1c/+/36419?usp=email ) Change subject: Add README.md to explain what this is all about ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > weird, master-libasn1c passes daily and uses the same contrib/jenkins.sh... […] I've rebased the patch on master to fix it. it was missing this patch: https://gerrit.osmocom.org/c/libasn1c/+/33739 -- To view, visit https://gerrit.osmocom.org/c/libasn1c/+/36419?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Change-Id: Idb8b7ac9ee93e93971376644444e434c41aa18fa Gerrit-Change-Number: 36419 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 25 Mar 2024 10:17:06 +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> Gerrit-MessageType: comment

2 months, 1 week

1
0
0 0

[S] Change in libasn1c[master]: Add README.md to explain what this is all about

by osmith

Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libasn1c/+/36419?usp=email ) Change subject: Add README.md to explain what this is all about ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > something really weird is happening in build verification of this patch. @osmith@sysmocom. […] weird, master-libasn1c passes daily and uses the same contrib/jenkins.sh... looking into it -- To view, visit https://gerrit.osmocom.org/c/libasn1c/+/36419?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libasn1c Gerrit-Branch: master Gerrit-Change-Id: Idb8b7ac9ee93e93971376644444e434c41aa18fa Gerrit-Change-Number: 36419 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 25 Mar 2024 09:56:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 months, 1 week

1
0
0 0

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

by lynxis lazus

lynxis lazus 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: Additional a configuration method by the remsim userspace tool might be still helpful if a user needs to invert it because of a specific modem. -- 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-Comment-Date: Mon, 25 Mar 2024 00:33:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 months, 1 week

1
0
0 0

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

by lynxis lazus

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/36441?usp=email ) Change subject: cardemu: add support for inverted sim presence pins ...................................................................... cardemu: add support for inverted sim presence pins Add a define PIN_SET_USIM1_PRES_INVERTED to support boards which has the usim presence pin inverted. When defined the pin will be inverted by the firmware. Related: SYS#6754 Change-Id: I33325f763b56b297762a3fb6fe6baa7b0354de3c --- M firmware/libcommon/source/mode_cardemu.c 1 file changed, 24 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/41/36441/1 diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c index a05840e..a232222 100644 --- a/firmware/libcommon/source/mode_cardemu.c +++ b/firmware/libcommon/source/mode_cardemu.c @@ -80,6 +80,7 @@ uint8_t ep_in; uint8_t ep_int; const Pin pin_insert; + bool pin_insert_inverted; #ifdef DETECT_VCC_BY_ADC uint32_t vcc_uv; #endif @@ -113,7 +114,10 @@ .ep_int = SIMTRACE_CARDEM_USB_EP_USIM1_INT, #ifdef PIN_SET_USIM1_PRES .pin_insert = PIN_SET_USIM1_PRES, -#endif +#ifdef PIN_SET_USIM1_PRES_INVERTED + .pin_insert_inverted = 1, +#endif /* PIN_SET_USIM1_PRES_INVERTED */ +#endif /* PIN_SET_USIM1_PRES */ }, #ifdef CARDEMU_SECOND_UART { @@ -128,7 +132,10 @@ .ep_int = SIMTRACE_CARDEM_USB_EP_USIM2_INT, #ifdef PIN_SET_USIM2_PRES .pin_insert = PIN_SET_USIM2_PRES, -#endif +#ifdef PIN_SET_USIM2_PRES_INVERTED + .pin_insert_inverted = 1, +#endif /* PIN_SET_USIM2_PRES_INVERTED */ +#endif /* PIN_SET_USIM2_PRES */ }, #endif }; @@ -708,7 +715,7 @@ return; } - if (card_insert) + if (card_insert ^ ci->pin_insert_inverted) PIO_Set(&ci->pin_insert); else PIO_Clear(&ci->pin_insert); -- 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-MessageType: newchange

2 months, 1 week

1
0
0 0

[S] Change in libgtpnl[master]: README.md: Improve markdown formatting; more links

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/36440?usp=email ) Change subject: README.md: Improve markdown formatting; more links ...................................................................... README.md: Improve markdown formatting; more links Change-Id: I16511491fdf00a01b9b6deecf8d19a1f2f5e6c3c --- M README.md 1 file changed, 15 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/README.md b/README.md index 95ad1ac..8a8efdd 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # libgtpnl - netlink library for Linux kernel GTP -In order to control the kernel-side GTP-U plane, a netlink based control -interface between GTP-C in userspace and GTP-U in kernelspace was -invented. +In order to control the kernel-side GTP-U plane (`gtp` driver), a +netlink based control interface between GTP-C in userspace and GTP-U in +kernelspace was invented. The encoding and decoding of these control messages is implemented in -the libgtpnl (library for GTP netlink). +this *libgtpnl* (library for GTP netlink). libgtpnl is part of the [Osmocom](https://osmocom.org/) Open Source Mobile Communications project. @@ -22,7 +22,8 @@ git clone https://gitea.osmocom.org/cellular-infrastructure/libgtpnl -Visiting the URL in a browser shows a web interface. +Visiting the URL in a browser shows a +[web interface](https://gitea.osmocom.org/cellular-infrastructure/libgtpnl). Mailing List ------------ -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/36440?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I16511491fdf00a01b9b6deecf8d19a1f2f5e6c3c Gerrit-Change-Number: 36440 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 months, 1 week

1
0
0 0

[S] Change in libgtpnl[master]: Add funding link to github mirror

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/36439?usp=email ) Change subject: Add funding link to github mirror ...................................................................... Add funding link to github mirror see https://docs.github.com/en/repositories/managing-your-repositorys-settings-… Change-Id: I2b5d1c422370ce8a2703c6f68403d27451559322 --- A .github/FUNDING.yml 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..7592deb --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +open_collective: osmocom -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/36439?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I2b5d1c422370ce8a2703c6f68403d27451559322 Gerrit-Change-Number: 36439 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 months, 1 week

1
0
0 0

[S] Change in libgtpnl[master]: Add funding link to github mirror

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/36439?usp=email ) Change subject: Add funding link to github mirror ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/36439?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I2b5d1c422370ce8a2703c6f68403d27451559322 Gerrit-Change-Number: 36439 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 23 Mar 2024 18:37:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 1 week

1
0
0 0

[S] Change in libgtpnl[master]: README.md: Improve markdown formatting; more links

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/36440?usp=email ) Change subject: README.md: Improve markdown formatting; more links ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/36440?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I16511491fdf00a01b9b6deecf8d19a1f2f5e6c3c Gerrit-Change-Number: 36440 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 23 Mar 2024 18:37:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 1 week

1
0
0 0

[S] Change in libgtpnl[master]: README.md: Improve markdown formatting; more links

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libgtpnl/+/36440?usp=email ) Change subject: README.md: Improve markdown formatting; more links ...................................................................... README.md: Improve markdown formatting; more links Change-Id: I16511491fdf00a01b9b6deecf8d19a1f2f5e6c3c --- M README.md 1 file changed, 15 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/40/36440/1 diff --git a/README.md b/README.md index 95ad1ac..8a8efdd 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # libgtpnl - netlink library for Linux kernel GTP -In order to control the kernel-side GTP-U plane, a netlink based control -interface between GTP-C in userspace and GTP-U in kernelspace was -invented. +In order to control the kernel-side GTP-U plane (`gtp` driver), a +netlink based control interface between GTP-C in userspace and GTP-U in +kernelspace was invented. The encoding and decoding of these control messages is implemented in -the libgtpnl (library for GTP netlink). +this *libgtpnl* (library for GTP netlink). libgtpnl is part of the [Osmocom](https://osmocom.org/) Open Source Mobile Communications project. @@ -22,7 +22,8 @@ git clone https://gitea.osmocom.org/cellular-infrastructure/libgtpnl -Visiting the URL in a browser shows a web interface. +Visiting the URL in a browser shows a +[web interface](https://gitea.osmocom.org/cellular-infrastructure/libgtpnl). Mailing List ------------ -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/36440?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I16511491fdf00a01b9b6deecf8d19a1f2f5e6c3c Gerrit-Change-Number: 36440 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 months, 1 week

1
0
0 0

[S] Change in libgtpnl[master]: Add funding link to github mirror

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libgtpnl/+/36439?usp=email ) Change subject: Add funding link to github mirror ...................................................................... Add funding link to github mirror see https://docs.github.com/en/repositories/managing-your-repositorys-settings-… Change-Id: I2b5d1c422370ce8a2703c6f68403d27451559322 --- A .github/FUNDING.yml 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libgtpnl refs/changes/39/36439/1 diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..7592deb --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +open_collective: osmocom -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/36439?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I2b5d1c422370ce8a2703c6f68403d27451559322 Gerrit-Change-Number: 36439 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 months, 1 week

1
0
0 0

[S] Change in osmo-e1d[master]: Add funding link to github mirror

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/36437?usp=email ) Change subject: Add funding link to github mirror ...................................................................... Add funding link to github mirror see https://docs.github.com/en/repositories/managing-your-repositorys-settings-… Change-Id: I4af5d8b94ef95f9187977a918d2ea9fe16360f94 --- A .github/FUNDING.yml 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..7592deb --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +open_collective: osmocom -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/36437?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I4af5d8b94ef95f9187977a918d2ea9fe16360f94 Gerrit-Change-Number: 36437 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 months, 1 week

1
0
0 0

[S] Change in osmo-e1d[master]: README.md: Improved markdown formatting; more links

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/36438?usp=email ) Change subject: README.md: Improved markdown formatting; more links ...................................................................... README.md: Improved markdown formatting; more links Change-Id: I7e4f1c8c527a63f13ef9eaa26a00e1b2efca82ae --- M README.md 1 file changed, 15 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/README.md b/README.md index ac2893e..4e1ad9b 100644 --- a/README.md +++ b/README.md @@ -2,16 +2,15 @@ ====================================== This repository contains the osmocom E1 interface daemon, -a pure userspace driver for the icE1usb hardware USB E1 adapter. +a pure userspace driver for the [icE1usb](https://osmocom.org/projects/e1-t1-adapter/wiki/IcE1usb) +hardware USB E1 adapter. -It is part of the [Osmocom](https://osmocom.org/) Open Source Mobile -Communications project. +It is part of the [Osmocom](https://osmocom.org/) Open Source Mobile Communications project. Homepage -------- -The official homepage of the project is -<https://osmocom.org/projects/osmo-e1d/wiki> +The official homepage of the project is <https://osmocom.org/projects/osmo-e1d/wiki> GIT Repository -------------- @@ -26,6 +25,7 @@ ------------- * [icE1usb USB E1 adapter](https://osmocom.org/projects/e1-t1-adapter/wiki/IcE1usb) + * pre-assembled hardware available from the [sysmocom webshop](https://shop.sysmocom.de/Osmocom-icE1usb-E1-interface-for-USB/icE1usb-kit) * [alternative DAHDI driver](https://osmocom.org/issues/4923) Mailing List @@ -33,7 +33,7 @@ Discussions related to osmo-e1d are happening on the openbsc(a)lists.osmocom.org mailing list, please see -https://lists.osmocom.org/mailman/listinfo/openbsc for subscription +<https://lists.osmocom.org/mailman/listinfo/openbsc> for subscription options and the list archive. Please observe the [Osmocom Mailing List -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/36438?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I7e4f1c8c527a63f13ef9eaa26a00e1b2efca82ae Gerrit-Change-Number: 36438 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 months, 1 week

1
0
0 0

[S] Change in osmo-e1d[master]: README.md: Improved markdown formatting; more links

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/36438?usp=email ) Change subject: README.md: Improved markdown formatting; more links ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/36438?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I7e4f1c8c527a63f13ef9eaa26a00e1b2efca82ae Gerrit-Change-Number: 36438 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 23 Mar 2024 17:51:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 1 week

1
0
0 0

[S] Change in osmo-e1d[master]: Add funding link to github mirror

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/36437?usp=email ) Change subject: Add funding link to github mirror ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/36437?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: I4af5d8b94ef95f9187977a918d2ea9fe16360f94 Gerrit-Change-Number: 36437 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 23 Mar 2024 17:51:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 1 week

1
0
0 0

[S] Change in libosmo-gprs[master]: Add funding link to github mirror

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/36435?usp=email ) Change subject: Add funding link to github mirror ...................................................................... Add funding link to github mirror see https://docs.github.com/en/repositories/managing-your-repositorys-settings-… Change-Id: I428cd9f4b1b15f5663756ca9e943c289f97ed8d9 --- A .github/FUNDING.yml 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..7592deb --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +open_collective: osmocom -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/36435?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I428cd9f4b1b15f5663756ca9e943c289f97ed8d9 Gerrit-Change-Number: 36435 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 months, 1 week

1
0
0 0

[S] Change in libosmo-gprs[master]: README.md: Improve formatting

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/36436?usp=email ) Change subject: README.md: Improve formatting ...................................................................... README.md: Improve formatting Change-Id: Ide52989e241a1546e7ac2a46aa6c34e5e536e088 --- M README.md 1 file changed, 19 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/README.md b/README.md index b88c581..5fa93ce 100644 --- a/README.md +++ b/README.md @@ -4,18 +4,17 @@ This project is a home for several libraries providing common GPRS routines: -* libosmo-csn1 - CSN.1 (Concrete Syntax Notation 1) codec; -* libosmo-gprs-rlcmac - RLC/MAC as per 3GPP TS 44.060, TS 44.018; -* libosmo-gprs-llc - LLC (Logical Link Control) as per 3GPP TS 44.064; -* libosmo-gprs-gmm - GMM (GPRS Mobility Management) as per 3GPP TS 24.008 section 9.4; -* libosmo-gprs-sm - SM (GPRS Session Management) as per 3GPP TS 24.008 section 9.5; -* libosmo-gprs-sndcp - SNDCP (Subnetwork Dependent Convergence Protocol) as per 3GPP TS 44.065. +* *libosmo-csn1* - CSN.1 (Concrete Syntax Notation 1) codec; +* *libosmo-gprs-rlcmac* - RLC/MAC as per 3GPP TS 44.060, TS 44.018; +* *libosmo-gprs-llc* - LLC (Logical Link Control) as per 3GPP TS 44.064; +* *libosmo-gprs-gmm* - GMM (GPRS Mobility Management) as per 3GPP TS 24.008 section 9.4; +* *libosmo-gprs-sm* - SM (GPRS Session Management) as per 3GPP TS 24.008 section 9.5; +* *libosmo-gprs-sndcp* - SNDCP (Subnetwork Dependent Convergence Protocol) as per 3GPP TS 44.065. Homepage -------- -The official homepage of the project is -https://osmocom.org/projects/libosmo-gprs +The official homepage of the project is <https://osmocom.org/projects/libosmo-gprs>. GIT Repository -------------- @@ -42,10 +41,10 @@ ------------ Our coding standards are described at -https://osmocom.org/projects/cellular-infrastructure/wiki/Coding_standards +<https://osmocom.org/projects/cellular-infrastructure/wiki/Coding_standards> Submit patches at https://gerrit.osmocom.org/ -See also https://osmocom.org/projects/cellular-infrastructure/wiki/Gerrit +See also <https://osmocom.org/projects/cellular-infrastructure/wiki/Gerrit> The current patch queue for libosmo-gprs can be seen at -https://gerrit.osmocom.org/#/q/project:libosmo-gprs+status:open +<https://gerrit.osmocom.org/#/q/project:libosmo-gprs+status:open> -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/36436?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ide52989e241a1546e7ac2a46aa6c34e5e536e088 Gerrit-Change-Number: 36436 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 months, 1 week

1
0
0 0

2024

2023

2022

gerrit-log March 2024