- gerrit-log - lists.osmocom.org

[XL] Change in libosmocore[master]: Introduce tests/osmo-config-merge testsuite

by pespin

Attention is currently required from: fixeria, laforge, osmith, pespin. Hello Jenkins Builder, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/40295?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: Introduce tests/osmo-config-merge testsuite ...................................................................... Introduce tests/osmo-config-merge testsuite This allows catching current bugs and possible regressions when fixing them. For instance, testB2.ok already shows a bug where lots of lines expected to be merged under the "cs7 instance 0" end up put in an un expected place. This happens due to comments being used by osmo-config-merge during tree creation, and will be fixed in a follow-up commit. Change-Id: Ia172d4c280f4bae1b411ad805cca02355ca7fcc9 --- M .gitignore M configure.ac M tests/Makefile.am A tests/osmo-config-merge/Makefile.am A tests/osmo-config-merge/atlocal.in A tests/osmo-config-merge/testA.cfg A tests/osmo-config-merge/testA.confmerge A tests/osmo-config-merge/testA.ok A tests/osmo-config-merge/testB.cfg A tests/osmo-config-merge/testB.confmerge A tests/osmo-config-merge/testB.ok A tests/osmo-config-merge/testB2.cfg A tests/osmo-config-merge/testB2.confmerge A tests/osmo-config-merge/testB2.ok A tests/osmo-config-merge/testsuite.at 15 files changed, 1,097 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/95/40295/6 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40295?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia172d4c280f4bae1b411ad805cca02355ca7fcc9 Gerrit-Change-Number: 40295 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(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-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[XL] Change in libosmocore[master]: Introduce tests/osmo-config-merge testsuite

by pespin

Attention is currently required from: fixeria, laforge, osmith. Hello Jenkins Builder, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/40295?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: Introduce tests/osmo-config-merge testsuite ...................................................................... Introduce tests/osmo-config-merge testsuite This allows catching current bugs and possible regressions when fixing them. For instance, testB2.ok already shows a bug where lots of lines expected to be merged under the "cs7 instance 0" end up put in an un expected place. This happens due to comments being used by osmo-config-merge during tree creation, and will be fixed in a follow-up commit. Change-Id: Ia172d4c280f4bae1b411ad805cca02355ca7fcc9 --- M .gitignore M configure.ac M tests/Makefile.am A tests/osmo-config-merge/Makefile.am A tests/osmo-config-merge/atlocal.in A tests/osmo-config-merge/testA.cfg A tests/osmo-config-merge/testA.confmerge A tests/osmo-config-merge/testA.ok A tests/osmo-config-merge/testB.cfg A tests/osmo-config-merge/testB.confmerge A tests/osmo-config-merge/testB.ok A tests/osmo-config-merge/testB2.cfg A tests/osmo-config-merge/testB2.confmerge A tests/osmo-config-merge/testB2.ok A tests/osmo-config-merge/testsuite.at 15 files changed, 1,079 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/95/40295/5 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40295?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia172d4c280f4bae1b411ad805cca02355ca7fcc9 Gerrit-Change-Number: 40295 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[XL] Change in libosmocore[master]: Introduce tests/osmo-config-merge testsuite

by pespin

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/40295?usp=email ) Change subject: Introduce tests/osmo-config-merge testsuite ...................................................................... Patch Set 4: (5 comments) File tests/osmo-config-merge/Makefile.am: https://gerrit.osmocom.org/c/libosmocore/+/40295/comment/b1b79b57_d68da1eb?… : PS4, Line 25: } >'$(srcdir)/package.m4' > I'd try to remove it and see if it still works Done https://gerrit.osmocom.org/c/libosmocore/+/40295/comment/965705f5_dd99afb0?… : PS4, Line 46: [ -e /proc/cpuinfo ] && cat /proc/cpuinfo > Acknowledged Done https://gerrit.osmocom.org/c/libosmocore/+/40295/comment/9b3ecb3a_f8b9646a?… : PS4, Line 47: $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) ENABLE_URING=$(ENABLE_URING) ENABLE_URING_TESTS=$(ENABLE_URING_TESTS) > Acknowledged Done https://gerrit.osmocom.org/c/libosmocore/+/40295/comment/f300cbf2_dcc2b90f?… : PS4, Line 51: $(TESTSUITEFLAGS) ENABLE_URING=$(ENABLE_URING) ENABLE_URING_TESTS=$(ENABLE_URING_TESTS) > Acknowledged Done File tests/osmo-config-merge/atlocal.in: PS4: > Yes, otherwise it failed when generating stuff iirc at configure time. Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40295?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia172d4c280f4bae1b411ad805cca02355ca7fcc9 Gerrit-Change-Number: 40295 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 May 2025 15:42:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: epdg: introduce testenv support

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40305?usp=email to look at the new patch set (#3). Change subject: epdg: introduce testenv support ...................................................................... epdg: introduce testenv support NOTE: EPDG_Tests.TC_mt_ipv4_echo_req still not working Related: OS#6795 Change-Id: I5063e6ef55e8918653e9634237103790f47784a2 --- M _testenv/data/podman/Dockerfile A _testenv/data/scripts/pipework M epdg/EPDG_Tests.cfg A epdg/epdg.sh A epdg/osmo-epdg.config A epdg/osmo-epdg.latest.config A epdg/testenv.cfg 7 files changed, 717 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/05/40305/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40305?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5063e6ef55e8918653e9634237103790f47784a2 Gerrit-Change-Number: 40305 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 month, 2 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: WIP: epdg: introduce testenv support

by pespin

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40305?usp=email ) Change subject: WIP: epdg: introduce testenv support ...................................................................... WIP: epdg: introduce testenv support NOTE: EPDG_Tests.TC_mt_ipv4_echo_req still not working Change-Id: I5063e6ef55e8918653e9634237103790f47784a2 --- M _testenv/data/podman/Dockerfile A _testenv/data/scripts/pipework M epdg/EPDG_Tests.cfg A epdg/epdg.sh A epdg/osmo-epdg.config A epdg/osmo-epdg.latest.config A epdg/testenv.cfg 7 files changed, 717 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/05/40305/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40305?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5063e6ef55e8918653e9634237103790f47784a2 Gerrit-Change-Number: 40305 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder

1 month, 2 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: WIP: epdg testsuite

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40305?usp=email ) Change subject: WIP: epdg testsuite ...................................................................... WIP: epdg testsuite NOTE: EPDG_Tests.TC_mt_ipv4_echo_req still not working Change-Id: I5063e6ef55e8918653e9634237103790f47784a2 --- M _testenv/data/podman/Dockerfile A _testenv/data/scripts/pipework M epdg/EPDG_Tests.cfg A epdg/epdg.sh A epdg/osmo-epdg.config A epdg/osmo-epdg.latest.config A epdg/testenv.cfg 7 files changed, 717 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/05/40305/1 diff --git a/_testenv/data/podman/Dockerfile b/_testenv/data/podman/Dockerfile index 3b0afb1..9f92206 100644 --- a/_testenv/data/podman/Dockerfile +++ b/_testenv/data/podman/Dockerfile @@ -31,6 +31,7 @@ ccache \ cmake \ cpio \ + erlang-dev \ erlang-nox \ flex \ gdb \ diff --git a/_testenv/data/scripts/pipework b/_testenv/data/scripts/pipework new file mode 100755 index 0000000..1381aa9 --- /dev/null +++ b/_testenv/data/scripts/pipework @@ -0,0 +1,489 @@ +#!/bin/sh +# This code should (try to) follow Google's Shell Style Guide +# (https://google.github.io/styleguide/shell.xml) +set -e + +case "$1" in + --wait) + WAIT=1 + ;; + --direct-phys) + DIRECT_PHYS=1 + shift + ;; +esac + +IFNAME=$1 + +# default value set further down if not set here +CONTAINER_IFNAME= +if [ "$2" = "-i" ]; then + CONTAINER_IFNAME=$3 + shift 2 +fi + +if [ "$2" = "-l" ]; then + LOCAL_IFNAME=$3 + shift 2 +fi + +#inet or inet6 +FAMILY_FLAG="-4" +if [ "$2" = "-a" ]; then + FAMILY_FLAG="-$3" + shift 2 +fi + +GUESTNAME=$2 +IPADDR=$3 +MACADDR=$4 + +case "$MACADDR" in + *@*) + VLAN="${MACADDR#*@}" + VLAN="${VLAN%%@*}" + MACADDR="${MACADDR%%@*}" + ;; + *) + VLAN= + ;; +esac + +# did they ask to generate a custom MACADDR? +# generate the unique string +case "$MACADDR" in + U:*) + macunique="${MACADDR#*:}" + # now generate a 48-bit hash string from $macunique + MACADDR=$(echo $macunique|md5sum|sed 's/^$..$$..$$..$$..$$..$.*$/02:\1:\2:\3:\4:\5/') + ;; +esac + + +[ "$IPADDR" ] || [ "$WAIT" ] || { + echo "Syntax:" + echo "pipework <hostinterface> [-i containerinterface] [-l localinterfacename] [-a addressfamily] <guest> <ipaddr>/<subnet>[@default_gateway] [macaddr][@vlan]" + echo "pipework <hostinterface> [-i containerinterface] [-l localinterfacename] <guest> dhcp [macaddr][@vlan]" + echo "pipework mac:<hostinterface_macaddress> [-i containerinterface] [-l localinterfacename] [-a addressfamily] <guest> <ipaddr>/<subnet>[@default_gateway] [macaddr][@vlan]" + echo "pipework mac:<hostinterface_macaddress> [-i containerinterface] [-l localinterfacename] <guest> dhcp [macaddr][@vlan]" + echo "pipework route <guest> <route_command>" + echo "pipework rule <guest> <rule_command>" + echo "pipework tc <guest> <tc_command>" + echo "pipework --wait [-i containerinterface]" + exit 1 +} + +# Succeed if the given utility is installed. Fail otherwise. +# For explanations about `which` vs `type` vs `command`, see: +# http://stackoverflow.com/questions/592620/check-if-a-program-exists-from-a-… +# (Thanks to @chenhanxiao for pointing this out!) +installed () { + command -v "$1" >/dev/null 2>&1 +} + +# Google Styleguide says error messages should go to standard error. +warn () { + echo "$@" >&2 +} +die () { + status="$1" + shift + warn "$@" + exit "$status" +} + +if echo $IFNAME | grep -q '^mac:'; then + mac_address=$(echo $IFNAME | cut -c5-) + ifmatch= + for iftest in /sys/class/net/*; do + if [ -f $iftest/address ] && [ "$mac_address" = "$(cat $iftest/address)" ]; then + ifmatch="$(basename $iftest)" + break + fi + done + + if [ -z "$ifmatch" ]; then + die 1 "Mac address $mac_address specified for interface but no host interface matched." + else + IFNAME=$ifmatch + fi +fi + +# First step: determine type of first argument (bridge, physical interface...), +# Unless "--wait" is set (then skip the whole section) +if [ -z "$WAIT" ]; then + if [ -d "/sys/class/net/$IFNAME" ] + then + if [ -d "/sys/class/net/$IFNAME/bridge" ]; then + IFTYPE=bridge + BRTYPE=linux + elif installed ovs-vsctl && ovs-vsctl list-br|grep -q "^${IFNAME}$"; then + IFTYPE=bridge + BRTYPE=openvswitch + elif [ "$(cat "/sys/class/net/$IFNAME/type")" -eq 32 ]; then # InfiniBand IPoIB interface type 32 + IFTYPE=ipoib + # The IPoIB kernel module is fussy, set device name to ib0 if not overridden + CONTAINER_IFNAME=${CONTAINER_IFNAME:-ib0} + PKEY=$VLAN + else IFTYPE=phys + fi + else + case "$IFNAME" in + br*) + IFTYPE=bridge + BRTYPE=linux + ;; + ovs*) + if ! installed ovs-vsctl; then + die 1 "Need OVS installed on the system to create an ovs bridge" + fi + IFTYPE=bridge + BRTYPE=openvswitch + ;; + route*) + IFTYPE=route + ;; + rule*) + IFTYPE=rule + ;; + tc*) + IFTYPE=tc + ;; + dummy*) + IFTYPE=dummy + ;; + *) die 1 "I do not know how to setup interface $IFNAME." ;; + esac + fi +fi + +# Set the default container interface name to eth1 if not already set +CONTAINER_IFNAME=${CONTAINER_IFNAME:-eth1} + +[ "$WAIT" ] && { + while true; do + # This first method works even without `ip` or `ifconfig` installed, + # but doesn't work on older kernels (e.g. CentOS 6.X). See #128. + grep -q '^1$' "/sys/class/net/$CONTAINER_IFNAME/carrier" && break + # This method hopefully works on those older kernels. + ip link ls dev "$CONTAINER_IFNAME" && break + sleep 1 + done > /dev/null 2>&1 + exit 0 +} + +[ "$IFTYPE" = bridge ] && [ "$BRTYPE" = linux ] && [ "$VLAN" ] && { + die 1 "VLAN configuration currently unsupported for Linux bridge." +} + +[ "$IFTYPE" = ipoib ] && [ "$MACADDR" ] && { + die 1 "MACADDR configuration unsupported for IPoIB interfaces." +} + +# Second step: find the guest (for now, we only support LXC containers) +while read _ mnt fstype options _; do + [ "$fstype" != "cgroup" ] && continue + echo "$options" | grep -qw devices || continue + CGROUPMNT=$mnt +done < /proc/mounts + +[ "$CGROUPMNT" ] || { + die 1 "Could not locate cgroup mount point." +} + +# Try to find a cgroup matching exactly the provided name. +M=$(find "$CGROUPMNT" -name "$GUESTNAME") +N=$(echo "$M" | wc -l) +if [ -z "$M" ] ; then + N=0 +fi +case "$N" in + 0) + # If we didn't find anything, try to lookup the container with Docker. + if installed docker; then + RETRIES=3 + while [ "$RETRIES" -gt 0 ]; do + DOCKERPID=$(docker inspect --format='{{ .State.Pid }}' "$GUESTNAME") + DOCKERCID=$(docker inspect --format='{{ .ID }}' "$GUESTNAME") + DOCKERCNAME=$(docker inspect --format='{{ .Name }}' "$GUESTNAME") + + [ "$DOCKERPID" != 0 ] && break + sleep 1 + RETRIES=$((RETRIES - 1)) + done + + [ "$DOCKERPID" = 0 ] && { + die 1 "Docker inspect returned invalid PID 0" + } + + [ "$DOCKERPID" = "<no value>" ] && { + die 1 "Container $GUESTNAME not found, and unknown to Docker." + } + else + die 1 "Container $GUESTNAME not found, and Docker not installed." + fi + ;; + 1) true ;; + 2) # LXC >=3.1.0 returns two entries from the cgroups mount instead of one. + echo "$M" | grep -q "lxc\.monitor" || die 1 "Found more than one container matching $GUESTNAME." + ;; + *) die 1 "Found more than one container matching $GUESTNAME." ;; +esac + +# only check IPADDR if we are not in a route mode +[ "$IFTYPE" != route ] && [ "$IFTYPE" != rule ] && [ "$IFTYPE" != tc ] && { + case "$IPADDR" in + # Let's check first if the user asked for DHCP allocation. + dhcp|dhcp:*) + # Use Docker-specific strategy to run the DHCP client + # from the busybox image, in the network namespace of + # the container. + if ! [ "$DOCKERPID" ]; then + warn "You asked for a Docker-specific DHCP method." + warn "However, $GUESTNAME doesn't seem to be a Docker container." + warn "Try to replace 'dhcp' with another option?" + die 1 "Aborting." + fi + DHCP_CLIENT=${IPADDR%%:*} + ;; + udhcpc|udhcpc:*|udhcpc-f|udhcpc-f:*|dhcpcd|dhcpcd:*|dhclient|dhclient:*|dhclient-f|dhclient-f:*) + DHCP_CLIENT=${IPADDR%%:*} + # did they ask for the client to remain? + DHCP_FOREGROUND= + [ "${DHCP_CLIENT%-f}" != "${DHCP_CLIENT}" ] && { + DHCP_FOREGROUND=true + } + DHCP_CLIENT=${DHCP_CLIENT%-f} + if ! installed "$DHCP_CLIENT"; then + die 1 "You asked for DHCP client $DHCP_CLIENT, but I can't find it." + fi + ;; + # Alright, no DHCP? Then let's see if we have a subnet *and* gateway. + */*@*) + GATEWAY="${IPADDR#*@}" GATEWAY="${GATEWAY%%@*}" + IPADDR="${IPADDR%%@*}" + ;; + # No gateway? We need at least a subnet, anyway! + */*) : ;; + # ... No? Then stop right here. + *) + warn "The IP address should include a netmask." + die 1 "Maybe you meant $IPADDR/24 ?" + ;; + esac +} + +# If a DHCP method was specified, extract the DHCP options. +if [ "$DHCP_CLIENT" ]; then + case "$IPADDR" in + *:*) DHCP_OPTIONS="${IPADDR#*:}" ;; + esac +fi + +if [ "$DOCKERPID" ]; then + NSPID=$DOCKERPID +else + NSPID=$(head -n 1 "$(find "$CGROUPMNT" -name "$GUESTNAME" | head -n 1)/tasks") + [ "$NSPID" ] || { + # it is an alternative way to get the pid + NSPID=$(lxc-info -n "$GUESTNAME" | grep PID | grep -Eo '[0-9]+') + [ "$NSPID" ] || { + die 1 "Could not find a process inside container $GUESTNAME." + } + } +fi + +# Check if an incompatible VLAN device already exists +[ "$IFTYPE" = phys ] && [ "$VLAN" ] && [ -d "/sys/class/net/$IFNAME.VLAN" ] && { + ip -d link show "$IFNAME.$VLAN" | grep -q "vlan.*id $VLAN" || { + die 1 "$IFNAME.VLAN already exists but is not a VLAN device for tag $VLAN" + } +} + +[ ! -d /var/run/netns ] && mkdir -p /var/run/netns +rm -f "/var/run/netns/$NSPID" +ln -s "/proc/$NSPID/ns/net" "/var/run/netns/$NSPID" + +# Check if we need to create a bridge. +[ "$IFTYPE" = bridge ] && [ ! -d "/sys/class/net/$IFNAME" ] && { + [ "$BRTYPE" = linux ] && { + (ip link add dev "$IFNAME" type bridge > /dev/null 2>&1) || (brctl addbr "$IFNAME") + ip link set "$IFNAME" up + } + [ "$BRTYPE" = openvswitch ] && { + ovs-vsctl add-br "$IFNAME" + } +} + +[ "$IFTYPE" != "route" ] && [ "$IFTYPE" != "dummy" ] && [ "$IFTYPE" != "rule" ] && [ "$IFTYPE" != "tc" ] && MTU=$(ip link show "$IFNAME" | awk '{print $5}') + +# If it's a bridge, we need to create a veth pair +[ "$IFTYPE" = bridge ] && { + if [ -z "$LOCAL_IFNAME" ]; then + LOCAL_IFNAME="v${CONTAINER_IFNAME}pl${NSPID}" + fi + GUEST_IFNAME="v${CONTAINER_IFNAME}pg${NSPID}" + # Does the link already exist? + if ip link show "$LOCAL_IFNAME" >/dev/null 2>&1; then + # link exists, is it in use? + if ip link show "$LOCAL_IFNAME" up | grep -q "UP"; then + echo "Link $LOCAL_IFNAME exists and is up" + exit 1 + fi + # delete the link so we can re-add it afterwards + ip link del "$LOCAL_IFNAME" + fi + ip link add name "$LOCAL_IFNAME" mtu "$MTU" type veth peer name "$GUEST_IFNAME" mtu "$MTU" + case "$BRTYPE" in + linux) + (ip link set "$LOCAL_IFNAME" master "$IFNAME" > /dev/null 2>&1) || (brctl addif "$IFNAME" "$LOCAL_IFNAME") + ;; + openvswitch) + if ! ovs-vsctl list-ports "$IFNAME" | grep -q "^${LOCAL_IFNAME}$"; then + ovs-vsctl add-port "$IFNAME" "$LOCAL_IFNAME" ${VLAN:+tag="$VLAN"} \ + -- set Interface "$LOCAL_IFNAME" \ + external-ids:pipework.interface="$LOCAL_IFNAME" \ + external-ids:pipework.bridge="$IFNAME" \ + ${DOCKERCID:+external-ids:pipework.containerid="$DOCKERCID"} \ + ${DOCKERCNAME:+external-ids:pipework.containername="$DOCKERCNAME"} \ + ${NSPID:+external-ids:pipework.nspid="$NSPID"} \ + ${VLAN:+external-ids:pipework.vlan="$VLAN"} + fi + ;; + esac + ip link set "$LOCAL_IFNAME" up +} + +# If it's a physical interface, create a macvlan subinterface +[ "$IFTYPE" = phys ] && { + [ "$VLAN" ] && { + [ ! -d "/sys/class/net/${IFNAME}.${VLAN}" ] && { + ip link add link "$IFNAME" name "$IFNAME.$VLAN" mtu "$MTU" type vlan id "$VLAN" + } + ip link set "$IFNAME" up + IFNAME=$IFNAME.$VLAN + } + + if [ ! -z "$DIRECT_PHYS" ]; then + GUEST_IFNAME=$IFNAME + else + GUEST_IFNAME=ph$NSPID$CONTAINER_IFNAME + ip link add link "$IFNAME" dev "$GUEST_IFNAME" mtu "$MTU" type macvlan mode bridge + fi + + ip link set "$IFNAME" up +} + +# If it's an IPoIB interface, create a virtual IPoIB interface (the IPoIB +# equivalent of a macvlan device) +# +# Note: no macvlan subinterface nor Ethernet bridge can be created on top of an +# IPoIB interface. InfiniBand is not Ethernet. IPoIB is an IP layer on top of +# InfiniBand, without an intermediate Ethernet layer. +[ "$IFTYPE" = ipoib ] && { + GUEST_IFNAME="${IFNAME}.${NSPID}" + + # If a partition key is provided, use it + [ "$PKEY" ] && { + GUEST_IFNAME="${IFNAME}.${PKEY}.${NSPID}" + PKEY="pkey 0x$PKEY" + } + + ip link add link "$IFNAME" name "$GUEST_IFNAME" type ipoib $PKEY + ip link set "$IFNAME" up +} + +# If its a dummy interface, create a dummy interface. +[ "$IFTYPE" = dummy ] && { + GUEST_IFNAME=du$NSPID$CONTAINER_IFNAME + ip link add dev "$GUEST_IFNAME" type dummy +} + +# If the `route` command was specified ... +if [ "$IFTYPE" = route ]; then + # ... discard the first two arguments and pass the rest to the route command. + shift 2 + ip netns exec "$NSPID" ip route "$@" +elif [ "$IFTYPE" = rule ] ; then + shift 2 + ip netns exec "$NSPID" ip rule "$@" +elif [ "$IFTYPE" = tc ] ; then + shift 2 + ip netns exec "$NSPID" tc "$@" +else + # Otherwise, run normally. + ip link set "$GUEST_IFNAME" netns "$NSPID" + ip netns exec "$NSPID" ip link set "$GUEST_IFNAME" name "$CONTAINER_IFNAME" + [ "$MACADDR" ] && ip netns exec "$NSPID" ip link set dev "$CONTAINER_IFNAME" address "$MACADDR" + + # When using any of the DHCP methods, we start a DHCP client in the + # network namespace of the container. With the 'dhcp' method, the + # client used is taken from the Docker busybox image (therefore + # requiring no specific client installed on the host). Other methods + # use a locally installed client. + case "$DHCP_CLIENT" in + dhcp) + docker run --rm -d --net container:$GUESTNAME --cap-add NET_ADMIN \ + busybox udhcpc -i "$CONTAINER_IFNAME" -x "hostname:$GUESTNAME" \ + $DHCP_OPTIONS \ + >/dev/null + ;; + udhcpc) + DHCP_Q="-q" + [ "$DHCP_FOREGROUND" ] && { + DHCP_OPTIONS="$DHCP_OPTIONS -f" + } + ip netns exec "$NSPID" "$DHCP_CLIENT" -qi "$CONTAINER_IFNAME" \ + -x "hostname:$GUESTNAME" \ + -p "/var/run/udhcpc.$GUESTNAME.pid" \ + $DHCP_OPTIONS + [ ! "$DHCP_FOREGROUND" ] && { + rm "/var/run/udhcpc.$GUESTNAME.pid" + } + ;; + dhclient) + ip netns exec "$NSPID" "$DHCP_CLIENT" "$CONTAINER_IFNAME" \ + -pf "/var/run/dhclient.$GUESTNAME.pid" \ + -lf "/etc/dhclient/dhclient.$GUESTNAME.leases" \ + $DHCP_OPTIONS + # kill dhclient after get ip address to prevent device be used after container close + [ ! "$DHCP_FOREGROUND" ] && { + kill "$(cat "/var/run/dhclient.$GUESTNAME.pid")" + rm "/var/run/dhclient.$GUESTNAME.pid" + } + ;; + dhcpcd) + ip netns exec "$NSPID" "$DHCP_CLIENT" -q "$CONTAINER_IFNAME" -h "$GUESTNAME" + ;; + "") + if installed ipcalc; then + eval $(ipcalc -b $IPADDR) + ip netns exec "$NSPID" ip "$FAMILY_FLAG" addr add "$IPADDR" brd "$BROADCAST" dev "$CONTAINER_IFNAME" + else + ip netns exec "$NSPID" ip "$FAMILY_FLAG" addr add "$IPADDR" dev "$CONTAINER_IFNAME" + fi + + [ "$GATEWAY" ] && { + ip netns exec "$NSPID" ip "$FAMILY_FLAG" route delete default >/dev/null 2>&1 && true + } + ip netns exec "$NSPID" ip "$FAMILY_FLAG" link set "$CONTAINER_IFNAME" up + [ "$GATEWAY" ] && { + ip netns exec "$NSPID" ip "$FAMILY_FLAG" route get "$GATEWAY" >/dev/null 2>&1 || \ + ip netns exec "$NSPID" ip "$FAMILY_FLAG" route add "$GATEWAY/32" dev "$CONTAINER_IFNAME" + ip netns exec "$NSPID" ip "$FAMILY_FLAG" route replace default via "$GATEWAY" dev "$CONTAINER_IFNAME" + } + ;; + esac + + # Give our ARP neighbors a nudge about the new interface + if installed arping; then + IPADDR=$(echo "$IPADDR" | cut -d/ -f1) + ip netns exec "$NSPID" arping -c 1 -A -I "$CONTAINER_IFNAME" "$IPADDR" > /dev/null 2>&1 || true + else + echo "Warning: arping not found; interface may not be immediately reachable" + fi +fi +# Remove NSPID to avoid `ip netns` catch it. +rm -f "/var/run/netns/$NSPID" + +# vim: set tabstop=2 shiftwidth=2 softtabstop=2 expandtab : diff --git a/epdg/EPDG_Tests.cfg b/epdg/EPDG_Tests.cfg index c164293..740ec8a 100644 --- a/epdg/EPDG_Tests.cfg +++ b/epdg/EPDG_Tests.cfg @@ -12,6 +12,18 @@ [MODULE_PARAMETERS] +EPDG_Tests.mp_gsup_local_ip := "127.0.0.103" +EPDG_Tests.mp_swx_local_ip := "127.0.0.103" +EPDG_Tests.mp_s6b_local_ip := "127.0.0.103" +EPDG_Tests.mp_s2b_local_ip := "127.0.0.103" +EPDG_Tests.mp_upf_gtpu_local_ip := "127.0.0.103" + +EPDG_Tests.mp_gsup_remote_ip := "127.0.0.20" +EPDG_Tests.mp_s6b_remote_ip := "127.0.0.20" +EPDG_Tests.mp_s2b_remote_ip := "127.0.0.20" + +# Match (diameter_watchdog_timer/1000)*diameter_watchdog_config["okay"] in osmo-epdg.config: +EPDG_Tests.mp_diam_watchdog_initial_wait_sec := 6; [MAIN_CONTROLLER] diff --git a/epdg/epdg.sh b/epdg/epdg.sh new file mode 100755 index 0000000..74a62d1 --- /dev/null +++ b/epdg/epdg.sh @@ -0,0 +1,32 @@ +#!/bin/bash +set +e +set -x + +EPDG_TUN="gtp0" +UE_IFACE="ue" +UE_SUBNET="192.168.0.0/16" +UE_ADDR="192.168.0.2/16" + +if [ "$IMAGE_SUFFIX" = "latest" ]; then + EPDG_CFG="osmo-epdg.latest.config" +else + EPDG_CFG="osmo-epdg.config" +fi + +ip link add $UE_IFACE type dummy +ip addr add $UE_ADDR dev $UE_IFACE +ip link set $UE_IFACE up +ip rule add from $UE_SUBNET table 45 + +sed -i "s#/tmp/osmo-epdg/_build/default/lib/gen_socket/priv/lib#$OSMO_DEV_MAKE_DIR/osmo-epdg/default/lib/gen_socket/priv/lib#g" "$EPDG_CFG" + +ERL_FLAGS="-config $EPDG_CFG" osmo-epdg & +MYPID=$! + +# We cannot set a route for the interface until it is created by osmo-epdg... +echo "Waiting for interface ${EPDG_TUN}..." +pipework --wait -i ${EPDG_TUN} +echo "Adding src ${UE_SUBNET} default route to ${EPDG_TUN}" +ip route add default dev $EPDG_TUN table 45 + +wait $MYPID diff --git a/epdg/osmo-epdg.config b/epdg/osmo-epdg.config new file mode 100644 index 0000000..64e0ad8 --- /dev/null +++ b/epdg/osmo-epdg.config @@ -0,0 +1,87 @@ +[ + %% =========================================== + %% Application config + %% =========================================== + {osmo_epdg, + [% GSUP Server connection parameters + {gsup_local_ip, "127.0.0.20"}, + {gsup_local_port, 4222}, + % Diameter Connection parameters + {dia_swx_remote_ip, "127.0.0.103"}, + {dia_swx_remote_port, 3868}, + {dia_swx_proto, sctp}, + {dia_swx_connect_timer, 200}, + {dia_swx_watchdog_timer, 6000}, + {dia_swx_watchdog_config, + [{okay, 1}, + {suspect, 1}]}, + {dia_swx_vendor_id, 0}, + {dia_swx_origin_host, "epdg.localdomain"}, + {dia_swx_origin_realm, "localdomain"}, + {dia_swx_context_id, "epdg@localdomain"}, + % Diameter s6b Connection parameters + {dia_s6b_local_ip, "127.0.0.20"}, + {dia_s6b_local_port, 3869}, + {dia_s6b_proto, sctp}, + {dia_s6b_connect_timer, 200}, + {dia_s6b_watchdog_timer, 6000}, + {dia_s6b_watchdog_config, + [{okay, 1}, + {suspect, 1}]}, + {dia_s6b_vendor_id, 0}, + {dia_s6b_origin_host, "aaa.localdomain"}, + {dia_s6b_origin_realm, "localdomain"}, + {dia_s6b_context_id, "aaa@localdomain"}, + % GTPv2C Connection parameters + {gtpc_local_ip, "127.0.0.20"}, + {gtpc_local_port, 2123}, + {gtpc_remote_ip, "127.0.0.103"}, + {gtpc_remote_port, 2123} + ] + }, + %% =========================================== + %% gtp_u_kmod config + %% =========================================== + {gtp_u_kmod, [ + {sockets, [{gtp0, [%% ip: IP Address assigned at the tunnel: + {ip, {127,0,0,20}}, + %% Allow binding to an IP address that is nonlocal or does not (yet) exist (IP_FREEBIND): + freebind, + % Create gtp tundev with role SGSN: + {role, sgsn} + ] + }] + } + ]}, + %% =========================================== + %% gen_socket config + %% =========================================== + {gen_socket, [ + {libdir, "/tmp/osmo-epdg/_build/default/lib/gen_socket/priv/lib"} +]}, + %% =========================================== + %% Lager logging config + %% =========================================== + {lager, [ + {log_root, "/data/"}, + {colored, true}, + {handlers, + [{lager_console_backend, [{level, debug}]}, + {lager_file_backend, + [{file, "console.log"}, {level, debug}, {size, 104857600}, {date, "$D0"}, {count, 10}]}, + {lager_file_backend, + [{file, "error.log"}, {level, error}, {size, 104857600}, {date, "$D0"}, {count, 10}]}]}, + {crash_log, "crash.log"}, + {crash_log_msg_size, 65536}, + {crash_log_size, 104857600}, + {crash_log_date, "$D0"}, + {crash_log_count, 10}, + {error_logger_redirect, true} + ]}, + {kernel, [ + {logger, [{handler, debug, logger_std_h, % {handler, HandlerId, Module, + #{config => #{file => "/data/erlang.log"}} + }] + } + ]} +]. diff --git a/epdg/osmo-epdg.latest.config b/epdg/osmo-epdg.latest.config new file mode 100644 index 0000000..ab176c8 --- /dev/null +++ b/epdg/osmo-epdg.latest.config @@ -0,0 +1,87 @@ +[ + %% =========================================== + %% Application config + %% =========================================== + {osmo_epdg, + [% GSUP Server connection parameters + {gsup_local_ip, "172.18.10.20"}, + {gsup_local_port, 4222}, + % Diameter Connection parameters + {dia_swx_remote_ip, "172.18.10.103"}, + {dia_swx_remote_port, 3868}, + {dia_swx_proto, sctp}, + {dia_swx_connect_timer, 200}, + {dia_swx_watchdog_timer, 6000}, + {dia_swx_watchdog_config, + [{okay, 1}, + {suspect, 1}]}, + {dia_swx_vendor_id, 0}, + {dia_swx_origin_host, "epdg.localdomain"}, + {dia_swx_origin_realm, "localdomain"}, + {dia_swx_context_id, "epdg@localdomain"}, + % Diameter s6b Connection parameters + {dia_s6b_local_ip, "172.18.10.20"}, + {dia_s6b_local_port, 3869}, + {dia_s6b_proto, sctp}, + {dia_s6b_connect_timer, 200}, + {dia_s6b_watchdog_timer, 6000}, + {dia_s6b_watchdog_config, + [{okay, 1}, + {suspect, 1}]}, + {dia_s6b_vendor_id, 0}, + {dia_s6b_origin_host, "aaa.localdomain"}, + {dia_s6b_origin_realm, "localdomain"}, + {dia_s6b_context_id, "aaa@localdomain"}, + % GTPv2C Connection parameters + {gtpc_local_ip, "172.18.10.20"}, + {gtpc_local_port, 2123}, + {gtpc_remote_ip, "172.18.10.103"}, + {gtpc_remote_port, 2123} + ] + }, + %% =========================================== + %% gtp_u_kmod config + %% =========================================== + {gtp_u_kmod, [ + {sockets, [{gtp0, [%% ip: IP Address assigned at the tunnel: + {ip, {172,18,10,20}}, + %% Allow binding to an IP address that is nonlocal or does not (yet) exist (IP_FREEBIND): + freebind, + % Create gtp tundev with role SGSN: + {role, sgsn} + ] + }] + } + ]}, + %% =========================================== + %% gen_socket config + %% =========================================== + {gen_socket, [ + {libdir, "/usr/lib"} +]}, + %% =========================================== + %% Lager logging config + %% =========================================== + {lager, [ + {log_root, "/data/"}, + {colored, true}, + {handlers, + [{lager_console_backend, [{level, debug}]}, + {lager_file_backend, + [{file, "console.log"}, {level, debug}, {size, 104857600}, {date, "$D0"}, {count, 10}]}, + {lager_file_backend, + [{file, "error.log"}, {level, error}, {size, 104857600}, {date, "$D0"}, {count, 10}]}]}, + {crash_log, "crash.log"}, + {crash_log_msg_size, 65536}, + {crash_log_size, 104857600}, + {crash_log_date, "$D0"}, + {crash_log_count, 10}, + {error_logger_redirect, true} + ]}, + {kernel, [ + {logger, [{handler, debug, logger_std_h, % {handler, HandlerId, Module, + #{config => #{file => "/data/erlang.log"}} + }] + } + ]} +]. diff --git a/epdg/testenv.cfg b/epdg/testenv.cfg new file mode 100644 index 0000000..d611b0b --- /dev/null +++ b/epdg/testenv.cfg @@ -0,0 +1,9 @@ +[testsuite] +program=EPDG_Tests +config=EPDG_Tests.cfg + +[epdg] +program=epdg.sh +make=osmo-epdg +package=osmo-epdg +copy=osmo-epdg.config osmo-epdg.latest.config -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40305?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5063e6ef55e8918653e9634237103790f47784a2 Gerrit-Change-Number: 40305 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[XL] Change in libosmocore[master]: Introduce tests/osmo-config-merge testsuite

