Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ci/+/27066
to look at the new patch set (#2).
Change subject: jobs/gerrit-verifications-dahdi.yml: new file
......................................................................
jobs/gerrit-verifications-dahdi.yml: new file
Add gerrit verifications for the out-of-tree dahdi-linux kernel module.
Put this in a separate file (not gerrit-verifications.yml), because:
* not only gerrit git repo gets cloned, but also linux.git, and caching
needs to be done properly for it
* so we can have one separate job per linux version that gets tested
Test v4.19 and v5.10 for now, as suggested in the issue.
Related: OS#5407
Depends: docker-playground Id72d19ad08681cd7cb3194de2226292f19e96df5
Change-Id: I65c7663a6b8045796536a727e4adf5554f16b2a9
---
A jobs/gerrit-verifications-dahdi.yml
1 file changed, 98 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/66/27066/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27066
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I65c7663a6b8045796536a727e4adf5554f16b2a9
Gerrit-Change-Number: 27066
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: newpatchset
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27067 )
Change subject: debian-bullseye-titan: run 8 parallel jobs for 'make deps'
......................................................................
debian-bullseye-titan: run 8 parallel jobs for 'make deps'
This reduces the time required for building test suites.
Change-Id: I6349d8304a248c7ae2a5373bf23a691f3a1cb991
---
M debian-bullseye-titan/Dockerfile
M debian-bullseye-titan/ttcn3-docker-prepare.sh
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
fixeria: Verified
diff --git a/debian-bullseye-titan/Dockerfile b/debian-bullseye-titan/Dockerfile
index 0b1fbda..1c22456 100644
--- a/debian-bullseye-titan/Dockerfile
+++ b/debian-bullseye-titan/Dockerfile
@@ -65,7 +65,7 @@
RUN if ! diff -q /tmp/deps-Makefile /osmo-ttcn3-hacks/deps/Makefile; then \
cd /osmo-ttcn3-hacks && \
git pull && \
- make deps; \
+ make -j8 deps; \
fi
ADD ttcn3-docker-prepare.sh /usr/local/bin/ttcn3-docker-prepare
diff --git a/debian-bullseye-titan/ttcn3-docker-prepare.sh b/debian-bullseye-titan/ttcn3-docker-prepare.sh
index e4144e2..c2b28b9 100755
--- a/debian-bullseye-titan/ttcn3-docker-prepare.sh
+++ b/debian-bullseye-titan/ttcn3-docker-prepare.sh
@@ -29,7 +29,7 @@
# OSMO_TTCN3_BRANCH is different). The Dockerfile does the initial 'make deps'
# and downloads /tmp/deps-Makefile.
if ! diff -q /tmp/deps-Makefile deps/Makefile; then
- make deps
+ make -j8 deps
fi
# Link start/stop scripts to /
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27067
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I6349d8304a248c7ae2a5373bf23a691f3a1cb991
Gerrit-Change-Number: 27067
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: laforge, fixeria.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27070 )
Change subject: open5gs-master: install dependencies using mk-build-deps
......................................................................
Patch Set 1: -Code-Review
(1 comment)
Patchset:
PS1:
(Added +1 by accident, I did have some comments that I suggest to address first.)
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27070
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I71ad7256116ee30f15aff38fd38588aa2bfab456
Gerrit-Change-Number: 27070
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
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: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 04 Feb 2022 13:24:12 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: laforge, fixeria.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27070 )
Change subject: open5gs-master: install dependencies using mk-build-deps
......................................................................
Patch Set 1: Code-Review+1
(2 comments)
File open5gs-master/Dockerfile:
https://gerrit.osmocom.org/c/docker-playground/+/27070/comment/ccc18beb_43f…
PS1, Line 31: RUN git clone https://github.com/$GITHUB_USER/$GITHUB_REPO
Maybe install dependencies here too? Then it wouldn't need to download all packages from debian/control each time the commit changes, only if new dependencies were added between when the docker container was created and the current master.
https://gerrit.osmocom.org/c/docker-playground/+/27070/comment/a0b25a59_c09…
PS1, Line 40: mk-build-deps -i -r -t 'apt-get --no-install-recommends -yV'
"apt-get build-dep ." should do the same, not sure if it internally uses mk-build-deps. If not, maybe we don't even need this dependency.
As mentioned here: https://osmocom.org/projects/cellular-infrastructure/wiki/Build_from_Source…
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27070
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I71ad7256116ee30f15aff38fd38588aa2bfab456
Gerrit-Change-Number: 27070
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
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: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 04 Feb 2022 13:22:56 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27067 )
Change subject: debian-bullseye-titan: run 8 parallel jobs for 'make deps'
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27067
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I6349d8304a248c7ae2a5373bf23a691f3a1cb991
Gerrit-Change-Number: 27067
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 04 Feb 2022 13:15:03 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27067 )
Change subject: debian-bullseye-titan: run 8 parallel jobs for 'make deps'
......................................................................
Patch Set 1: Verified+1
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27067
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I6349d8304a248c7ae2a5373bf23a691f3a1cb991
Gerrit-Change-Number: 27067
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 04 Feb 2022 12:59:19 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27067 )
Change subject: debian-bullseye-titan: run 8 parallel jobs for 'make deps'
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27067
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I6349d8304a248c7ae2a5373bf23a691f3a1cb991
Gerrit-Change-Number: 27067
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 04 Feb 2022 12:56:06 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27067 )
Change subject: debian-bullseye-titan: run 8 parallel jobs for 'make deps'
......................................................................
debian-bullseye-titan: run 8 parallel jobs for 'make deps'
This reduces the time required for building test suites.
Change-Id: I6349d8304a248c7ae2a5373bf23a691f3a1cb991
---
M debian-bullseye-titan/Dockerfile
M debian-bullseye-titan/ttcn3-docker-prepare.sh
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/67/27067/1
diff --git a/debian-bullseye-titan/Dockerfile b/debian-bullseye-titan/Dockerfile
index 0b1fbda..1c22456 100644
--- a/debian-bullseye-titan/Dockerfile
+++ b/debian-bullseye-titan/Dockerfile
@@ -65,7 +65,7 @@
RUN if ! diff -q /tmp/deps-Makefile /osmo-ttcn3-hacks/deps/Makefile; then \
cd /osmo-ttcn3-hacks && \
git pull && \
- make deps; \
+ make -j8 deps; \
fi
ADD ttcn3-docker-prepare.sh /usr/local/bin/ttcn3-docker-prepare
diff --git a/debian-bullseye-titan/ttcn3-docker-prepare.sh b/debian-bullseye-titan/ttcn3-docker-prepare.sh
index e4144e2..c2b28b9 100755
--- a/debian-bullseye-titan/ttcn3-docker-prepare.sh
+++ b/debian-bullseye-titan/ttcn3-docker-prepare.sh
@@ -29,7 +29,7 @@
# OSMO_TTCN3_BRANCH is different). The Dockerfile does the initial 'make deps'
# and downloads /tmp/deps-Makefile.
if ! diff -q /tmp/deps-Makefile deps/Makefile; then
- make deps
+ make -j8 deps
fi
# Link start/stop scripts to /
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27067
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I6349d8304a248c7ae2a5373bf23a691f3a1cb991
Gerrit-Change-Number: 27067
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: osmith.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/27059 )
Change subject: contrib/jenkins.sh: new file
......................................................................
Set Ready For Review
--
To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27059
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: dahdi-linux
Gerrit-Branch: master
Gerrit-Change-Id: I904ab66a1ecd72492642ac2cc4cb102c7283c590
Gerrit-Change-Number: 27059
Gerrit-PatchSet: 7
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 04 Feb 2022 11:46:35 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
Hello fixeria,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/docker-playground/+/27063
to look at the new patch set (#3).
Change subject: Add ttcn3-ggsn-ogs testsuite
......................................................................
Add ttcn3-ggsn-ogs testsuite
This new setup allows running TTCN3 GGSN_Tests against open5gs, which
will soon gain GTPv1C support.
Change-Id: Ia6c122fce951d369a5d2362cbe99d10d61c15f49
---
A ttcn3-ggsn-test-ogs/jenkins.sh
A ttcn3-ggsn-test-ogs/ogs
A ttcn3-ggsn-test/jenkins-ogs.sh
A ttcn3-ggsn-test/ogs/GGSN_Tests.cfg
A ttcn3-ggsn-test/ogs/freediameter.conf
A ttcn3-ggsn-test/ogs/smfd.yaml
A ttcn3-ggsn-test/ogs/upfd-setup.sh
A ttcn3-ggsn-test/ogs/upfd.sh
A ttcn3-ggsn-test/ogs/upfd.yaml
9 files changed, 1,166 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/63/27063/3
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27063
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ia6c122fce951d369a5d2362cbe99d10d61c15f49
Gerrit-Change-Number: 27063
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: fixeria.
Hello fixeria,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/docker-playground/+/27063
to look at the new patch set (#2).
Change subject: Add ttcn3-ggsn-ogs testsuite
......................................................................
Add ttcn3-ggsn-ogs testsuite
This new setup allows running TTCN3 GGSN_Tests against open5gs, which
will soon gain GTPv1C support.
Change-Id: Ia6c122fce951d369a5d2362cbe99d10d61c15f49
---
A ttcn3-ggsn-test-ogs/jenkins.sh
A ttcn3-ggsn-test-ogs/ogs
A ttcn3-ggsn-test/jenkins-ogs.sh
A ttcn3-ggsn-test/ogs/GGSN_Tests.cfg
A ttcn3-ggsn-test/ogs/freediameter.conf
A ttcn3-ggsn-test/ogs/smfd.yaml
A ttcn3-ggsn-test/ogs/upfd-setup.sh
A ttcn3-ggsn-test/ogs/upfd.sh
A ttcn3-ggsn-test/ogs/upfd.yaml
9 files changed, 1,132 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/63/27063/2
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27063
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ia6c122fce951d369a5d2362cbe99d10d61c15f49
Gerrit-Change-Number: 27063
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27063 )
Change subject: Add ttcn3-ggsn-ogs testsuite
......................................................................
Patch Set 1:
(1 comment)
File ttcn3-ggsn-test/jenkins-ogs.sh:
https://gerrit.osmocom.org/c/docker-playground/+/27063/comment/05b75321_866…
PS1, Line 42: /data/open5gs-smfd.out
> What's the point of having /data/open5gs-smfd. […]
Yes, it really helped. Furthermore the out file seems to actually contains colors which make it also easier to read. Also it's easier plugging it gdb in ther eif the line already exists (I'm running it under gdb to get a backtrace automatically to stdout when the program exits/crashes).
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27063
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ia6c122fce951d369a5d2362cbe99d10d61c15f49
Gerrit-Change-Number: 27063
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 04 Feb 2022 08:39:48 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27061 )
Change subject: ggsn: Set up diameter for open5gs
......................................................................
Patch Set 1: Code-Review+1
(1 comment)
File ggsn_tests/GGSN_Tests.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27061/comment/2b0f0627_ee97…
PS1, Line 194: friend
Why 'friend'? Is it [going to be] used by some other module?
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27061
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: Iedadb98be2a2e851b75e4e67c22bca7047191fec
Gerrit-Change-Number: 27061
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 04 Feb 2022 08:39:21 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27060 )
Change subject: ggsn: Add module parameter to run tests against open5gs
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27060
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: I4ebb3ed73f0f9a20c14d73891ba8b8051f823ab8
Gerrit-Change-Number: 27060
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 04 Feb 2022 08:36:51 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27063 )
Change subject: Add ttcn3-ggsn-ogs testsuite
......................................................................
Patch Set 1: Code-Review+1
(2 comments)
File ttcn3-ggsn-test-ogs/jenkins.sh:
https://gerrit.osmocom.org/c/docker-playground/+/27063/comment/5a2e9d88_4f0…
PS1, Line 1: ../ttcn3-ggsn-test/jenkins-ogs.sh
"No newline at end of revision file"
File ttcn3-ggsn-test/jenkins-ogs.sh:
https://gerrit.osmocom.org/c/docker-playground/+/27063/comment/717c5622_d15…
PS1, Line 42: /data/open5gs-smfd.out
What's the point of having /data/open5gs-smfd.log (written by open5gs-smfd itself) and this additional file? Catching the last lines preceding a segfault? Just wondering.
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27063
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ia6c122fce951d369a5d2362cbe99d10d61c15f49
Gerrit-Change-Number: 27063
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 04 Feb 2022 08:34:58 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27063 )
Change subject: Add ttcn3-ggsn-ogs testsuite
......................................................................
Add ttcn3-ggsn-ogs testsuite
This new setup allows running TTCN3 GGSN_Tests against open5gs, which
will soon gain GTPv1C support.
Change-Id: Ia6c122fce951d369a5d2362cbe99d10d61c15f49
---
A ttcn3-ggsn-test-ogs/jenkins.sh
A ttcn3-ggsn-test-ogs/ogs
A ttcn3-ggsn-test/jenkins-ogs.sh
A ttcn3-ggsn-test/ogs/GGSN_Tests.cfg
A ttcn3-ggsn-test/ogs/freediameter.conf
A ttcn3-ggsn-test/ogs/smfd.yaml
A ttcn3-ggsn-test/ogs/upfd-setup.sh
A ttcn3-ggsn-test/ogs/upfd.sh
A ttcn3-ggsn-test/ogs/upfd.yaml
9 files changed, 1,131 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/63/27063/1
diff --git a/ttcn3-ggsn-test-ogs/jenkins.sh b/ttcn3-ggsn-test-ogs/jenkins.sh
new file mode 120000
index 0000000..b688dd2
--- /dev/null
+++ b/ttcn3-ggsn-test-ogs/jenkins.sh
@@ -0,0 +1 @@
+../ttcn3-ggsn-test/jenkins-ogs.sh
\ No newline at end of file
diff --git a/ttcn3-ggsn-test-ogs/ogs b/ttcn3-ggsn-test-ogs/ogs
new file mode 120000
index 0000000..b048f0e
--- /dev/null
+++ b/ttcn3-ggsn-test-ogs/ogs
@@ -0,0 +1 @@
+../ttcn3-ggsn-test/ogs
\ No newline at end of file
diff --git a/ttcn3-ggsn-test/jenkins-ogs.sh b/ttcn3-ggsn-test/jenkins-ogs.sh
new file mode 100755
index 0000000..57fed00
--- /dev/null
+++ b/ttcn3-ggsn-test/jenkins-ogs.sh
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+. ../jenkins-common.sh
+
+KERNEL_TEST="${KERNEL_TEST:-0}"
+IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}"
+docker_images_require \
+ "open5gs-$IMAGE_SUFFIX" \
+ "ttcn3-ggsn-test"
+
+set_clean_up_trap
+set -e
+
+#Make sure NET_NAME doesn't clash with the AoIP BSC test
+NET_NAME=ttcn3-ggsn-test-ogs
+
+mkdir $VOL_BASE_DIR/ggsn-tester
+cp ogs/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
+cp ogs/smfd.yaml $VOL_BASE_DIR/ggsn/
+cp ogs/upfd.yaml $VOL_BASE_DIR/ggsn/
+cp ogs/freediameter.conf $VOL_BASE_DIR/ggsn/
+cp ogs/upfd.sh $VOL_BASE_DIR/ggsn/
+cp ogs/upfd-setup.sh $VOL_BASE_DIR/ggsn/
+
+SUBNET=3
+network_create $SUBNET
+
+# start container with ggsn (smf+upf) in background
+docker run --cap-add=NET_ADMIN \
+ --device /dev/net/tun:/dev/net/tun \
+ --sysctl net.ipv6.conf.all.disable_ipv6=0 \
+ --rm \
+ --ulimit core=-1 \
+ -v $VOL_BASE_DIR/ggsn:/data \
+ --name ${BUILD_TAG}-ggsn-ogs-smf -d \
+ $DOCKER_ARGS \
+ $(docker_network_params $SUBNET 201) \
+ $REPO_USER/open5gs-$IMAGE_SUFFIX \
+ /bin/sh -c "open5gs-smfd -c /data/smfd.yaml >/data/open5gs-smfd.out 2>&1"
+
+docker run --cap-add=NET_ADMIN \
+ --device /dev/net/tun:/dev/net/tun \
+ --sysctl net.ipv6.conf.all.disable_ipv6=0 \
+ --rm \
+ --ulimit core=-1 \
+ -v $VOL_BASE_DIR/ggsn:/data \
+ --name ${BUILD_TAG}-ggsn-ogs-upf -d \
+ $DOCKER_ARGS \
+ $(docker_network_params $SUBNET 222) \
+ $REPO_USER/open5gs-$IMAGE_SUFFIX \
+ /bin/sh -c "/data/upfd.sh -c /data/upfd.yaml >/data/open5gs-upfd.out 2>&1"
+
+# 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" \
+ --name ${BUILD_TAG}-ggsn-test \
+ $DOCKER_ARGS \
+ $REPO_USER/ttcn3-ggsn-test
diff --git a/ttcn3-ggsn-test/ogs/GGSN_Tests.cfg b/ttcn3-ggsn-test/ogs/GGSN_Tests.cfg
new file mode 100644
index 0000000..ccbda8d
--- /dev/null
+++ b/ttcn3-ggsn-test/ogs/GGSN_Tests.cfg
@@ -0,0 +1,25 @@
+[ORDERED_INCLUDE]
+"/osmo-ttcn3-hacks/Common.cfg"
+"/osmo-ttcn3-hacks/ggsn_tests/GGSN_Tests.default"
+
+[LOGGING]
+*.JUnitLogger.testsuite_name := "GGSN_Tests"
+
+[TESTPORT_PARAMETERS]
+*.GGSNVTY.CTRL_HOSTNAME := "172.18.3.201"
+
+[MODULE_PARAMETERS]
+# our Own IP address
+GGSN_Tests.m_bind_ip_gtpc := "172.18.3.202"
+GGSN_Tests.m_bind_ip_gtpu := "172.18.3.202"
+# GGSN IP address
+GGSN_Tests.m_ggsn_ip_gtpc := "172.18.3.201"
+GGSN_Tests.m_ggsn_ip_gtpu := "172.18.3.201"
+# GGSN announced DNS address
+GGSN_Tests.m_ggsn_ip4_dns1 := "172.18.3.201"
+GGSN_Tests.m_ggsn_ip6_dns1 := "fd02:db8:3::201"
+GGSN_Tests.m_ggsn_impl := GGSN_IMPL_OPEN5GS
+
+[EXECUTE]
+#GGSN_Tests.control
+GGSN_Tests.TC_pdp4_act_deact
diff --git a/ttcn3-ggsn-test/ogs/freediameter.conf b/ttcn3-ggsn-test/ogs/freediameter.conf
new file mode 100644
index 0000000..612bd35
--- /dev/null
+++ b/ttcn3-ggsn-test/ogs/freediameter.conf
@@ -0,0 +1,267 @@
+# This is a sample configuration file for freeDiameter daemon.
+
+# Most of the options can be omitted, as they default to reasonable values.
+# Only TLS-related options must be configured properly in usual setups.
+
+# It is possible to use "include" keyword to import additional files
+# e.g.: include "/etc/freeDiameter.d/*.conf"
+# This is exactly equivalent as copy & paste the content of the included file(s)
+# where the "include" keyword is found.
+
+
+##############################################################
+## Peer identity and realm
+
+# The Diameter Identity of this daemon.
+# This must be a valid FQDN that resolves to the local host.
+# Default: hostname's FQDN
+#Identity = "aaa.koganei.freediameter.net";
+Identity = "smf.localdomain";
+
+# The Diameter Realm of this daemon.
+# Default: the domain part of Identity (after the first dot).
+#Realm = "koganei.freediameter.net";
+Realm = "localdomain";
+
+##############################################################
+## Transport protocol configuration
+
+# The port this peer is listening on for incoming connections (TCP and SCTP).
+# Default: 3868. Use 0 to disable.
+Port = 3868;
+
+# The port this peer is listening on for incoming TLS-protected connections (TCP and SCTP).
+# See TLS_old_method for more information about TLS flavours.
+# Note: we use TLS/SCTP instead of DTLS/SCTP at the moment. This will change in future version of freeDiameter.
+# Default: 5868. Use 0 to disable.
+SecPort = 0;
+
+# Use RFC3588 method for TLS protection, where TLS is negociated after CER/CEA exchange is completed
+# on the unsecure connection. The alternative is RFC6733 mechanism, where TLS protects also the
+# CER/CEA exchange on a dedicated secure port.
+# This parameter only affects outgoing connections.
+# The setting can be also defined per-peer (see Peers configuration section).
+# Default: use RFC6733 method with separate port for TLS.
+#TLS_old_method;
+
+# Disable use of TCP protocol (only listen and connect over SCTP)
+# Default : TCP enabled
+#No_TCP;
+
+# Disable use of SCTP protocol (only listen and connect over TCP)
+# Default : SCTP enabled
+#No_SCTP;
+# This option is ignored if freeDiameter is compiled with DISABLE_SCTP option.
+
+# Prefer TCP instead of SCTP for establishing new connections.
+# This setting may be overwritten per peer in peer configuration blocs.
+# Default : SCTP is attempted first.
+#Prefer_TCP;
+
+# Default number of streams per SCTP associations.
+# This setting may be overwritten per peer basis.
+# Default : 30 streams
+#SCTP_streams = 30;
+
+##############################################################
+## Endpoint configuration
+
+# Disable use of IP addresses (only IPv6)
+# Default : IP enabled
+#No_IP;
+
+# Disable use of IPv6 addresses (only IP)
+# Default : IPv6 enabled
+#No_IPv6;
+
+# Specify local addresses the server must bind to
+# Default : listen on all addresses available.
+#ListenOn = "202.249.37.5";
+#ListenOn = "2001:200:903:2::202:1";
+#ListenOn = "fe80::21c:5ff:fe98:7d62%eth0";
+ListenOn = "172.18.3.201";
+
+
+##############################################################
+## Server configuration
+
+# How many Diameter peers are allowed to be connecting at the same time ?
+# This parameter limits the number of incoming connections from the time
+# the connection is accepted until the first CER is received.
+# Default: 5 unidentified clients in paralel.
+#ThreadsPerServer = 5;
+
+##############################################################
+## TLS Configuration
+
+# TLS is managed by the GNUTLS library in the freeDiameter daemon.
+# You may find more information about parameters and special behaviors
+# in the relevant documentation.
+# http://www.gnu.org/software/gnutls/manual/
+
+# Credentials of the local peer
+# The X509 certificate and private key file to use for the local peer.
+# The files must contain PKCS-1 encoded RSA key, in PEM format.
+# (These parameters are passed to gnutls_certificate_set_x509_key_file function)
+# Default : NO DEFAULT
+#TLS_Cred = "<x509 certif file.PEM>" , "<x509 private key file.PEM>";
+#TLS_Cred = "/etc/ssl/certs/freeDiameter.pem", "/etc/ssl/private/freeDiameter.key";
+TLS_Cred = "/usr/local/etc/freeDiameter/smf.cert.pem", "/usr/local/etc/freeDiameter/smf.key.pem";
+
+# Certificate authority / trust anchors
+# The file containing the list of trusted Certificate Authorities (PEM list)
+# (This parameter is passed to gnutls_certificate_set_x509_trust_file function)
+# The directive can appear several times to specify several files.
+# Default : GNUTLS default behavior
+#TLS_CA = "<file.PEM>";
+TLS_CA = "/usr/local/etc/freeDiameter/cacert.pem";
+
+# Certificate Revocation List file
+# The information about revoked certificates.
+# The file contains a list of trusted CRLs in PEM format. They should have been verified before.
+# (This parameter is passed to gnutls_certificate_set_x509_crl_file function)
+# Note: openssl CRL format might have interoperability issue with GNUTLS format.
+# Default : GNUTLS default behavior
+#TLS_CRL = "<file.PEM>";
+
+# GNU TLS Priority string
+# This string allows to configure the behavior of GNUTLS key exchanges
+# algorithms. See gnutls_priority_init function documentation for information.
+# You should also refer to the Diameter required TLS support here:
+# http://tools.ietf.org/html/rfc6733#section-13.1
+# Default : "NORMAL"
+# Example: TLS_Prio = "NONE:+VERS-TLS1.1:+AES-128-CBC:+RSA:+SHA1:+COMP-NULL";
+#TLS_Prio = "NORMAL";
+
+# Diffie-Hellman parameters size
+# Set the number of bits for generated DH parameters
+# Valid value should be 768, 1024, 2048, 3072 or 4096.
+# (This parameter is passed to gnutls_dh_params_generate2 function,
+# it usually should match RSA key size)
+# Default : 1024
+#TLS_DH_Bits = 1024;
+
+# Alternatively, you can specify a file to load the PKCS#3 encoded
+# DH parameters directly from. This accelerates the daemon start
+# but is slightly less secure. If this file is provided, the
+# TLS_DH_Bits parameters has no effect.
+# Default : no default.
+#TLS_DH_File = "<file.PEM>";
+
+
+##############################################################
+## Timers configuration
+
+# The Tc timer of this peer.
+# It is the delay before a new attempt is made to reconnect a disconnected peer.
+# The value is expressed in seconds. The recommended value is 30 seconds.
+# Default: 30
+#TcTimer = 30;
+
+# The Tw timer of this peer.
+# It is the delay before a watchdog message is sent, as described in RFC 3539.
+# The value is expressed in seconds. The default value is 30 seconds. Value must
+# be greater or equal to 6 seconds. See details in the RFC.
+# Default: 30
+#TwTimer = 30;
+
+##############################################################
+## Applications configuration
+
+# Disable the relaying of Diameter messages?
+# For messages not handled locally, the default behavior is to forward the
+# message to another peer if any is available, according to the routing
+# algorithms. In addition the "0xffffff" application is advertised in CER/CEA
+# exchanges.
+# Default: Relaying is enabled.
+#NoRelay;
+NoRelay;
+
+# Number of server threads that can handle incoming messages at the same time.
+# Default: 4
+#AppServThreads = 4;
+
+# Other applications are configured by loaded extensions.
+
+##############################################################
+## Extensions configuration
+
+# The freeDiameter framework merely provides support for
+# Diameter Base Protocol. The specific application behaviors,
+# as well as advanced functions, are provided
+# by loadable extensions (plug-ins).
+# These extensions may in addition receive the name of a
+# configuration file, the format of which is extension-specific.
+#
+# Format:
+#LoadExtension = "/path/to/extension" [ : "/optional/configuration/file" ] ;
+#
+# Examples:
+#LoadExtension = "extensions/sample.fdx";
+#LoadExtension = "extensions/sample.fdx":"conf/sample.conf";
+
+# Extensions are named as follow:
+# dict_* for extensions that add content to the dictionary definitions.
+# dbg_* for extensions useful only to retrieve more information on the framework execution.
+# acl_* : Access control list, to control which peers are allowed to connect.
+# rt_* : routing extensions that impact how messages are forwarded to other peers.
+# app_* : applications, these extensions usually register callbacks to handle specific messages.
+# test_* : dummy extensions that are useful only in testing environments.
+
+
+# The dbg_msg_dump.fdx extension allows you to tweak the way freeDiameter displays some
+# information about some events. This extension does not actually use a configuration file
+# but receives directly a parameter in the string passed to the extension. Here are some examples:
+## LoadExtension = "dbg_msg_dumps.fdx" : "0x1111"; # Removes all default hooks, very quiet even in case of errors.
+## LoadExtension = "dbg_msg_dumps.fdx" : "0x2222"; # Display all events with few details.
+## LoadExtension = "dbg_msg_dumps.fdx" : "0x0080"; # Dump complete information about sent and received messages.
+# The four digits respectively control: connections, routing decisions, sent/received messages, errors.
+# The values for each digit are:
+# 0 - default - keep the default behavior
+# 1 - quiet - remove any specific log
+# 2 - compact - display only a summary of the information
+# 4 - full - display the complete information on a single long line
+# 8 - tree - display the complete information in an easier to read format spanning several lines.
+
+LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dbg_msg_dumps.fdx" : "0x8888";
+LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_rfc5777.fdx";
+LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_mip6i.fdx";
+LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_nasreq.fdx";
+LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_nas_mipv6.fdx";
+LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_dcca.fdx";
+LoadExtension = "/usr/local/lib/x86_64-linux-gnu/freeDiameter/dict_dcca_3gpp.fdx";
+
+
+##############################################################
+## Peers configuration
+
+# The local server listens for incoming connections. By default,
+# all unknown connecting peers are rejected. Extensions can override this behavior (e.g., acl_wl).
+#
+# In addition to incoming connections, the local peer can
+# be configured to establish and maintain connections to some
+# Diameter nodes and allow connections from these nodes.
+# This is achieved with the ConnectPeer directive described below.
+#
+# Note that the configured Diameter Identity MUST match
+# the information received inside CEA, or the connection will be aborted.
+#
+# Format:
+#ConnectPeer = "diameterid" [ { parameter1; parameter2; ...} ] ;
+# Parameters that can be specified in the peer's parameter list:
+# No_TCP; No_SCTP; No_IP; No_IPv6; Prefer_TCP; TLS_old_method;
+# No_TLS; # assume transparent security instead of TLS. DTLS is not supported yet (will change in future versions).
+# Port = 5868; # The port to connect to
+# TcTimer = 30;
+# TwTimer = 30;
+# ConnectTo = "202.249.37.5";
+# ConnectTo = "2001:200:903:2::202:1";
+# TLS_Prio = "NORMAL";
+# Realm = "realm.net"; # Reject the peer if it does not advertise this realm.
+# Examples:
+#ConnectPeer = "aaa.wide.ad.jp";
+#ConnectPeer = "old.diameter.serv" { TcTimer = 60; TLS_old_method; No_SCTP; Port=3868; } ;
+ConnectPeer = "ttcn3ggsntest.localdomain" { ConnectTo = "172.18.3.202"; Port = 3868; No_TLS; TcTimer = 2; };
+
+
+##############################################################
diff --git a/ttcn3-ggsn-test/ogs/smfd.yaml b/ttcn3-ggsn-test/ogs/smfd.yaml
new file mode 100644
index 0000000..634cc9a
--- /dev/null
+++ b/ttcn3-ggsn-test/ogs/smfd.yaml
@@ -0,0 +1,520 @@
+#
+# logger:
+#
+# o Set OGS_LOG_INFO to all domain level
+# - If `level` is omitted, the default level is OGS_LOG_INFO)
+# - If `domain` is omitted, the all domain level is set from 'level'
+# (Nothing is needed)
+#
+# o Set OGS_LOG_ERROR to all domain level
+# - `level` can be set with none, fatal, error, warn, info, debug, trace
+# level: error
+#
+# o Set OGS_LOG_DEBUG to mme/emm domain level
+# level: debug
+# domain: mme,emm
+#
+# o Set OGS_LOG_TRACE to all domain level
+# level: trace
+# domain: core,pfcp,fd,pfcp,gtp,smf,event,tlv,mem,sock
+#
+logger:
+ file: /data/open5gs-smfd.log
+ level: info
+#
+# smf:
+#
+# <SBI Server>
+#
+# o SBI Server(http://<all address available>:80)
+# sbi:
+#
+# o SBI Server(http://<any address>:80)
+# sbi:
+# - addr:
+# - 0.0.0.0
+# - ::0
+# port: 7777
+#
+# o SBI Server(https://<all address avaiable>:443)
+# sbi:
+# - tls:
+# key: smf.key
+# pem: smf.pem
+#
+# o SBI Server(https://127.0.0.4:443, http://[::1]:80)
+# sbi:
+# - addr: 127.0.0.4
+# tls:
+# key: smf.key
+# pem: smf.pem
+# - addr: ::1
+#
+# o SBI Server(http://smf.open5gs.org:80)
+# sbi:
+# - name: smf.open5gs.org
+#
+# o SBI Server(http://127.0.0.4:7777)
+# sbi:
+# - addr: 127.0.0.4
+# port: 7777
+#
+# o SBI Server(http://<eth0 IP address>:80)
+# sbi:
+# - dev: eth0
+#
+# o Provide custom SBI address to be advertised to NRF
+# sbi:
+# - dev: eth0
+# advertise: open5gs-smf.svc.local
+#
+# sbi:
+# - addr: localhost
+# advertise:
+# - 127.0.0.99
+# - ::1
+#
+# <PFCP Server>
+#
+# o PFCP Server(127.0.0.4:8805, ::1:8805)
+# pfcp:
+# - addr: 127.0.0.4
+# - addr: ::1
+#
+# o PFCP-U Server(127.0.0.1:2152, [::1]:2152)
+# pfcp:
+# name: localhost
+#
+# <GTP-C Server>
+#
+# o GTP-C Server(127.0.0.4:2123, [fd69:f21d:873c:fa::3]:2123)
+# gtpc:
+# addr:
+# - 127.0.0.4
+# - fd69:f21d:873c:fa::3
+#
+# o On SMF, Same configuration
+# (127.0.0.4:2123, [fd69:f21d:873c:fa::3]:2123).
+# gtpc:
+# - addr: 127.0.0.4
+# - addr: fd69:f21d:873c:fa::3
+#
+# <GTP-U Server>>
+#
+# o GTP-U Server(127.0.0.4:2152, [::1]:2152)
+# gtpu:
+# - addr: 127.0.0.4
+# - addr: ::1
+#
+# o GTP-U Server(127.0.0.1:2152, [::1]:2152)
+# gtpu:
+# name: localhost
+#
+# <Subnet for UE Pool>
+#
+# o IPv4 Pool
+# subnet:
+# addr: 10.45.0.1/16
+#
+# o IPv4/IPv6 Pool
+# subnet:
+# - addr: 10.45.0.1/16
+# - addr: 2001:db8:cafe::1/48
+#
+#
+# o Specific DNN/APN(e.g 'ims') uses 10.46.0.1/16, 2001:db8:babe::1/48
+# ; If the UE has unknown DNN/APN(not internet/ims), SMF/UPF will crash.
+#
+# subnet:
+# - addr: 10.45.0.1/16
+# dnn: internet
+# - addr: 2001:db8:cafe::1/48
+# dnn: internet
+# - addr: 10.46.0.1/16
+# dnn: ims
+# - addr: 2001:db8:babe::1/48
+# dnn: ims
+#
+# o Specific DNN/APN with the FALLBACK SUBNET(10.47.0.1/16)
+# ; Note that put the FALLBACK SUBNET last to avoid SMF/UPF crash.
+#
+# subnet:
+# - addr: 10.45.0.1/16
+# dnn: internet
+# - addr: 10.46.0.1/16
+# dnn: ims
+# - addr: 10.50.0.1/16 ## FALLBACK SUBNET
+#
+# o Pool Range Sample
+# subnet:
+# - addr: 10.45.0.1/24
+# range: 10.45.0.100-10.45.0.200
+#
+# subnet:
+# - addr: 10.45.0.1/24
+# range:
+# - 10.45.0.5-10.45.0.50
+# - 10.45.0.100-
+#
+# subnet:
+# - addr: 10.45.0.1/24
+# range:
+# - -10.45.0.200
+# - 10.45.0.210-10.45.0.220
+#
+# subnet:
+# - addr: 10.45.0.1/16
+# range:
+# - 10.45.0.100-10.45.0.200
+# - 10.45.1.100-10.45.1.200
+# - addr: 2001:db8:cafe::1/48
+# range:
+# - 2001:db8:cafe:a0::0-2001:db8:cafe:b0::0
+# - 2001:db8:cafe:c0::0-2001:db8:cafe:d0::0
+#
+# <Domain Name Server>
+#
+# o Primary/Secondary can be configured. Others are ignored.
+#
+# dns:
+# - 8.8.8.8
+# - 8.8.4.4
+# - 2001:4860:4860::8888
+# - 2001:4860:4860::8844
+#
+# <MTU Size>
+#
+# o Provisioning a limit on the size of the packets sent by the MS
+# to avoid packet fragmentation in the backbone network
+# between the MS and the GGSN/PGW and/or across the (S)Gi reference point)
+# when some of the backbone links does not support
+# packets larger then 1500 octets
+#
+# <P-CSCF>
+#
+# o Proxy Call Session Control Function
+#
+# p-cscf:
+# - 127.0.0.1
+# - ::1
+#
+# <SMF Selection - 5G Core only>
+# 1. SMF sends SmfInfo(S-NSSAI, DNN, TAI) to the NRF
+# 2. NRF responds to AMF with SmfInfo during NF-Discovery.
+# 3. AMF selects SMF based on S-NSSAI, DNN and TAI in SmfInfo.
+#
+# Note that if there is no SmfInfo, any AMF can select this SMF.
+#
+# o S-NSSAI[SST:1] and DNN[internet] - At least 1 DNN is required in S-NSSAI
+# info:
+# - s_nssai:
+# - sst: 1
+# dnn:
+# - internet
+#
+# o S-NSSAI[SST:1 SD:009000] and DNN[internet or ims]
+# info:
+# - s_nssai:
+# - sst: 1
+# sd: 009000
+# dnn:
+# - internet
+# - ims
+#
+# o S-NSSAI[SST:1] and DNN[internet] and TAI[PLMN-ID:90170 TAC:1]
+# info:
+# - s_nssai:
+# - sst: 1
+# dnn:
+# - internet
+# tai:
+# - plmn_id:
+# mcc: 901
+# mnc: 70
+# tac: 1
+#
+# o If any of conditions below are met:
+# - S-NSSAI[SST:1] and DNN[internet] and TAI[PLMN-ID:90170 TAC:1-9]
+# - S-NSSAI[SST:2 SD:000080] and DNN[internet or ims]
+# - S-NSSAI[SST:4] and DNN[internet] and TAI[PLMN-ID:90170 TAC:10-20,30-40]
+#
+# info:
+# - s_nssai:
+# - sst: 1
+# dnn:
+# - internet
+# tai:
+# - plmn_id:
+# mcc: 901
+# mnc: 70
+# range:
+# - 1-9
+# - s_nssai:
+# - sst: 2
+# sd: 000080
+# dnn:
+# - internet
+# - ims
+# - s_nssai:
+# - sst: 4
+# dnn:
+# - internet
+# tai:
+# - plmn_id:
+# mcc: 901
+# mnc: 70
+# range:
+# - 10-20
+# - 30-40
+#
+# o Complex Example
+# info:
+# - s_nssai:
+# - sst: 1
+# dnn:
+# - internet
+# - sst: 1
+# sd: 000080
+# dnn:
+# - internet
+# - ims
+# - sst: 1
+# sd: 009000
+# dnn:
+# [internet, ims]
+# - sst: 2
+# dnn:
+# - internet
+# - sst: 3
+# sd: 123456
+# dnn:
+# - internet
+# tai:
+# - plmn_id:
+# mcc: 901
+# mnc: 70
+# tac: [1, 2, 3]
+# - plmn_id:
+# mcc: 901
+# mnc: 70
+# tac: 4
+# - plmn_id:
+# mcc: 901
+# mnc: 70
+# tac:
+# - 5
+# - 6
+# - plmn_id:
+# mcc: 901
+# mnc: 70
+# range:
+# - 100-200
+# - 300-400
+# - plmn_id:
+# mcc: 901
+# mnc: 70
+# range:
+# - 500-600
+# - 700-800
+# - 900-1000
+# - s_nssai:
+# - sst: 4
+# dnn:
+# - internet
+# tai:
+# - plmn_id:
+# mcc: 901
+# mnc: 70
+# tac: 99
+#
+
+smf:
+ sbi:
+ - addr: 172.18.3.201
+ port: 7777
+ pfcp:
+ - addr: 172.18.3.201
+ gtpc:
+ - addr: 172.18.3.201
+ gtpu:
+ - addr: 172.18.3.201
+ port: 2152
+ subnet:
+ - addr: 176.16.222.1/24
+ dns:
+ - 172.18.3.201
+ - 8.8.8.8
+ mtu: 1400
+ freeDiameter: /data/freediameter.conf
+
+#
+# nrf:
+#
+# <SBI Client>>
+#
+# o SBI Client(http://127.0.0.1:7777)
+# sbi:
+# addr: 127.0.0.10
+# port: 7777
+#
+# o SBI Client(https://127.0.0.10:443, http://nrf.open5gs.org:80)
+# sbi:
+# - addr: 127.0.0.10
+# tls:
+# key: nrf.key
+# pem: nrf.pem
+# - name: nrf.open5gs.org
+#
+# o SBI Client(http://[fd69:f21d:873c:fa::1]:80)
+# If prefer_ipv4 is true, http://127.0.0.10:80 is selected.
+#
+# sbi:
+# addr:
+# - 127.0.0.10
+# - fd69:f21d:873c:fa::1
+#
+nrf:
+ sbi:
+ - addr:
+ - 172.18.3.201
+ port: 7777
+
+#
+# upf:
+#
+# <PFCP Client>>
+#
+# o PFCP Client(127.0.0.7:8805)
+#
+# pfcp:
+# addr: 127.0.0.7
+#
+# <UPF Selection>
+#
+# o Round-Robin
+# (note that round robin can be disabled for a particular node
+# by setting flag 'rr' to 0)
+#
+# upf:
+# pfcp:
+# - addr: 127.0.0.7
+# - addr: 127.0.0.12
+# rr: 0
+# - addr: 127.0.0.19
+#
+# o UPF selection by eNodeB TAC
+# (either single TAC or multiple TACs, DECIMAL representation)
+#
+# upf:
+# pfcp:
+# - addr: 127.0.0.7
+# tac: 1
+# - addr: 127.0.0.12
+# tac: [3,5,8]
+#
+# o UPF selection by UE's DNN/APN (either single DNN/APN or multiple DNNs/APNs)
+#
+# upf:
+# pfcp:
+# - addr: 127.0.0.7
+# dnn: ims
+# - addr: 127.0.0.12
+# dnn: [internet, web]
+#
+# o UPF selection by CellID(e_cell_id: 28bit, nr_cell_id: 36bit)
+# (either single enb_id or multiple enb_ids, HEX representation)
+#
+# upf:
+# pfcp:
+# - addr: 127.0.0.7
+# e_cell_id: 463
+# - addr: 127.0.0.12
+# nr_cell_id: [123456789, 9413]
+#
+upf:
+ pfcp:
+ - addr: 172.18.3.222
+
+#
+# parameter:
+#
+# o Number of output streams per SCTP associations.
+# sctp_streams: 30
+#
+# o Disable use of IPv4 addresses (only IPv6)
+# no_ipv4: true
+#
+# o Disable use of IPv6 addresses (only IPv4)
+# no_ipv6: true
+#
+# o Prefer IPv4 instead of IPv6 for estabishing new GTP connections.
+# prefer_ipv4: true
+#
+# o Disable selection of UPF PFCP in Round-Robin manner
+# no_pfcp_rr_select: true
+#
+parameter:
+
+#
+# max:
+#
+# o Maximum Number of UE per AMF/MME
+# ue: 1024
+# o Maximum Number of gNB/eNB per AMF/MME
+# gnb: 64
+#
+max:
+
+#
+# pool:
+#
+# o The default memory pool size was set assuming 1024 UEs.
+# To connect more UEs, you need to increase the size further.
+#
+# - Pool-size 128 => 65536 Number
+# - Pool-size 256 => 16384 Number
+# - Pool-size 512 => 4096 Number
+# - Pool-size 1024 => 1024 Number
+# - Pool-size 2048 => 512 Number
+# - Pool-size 8192 => 128 Number
+# - Pool-size 1024*1024 => 8 Number
+#
+# 128: 65536
+# 256: 16384
+# 512: 4096
+# 1024: 1024
+# 2048: 512
+# 8192: 128
+# big: 8
+#
+pool:
+
+#
+# time:
+#
+# o NF Instance Heartbeat (Default : 0)
+# NFs will not send heart-beat timer in NFProfile
+# NRF will send heart-beat timer in NFProfile
+#
+# o NF Instance Heartbeat (20 seconds)
+# NFs will send heart-beat timer (20 seconds) in NFProfile
+# NRF can change heart-beat timer in NFProfile
+#
+# nf_instance:
+# heartbeat: 20
+#
+# o Message Wait Duration (Default : 10,000 ms = 10 seconds)
+#
+# o Message Wait Duration (3000 ms)
+# message:
+# duration: 3000
+#
+# o Handover Wait Duration (Default : 300 ms)
+# Time to wait for SMF to send
+# PFCP Session Modification Request(Remove Indirect Tunnel) to the UPF
+# after sending Nsmf_PDUSession_UpdateSMContext Response(hoState:COMPLETED)
+#
+# o Handover Wait Duration (500ms)
+# handover:
+# duration: 500
+time:
diff --git a/ttcn3-ggsn-test/ogs/upfd-setup.sh b/ttcn3-ggsn-test/ogs/upfd-setup.sh
new file mode 100755
index 0000000..7ab538d
--- /dev/null
+++ b/ttcn3-ggsn-test/ogs/upfd-setup.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if ! grep "ogstun" /proc/net/dev > /dev/null; then
+ ip tuntap add name ogstun mode tun
+fi
+ip addr del 176.16.222.1/16 dev ogstun 2> /dev/null
+ip addr add 176.16.222.1/16 dev ogstun
+#ip addr del cafe::1/64 dev ogstun 2> /dev/null
+#ip addr add cafe::1/64 dev ogstun
+ip link set ogstun up
diff --git a/ttcn3-ggsn-test/ogs/upfd.sh b/ttcn3-ggsn-test/ogs/upfd.sh
new file mode 100755
index 0000000..694df35
--- /dev/null
+++ b/ttcn3-ggsn-test/ogs/upfd.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+set -x
+/data/upfd-setup.sh
+#du -lha / | grep freeDiameter
+su - osmocom -c "open5gs-upfd $*"
diff --git a/ttcn3-ggsn-test/ogs/upfd.yaml b/ttcn3-ggsn-test/ogs/upfd.yaml
new file mode 100644
index 0000000..35eeff7
--- /dev/null
+++ b/ttcn3-ggsn-test/ogs/upfd.yaml
@@ -0,0 +1,236 @@
+#
+# logger:
+#
+# o Set OGS_LOG_INFO to all domain level
+# - If `level` is omitted, the default level is OGS_LOG_INFO)
+# - If `domain` is omitted, the all domain level is set from 'level'
+# (Nothing is needed)
+#
+# o Set OGS_LOG_ERROR to all domain level
+# - `level` can be set with none, fatal, error, warn, info, debug, trace
+# level: error
+#
+# o Set OGS_LOG_DEBUG to mme/emm domain level
+# level: debug
+# domain: mme,emm
+#
+# o Set OGS_LOG_TRACE to all domain level
+# level: trace
+# domain: core,pfcp,gtp,upf,event,tlv,mem,sock
+#
+logger:
+ file: /data/open5gs-upfd.log
+ level: info
+
+#
+# upf:
+#
+# <PFCP Server>
+#
+# o PFCP Server(127.0.0.7:8805, ::1:8805)
+# pfcp:
+# - addr: 127.0.0.7
+# - addr: ::1
+#
+# o PFCP-U Server(127.0.0.1:2152, [::1]:2152)
+# pfcp:
+# name: localhost
+#
+# <GTP-U Server>>
+#
+# o GTP-U Server(127.0.0.7:2152, [::1]:2152)
+# gtpu:
+# - addr: 127.0.0.7
+# - addr: ::1
+#
+# o GTP-U Server(127.0.0.1:2152, [::1]:2152)
+# gtpu:
+# name: localhost
+#
+# o User Plane IP Resource information
+# gtpu:
+# - addr:
+# - 127.0.0.7
+# - ::1
+# teid_range_indication: 4
+# teid_range: 10
+# network_instance: internet
+# source_interface: 0
+# - addr: 127.0.10.4
+# teid_range_indication: 4
+# teid_range: 5
+# network_instance: ims
+# source_interface: 1
+#
+# o Provide custom UPF GTP-U address to be advertised inside NGAP messages
+# gtpu:
+# - addr: 10.4.128.21
+# advertise: 172.24.15.30
+#
+# gtpu:
+# - addr: 10.4.128.21
+# advertise:
+# - 127.0.0.1
+# - ::1
+#
+# gtpu:
+# - addr: 10.4.128.21
+# advertise: upf1.5gc.mnc001.mcc001.3gppnetwork.org
+#
+# gtpu:
+# - dev: ens3
+# advertise: upf1.5gc.mnc001.mcc001.3gppnetwork.org
+#
+# <Subnet for UE network>
+#
+# Note that you need to setup your UE network using TUN device.
+# (ogstun, ogstun2, ogstunX, ..)
+#
+# o IPv4 Pool
+# $ sudo ip addr add 10.45.0.1/16 dev ogstun
+#
+# subnet:
+# addr: 10.45.0.1/16
+#
+# o IPv4/IPv6 Pool
+# $ sudo ip addr add 10.45.0.1/16 dev ogstun
+# $ sudo ip addr add 2001:db8:cafe::1/48 dev ogstun
+#
+# subnet:
+# - addr: 10.45.0.1/16
+# - addr: 2001:db8:cafe::1/48
+#
+#
+# o Specific DNN/APN(e.g 'ims') uses 10.46.0.1/16, 2001:db8:babe::1/48
+# All other APNs use 10.45.0.1/16, 2001:db8:cafe::1/48
+# $ sudo ip addr add 10.45.0.1/16 dev ogstun
+# $ sudo ip addr add 10.46.0.1/16 dev ogstun
+# $ sudo ip addr add 2001:db8:cafe::1/48 dev ogstun
+# $ sudo ip addr add 2001:db8:babe::1/48 dev ogstun
+#
+# ; If the UE has unknown DNN/APN(not internet/ims), SMF/UPF will crash.
+#
+# subnet:
+# - addr: 10.45.0.1/16
+# dnn: internet
+# - addr: 2001:db8:cafe::1/48
+# dnn: internet
+# - addr: 10.46.0.1/16
+# dnn: ims
+# - addr: 2001:db8:babe::1/48
+# dnn: ims
+#
+# o Specific DNN/APN with the FALLBACK SUBNET(10.47.0.1/16)
+# ; Note that put the FALLBACK SUBNET last to avoid SMF/UPF crash.
+#
+# subnet:
+# - addr: 10.45.0.1/16
+# dnn: internet
+# - addr: 10.46.0.1/16
+# dnn: ims
+# - addr: 10.50.0.1/16 ## FALLBACK SUBNET
+#
+# o Multiple Devices (default: ogstun)
+# $ sudo ip addr add 10.45.0.1/16 dev ogstun
+# $ sudo ip addr add 2001:db8:cafe::1/48 dev ogstun2
+# $ sudo ip addr add 10.46.0.1/16 dev ogstun3
+# $ sudo ip addr add 2001:db8:babe::1/48 dev ogstun3
+#
+# subnet:
+# - addr: 10.45.0.1/16
+# dnn: internet
+# - addr: 2001:db8:cafe::1/48
+# dnn: internet
+# dev: ogstun2
+# - addr: 10.46.0.1/16
+# dnn: ims
+# dev: ogstun3
+# - addr: 2001:db8:babe::1/48
+# dnn: ims
+# dev: ogstun3
+#
+upf:
+ pfcp:
+ - addr: 172.18.3.222
+ gtpu:
+ - addr: 172.18.3.222
+ port: 2152
+ subnet:
+ - addr: 176.16.222.1/24
+ dnn: internet
+ dev: ogstun
+
+#
+# smf:
+#
+# <PFCP Client>>
+#
+# o PFCP Client(127.0.0.4:8805)
+#
+# pfcp:
+# addr: 127.0.0.4
+#
+smf:
+ pfcp:
+ - addr: 172.18.3.201
+
+#
+# parameter:
+#
+# o Number of output streams per SCTP associations.
+# sctp_streams: 30
+#
+# o Disable use of IPv4 addresses (only IPv6)
+# no_ipv4: true
+#
+# o Disable use of IPv6 addresses (only IPv4)
+# no_ipv6: true
+#
+# o Prefer IPv4 instead of IPv6 for estabishing new GTP connections.
+# prefer_ipv4: true
+#
+parameter:
+
+#
+# max:
+#
+# o Maximum Number of UE per AMF/MME
+# ue: 1024
+# o Maximum Number of gNB/eNB per AMF/MME
+# gnb: 64
+#
+max:
+
+#
+# pool:
+#
+# o The default memory pool size was set assuming 1024 UEs.
+# To connect more UEs, you need to increase the size further.
+#
+# - Pool-size 128 => 65536 Number
+# - Pool-size 256 => 16384 Number
+# - Pool-size 512 => 4096 Number
+# - Pool-size 1024 => 1024 Number
+# - Pool-size 2048 => 512 Number
+# - Pool-size 8192 => 128 Number
+# - Pool-size 1024*1024 => 8 Number
+#
+# 128: 65536
+# 256: 16384
+# 512: 4096
+# 1024: 1024
+# 2048: 512
+# 8192: 128
+# big: 8
+#
+pool:
+
+#
+# time:
+#
+# o Message Wait Duration (Default : 10,000 ms = 10 seconds)
+#
+# o Message Wait Duration (3000 ms)
+# message:
+# duration: 3000
+time:
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27063
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ia6c122fce951d369a5d2362cbe99d10d61c15f49
Gerrit-Change-Number: 27063
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27060 )
Change subject: ggsn: Add module parameter to run tests against open5gs
......................................................................
ggsn: Add module parameter to run tests against open5gs
Change-Id: I4ebb3ed73f0f9a20c14d73891ba8b8051f823ab8
---
M ggsn_tests/GGSN_Tests.ttcn
1 file changed, 12 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/60/27060/1
diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn
index 634534f..63e0696 100644
--- a/ggsn_tests/GGSN_Tests.ttcn
+++ b/ggsn_tests/GGSN_Tests.ttcn
@@ -35,6 +35,11 @@
const integer GTP1C_PORT := 2123;
const integer GTP1U_PORT := 2152;
+ type enumerated GGSN_Impl {
+ GGSN_IMPL_OSMOCOM,
+ GGSN_IMPL_OPEN5GS
+ };
+
modulepar {
/* Default IP addresses. May be overridden by GGSN_Tests configuration files. */
@@ -65,6 +70,8 @@
* The tests expect to be able to send ping packets between any two simulated MS within the same
* address range. This requires IP forwarding to be enabled on the corresponding tun interfaces.
*/
+
+ GGSN_Impl m_ggsn_impl := GGSN_IMPL_OSMOCOM;
}
type set PdpContext {
@@ -197,9 +204,11 @@
g_c_seq_nr := f_rnd_int(65535);
g_d_seq_nr := f_rnd_int(65535);
- f_init_vty();
- f_vty_set_gpdu_txseq(use_gtpu_txseq);
- f_vty_enable_echo_interval(g_use_echo);
+ if (m_ggsn_impl == GGSN_IMPL_OSMOCOM) {
+ f_init_vty();
+ f_vty_set_gpdu_txseq(use_gtpu_txseq);
+ f_vty_enable_echo_interval(g_use_echo);
+ }
}
/* Altstep implementing responses to any incoming echo requests */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27060
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: I4ebb3ed73f0f9a20c14d73891ba8b8051f823ab8
Gerrit-Change-Number: 27060
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange