- gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: testenv/README: document current working dir
by osmith 23 Sep '24

23 Sep '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38260?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: testenv/README: document current working dir ...................................................................... testenv/README: document current working dir Change-Id: I218507bcbec94a36976fbf57d12ffd083fd2acfb --- M _testenv/README.md 1 file changed, 23 insertions(+), 5 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/_testenv/README.md b/_testenv/README.md index 82903a1..983692c 100644 --- a/_testenv/README.md +++ b/_testenv/README.md @@ -55,14 +55,14 @@ * `clean=`: optional script to run before running the testsuite and on exit. This can be used to clean up network devices for example, or to fix name collisions when running a test with multiple configs - (`rename_junit_xml_classname.sh`). See below for `PATH`. A + (`rename_junit_xml_classname.sh`). See below for `PATH` and `PWD`. A `TESTENV_CLEAN_REASON` env var is set to `prepare`, `crashed` or `finished` depending on when the script runs. #### Component section * `program=`: executable for starting a test component, may contain arguments. - See below for `PATH`. + See below for `PATH` and `PWD`. * `copy=`: file(s) to copy from the testsuite directory to the test directory, like `.cfg` and `.confmerge` files. Multiple values are separated by spaces. @@ -78,12 +78,12 @@ * `prepare=`: optional script to run before staring the program (after files are copied to the test directory). Typically this is used to create configs - with `osmo-config-merge`. See below for `PATH`. + with `osmo-config-merge`. See below for `PATH` and `PWD`. * `setup=`: optional script to run after the program was started. Execution of the next program / the testsuite will wait until the setup script has quit. This can be used to wait until the program is ready or to fill a test - database for example. See below for `PATH`. + database for example. See below for `PATH` and `PWD`. * `clean=`: same as in the Testsuite section above, but runs at a slightly different time: before/after/on crash of the program instead of the @@ -96,7 +96,9 @@ * `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. -### PATH +### Executables + +#### $PATH Executables mentioned in `program=`, `prepare=`, `setup=` and `clean=` run with a `PATH` environment variable containing: @@ -105,6 +107,22 @@ * The directory for binaries built from source * The directory `_testenv/data/scripts` (which has e.g. `respawn.sh`) +#### $PWD (current working dir) + +The executables run inside a directory with the component name, inside the log +dir. For example: + +``` +/tmp/logs +├── ggsn # Executables from [ggsn] section run in this dir +│ ├── ggsn.log +│ └── osmo-ggsn.cfg +└── testsuite # Executables from [testsuite] run in this dir + ├── Common.cfg + ├── GGSN_Tests.cfg + └── GGSN_Tests.default +``` + ### Latest configs Sometimes we need to run test components and/or testsuites with different -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38260?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I218507bcbec94a36976fbf57d12ffd083fd2acfb Gerrit-Change-Number: 38260 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv/README: deduplicate clean= description
by osmith 23 Sep '24

23 Sep '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38259?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: testenv/README: deduplicate clean= description ...................................................................... testenv/README: deduplicate clean= description Change-Id: I12dc9adb508a409a6156f9682c9db5684f551b06 --- M _testenv/README.md 1 file changed, 3 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/_testenv/README.md b/_testenv/README.md index 2c70a0a..82903a1 100644 --- a/_testenv/README.md +++ b/_testenv/README.md @@ -85,11 +85,9 @@ This can be used to wait until the program is ready or to fill a test database for example. See below for `PATH`. -* `clean=`: optional script to run before `prepare=` and on exit. This can be - used to clean up network devices for example, or to fix name collisions when - running a test with multiple configs (`rename_junit_xml_classname.sh`). See - below for `PATH`. A `TESTENV_CLEAN_REASON` env var is set to `prepare`, - `crashed` or `finished` depending on when the script runs. +* `clean=`: same as in the Testsuite section above, but runs at a slightly + different time: before/after/on crash of the program instead of the + testsuite. * `vty_port=`: optionally set the VTY port for the SUT component to obtain a talloc report after each test case has been executed. If this is not set, no -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38259?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I12dc9adb508a409a6156f9682c9db5684f551b06 Gerrit-Change-Number: 38259 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: clean_run_scripts: skip if podman stopped
by osmith 23 Sep '24

23 Sep '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38261?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: testenv: clean_run_scripts: skip if podman stopped ...................................................................... testenv: clean_run_scripts: skip if podman stopped Do not attempt to run the clean_run_scripts, if podman is being used and the container has already been shutdown. Change-Id: I3cc05aabd97b73b65c3089e8806f7a9b32e5975c --- M _testenv/README.md M _testenv/testenv/testdir.py 2 files changed, 12 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/_testenv/README.md b/_testenv/README.md index 983692c..09b12e8 100644 --- a/_testenv/README.md +++ b/_testenv/README.md @@ -57,7 +57,8 @@ collisions when running a test with multiple configs (`rename_junit_xml_classname.sh`). See below for `PATH` and `PWD`. A `TESTENV_CLEAN_REASON` env var is set to `prepare`, `crashed` or `finished` - depending on when the script runs. + depending on when the script runs. The script will not run on crash if podman + is used, as the container gets shutdown beforehand. #### Component section diff --git a/_testenv/testenv/testdir.py b/_testenv/testenv/testdir.py index 242d17d..55f04d2 100644 --- a/_testenv/testenv/testdir.py +++ b/_testenv/testenv/testdir.py @@ -170,8 +170,14 @@ def clean_run_scripts(reason="crashed"): global clean_scripts - for section, script in clean_scripts.items(): - logging.info(f"Running {section} clean script (reason: {reason})") - env = {"TESTENV_CLEAN_REASON": reason} - testenv.cmd.run(script, cwd=os.path.join(testdir, section), env=env) + if not clean_scripts: + return + elif testenv.args.podman and not testenv.podman.is_running(): + logging.debug("Skipping clean up scripts, podman container has already stopped") + else: + for section, script in clean_scripts.items(): + logging.info(f"Running {section} clean script (reason: {reason})") + env = {"TESTENV_CLEAN_REASON": reason} + testenv.cmd.run(script, cwd=os.path.join(testdir, section), env=env) + clean_scripts = {} -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38261?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3cc05aabd97b73b65c3089e8806f7a9b32e5975c Gerrit-Change-Number: 38261 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: testenv: copy=: support copying directories too
by osmith 23 Sep '24

23 Sep '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38262?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: testenv: copy=: support copying directories too ...................................................................... testenv: copy=: support copying directories too In preparation for adding the inital testenv.cfgs for ggsn, allow copying full directories with copy= too. This will make the ggsn testenv.cfg files easier to maintain. Change-Id: I8e680fbd93516030614c015d7c3b5bdb153ec487 --- M _testenv/README.md M _testenv/testenv/testdir.py 2 files changed, 16 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/_testenv/README.md b/_testenv/README.md index 09b12e8..7db3e24 100644 --- a/_testenv/README.md +++ b/_testenv/README.md @@ -65,8 +65,9 @@ * `program=`: executable for starting a test component, may contain arguments. See below for `PATH` and `PWD`. -* `copy=`: file(s) to copy from the testsuite directory to the test directory, - like `.cfg` and `.confmerge` files. Multiple values are separated by spaces. +* `copy=`: optionally copy a space separated list of files or directories from + the testsuite directory to the test directory, like `.cfg` and `.confmerge` + files. * `make=`: osmo-dev make target for building from source, if running without `--binary-repo`. This is usually the name of the git repository, but could diff --git a/_testenv/testenv/testdir.py b/_testenv/testenv/testdir.py index 55f04d2..ee698fff 100644 --- a/_testenv/testenv/testdir.py +++ b/_testenv/testenv/testdir.py @@ -80,11 +80,19 @@ testenv.cmd.run(["install", "-Dm644", path, path_dest]) if "copy" in section_data: - for file in section_data["copy"].split(" "): - path = os.path.join(testsuite_dir, file) - path_dest = os.path.join(section_dir, file) - mode = 755 if os.access(path, os.X_OK) else 644 - testenv.cmd.run(["install", f"-Dm{mode}", path, path_dest]) + for copy_entry in section_data["copy"].split(" "): + path = os.path.join(testsuite_dir, copy_entry) + if os.path.isdir(path): + pattern = os.path.join(path, "**") + paths = glob.glob(pattern, recursive=True) + else: + paths = [path] + for path in paths: + if os.path.isdir(path): + continue + path_dest = os.path.join(section_dir, os.path.relpath(path, testsuite_dir)) + mode = 755 if os.access(path, os.X_OK) else 644 + testenv.cmd.run(["install", f"-Dm{mode}", path, path_dest]) if "clean" in section_data: logging.info(f"Running {section} clean script (reason: prepare)") -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38262?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8e680fbd93516030614c015d7c3b5bdb153ec487 Gerrit-Change-Number: 38262 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: ggsn: sync GGSN_Tests.cfg with docker-playground
by osmith 23 Sep '24

23 Sep '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38263?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: ggsn: sync GGSN_Tests.cfg with docker-playground ...................................................................... ggsn: sync GGSN_Tests.cfg with docker-playground Add parameters that are missing from the config. Change-Id: I16a8cbd77f52a1ca5c52c045b8d0932e681cc380 --- M ggsn_tests/GGSN_Tests.cfg 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ggsn_tests/GGSN_Tests.cfg b/ggsn_tests/GGSN_Tests.cfg index b542108..3d4d2af 100644 --- a/ggsn_tests/GGSN_Tests.cfg +++ b/ggsn_tests/GGSN_Tests.cfg @@ -13,10 +13,22 @@ [TESTPORT_PARAMETERS] [MODULE_PARAMETERS] +# our Own IP address +GGSN_Tests.m_bind_ip_gtpc := "127.0.0.1" +GGSN_Tests.m_bind_ip_gtpu := "127.0.0.1" +# GGSN IP address +GGSN_Tests.m_ggsn_ip_gtpc := "127.0.0.2" +GGSN_Tests.m_ggsn_ip_gtpu := "127.0.0.2" +# GGSN announced DNS address +GGSN_Tests.m_ggsn_ip4_dns1 := "172.18.3.201" +GGSN_Tests.m_ggsn_ip6_dns1 := "fd02:db8:3::201" + # local T3-RESPONSE timeout, seconds: GGSN_Tests.mp_t3_response := 1; # local N3-REQUESTS counter: GGSN_Tests.mp_n3_requests := 2; +GGSN_Tests.m_ggsn_conf := GGSN_CONF_ALL + [EXECUTE] GGSN_Tests.control -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38263?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I16a8cbd77f52a1ca5c52c045b8d0932e681cc380 Gerrit-Change-Number: 38263 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in osmo-ttcn3-hacks[master]: ggsn: add testenv.cfgs for osmo-ggsn
by osmith 23 Sep '24

23 Sep '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38265?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: ggsn: add testenv.cfgs for osmo-ggsn ...................................................................... ggsn: add testenv.cfgs for osmo-ggsn Change-Id: I941b859261c1fbf27360673f14f8a79f0cf6f509 --- D ggsn_tests/osmo-ggsn.cfg A ggsn_tests/osmo-ggsn/osmo-ggsn-all.confmerge A ggsn_tests/osmo-ggsn/osmo-ggsn-v4_only.confmerge A ggsn_tests/osmo-ggsn/osmo-ggsn-v4v6_only.confmerge A ggsn_tests/osmo-ggsn/osmo-ggsn-v6_only.confmerge A ggsn_tests/osmo-ggsn/osmo-ggsn.src.cfg A ggsn_tests/osmo-ggsn/testenv.sh A ggsn_tests/testenv_osmo_ggsn_all.cfg A ggsn_tests/testenv_osmo_ggsn_v4_only.cfg A ggsn_tests/testenv_osmo_ggsn_v4v6_only.cfg A ggsn_tests/testenv_osmo_ggsn_v6_only.cfg 11 files changed, 253 insertions(+), 83 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ggsn_tests/osmo-ggsn.cfg b/ggsn_tests/osmo-ggsn.cfg deleted file mode 100644 index 28284e7..0000000 --- a/ggsn_tests/osmo-ggsn.cfg +++ /dev/null @@ -1,83 +0,0 @@ -! -! OpenGGSN (0.94.1-adac) configuration saved from vty -!! -! -log gsmtap 127.0.0.1 - logging level set-all debug - logging filter all 1 -! -log stderr - logging filter all 1 - logging color 1 - logging print category 1 - logging timestamp 1 - logging print extended-timestamp 1 - logging level ip info - logging level tun info - logging level ggsn info - logging level sgsn notice - logging level icmp6 debug - logging level lglobal notice - logging level llapd notice - logging level linp notice - logging level lmux notice - logging level lmi notice - logging level lmib notice - logging level lsms notice - logging level lctrl notice - logging level lgtp info - logging level lstats notice - logging level lgsup notice - logging level loap notice - logging level lss7 notice - logging level lsccp notice - logging level lsua notice - logging level lm3ua notice - logging level lmgcp notice - logging level lgtp debug -! -stats interval 5 -! -line vty - no login - bind 0.0.0.0 -! -ggsn ggsn0 - gtp state-dir /tmp - gtp bind-ip 127.0.0.2 - timer gtp T3 1 - timer gtp T1003 2 - timer gtp X3 2 - apn internet - gtpu-mode tun - tun-device tun4 - type-support v4 - ip prefix dynamic 176.16.16.0/20 - ip dns 0 172.18.3.201 - ip dns 1 8.8.8.8 - ip ifconfig 176.16.16.0/20 - no shutdown - apn inet6 - gtpu-mode tun - tun-device tun6 - type-support v6 - ipv6 prefix dynamic 2001:780:44:2000:0:0:0:0/56 - ipv6 dns 0 fd02:db8:3::201 - ipv6 dns 1 2001:4860:4860::8844 - ipv6 ifconfig 2001:780:44:2000:0:0:0:0/56 - no shutdown - apn inet46 - gtpu-mode tun - tun-device tun46 - type-support v4v6 - ip prefix dynamic 176.16.32.0/20 - ip dns 0 172.18.3.201 - ip dns 1 8.8.8.8 - ip ifconfig 176.16.32.0/20 - ipv6 prefix dynamic 2001:780:44:2100:0:0:0:0/56 - ipv6 dns 0 fd02:db8:3::201 - ipv6 dns 1 2001:4860:4860::8844 - ipv6 ifconfig 2001:780:44:2100:0:0:0:0/56 - no shutdown - default-apn internet - no shutdown ggsn diff --git a/ggsn_tests/osmo-ggsn/osmo-ggsn-all.confmerge b/ggsn_tests/osmo-ggsn/osmo-ggsn-all.confmerge new file mode 100644 index 0000000..57dbd79 --- /dev/null +++ b/ggsn_tests/osmo-ggsn/osmo-ggsn-all.confmerge @@ -0,0 +1,34 @@ +ggsn ggsn0 + apn internet + gtpu-mode tun + tun-device tun4 + type-support v4 + ip prefix dynamic 176.16.16.0/20 + ip dns 0 172.18.3.201 + ip dns 1 8.8.8.8 + ip ifconfig 176.16.16.0/20 + no shutdown + apn inet6 + gtpu-mode tun + tun-device tun6 + type-support v6 + ipv6 prefix dynamic 2001:780:44:2000:0:0:0:0/56 + ipv6 dns 0 fd02:db8:3::201 + ipv6 dns 1 2001:4860:4860::8844 + ipv6 ifconfig 2001:780:44:2000:0:0:0:0/56 + no shutdown + apn inet46 + gtpu-mode tun + tun-device tun46 + type-support v4v6 + ip prefix dynamic 176.16.32.0/20 + ip dns 0 172.18.3.201 + ip dns 1 8.8.8.8 + ip ifconfig 176.16.32.0/20 + ipv6 prefix dynamic 2001:780:44:2100:0:0:0:0/56 + ipv6 dns 0 fd02:db8:3::201 + ipv6 dns 1 2001:4860:4860::8844 + ipv6 ifconfig 2001:780:44:2100:0:0:0:0/56 + no shutdown + default-apn internet + no shutdown ggsn diff --git a/ggsn_tests/osmo-ggsn/osmo-ggsn-v4_only.confmerge b/ggsn_tests/osmo-ggsn/osmo-ggsn-v4_only.confmerge new file mode 100644 index 0000000..a39a4d4 --- /dev/null +++ b/ggsn_tests/osmo-ggsn/osmo-ggsn-v4_only.confmerge @@ -0,0 +1,12 @@ +ggsn ggsn0 + apn internet + gtpu-mode tun + tun-device tun4 + type-support v4 + ip prefix dynamic 176.16.16.0/20 + ip dns 0 172.18.3.201 + ip dns 1 8.8.8.8 + ip ifconfig 176.16.16.0/20 + no shutdown + default-apn internet + no shutdown ggsn diff --git a/ggsn_tests/osmo-ggsn/osmo-ggsn-v4v6_only.confmerge b/ggsn_tests/osmo-ggsn/osmo-ggsn-v4v6_only.confmerge new file mode 100644 index 0000000..6351ebe --- /dev/null +++ b/ggsn_tests/osmo-ggsn/osmo-ggsn-v4v6_only.confmerge @@ -0,0 +1,16 @@ +ggsn ggsn0 + apn inet46 + gtpu-mode tun + tun-device tun46 + type-support v4v6 + ip prefix dynamic 176.16.32.0/20 + ip dns 0 172.18.3.201 + ip dns 1 8.8.8.8 + ip ifconfig 176.16.32.0/20 + ipv6 prefix dynamic 2001:780:44:2100:0:0:0:0/56 + ipv6 dns 0 fd02:db8:3::201 + ipv6 dns 1 2001:4860:4860::8844 + ipv6 ifconfig 2001:780:44:2100:0:0:0:0/56 + no shutdown + default-apn inet46 + no shutdown ggsn diff --git a/ggsn_tests/osmo-ggsn/osmo-ggsn-v6_only.confmerge b/ggsn_tests/osmo-ggsn/osmo-ggsn-v6_only.confmerge new file mode 100644 index 0000000..5e3f000 --- /dev/null +++ b/ggsn_tests/osmo-ggsn/osmo-ggsn-v6_only.confmerge @@ -0,0 +1,12 @@ +ggsn ggsn0 + apn inet6 + gtpu-mode tun + tun-device tun6 + type-support v6 + ipv6 prefix dynamic 2001:780:44:2000:0:0:0:0/56 + ipv6 dns 0 fd02:db8:3::201 + ipv6 dns 1 2001:4860:4860::8844 + ipv6 ifconfig 2001:780:44:2000:0:0:0:0/56 + no shutdown + default-apn inet6 + no shutdown ggsn diff --git a/ggsn_tests/osmo-ggsn/osmo-ggsn.src.cfg b/ggsn_tests/osmo-ggsn/osmo-ggsn.src.cfg new file mode 100644 index 0000000..e9dca06 --- /dev/null +++ b/ggsn_tests/osmo-ggsn/osmo-ggsn.src.cfg @@ -0,0 +1,50 @@ +! +! OpenGGSN (0.94.1-adac) configuration saved from vty +!! +! +log gsmtap 127.0.0.1 + logging level set-all debug + logging filter all 1 +! +log stderr + logging filter all 1 + logging color 1 + logging print category 1 + logging timestamp 1 + logging print extended-timestamp 1 + logging level ip info + logging level tun info + logging level ggsn info + logging level sgsn notice + logging level icmp6 debug + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp info + logging level lstats notice + logging level lgsup notice + logging level loap notice + logging level lss7 notice + logging level lsccp notice + logging level lsua notice + logging level lm3ua notice + logging level lmgcp notice + logging level lgtp debug +! +stats interval 5 +! +line vty + no login + bind 0.0.0.0 +! +ggsn ggsn0 + gtp state-dir /tmp + gtp bind-ip 127.0.0.2 + timer gtp T3 1 + timer gtp T1003 2 + timer gtp X3 2 diff --git a/ggsn_tests/osmo-ggsn/testenv.sh b/ggsn_tests/osmo-ggsn/testenv.sh new file mode 100755 index 0000000..d797d44 --- /dev/null +++ b/ggsn_tests/osmo-ggsn/testenv.sh @@ -0,0 +1,85 @@ +#!/bin/sh -ex +CONFIG="$1" # all, v4_only, etc. +DEV=ggsn_dummy + +check_usage() { + local valid="all|v4_only|v6_only|v4v6_only" + + if [ -z "$CONFIG" ]; then + set +x + echo "Do not run this script manually." + echo "Run 'testenv.py run ggsn' instead." + exit 1 + fi + + case "|$valid|" in + *"|$CONFIG|"*) + ;; + *) + set +x + echo "usage: testenv.sh $valid" + exit 1 + ;; + esac +} + +adjust_osmo_ggsn_config() { + osmo-config-merge \ + osmo-ggsn/osmo-ggsn.src.cfg \ + osmo-ggsn/osmo-ggsn-"$CONFIG".confmerge \ + > osmo-ggsn.cfg +} + +adjust_ttcn3_config() { + local config_upper="$(echo "$CONFIG" | tr "[:lower:]" "[:upper:]")" + + sed -i "s/^GGSN_Tests.m_ggsn_conf := .*/GGSN_Tests.m_ggsn_conf := GGSN_CONF_$config_upper/" \ + ../testsuite/GGSN_Tests.cfg +} + +setcap_osmo_ggsn() { + sudo setcap CAP_NET_ADMIN=+eip $(which osmo-ggsn) +} + +add_dummy_netdev() { + # Add a network device reachable through the GTP tunnel that can answer ICMP + # pings (for e.g. TC_pdp4_act_deact_gtpu_access) + sudo ip link add "$DEV" type dummy + sudo ip addr add "172.18.3.201" dev "$DEV" + sudo ip addr add "fd02:db8:3::201" dev "$DEV" + sudo ip link set "$DEV" up +} + +del_dummy_netdev() { + if ip link ls dev "$DEV" >/dev/null 2>&1; then + sudo ip link del "$DEV" + fi +} + +rename_junit_xml_classname() { + if [ "$CONFIG" != "all" ]; then + ( cd ../testsuite + rename_junit_xml_classname.sh "_$CONFIG" ) + fi +} + +check_usage + +case "$TESTENV_CLEAN_REASON" in + prepare) + adjust_osmo_ggsn_config + adjust_ttcn3_config + setcap_osmo_ggsn + del_dummy_netdev + add_dummy_netdev + ;; + crashed|finished) + del_dummy_netdev + rename_junit_xml_classname + ;; + *) + set +x + echo "ERROR: unexpected TESTENV_CLEAN_REASON: $TESTENV_CLEAN_REASON" + exit 1 + ;; +esac diff --git a/ggsn_tests/testenv_osmo_ggsn_all.cfg b/ggsn_tests/testenv_osmo_ggsn_all.cfg new file mode 100644 index 0000000..08f25c5 --- /dev/null +++ b/ggsn_tests/testenv_osmo_ggsn_all.cfg @@ -0,0 +1,11 @@ +[testsuite] +program=GGSN_Tests +config=GGSN_Tests.cfg + +[ggsn] +program=osmo-ggsn +make=osmo-ggsn +package=osmo-ggsn +copy=osmo-ggsn +clean=osmo-ggsn/testenv.sh all +vty_port=4260 diff --git a/ggsn_tests/testenv_osmo_ggsn_v4_only.cfg b/ggsn_tests/testenv_osmo_ggsn_v4_only.cfg new file mode 100644 index 0000000..c9adef7 --- /dev/null +++ b/ggsn_tests/testenv_osmo_ggsn_v4_only.cfg @@ -0,0 +1,11 @@ +[testsuite] +program=GGSN_Tests +config=GGSN_Tests.cfg + +[ggsn] +program=osmo-ggsn +make=osmo-ggsn +package=osmo-ggsn +copy=osmo-ggsn.src.cfg osmo-ggsn-v4_only.confmerge +clean=testenv.sh v4_only +vty_port=4260 diff --git a/ggsn_tests/testenv_osmo_ggsn_v4v6_only.cfg b/ggsn_tests/testenv_osmo_ggsn_v4v6_only.cfg new file mode 100644 index 0000000..cc23fcb --- /dev/null +++ b/ggsn_tests/testenv_osmo_ggsn_v4v6_only.cfg @@ -0,0 +1,11 @@ +[testsuite] +program=GGSN_Tests +config=GGSN_Tests.cfg + +[ggsn] +program=osmo-ggsn +make=osmo-ggsn +package=osmo-ggsn +copy=osmo-ggsn.src.cfg osmo-ggsn-v4v6_only.confmerge +clean=testenv.sh v4v6_only +vty_port=4260 diff --git a/ggsn_tests/testenv_osmo_ggsn_v6_only.cfg b/ggsn_tests/testenv_osmo_ggsn_v6_only.cfg new file mode 100644 index 0000000..6109595 --- /dev/null +++ b/ggsn_tests/testenv_osmo_ggsn_v6_only.cfg @@ -0,0 +1,11 @@ +[testsuite] +program=GGSN_Tests +config=GGSN_Tests.cfg + +[ggsn] +program=osmo-ggsn +make=osmo-ggsn +package=osmo-ggsn +copy=osmo-ggsn.src.cfg osmo-ggsn-v6_only.confmerge +clean=testenv.sh v6_only +vty_port=4260 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38265?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I941b859261c1fbf27360673f14f8a79f0cf6f509 Gerrit-Change-Number: 38265 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv/README: consistency fix
by osmith 23 Sep '24

23 Sep '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38257?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: testenv/README: consistency fix ...................................................................... testenv/README: consistency fix Add = after the vty_* keys too, like the others. Change-Id: Ic9828b67f5a81498d0e951dd71b80b36cdd36173 --- M _testenv/README.md 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/_testenv/README.md b/_testenv/README.md index 8562063..2c70a0a 100644 --- a/_testenv/README.md +++ b/_testenv/README.md @@ -91,12 +91,12 @@ below for `PATH`. A `TESTENV_CLEAN_REASON` env var is set to `prepare`, `crashed` or `finished` depending on when the script runs. -* `vty_port`: optionally set the VTY port for the SUT component to obtain a +* `vty_port=`: optionally set the VTY port for the SUT component to obtain a talloc report after each test case has been executed. If this is not set, no talloc reports will be obtained. -* `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. +* `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. ### PATH -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38257?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic9828b67f5a81498d0e951dd71b80b36cdd36173 Gerrit-Change-Number: 38257 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: testsuite: use rsync with --archive
by osmith 23 Sep '24

23 Sep '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38256?usp=email ) Change subject: testenv: testsuite: use rsync with --archive ...................................................................... testenv: testsuite: use rsync with --archive When running in podman, the source files from the testsuite get copied to a temporary directory to build the testsuites out-of-tree (avoiding conflicts with possibly incompatible binary objects that may exist from previously building the testsuites on the host). This also copies additional scripts for preparation / clean up that may be used in testenv.cfg. Use the --archive flag with rsync to ensure that the executability is the same. I could have also used --executability, but --archive contains two other existing flags and more flags which may help us from running into unexpected situations such as this one. Without this patch, there was a bug when: * first creating a shell script but not making it executable * running testenv with podman (where rsync runs and creates the file initially without executable permissions) * making the script executable * running testenv with podman again, rsync will not adjust the permissions for the copy of the file * user wonders why there is a "sh: 1: script.sh: Permission denied" error Change-Id: Ia9737bd8ba22a555615862bf5e14dbdf0dea19b4 --- M _testenv/testenv/testsuite.py 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/_testenv/testenv/testsuite.py b/_testenv/testenv/testsuite.py index 7a42216..7fc4344 100644 --- a/_testenv/testenv/testsuite.py +++ b/_testenv/testenv/testsuite.py @@ -52,8 +52,7 @@ testenv.cmd.run( [ "rsync", - "--links", - "--recursive", + "--archive", f"--files-from={copy_list}", f"{ttcn3_hacks_dir_src}/", f"{ttcn3_hacks_dir}/", -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38256?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia9737bd8ba22a555615862bf5e14dbdf0dea19b4 Gerrit-Change-Number: 38256 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: podman.exec_cmd: better error if stopped
by osmith 23 Sep '24

23 Sep '24

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38258?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: testenv: podman.exec_cmd: better error if stopped ...................................................................... testenv: podman.exec_cmd: better error if stopped Testenv may try to run a comand in podman after the container was stopped, if there is a bug in the shutdown logic. Give a meaningful error in that case, instead of failing later on with a cryptic error in subprocess.run() because None was passed inside cmd (for the container name) instead of a string. Change-Id: I29ebe200258a9a9ffb127ec8fa1260b7e2124c38 --- M _testenv/testenv/podman.py 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/_testenv/testenv/podman.py b/_testenv/testenv/podman.py index 6d801fa..53806a4 100644 --- a/_testenv/testenv/podman.py +++ b/_testenv/testenv/podman.py @@ -131,6 +131,10 @@ def exec_cmd(cmd, podman_opts=[], cwd=None, env={}, *args, **kwargs): + if not container_name: + raise RuntimeError("Attempting to execute a command in podman, but the" + f" container isn't running anymore: {cmd}") + podman_opts = list(podman_opts) podman_opts += generate_env_podman(env) # Attach a fake tty (eclipse-titan won't print colored output otherwise) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38258?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I29ebe200258a9a9ffb127ec8fa1260b7e2124c38 Gerrit-Change-Number: 38258 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: testsuite: use rsync with --archive
by osmith 23 Sep '24

23 Sep '24

Attention is currently required from: laforge, pespin. osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38256?usp=email ) Change subject: testenv: testsuite: use rsync with --archive ...................................................................... Patch Set 2: Code-Review+2 (2 comments) Patchset: PS1: > I think in general it's useful to use `-a` with rsync as a default option in all situations. […] Done Patchset: PS2: applying +2 after using --archive -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38256?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia9737bd8ba22a555615862bf5e14dbdf0dea19b4 Gerrit-Change-Number: 38256 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 23 Sep 2024 11:15:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

1 0

2026

2025

2024

2023

2022

gerrit-log