by pespin

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/40295?usp=email ) Change subject: Introduce tests/osmo-config-merge testsuite ...................................................................... Patch Set 4: (2 comments) File tests/osmo-config-merge/atlocal.in: PS4: > do we need this empty file? Yes, otherwise it failed when generating stuff iirc at configure time. File tests/osmo-config-merge/testA.ok: https://gerrit.osmocom.org/c/libosmocore/+/40295/comment/1f969dcf_2fd53942?… : PS4, Line 74: power-ramp step-size 8000 mdB : power-ramp step-interval 1 : phy 0 instance 0 : power-ramp step-size 2000 mdB > is this correct? I would have expected that the new power-ramp step-size overwrites the previous one Yes it's correct afaict, osmo-config-merge doesn't know about vty command internals and hence cannot know if 2 commands which are different test can actually be replaced. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40295?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia172d4c280f4bae1b411ad805cca02355ca7fcc9 Gerrit-Change-Number: 40295 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 May 2025 14:29:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[XL] Change in libosmocore[master]: Introduce tests/osmo-config-merge testsuite

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/40295?usp=email ) Change subject: Introduce tests/osmo-config-merge testsuite ...................................................................... Patch Set 4: (1 comment) File tests/osmo-config-merge/Makefile.am: https://gerrit.osmocom.org/c/libosmocore/+/40295/comment/3e85ca25_c5f03680?… : PS4, Line 25: } >'$(srcdir)/package.m4' > No idea tbh, copied it from tests/Makefile.am. Let me know if you know better about this stuff. I'd try to remove it and see if it still works -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40295?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia172d4c280f4bae1b411ad805cca02355ca7fcc9 Gerrit-Change-Number: 40295 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 May 2025 14:28:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[XL] Change in libosmocore[master]: Introduce tests/osmo-config-merge testsuite

by pespin

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/40295?usp=email ) Change subject: Introduce tests/osmo-config-merge testsuite ...................................................................... Patch Set 4: (4 comments) File tests/osmo-config-merge/Makefile.am: https://gerrit.osmocom.org/c/libosmocore/+/40295/comment/0c9de919_e0d9af3e?… : PS4, Line 25: } >'$(srcdir)/package.m4' > What do we need package. […] No idea tbh, copied it from tests/Makefile.am. Let me know if you know better about this stuff. https://gerrit.osmocom.org/c/libosmocore/+/40295/comment/10887003_0c96aef4?… : PS4, Line 46: [ -e /proc/cpuinfo ] && cat /proc/cpuinfo > This is already done in tests/Makefile.am, so I would remove it here. Acknowledged https://gerrit.osmocom.org/c/libosmocore/+/40295/comment/41c61360_43496d27?… : PS4, Line 47: $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) ENABLE_URING=$(ENABLE_URING) ENABLE_URING_TESTS=$(ENABLE_URING_TESTS) > ```suggestion […] Acknowledged https://gerrit.osmocom.org/c/libosmocore/+/40295/comment/c125038f_544e472b?… : PS4, Line 51: $(TESTSUITEFLAGS) ENABLE_URING=$(ENABLE_URING) ENABLE_URING_TESTS=$(ENABLE_URING_TESTS) > ```suggestion […] Acknowledged -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40295?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia172d4c280f4bae1b411ad805cca02355ca7fcc9 Gerrit-Change-Number: 40295 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 May 2025 14:27:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[XL] Change in libosmocore[master]: Introduce tests/osmo-config-merge testsuite

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/40295?usp=email ) Change subject: Introduce tests/osmo-config-merge testsuite ...................................................................... Patch Set 4: (6 comments) File tests/osmo-config-merge/Makefile.am: https://gerrit.osmocom.org/c/libosmocore/+/40295/comment/6944e778_68ec345b?… : PS4, Line 25: } >'$(srcdir)/package.m4' What do we need package.m4 for? https://gerrit.osmocom.org/c/libosmocore/+/40295/comment/09c8c254_20aeb22f?… : PS4, Line 46: [ -e /proc/cpuinfo ] && cat /proc/cpuinfo This is already done in tests/Makefile.am, so I would remove it here. https://gerrit.osmocom.org/c/libosmocore/+/40295/comment/c5a9850a_f208585d?… : PS4, Line 47: $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) ENABLE_URING=$(ENABLE_URING) ENABLE_URING_TESTS=$(ENABLE_URING_TESTS) ```suggestion $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) ``` https://gerrit.osmocom.org/c/libosmocore/+/40295/comment/d1a71072_698b27d1?… : PS4, Line 51: $(TESTSUITEFLAGS) ENABLE_URING=$(ENABLE_URING) ENABLE_URING_TESTS=$(ENABLE_URING_TESTS) ```suggestion $(TESTSUITEFLAGS) ``` File tests/osmo-config-merge/atlocal.in: PS4: do we need this empty file? File tests/osmo-config-merge/testA.ok: https://gerrit.osmocom.org/c/libosmocore/+/40295/comment/f755bf44_dfefc29a?… : PS4, Line 74: power-ramp step-size 8000 mdB : power-ramp step-interval 1 : phy 0 instance 0 : power-ramp step-size 2000 mdB is this correct? I would have expected that the new power-ramp step-size overwrites the previous one -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40295?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia172d4c280f4bae1b411ad805cca02355ca7fcc9 Gerrit-Change-Number: 40295 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 May 2025 14:25:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 month, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log