Attention is currently required from: roox, roh.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27017 )
Change subject: icE1usb: Move GPS-DO USB control to separate USB interface
......................................................................
Patch Set 3: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1-hardware/+/27017
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1-hardware
Gerrit-Branch: master
Gerrit-Change-Id: Icd6555a14896c38626fb147b78af44ff719f2254
Gerrit-Change-Number: 27017
Gerrit-PatchSet: 3
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: roh <jsteiger(a)sysmocom.de>
Gerrit-Reviewer: roox <mardnh(a)gmx.de>
Gerrit-Reviewer: tnt <tnt(a)246tNt.com>
Gerrit-Attention: roox <mardnh(a)gmx.de>
Gerrit-Attention: roh <jsteiger(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 03 Feb 2022 12:04:55 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27056 )
Change subject: ttcn3-pgw-test: configure the 'ogstun' device for open5gs-upfd
......................................................................
ttcn3-pgw-test: configure the 'ogstun' device for open5gs-upfd
Unlike osmo-ggsn, open5gs-upfd does not configure the tun interface
itself. All IPv4/IPv6 addresses must be assigned manually. This
is exactly why both PGW_Tests.TC_createSession_ping4[_256] fail:
[sock] ERROR: ogs_write() failed (5:Input/outputerror) (../lib/tun/tunio.c:84)
[upf] WARNING: ogs_tun_write() failed (../src/upf/gtp-path.c:448)
Take Harald's setup.sh from open5gs-master and execute it in the
container running open5gs-upfd. This fixes the ogs_write() errors.
Change-Id: I0730b1f69285484a0aa0ebd664dafd8e476b294f
Related: SYS#5602
---
M ttcn3-pgw-test/jenkins.sh
A ttcn3-pgw-test/ogstun-setup.sh
2 files changed, 14 insertions(+), 0 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved; Verified
diff --git a/ttcn3-pgw-test/jenkins.sh b/ttcn3-pgw-test/jenkins.sh
index 662e49b..bd6967c 100755
--- a/ttcn3-pgw-test/jenkins.sh
+++ b/ttcn3-pgw-test/jenkins.sh
@@ -16,6 +16,7 @@
mkdir $VOL_BASE_DIR/pgw
cp freeDiameter-smf.conf $VOL_BASE_DIR/pgw/
cp open5gs-*.yaml $VOL_BASE_DIR/pgw/
+cp ogstun-setup.sh $VOL_BASE_DIR/pgw/
SUBNET=18
network_create $SUBNET
@@ -43,6 +44,9 @@
$REPO_USER/open5gs-$IMAGE_SUFFIX \
open5gs-upfd -c /data/open5gs-upf.yaml
+# configure the 'ogstun' device for open5gs-upfd
+docker exec ${BUILD_TAG}-upf /data/ogstun-setup.sh
+
# start container with open5gs-smfd in background
docker run --cap-add=NET_ADMIN \
--device /dev/net/tun:/dev/net/tun \
diff --git a/ttcn3-pgw-test/ogstun-setup.sh b/ttcn3-pgw-test/ogstun-setup.sh
new file mode 100755
index 0000000..58693fd
--- /dev/null
+++ b/ttcn3-pgw-test/ogstun-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 10.45.0.1/16 dev ogstun 2> /dev/null
+ip addr add 10.45.0.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
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27056
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I0730b1f69285484a0aa0ebd664dafd8e476b294f
Gerrit-Change-Number: 27056
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: fixeria.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27057 )
Change subject: open5gs-master: remove both setup.sh and pgw.sh
......................................................................
Patch Set 2: Verified+1
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27057
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I96abc3ac57ade34cd79af6451bb201e36f5cd7f7
Gerrit-Change-Number: 27057
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 03 Feb 2022 12:03:48 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27057 )
Change subject: open5gs-master: remove both setup.sh and pgw.sh
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27057
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I96abc3ac57ade34cd79af6451bb201e36f5cd7f7
Gerrit-Change-Number: 27057
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 03 Feb 2022 12:03:35 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: pespin.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27052 )
Change subject: ggsn: Submit User Location Information in CreatePDPContextReq
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27052
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: Iaea95e5779d4f878023ce3f160ac69f092452056
Gerrit-Change-Number: 27052
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 03 Feb 2022 11:56:59 +0000
Gerrit-HasComments: No
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/libosmocore/+/27047 )
Change subject: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
> So the linter suggests the following: […]
I guess you could use the do - while loop, and add a semicolon at the end for compatibility:
#define OSMO_ASSERT(exp) \
do { \
if (!OSMO_LIKELY(exp)) { \
osmo_panic("Assert failed %s %s:%d\n", #exp, __FILE__, __LINE__); \
} \
} while (0);
IMHO this check is really useful in other cases (not here, because the whole macro is inside an if, thus it shouldn't lead to if-else logic defects as described here https://stackoverflow.com/a/9496007).
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27047
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I29b32a2477ec92762f8f0ce5e5c5a30810f6abbe
Gerrit-Change-Number: 27047
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: dexter <pmaier(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 03 Feb 2022 11:54:50 +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/+/27052 )
Change subject: ggsn: Submit User Location Information in CreatePDPContextReq
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27052
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: Iaea95e5779d4f878023ce3f160ac69f092452056
Gerrit-Change-Number: 27052
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: Thu, 03 Feb 2022 11:27:08 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27058 )
Change subject: jobs/registry-update-base-images: centos8 -> alma
......................................................................
jobs/registry-update-base-images: centos8 -> alma
Follow up on the change of using almalinux instead of centos8 in
docker-playground, with providing the almalinux base images in the
Osmocom registry.
Related: SYS#5818
Related: docker-playground I30e1a773b901b1d2187214445116c7f2aecc4e36
Change-Id: I93a8892da628b8d2f9cbb2a6453e8ab3153a9c4a
---
M jobs/registry-update-base-images.yml
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/jobs/registry-update-base-images.yml b/jobs/registry-update-base-images.yml
index 1e5e423..328dbf6 100644
--- a/jobs/registry-update-base-images.yml
+++ b/jobs/registry-update-base-images.yml
@@ -26,7 +26,7 @@
ubuntu:zesty
centos:centos7
- centos:centos8
+ almalinux:8
"
for i in $IMAGES; do
src=$i
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27058
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I93a8892da628b8d2f9cbb2a6453e8ab3153a9c4a
Gerrit-Change-Number: 27058
Gerrit-PatchSet: 1
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-MessageType: merged
Attention is currently required from: laforge, pespin.
Hello Jenkins Builder, laforge, pespin,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27054
to look at the new patch set (#2).
Change subject: PGW_Tests: f_start_prog(): redirect stdout/stderr to files
......................................................................
PGW_Tests: f_start_prog(): redirect stdout/stderr to files
This would allow us to see the output of a program being executed.
Change-Id: I04ab92c13fcd893d39dbb6a8a8af5ff41d207e36
Related: SYS#5602
---
M pgw/PGW_Tests.ttcn
1 file changed, 17 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/54/27054/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27054
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: I04ab92c13fcd893d39dbb6a8a8af5ff41d207e36
Gerrit-Change-Number: 27054
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: laforge, pespin.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27054 )
Change subject: PGW_Tests: f_start_prog(): redirect stdout/stderr to files
......................................................................
Patch Set 1:
(1 comment)
File pgw/PGW_Tests.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27054/comment/750ea64d_f3fb…
PS1, Line 408: var charstring prefix := mp_run_prog_log_path & "/" & testcasename();
> Better have this kind of modifiers to the passed command enabled conditionaly by a param passed to f […]
Ack
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27054
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: I04ab92c13fcd893d39dbb6a8a8af5ff41d207e36
Gerrit-Change-Number: 27054
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 03 Feb 2022 09:08:26 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27056 )
Change subject: ttcn3-pgw-test: configure the 'ogstun' device for open5gs-upfd
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27056
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I0730b1f69285484a0aa0ebd664dafd8e476b294f
Gerrit-Change-Number: 27056
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 03 Feb 2022 08:45:09 +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/+/27057 )
Change subject: open5gs-master: remove both setup.sh and pgw.sh
......................................................................
Patch Set 2: Code-Review+1
(1 comment)
Patchset:
PS2:
ack, I also copied them & modified them in ttcn3-ggsn-test/ogs/
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27057
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I96abc3ac57ade34cd79af6451bb201e36f5cd7f7
Gerrit-Change-Number: 27057
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 03 Feb 2022 08:44:15 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: laforge, fixeria.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27054 )
Change subject: PGW_Tests: f_start_prog(): redirect stdout/stderr to files
......................................................................
Patch Set 1:
(1 comment)
File pgw/PGW_Tests.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27054/comment/502ad171_85db…
PS1, Line 408: var charstring prefix := mp_run_prog_log_path & "/" & testcasename();
Better have this kind of modifiers to the passed command enabled conditionaly by a param passed to f_start_prog, for instance: bool redirect_output
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27054
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: I04ab92c13fcd893d39dbb6a8a8af5ff41d207e36
Gerrit-Change-Number: 27054
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 03 Feb 2022 08:43:10 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/27058 )
Change subject: jobs/registry-update-base-images: centos8 -> alma
......................................................................
jobs/registry-update-base-images: centos8 -> alma
Follow up on the change of using almalinux instead of centos8 in
docker-playground, with providing the almalinux base images in the
Osmocom registry.
Related: SYS#5818
Related: docker-playground I30e1a773b901b1d2187214445116c7f2aecc4e36
Change-Id: I93a8892da628b8d2f9cbb2a6453e8ab3153a9c4a
---
M jobs/registry-update-base-images.yml
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/58/27058/1
diff --git a/jobs/registry-update-base-images.yml b/jobs/registry-update-base-images.yml
index 1e5e423..328dbf6 100644
--- a/jobs/registry-update-base-images.yml
+++ b/jobs/registry-update-base-images.yml
@@ -26,7 +26,7 @@
ubuntu:zesty
centos:centos7
- centos:centos8
+ almalinux:8
"
for i in $IMAGES; do
src=$i
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27058
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I93a8892da628b8d2f9cbb2a6453e8ab3153a9c4a
Gerrit-Change-Number: 27058
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
fixeria has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/docker-playground/+/27056 )
Change subject: ttcn3-pgw-test: configure the 'ogstun' device for open5gs-upfd
......................................................................
ttcn3-pgw-test: configure the 'ogstun' device for open5gs-upfd
Unlike osmo-ggsn, open5gs-upfd does not configure the tun interface
itself. All IPv4/IPv6 addresses must be assigned manually. This
is exactly why both PGW_Tests.TC_createSession_ping4[_256] fail:
[sock] ERROR: ogs_write() failed (5:Input/outputerror) (../lib/tun/tunio.c:84)
[upf] WARNING: ogs_tun_write() failed (../src/upf/gtp-path.c:448)
Take Harald's setup.sh from open5gs-master and execute it in the
container running open5gs-upfd. This fixes the ogs_write() errors.
Change-Id: I0730b1f69285484a0aa0ebd664dafd8e476b294f
Related: SYS#5602
---
M ttcn3-pgw-test/jenkins.sh
A ttcn3-pgw-test/ogstun-setup.sh
2 files changed, 14 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/56/27056/2
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27056
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I0730b1f69285484a0aa0ebd664dafd8e476b294f
Gerrit-Change-Number: 27056
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
fixeria has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/docker-playground/+/27057 )
Change subject: open5gs-master: remove both setup.sh and pgw.sh
......................................................................
open5gs-master: remove both setup.sh and pgw.sh
Having these scripts makes no sense anymore, because:
* setup.sh was moved to ttcn3-pgw-test,
* pgw.sh runs non-existing open5gs-pgwd.
Change-Id: I96abc3ac57ade34cd79af6451bb201e36f5cd7f7
Related: SYS#5602
---
M open5gs-master/Dockerfile
D open5gs-master/pgw.sh
D open5gs-master/setup.sh
3 files changed, 0 insertions(+), 18 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/57/27057/2
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27057
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I96abc3ac57ade34cd79af6451bb201e36f5cd7f7
Gerrit-Change-Number: 27057
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27056 )
Change subject: ttcn3-pgw-test: configure the 'ogstun' device for open5gs-upfd
......................................................................
ttcn3-pgw-test: configure the 'ogstun' device for open5gs-upfd
Unlike osmo-ggsn, open5gs-upfd does not configure the tun interface
itself. All IPv4/IPv6 addresses must be assigned manually. This
is exactly why both PGW_Tests.TC_createSession_ping4[_256] fail:
[sock] ERROR: ogs_write() failed (5:Input/outputerror) (../lib/tun/tunio.c:84)
[upf] WARNING: ogs_tun_write() failed (../src/upf/gtp-path.c:448)
Take Harald's setup.sh from open5gs-master and execute it in the
container running open5gs-upfd. This makes both test cases pass.
Change-Id: I0730b1f69285484a0aa0ebd664dafd8e476b294f
Related: SYS#5602
---
M ttcn3-pgw-test/jenkins.sh
A ttcn3-pgw-test/ogstun-setup.sh
2 files changed, 14 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/56/27056/1
diff --git a/ttcn3-pgw-test/jenkins.sh b/ttcn3-pgw-test/jenkins.sh
index 662e49b..bd6967c 100755
--- a/ttcn3-pgw-test/jenkins.sh
+++ b/ttcn3-pgw-test/jenkins.sh
@@ -16,6 +16,7 @@
mkdir $VOL_BASE_DIR/pgw
cp freeDiameter-smf.conf $VOL_BASE_DIR/pgw/
cp open5gs-*.yaml $VOL_BASE_DIR/pgw/
+cp ogstun-setup.sh $VOL_BASE_DIR/pgw/
SUBNET=18
network_create $SUBNET
@@ -43,6 +44,9 @@
$REPO_USER/open5gs-$IMAGE_SUFFIX \
open5gs-upfd -c /data/open5gs-upf.yaml
+# configure the 'ogstun' device for open5gs-upfd
+docker exec ${BUILD_TAG}-upf /data/ogstun-setup.sh
+
# start container with open5gs-smfd in background
docker run --cap-add=NET_ADMIN \
--device /dev/net/tun:/dev/net/tun \
diff --git a/ttcn3-pgw-test/ogstun-setup.sh b/ttcn3-pgw-test/ogstun-setup.sh
new file mode 100755
index 0000000..58693fd
--- /dev/null
+++ b/ttcn3-pgw-test/ogstun-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 10.45.0.1/16 dev ogstun 2> /dev/null
+ip addr add 10.45.0.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
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27056
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I0730b1f69285484a0aa0ebd664dafd8e476b294f
Gerrit-Change-Number: 27056
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: osmith, fixeria, pespin.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27046 )
Change subject: core/utils.h: add OSMO_LIKELY / OSMO_UNLIKELY macros
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
no commitlog rationale.
does this really make sense in our use cases? did you see any benchmark differences? curious...
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27046
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I0b029654ba050f079eed4a0574a3fa8019677067
Gerrit-Change-Number: 27046
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 02 Feb 2022 17:47:04 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/27053 )
Change subject: lua dissector: adjust usage instructions
......................................................................
lua dissector: adjust usage instructions
...as originally described in the first commit that added the file.
Change-Id: I67918f0f62b1619786324ae84276a46d7c64eee5
---
M contrib/simtrace.lua
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/contrib/simtrace.lua b/contrib/simtrace.lua
index fa477d5..fadc01a 100644
--- a/contrib/simtrace.lua
+++ b/contrib/simtrace.lua
@@ -2,7 +2,10 @@
-- (C) 2021 by sysmocom - s.f.m.c. GmbH, Author: Eric Wild
-- SPDX-License-Identifier: GPL-2.0+
--
--- Usage: Put this into your ~/.wireshark/init.lua [or include it from there]
+-- Usage: Move this file to your "personal lua plugins" folder that
+-- can be found in the Wireshark Help->About Wireshark->Folders tab
+-- Windows: %APPDATA%\Wireshark\plugins.
+-- Unix-like systems: ~/.local/lib/wireshark/plugins.
usb_simtrace_protocol = Proto("USB_simtrace", "USB simtrace protocol")
--
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/27053
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-Change-Id: I67918f0f62b1619786324ae84276a46d7c64eee5
Gerrit-Change-Number: 27053
Gerrit-PatchSet: 1
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged
laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27044 )
Change subject: ttcn3-pgw-test: make osmo-uecups-daemon more verbose
......................................................................
ttcn3-pgw-test: make osmo-uecups-daemon more verbose
Change-Id: Id491b4f9db63c82f3dc58f3fc523b4f84fea01e0
Related: SYS#5602
---
M ttcn3-pgw-test/osmo-uecups-daemon.cfg
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
laforge: Verified
pespin: Looks good to me, but someone else must approve
dexter: Looks good to me, approved
diff --git a/ttcn3-pgw-test/osmo-uecups-daemon.cfg b/ttcn3-pgw-test/osmo-uecups-daemon.cfg
index 9f63bb7..e268277 100644
--- a/ttcn3-pgw-test/osmo-uecups-daemon.cfg
+++ b/ttcn3-pgw-test/osmo-uecups-daemon.cfg
@@ -8,7 +8,8 @@
logging timestamp 1
logging color 0
!
- logging level set-all info
+ logging level set-all debug
+ logging level linp info
line vty
bind 0.0.0.0
uecups
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27044
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Id491b4f9db63c82f3dc58f3fc523b4f84fea01e0
Gerrit-Change-Number: 27044
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27045 )
Change subject: osmo-uecups-master: install iputils-ping for ttcn3-pgw-test
......................................................................
osmo-uecups-master: install iputils-ping for ttcn3-pgw-test
In ttcn3-pgw-test we order osmo-uecups-daemon to execute `ping`,
which is not available in Debian images. Install it.
Change-Id: I73a78949d2e433d7cc4233395e45665056f083c8
Related: SYS#5602
---
M osmo-uecups-master/Dockerfile
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, approved; Verified
pespin: Looks good to me, but someone else must approve
diff --git a/osmo-uecups-master/Dockerfile b/osmo-uecups-master/Dockerfile
index e8767d1..74469e5 100644
--- a/osmo-uecups-master/Dockerfile
+++ b/osmo-uecups-master/Dockerfile
@@ -11,6 +11,7 @@
libosmocore-dev \
libosmo-netif-dev \
libsctp-dev \
+ iputils-ping \
strace && \
apt-get clean
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27045
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I73a78949d2e433d7cc4233395e45665056f083c8
Gerrit-Change-Number: 27045
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: fixeria.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27055 )
Change subject: ttcn3-pgw-test: set PGW_Tests.mp_run_prog_log_path to '/data'
......................................................................
Patch Set 1: Verified+1 Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27055
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Idd5a37e5768c400d410958149b97869db1e92fb1
Gerrit-Change-Number: 27055
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 02 Feb 2022 17:45:30 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: fixeria.
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27044 )
Change subject: ttcn3-pgw-test: make osmo-uecups-daemon more verbose
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27044
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Id491b4f9db63c82f3dc58f3fc523b4f84fea01e0
Gerrit-Change-Number: 27044
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 02 Feb 2022 15:48:44 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: neels.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27050 )
Change subject: add osmo_sockaddr_from/to_octets()
......................................................................
Patch Set 1:
(2 comments)
File src/socket.c:
https://gerrit.osmocom.org/c/libosmocore/+/27050/comment/18d2a3fc_17796f51
PS1, Line 1746: size_t l;
use len if possible, my eyes hurt seeing number ones everywhere due to l and 1 looking similar :P
https://gerrit.osmocom.org/c/libosmocore/+/27050/comment/253b2e50_e002e2f3
PS1, Line 1747: switch (os->u.sin.sin_family) {
os->u.sa.sa_family
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27050
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ie9e33bfac525c59c30714663d2bfcc62ec9eeb81
Gerrit-Change-Number: 27050
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 02 Feb 2022 15:45:39 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: osmith, laforge, fixeria, pespin.
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27047 )
Change subject: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT
......................................................................
Patch Set 2:
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/libosmocore/+/27047/comment/c1fe0776_03f5d60a
PS2, Line 7: core/utils.h: make use of OSMO_LIKELY in OSMO_ASSERT
Maybe explain a bit more where the advantage is.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27047
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I29b32a2477ec92762f8f0ce5e5c5a30810f6abbe
Gerrit-Change-Number: 27047
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-CC: dexter <pmaier(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 02 Feb 2022 15:42:27 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment