- gerrit-log - lists.osmocom.org

[XS] Change in osmo-ttcn3-hacks[master]: testenv: qemu: fix adding kernel modules

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40313?usp=email ) Change subject: testenv: qemu: fix adding kernel modules ...................................................................... testenv: qemu: fix adding kernel modules Without this patch qemu_initrd_add_file fails to add kernel modules with "No such file or directory" when running in podman, even though the files exist: ./testenv.py run ggsn -Dp -c osmo_ggsn_v4_only … + cp -a --parents /lib/modules/6.1.0-34-amd64/kernel/drivers/net/net_failover.ko /tmp/testenv-ggsn_tests-osmo_ggsn_v4_only-20250509-1146-cd82caba-wegi5i98/ggsn/_initrd/usr cp: 'lib/modules/6.1.0-34-amd64/kernel/drivers/net': No such file or directory … When looking at it with strace it became clear that this comes from a getxattr that fails in the podman filesystem and returns a misleading error: getxattr("lib/modules/6.1.0-34-amd64/kernel/drivers/net", "system.posix_acl_access", 0x7ffc012054e0, 132) = -1 ENOENT (No such file or directory) Fix it by modifying the cp command to not try to preserve any attributes (they don't matter in the initramfs). Change-Id: Ic32318da169ee8ebf867937782be5cf8a15f9f2f --- M _testenv/data/scripts/qemu/qemu_functions.sh 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/13/40313/1 diff --git a/_testenv/data/scripts/qemu/qemu_functions.sh b/_testenv/data/scripts/qemu/qemu_functions.sh index e2014a1..9c92a37 100755 --- a/_testenv/data/scripts/qemu/qemu_functions.sh +++ b/_testenv/data/scripts/qemu/qemu_functions.sh @@ -8,14 +8,15 @@ # $@: path to files qemu_initrd_add_file() { local i + local cp="cp --no-dereference --recursive --parents" for i in "$@"; do case "$i" in /bin/*|/sbin/*|/lib/*|/lib64/*) - cp -a --parents "$i" "$INITRD_DIR"/usr + $cp "$i" "$INITRD_DIR"/usr ;; *) - cp -a --parents "$i" "$INITRD_DIR" + $cp "$i" "$INITRD_DIR" ;; esac done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40313?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: Ic32318da169ee8ebf867937782be5cf8a15f9f2f Gerrit-Change-Number: 40313 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: fix not aborting on build_initrd error

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40314?usp=email ) Change subject: testenv: fix not aborting on build_initrd error ...................................................................... testenv: fix not aborting on build_initrd error Without this patch the build_initrd function keeps going on errors: + cp -a --parents /lib/modules/6.1.0-34-amd64/kernel/drivers/net/net_failover.ko /tmp/testenv-ggsn_tests-osmo_ggsn_v4_only-20250509-1040-a21668df-euc9e2fs/ggsn/_initrd/usr cp: 'lib/modules/6.1.0-34-amd64/kernel/drivers/net': No such file or directory + cp -a --parents /lib/modules/6.1.0-34-amd64/kernel/drivers/net/virtio_net.ko /tmp/testenv-ggsn_tests-osmo_ggsn_v4_only-20250509-1040-a21668df-euc9e2fs/ggsn/_initrd/usr … The reason for that is that even though the script runs with set -e, the -e flag gets ignored between if…then where the build_initrd shell function gets called: if ! build_initrd >build_initrd.log 2>&1; then qemu_initrd_exit_error "build_initrd.log" fi Fix it by using a trap instead. Related: https://unix.stackexchange.com/a/65564 Change-Id: I2870b7e7ba28b2afc72e86b7a3bc389103564c80 --- M _testenv/data/scripts/qemu/qemu_functions.sh M ggsn_tests/osmo-ggsn/run.sh 2 files changed, 18 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/40314/1 diff --git a/_testenv/data/scripts/qemu/qemu_functions.sh b/_testenv/data/scripts/qemu/qemu_functions.sh index 9c92a37..46e7273 100755 --- a/_testenv/data/scripts/qemu/qemu_functions.sh +++ b/_testenv/data/scripts/qemu/qemu_functions.sh @@ -136,10 +136,12 @@ | gzip -1 > "$INITRD_DIR".gz ) } +# Trap for qemu_build_initrd_with_log_redirect +# Building the initrd is quite verbose, therefore put it in a log file +# and only output its contents on error (see e.g. osmo-ggsn/run.sh) qemu_initrd_exit_error() { - # Building the initrd is quite verbose, therefore put it in a log file - # and only output its contents on error (see e.g. osmo-ggsn/run.sh) - cat "$1" + trap - EXIT INT TERM 0 + cat "build_initrd.log" set +x echo echo "ERROR: failed to build the initrd!" @@ -147,6 +149,18 @@ exit 1 } +# Users of qemu_functions should define a build_initrd function that calls +# qemu_initrd_init, qemu_initrd_add_* and qemu_initrd_finish. See ggsn's run.sh +# as example. The function here redirects the very verbose output of building +# the initrd to a separate log file, and aborts and display the log on error. +qemu_build_initrd_with_log_redirect() { + # Use a trap instead of "if !build_initrd; then ..." logic as "set -e" + # gets otherwise: https://unix.stackexchange.com/a/65564 + trap qemu_initrd_exit_error EXIT INT TERM 0 + build_initrd >build_initrd.log 2>&1 + trap - EXIT INT TERM 0 +} + qemu_random_mac() { printf "52:54:" date "+%c %N" | sha1sum | sed 's/$.\{2\}$/\1:/g' | cut -d: -f 1-4 diff --git a/ggsn_tests/osmo-ggsn/run.sh b/ggsn_tests/osmo-ggsn/run.sh index ae77484..27e633e 100755 --- a/ggsn_tests/osmo-ggsn/run.sh +++ b/ggsn_tests/osmo-ggsn/run.sh @@ -32,9 +32,5 @@ } . qemu_functions.sh - -if ! build_initrd >build_initrd.log 2>&1; then - qemu_initrd_exit_error "build_initrd.log" -fi - +qemu_build_initrd_with_log_redirect qemu_run -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40314?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: I2870b7e7ba28b2afc72e86b7a3bc389103564c80 Gerrit-Change-Number: 40314 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: qemu: initrd build fail: stop immediately

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40315?usp=email ) Change subject: testenv: qemu: initrd build fail: stop immediately ...................................................................... testenv: qemu: initrd build fail: stop immediately Let qemu_wait.sh fail immediately when building the initrd has failed, instead of waiting until it runs into a timeout. Change-Id: I6de4d1c31385af52ee0fd55378adb10a9e2c2154 --- M _testenv/data/scripts/qemu/qemu_functions.sh M _testenv/data/scripts/qemu/qemu_wait.sh 2 files changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/15/40315/1 diff --git a/_testenv/data/scripts/qemu/qemu_functions.sh b/_testenv/data/scripts/qemu/qemu_functions.sh index 46e7273..a984ff9 100755 --- a/_testenv/data/scripts/qemu/qemu_functions.sh +++ b/_testenv/data/scripts/qemu/qemu_functions.sh @@ -146,6 +146,7 @@ echo echo "ERROR: failed to build the initrd!" echo + touch build_initrd_failed exit 1 } diff --git a/_testenv/data/scripts/qemu/qemu_wait.sh b/_testenv/data/scripts/qemu/qemu_wait.sh index fb45c7e..2d42701 100755 --- a/_testenv/data/scripts/qemu/qemu_wait.sh +++ b/_testenv/data/scripts/qemu/qemu_wait.sh @@ -8,6 +8,12 @@ i=0 for i in $(seq 1 600); do sleep 0.1 + + # Check for the marker from qemu_initrd_exit_error + if [ -e build_initrd_failed ]; then + exit 1 + fi + if grep -q KERNEL_TEST_VM_IS_READY "$LOGFILE"; then # Wait some more for SUT to become ready sleep 1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40315?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: I6de4d1c31385af52ee0fd55378adb10a9e2c2154 Gerrit-Change-Number: 40315 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: qemu_initrd_add_bin: support adding so

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40318?usp=email ) Change subject: testenv: qemu_initrd_add_bin: support adding so ...................................................................... testenv: qemu_initrd_add_bin: support adding so Erlang has its own library loading mechanism, so we need to explicitly add the depending libraries to the initramfs instead of just pointing at binaries. Change-Id: I1b9f06e7bff22b9260fbe0bd765177a25e97b557 --- M _testenv/data/scripts/qemu/qemu_functions.sh 1 file changed, 15 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/18/40318/1 diff --git a/_testenv/data/scripts/qemu/qemu_functions.sh b/_testenv/data/scripts/qemu/qemu_functions.sh index efbdd2d..c1ef8b8 100755 --- a/_testenv/data/scripts/qemu/qemu_functions.sh +++ b/_testenv/data/scripts/qemu/qemu_functions.sh @@ -51,19 +51,27 @@ done } -# Add binaries with depending libraries -# $@: paths to binaries +# Add binaries/libraries with depending libraries +# $@: paths to binaries/libraries qemu_initrd_add_bin() { local bin local bin_path local file for bin in "$@"; do - local bin_path="$(which "$bin")" - if [ -z "$bin_path" ]; then - echo "ERROR: file not found: $bin" - exit 1 - fi + local bin_path + case "$bin" in + /*) + bin_path="$bin" + ;; + *) + bin_path="$(which "$bin")" + if [ -z "$bin_path" ]; then + echo "ERROR: file not found: $bin" + exit 1 + fi + ;; + esac lddtree_out="$(lddtree -l "$bin_path")" if [ -z "$lddtree_out" ]; then -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40318?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: I1b9f06e7bff22b9260fbe0bd765177a25e97b557 Gerrit-Change-Number: 40318 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: support qemu=required in testenv.cfg

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40317?usp=email ) Change subject: testenv: support qemu=required in testenv.cfg ...................................................................... testenv: support qemu=required in testenv.cfg Make it possible to set qemu=required in addition to the existing possibility of qemu=optional in the testenv configs and verify that either the debian kernel (from the podman container) or a custom kernel gets used for such configs. This is in preparation for adding a testenv config for osmo-epdg, which uses kernel-gtp and unlike osmo-ggsn doesn't have userspace fallback code. With testenv using the hosts gtp kernel device for this is not supported (it would have several downsides anyway, such as not being in control what exact kernel version is used leading to different test outcomes for different users, not being easily able to compare different kernel versions, having a harder time getting debug logs from the module etc.). Change-Id: If4abdf1f9248fee0915603a9b3c6e3e5e5083057 --- M _testenv/README.md M _testenv/testenv/testenv_cfg.py 2 files changed, 21 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/17/40317/1 diff --git a/_testenv/README.md b/_testenv/README.md index 66158c4..1b62d65 100644 --- a/_testenv/README.md +++ b/_testenv/README.md @@ -122,10 +122,11 @@ * `vty_host=`: optionally set the VTY host for the SUT component to be used when obtaining a talloc report. If this is not set, `127.0.0.1` is used. -* `qemu=`: set to `optional` to allow running this test component in QEMU. - Additional logic must be added to build an initrd with the test component and - actually run it in QEMU, this is done by sourcing `qemu_functions.sh` and - using functions from there. See the `ggsn` testsuite for reference. +* `qemu=`: set to `optional`/`required` to allow/require running this test + component in QEMU. Additional logic must be added to build an initrd with the + test component and actually run it in QEMU, this is done by sourcing + `qemu_functions.sh` and using functions from there. See the `ggsn` testsuite + for reference. ### Executables diff --git a/_testenv/testenv/testenv_cfg.py b/_testenv/testenv/testenv_cfg.py index 70d64c8..fc28d84 100644 --- a/_testenv/testenv/testenv_cfg.py +++ b/_testenv/testenv/testenv_cfg.py @@ -76,31 +76,37 @@ def verify_qemu_cfgs(): - """Check if -C or -K is set, but any of the selected configs can't run with - QEMU.""" - if not testenv.args.kernel: - return + """Check if passed -C or -K args make sense with the testenv configs.""" + testsuite = testenv.args.testsuite + qemu_supported = False + qemu_required = False for basename, cfg in cfgs.items(): - missing = True - for section in cfg.keys(): if "qemu" in cfg[section]: - missing = False + qemu_supported = True + if cfg[section]["qemu"] == "required": + qemu_required = True break - if missing: - testsuite = testenv.args.testsuite + if testenv.args.kernel and not qemu_supported: logging.critical(f"{testsuite}/{basename}: doesn't support running in QEMU") exit_error_readme() + if not testenv.args.kernel and qemu_required: + logging.error(f"{testsuite}/{basename}: {section} must run in QEMU") + logging.error("Use one of:") + logging.error(" -D, --debian-kernel") + logging.error(" -C, --custom-kernel") + exit_error_readme() + def verify_qemu_section(path, cfg, section): """Verify that qemu= has proper values.""" if "qemu" not in cfg[section]: return - valid = ["optional"] + valid = ["optional", "required"] value = cfg[section]["qemu"] if value not in valid: -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40317?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: If4abdf1f9248fee0915603a9b3c6e3e5e5083057 Gerrit-Change-Number: 40317 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: qemu: add modules.alias

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40316?usp=email ) Change subject: testenv: qemu: add modules.alias ...................................................................... testenv: qemu: add modules.alias Fix loading the sctp module, which is needed to run osmo-epdg in QEMU: modprobe: can't load module libcrc32c (kernel/lib/libcrc32c.ko): unknown symbol in module, or unknown parameter Change-Id: I475176734b994e7abda63badda0983ab6534b682 --- M _testenv/data/scripts/qemu/qemu_functions.sh 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/40316/1 diff --git a/_testenv/data/scripts/qemu/qemu_functions.sh b/_testenv/data/scripts/qemu/qemu_functions.sh index a984ff9..efbdd2d 100755 --- a/_testenv/data/scripts/qemu/qemu_functions.sh +++ b/_testenv/data/scripts/qemu/qemu_functions.sh @@ -41,7 +41,9 @@ | sort -u \ | cut -d ' ' -f 2)" - qemu_initrd_add_file $files + qemu_initrd_add_file \ + $files \ + /usr/lib/modules/"$kernel"/modules.alias # Save the list of modules for i in $@; do -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40316?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: I475176734b994e7abda63badda0983ab6534b682 Gerrit-Change-Number: 40316 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: cfg: check for multiple spaces in lists

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40309?usp=email ) Change subject: testenv: cfg: check for multiple spaces in lists ...................................................................... testenv: cfg: check for multiple spaces in lists Pau ran into an unexpected bug while having entries in copy= separated by multiple spaces ("copy=osmo-stp.cfg osmo-stp-m3ua.confmerge"): [testenv][m3ua] + ['cp', '-a', 'osmo-stp.cfg', '', 'osmo-stp-m3ua.confmerge', '/tmp/testenv-stp-m3ua-20250516-1349-e4103924-bfvi_syt/stp'] cp: cannot stat '': No such file or directory Catch this early and print a more useful error: [testenv] /home/user/code/osmo-dev/src/osmo-ttcn3-hacks/stp/testenv.cfg: copy= in section [stp] has multiple spaces: [testenv] "osmo-stp.cfg osmo-stp-m3ua.confmerge" [testenv] Please separate elements with only one space. Change-Id: Ie47cf5482ba479457a662759ce87611a7c41e29c --- M _testenv/testenv/testenv_cfg.py 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/09/40309/1 diff --git a/_testenv/testenv/testenv_cfg.py b/_testenv/testenv/testenv_cfg.py index 70d64c8..1ff662f 100644 --- a/_testenv/testenv/testenv_cfg.py +++ b/_testenv/testenv/testenv_cfg.py @@ -133,6 +133,10 @@ "packages": "package", "programs": "program", } + keys_lists = [ + "copy", + "package", + ] if "testsuite" not in cfg: logging.error(f"{path}: missing [testsuite] section") @@ -173,6 +177,13 @@ logging.error("If this is on purpose, set make=no.") exit_error_readme() + for key in keys_lists: + if key in cfg[section] and " " in cfg[section][key]: + logging.error(f"{path}: {key}= in section [{section}] has multiple spaces:") + logging.error(f' "{cfg[section][key]}"') + logging.error("Please separate elements with only one space.") + sys.exit(1) + get_vty_host_port(cfg, path) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40309?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: Ie47cf5482ba479457a662759ce87611a7c41e29c Gerrit-Change-Number: 40309 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: stp: Rename STP_Tests.ttcn -> STP_Tests_IPA_M3UA.ttcn

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40308?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: stp: Rename STP_Tests.ttcn -> STP_Tests_IPA_M3UA.ttcn ...................................................................... stp: Rename STP_Tests.ttcn -> STP_Tests_IPA_M3UA.ttcn The previous name usually causes confusion since it seems to indicate either: * Some sort of common placeholder for STP_Tests_IPA and STP_Tests_M3UA (it's not the case, we already have STP_Tests_Common.ttcn for that) * A placeholder for tests not IPA or M3UA related (it's not the case, since it only contains IPA<->M3UA tests). Hence, rename it to denote better the aim of that file, ie. testing forwarding between IPA and M3UA AS(P)s. Change-Id: Id2963407adf11add01630c3899a062d764c8ad75 --- M stp/README.md M stp/STP_Tests.cfg M stp/STP_Tests_Common.ttcn M stp/STP_Tests_IPA.ttcn R stp/STP_Tests_IPA_M3UA.ttcn M stp/STP_Tests_M3UA.ttcn M stp/expected-results.xml 7 files changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/08/40308/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40308?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: Id2963407adf11add01630c3899a062d764c8ad75 Gerrit-Change-Number: 40308 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 month, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: stp: Rename STP_Tests.ttcn -> STP_Tests_IPA_M3UA.ttcn

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40308?usp=email ) Change subject: stp: Rename STP_Tests.ttcn -> STP_Tests_IPA_M3UA.ttcn ...................................................................... stp: Rename STP_Tests.ttcn -> STP_Tests_IPA_M3UA.ttcn The previous name usually causes confusion since it seems to indicate either: * Some sort of common placeholder for STP_Tests_IPA and STP_Tests_M3UA (it's not the case, we already have STP_Tests_Common.ttcn for that) * A placeholder for tests not IPA or M3UA related (it's not the case, since it only contains IPA<->M3UA tests). Hence, rename it to denote better the aim of that file, ie. testing forwarding between IPA and M3UA AS(P)s. Change-Id: Id2963407adf11add01630c3899a062d764c8ad75 --- M stp/README.md M stp/STP_Tests.cfg M stp/STP_Tests_Common.ttcn M stp/STP_Tests_IPA.ttcn R stp/STP_Tests_IPA_M3UA.ttcn M stp/STP_Tests_M3UA.ttcn 6 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/08/40308/1 diff --git a/stp/README.md b/stp/README.md index 20a42b5..d79b741 100644 --- a/stp/README.md +++ b/stp/README.md @@ -1,4 +1,4 @@ -# STP_Tests.ttcn +# STP_Tests_*.ttcn * external interfaces * M3UA/SCTP (can emulate both client and server side) @@ -9,7 +9,7 @@ digraph G { rankdir=LR; STP [label="IUT\nosmo-stp",shape="box"]; - ATS [label="ATS\nSTP_Tests.ttcn"]; + ATS [label="ATS\nSTP_Tests_*.ttcn"]; ATS -> STP [label="M3UA", dir="both"]; ATS -> STP [label="IPA", dir="both"]; diff --git a/stp/STP_Tests.cfg b/stp/STP_Tests.cfg index 945ef8f..169185e 100644 --- a/stp/STP_Tests.cfg +++ b/stp/STP_Tests.cfg @@ -17,4 +17,4 @@ [EXECUTE] STP_Tests_M3UA.control STP_Tests_IPA.control -STP_Tests.control +STP_Tests_IPA_M3UA.control diff --git a/stp/STP_Tests_Common.ttcn b/stp/STP_Tests_Common.ttcn index a540b10..463e935 100644 --- a/stp/STP_Tests_Common.ttcn +++ b/stp/STP_Tests_Common.ttcn @@ -10,9 +10,9 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -friend module STP_Tests; friend module STP_Tests_M3UA; friend module STP_Tests_IPA; +friend module STP_Tests_IPA_M3UA; import from TELNETasp_PortType all; import from Osmocom_VTY_Functions all; diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn index ae7e1da..b7da439 100644 --- a/stp/STP_Tests_IPA.ttcn +++ b/stp/STP_Tests_IPA.ttcn @@ -10,7 +10,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -friend module STP_Tests; +friend module STP_Tests_IPA_M3UA; import from General_Types all; import from Osmocom_Types all; diff --git a/stp/STP_Tests.ttcn b/stp/STP_Tests_IPA_M3UA.ttcn similarity index 99% rename from stp/STP_Tests.ttcn rename to stp/STP_Tests_IPA_M3UA.ttcn index b7f6ec1..08ca5aa 100644 --- a/stp/STP_Tests.ttcn +++ b/stp/STP_Tests_IPA_M3UA.ttcn @@ -1,4 +1,4 @@ -module STP_Tests { +module STP_Tests_IPA_M3UA { /* Osmocom STP test suite in in TTCN-3 * (C) 2019 Harald Welte <laforge(a)gnumonks.org> diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 0d2e87d..eddd0b1 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -11,7 +11,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -friend module STP_Tests; +friend module STP_Tests_IPA_M3UA; import from General_Types all; import from Osmocom_Types all; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40308?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: Id2963407adf11add01630c3899a062d764c8ad75 Gerrit-Change-Number: 40308 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

[L] Change in libosmocore[master]: osmo-config-merge: Fix comments with different indentation creating m...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/40296?usp=email ) Change subject: osmo-config-merge: Fix comments with different indentation creating merge problems ...................................................................... osmo-config-merge: Fix comments with different indentation creating merge problems VTY comments are not part of the tree structure, since they can be placed anywhere and are just ignored. Hence, ignore them when generating the tree structure during file read. This has the backside that of course when merging files, comments on the 0-level show up in the end in testB.ok since the content below it in testB.confmerge is now merged (properly) into previous nodes. This can be slightly improved by placing the comments in the proper indentation level, since if a new node is appended from the .confmerge, they will be added in order and hence will show up properly. Change-Id: I7de78d3ed3ca27e3470ea66a78ff9c5acfe65741 --- M tests/osmo-config-merge/testA.ok M tests/osmo-config-merge/testB.ok M tests/osmo-config-merge/testB2.ok M utils/osmo-config-merge.c 4 files changed, 156 insertions(+), 128 deletions(-) Approvals: pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/osmo-config-merge/testA.ok b/tests/osmo-config-merge/testA.ok index b0768ad..c244bd0 100644 --- a/tests/osmo-config-merge/testA.ok +++ b/tests/osmo-config-merge/testA.ok @@ -15,7 +15,6 @@ logging print level 1 logging timestamp 1 logging color 1 -! logging level set-all notice logging level rsl info logging level meas info @@ -28,6 +27,7 @@ logging level lmib info logging level lmux info ! +! line vty no login bind 127.0.0.1 diff --git a/tests/osmo-config-merge/testB.ok b/tests/osmo-config-merge/testB.ok index 64860f8..0edb5a9 100644 --- a/tests/osmo-config-merge/testB.ok +++ b/tests/osmo-config-merge/testB.ok @@ -54,6 +54,74 @@ local-ip 127.0.0.1 local-ip ::1 accept-asp-connections dynamic-permitted + asp asp-sender 9999 2905 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role sg + sctp-role server + asp asp-receiver0 10000 2905 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role sg + sctp-role server + asp asp-receiver1 10001 2905 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role sg + sctp-role server + asp asp-client0 10002 2906 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role asp + sctp-role client + asp asp-client60-norctx0 11060 2907 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role asp + sctp-role client + asp asp-client61-norctx0 11061 2907 m3ua + local-ip 127.0.0.1 + local-ip ::1 + remote-ip 127.0.0.1 + remote-ip ::1 + role asp + sctp-role client + as as-sender m3ua + asp asp-sender + routing-key 1023 23 + as as-receiver m3ua + asp asp-receiver0 + asp asp-receiver1 + routing-key 1042 42 + as as-client m3ua + routing-key 1055 55 + asp asp-client0 + as as-client60-norctx m3ua + routing-key 0 60 + asp asp-client60-norctx0 + as as-client61-norctx m3ua + routing-key 0 61 + asp asp-client61-norctx0 + route-table system + update route 23 16777215 linkset as-sender + update route 42 16777215 linkset as-receiver + update route 55 16777215 linkset as-client + update route 60 16777215 linkset as-client60-norctx + update route 61 16777215 linkset as-client61-norctx + listen m3ua 2905 + local-ip 127.0.0.1 + local-ip ::1 + accept-asp-connections dynamic-permitted ! ! IPA AS/ASP: ! @@ -124,77 +192,9 @@ ! !M3UA AS/ASP: ! - asp asp-sender 9999 2905 m3ua - local-ip 127.0.0.1 - local-ip ::1 - remote-ip 127.0.0.1 - remote-ip ::1 - role sg - sctp-role server - asp asp-receiver0 10000 2905 m3ua - local-ip 127.0.0.1 - local-ip ::1 - remote-ip 127.0.0.1 - remote-ip ::1 - role sg - sctp-role server - asp asp-receiver1 10001 2905 m3ua - local-ip 127.0.0.1 - local-ip ::1 - remote-ip 127.0.0.1 - remote-ip ::1 - role sg - sctp-role server - asp asp-client0 10002 2906 m3ua - local-ip 127.0.0.1 - local-ip ::1 - remote-ip 127.0.0.1 - remote-ip ::1 - role asp - sctp-role client - asp asp-client60-norctx0 11060 2907 m3ua - local-ip 127.0.0.1 - local-ip ::1 - remote-ip 127.0.0.1 - remote-ip ::1 - role asp - sctp-role client - asp asp-client61-norctx0 11061 2907 m3ua - local-ip 127.0.0.1 - local-ip ::1 - remote-ip 127.0.0.1 - remote-ip ::1 - role asp - sctp-role client - as as-sender m3ua - asp asp-sender - routing-key 1023 23 - as as-receiver m3ua - asp asp-receiver0 - asp asp-receiver1 - routing-key 1042 42 - as as-client m3ua - routing-key 1055 55 - asp asp-client0 - as as-client60-norctx m3ua - routing-key 0 60 - asp asp-client60-norctx0 - as as-client61-norctx m3ua - routing-key 0 61 - asp asp-client61-norctx0 ! ! ROUTING TABLE: ! - route-table system - update route 23 16777215 linkset as-sender - update route 42 16777215 linkset as-receiver - update route 55 16777215 linkset as-client - update route 60 16777215 linkset as-client60-norctx - update route 61 16777215 linkset as-client61-norctx ! !SERVERS: ! - listen m3ua 2905 - local-ip 127.0.0.1 - local-ip ::1 - accept-asp-connections dynamic-permitted diff --git a/tests/osmo-config-merge/testB2.ok b/tests/osmo-config-merge/testB2.ok index 6a44388..e206e74 100644 --- a/tests/osmo-config-merge/testB2.ok +++ b/tests/osmo-config-merge/testB2.ok @@ -1,37 +1,4 @@ ! - asp ipa-asp-loadshare-sender0 20000 5000 ipa - local-ip 127.0.0.1 - remote-ip 127.0.0.1 - asp ipa-asp-loadshare-sender1 20001 5000 ipa - local-ip 127.0.0.1 - remote-ip 127.0.0.1 - as ipa-as-loadshare-sender ipa - routing-key 0 6 - point-code override dpc 31 - asp ipa-asp-loadshare-sender0 - asp ipa-asp-loadshare-sender1 - asp ipa-asp-loadshare-receiver0 20002 5000 ipa - local-ip 127.0.0.1 - remote-ip 127.0.0.1 - role sg - sctp-role server - asp ipa-asp-loadshare-receiver1 20003 5000 ipa - local-ip 127.0.0.1 - remote-ip 127.0.0.1 - role sg - sctp-role server - as ipa-as-loadshare-receiver ipa - traffic-mode loadshare - routing-key 0 7 - point-code override dpc 32 - asp ipa-asp-loadshare-receiver0 - asp ipa-asp-loadshare-receiver1 - route-table system - update route 31 16777215 linkset ipa-as-loadshare-receiver - update route 33 16777215 linkset ipa-as-override-receiver - update route 5 16777215 linkset ipa-as-dynamic-asp - listen ipa 5000 - accept-asp-connections dynamic-permitted ! OsmoSTP (1.1.0.2-3884) configuration saved from vty !! ! @@ -80,13 +47,13 @@ route-table system update route 123 16777215 linkset as-sender-tcp update route 155 16777215 linkset as-client-tcp + update route 31 16777215 linkset ipa-as-loadshare-receiver + update route 33 16777215 linkset ipa-as-override-receiver + update route 5 16777215 linkset ipa-as-dynamic-asp listen m3ua 2905 tcp local-ip 127.0.0.1 local-ip ::1 accept-asp-connections dynamic-permitted -! -!M3UA AS/ASP: -! asp asp-sender 9999 2905 m3ua local-ip 127.0.0.1 local-ip ::1 @@ -145,27 +112,43 @@ as as-client61-norctx m3ua routing-key 0 61 asp asp-client61-norctx0 -! -! ROUTING TABLE: -! route-table system update route 23 16777215 linkset as-sender update route 42 16777215 linkset as-receiver update route 55 16777215 linkset as-client update route 60 16777215 linkset as-client60-norctx update route 61 16777215 linkset as-client61-norctx -! -!SERVERS: -! listen m3ua 2905 local-ip 127.0.0.1 local-ip ::1 accept-asp-connections dynamic-permitted -cs7 instance 0 -! -! IPA AS/ASP: -! Port 2004 is reserved for use with ipa-as-dynamic-asp in TTCN-3. -! OVERRIDE: + asp ipa-asp-loadshare-sender0 20000 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + asp ipa-asp-loadshare-sender1 20001 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + as ipa-as-loadshare-sender ipa + routing-key 0 6 + point-code override dpc 31 + asp ipa-asp-loadshare-sender0 + asp ipa-asp-loadshare-sender1 + asp ipa-asp-loadshare-receiver0 20002 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + asp ipa-asp-loadshare-receiver1 20003 5000 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role sg + sctp-role server + as ipa-as-loadshare-receiver ipa + traffic-mode loadshare + routing-key 0 7 + point-code override dpc 32 + asp ipa-asp-loadshare-receiver0 + asp ipa-asp-loadshare-receiver1 asp ipa-asp-override-sender 20005 5000 ipa local-ip 127.0.0.1 remote-ip 127.0.0.1 @@ -189,11 +172,29 @@ point-code override dpc 34 asp ipa-asp-override-receiver0 asp ipa-asp-override-receiver1 -! DYNAMIC AS: as ipa-as-dynamic-asp ipa routing-key 0 5 point-code override dpc 23 + listen ipa 5000 + accept-asp-connections dynamic-permitted +! +!M3UA AS/ASP: +! ! ! ROUTING TABLE: ! +! !SERVERS: +! +! +! IPA AS/ASP: +! +! Port 2004 is reserved for use with ipa-as-dynamic-asp in TTCN-3. +! OVERRIDE: +! DYNAMIC AS: +! +! ROUTING TABLE: +! +! +!SERVERS: +! diff --git a/utils/osmo-config-merge.c b/utils/osmo-config-merge.c index ed2039a..f7db945 100644 --- a/utils/osmo-config-merge.c +++ b/utils/osmo-config-merge.c @@ -39,6 +39,7 @@ */ #include <stdio.h> +#include <stdbool.h> #include <string.h> #include <errno.h> @@ -89,16 +90,35 @@ return NULL; } +/* Return pointer to line content, or empty string if only whitspace is found */ +static const char *line_lstrip(const char *line) +{ + OSMO_ASSERT(line); + unsigned int len = strlen(line); + for (unsigned int i = 0; i < len; i++) { + if (line[i] == ' ') + continue; + return &line[i]; + } + /* points to empty string '\0' */ + return &line[len]; +} + /* count the number of spaces / indent level */ static int count_indent(const char *line) { - int i; + const char *content = line_lstrip(line); + return content - line; +} - for (i = 0; i < strlen(line); i++) { - if (line[i] != ' ') - return i; - } - return i; +static bool line_is_comment(const char *line) +{ + const char *content = line_lstrip(line); + if (content[0] == '\0') + return true; + if (content[0] == '!' || line[0] == '#') + return true; + return false; } /* strip any triling CR / LF */ @@ -141,7 +161,9 @@ line_num++; chomp(line); int indent = count_indent(line); + bool coment = line_is_comment(&line[indent]); struct node *n; + if (indent > cur_indent) { if (indent > cur_indent+1) { fprintf(stderr, "File '%s' isn't well-formed in line %u, aborting!\n", @@ -153,20 +175,25 @@ n = node_alloc_child(last); } else if (indent < cur_indent) { int i; + struct node *par = last; for (i = 0; i < cur_indent - indent; i++) { /* go to parent, add another sibling */ - if (last->parent) - last = last->parent; + if (par->parent) + par = par->parent; } - n = node_alloc_child(last->parent); + n = node_alloc_child(par->parent); } else { /* add a new sibling (child of parent) */ n = node_alloc_child(last->parent); } n->line = talloc_strdup(n, line); - last = n; - cur_indent = indent; + /* comments are not part of the indentation structure of the + * file, hence commands after it are not to be affected by them: */ + if (!coment) { + last = n; + cur_indent = indent; + } } fclose(infile); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/40296?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7de78d3ed3ca27e3470ea66a78ff9c5acfe65741 Gerrit-Change-Number: 40296 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-Reviewer: pespin <pespin(a)sysmocom.de>

1 month, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log