- gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: msc: Avoid race condition when setting osmux options via VTY

by daniel

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27286 ) Change subject: msc: Avoid race condition when setting osmux options via VTY ...................................................................... msc: Avoid race condition when setting osmux options via VTY If the RAN_Emulation is started before the VTY reconfiguration we could get a BSSMAP Reset/ResetAck with Osmux support advertised even though the test expects it to be disabled (or vice versa). Do the VTY configuration before starting the RAN_Emulation. Fixes sporadic/load-related TTCN3 failures with message "BSSMAP: Timeout waiting for RESET-ACK after sending RESET" (e.g. TC_iu_and_mt_call_osmux, TC_iu_and_mo_sms in run +1567) Change-Id: Ife23f70c6523034f3c3c53b6c1c81428566fd43e --- M msc/MSC_Tests.ttcn 1 file changed, 24 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/86/27286/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index db96d60..dd31daf 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -304,29 +304,7 @@ testcase.stop("excess number of BSC instances requested"); } - for (var integer i := 0; i < num_bsc; i := i + 1) { - if (isbound(mp_bssap_cfg[i])) { - var RanOps ranops := BSC_RanOps; - ranops.use_osmux := osmux; - f_ran_adapter_init(g_bssap[i], mp_bssap_cfg[i], "MSC_Test_" & int2str(i), ranops); - f_ran_adapter_start(g_bssap[i]); - } else { - testcase.stop("missing BSSAP configuration"); - } - } - f_ipa_ctrl_start_client(mp_msc_ip, mp_msc_ctrl_port); - f_init_mncc("MSC_Test"); - f_init_mgcp("MSC_Test"); - - if (gsup == true) { - f_init_gsup("MSC_Test"); - } - f_init_smpp("MSC_Test"); - - if (sgsap == true) { - f_init_sgsap("MSC_Test"); - } map(self:MSCVTY, system:MSCVTY); f_vty_set_prompts(MSCVTY); @@ -344,6 +322,30 @@ } else { f_vty_config(MSCVTY, "msc", "osmux off"); } + + for (var integer i := 0; i < num_bsc; i := i + 1) { + if (isbound(mp_bssap_cfg[i])) { + var RanOps ranops := BSC_RanOps; + ranops.use_osmux := osmux; + f_ran_adapter_init(g_bssap[i], mp_bssap_cfg[i], "MSC_Test_" & int2str(i), ranops); + f_ran_adapter_start(g_bssap[i]); + } else { + testcase.stop("missing BSSAP configuration"); + } + } + + f_init_mncc("MSC_Test"); + f_init_mgcp("MSC_Test"); + + if (gsup == true) { + f_init_gsup("MSC_Test"); + } + f_init_smpp("MSC_Test"); + + if (sgsap == true) { + f_init_sgsap("MSC_Test"); + } + } /* Initialize for a direct connection to BSSAP. This function is an alternative -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27286 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ife23f70c6523034f3c3c53b6c1c81428566fd43e Gerrit-Change-Number: 27286 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: ttcn3-fr-test/jenkins.sh: revert docker run --rm

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27283 ) Change subject: ttcn3-fr-test/jenkins.sh: revert docker run --rm ...................................................................... ttcn3-fr-test/jenkins.sh: revert docker run --rm Revert the change of adding a --rm to the "docker run" commands done in I48b01c43fedf379b8a565eaab0369806d7831bd8. This script runs the containers in the background, waits until they are done, copies the logs and then removes them afterwards. Fix for: + docker kill jenkins-ttcn3-fr-test-384-frnet jenkins-ttcn3-fr-test-384-frnet + docker logs --timestamps jenkins-ttcn3-fr-test-384-ttcn3-fr-test Error: No such container: jenkins-ttcn3-fr-test-384-ttcn3-fr-test Change-Id: I56dc07820ccfa8ad6936764262a7c6c272e59c37 --- M ttcn3-fr-test/jenkins.sh 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh index 34aa740..4531e3a 100755 --- a/ttcn3-fr-test/jenkins.sh +++ b/ttcn3-fr-test/jenkins.sh @@ -25,7 +25,7 @@ echo Starting container with FRNET docker run \ - --rm \ + `# --rm is done in below` \ --cap-add=NET_RAW --cap-add=SYS_RAWIO \ $(docker_network_params $SUBNET 10) \ --ulimit core=-1 \ @@ -45,7 +45,7 @@ echo Starting container with FR testsuite docker run \ - --rm \ + `# --rm is done in below` \ --cap-add=NET_RAW --cap-add=SYS_RAWIO \ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27283 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I56dc07820ccfa8ad6936764262a7c6c272e59c37 Gerrit-Change-Number: 27283 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: ttcn3-fr-test/jenkins.sh: make use of clean_up()

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27284 ) Change subject: ttcn3-fr-test/jenkins.sh: make use of clean_up() ...................................................................... ttcn3-fr-test/jenkins.sh: make use of clean_up() Move cleaning up logic to clean_up(), so it runs as part of the clean_up_trap if any command in the previous code fails. For example, if the first docker container started properly, but the second docker container failed to start: without this patch, it would just stop the script without running the clean up code. Change-Id: I4624e37d5d2fa90b71b32d72067b3645f69805da --- M ttcn3-fr-test/jenkins.sh 1 file changed, 12 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh index 4531e3a..182f512 100755 --- a/ttcn3-fr-test/jenkins.sh +++ b/ttcn3-fr-test/jenkins.sh @@ -8,6 +8,16 @@ set_clean_up_trap set -e +clean_up() { + # kill the frnet container to avoid "You cannot remove a running container " below in 'rm' + docker kill ${BUILD_TAG}-frnet || true + + # store execution logs for both containers + docker logs --timestamps ${BUILD_TAG}-ttcn3-fr-test > $VOL_BASE_DIR/fr-tester/exec.log || true + docker logs --timestamps ${BUILD_TAG}-frnet > $VOL_BASE_DIR/frnet/exec.log || true + docker container rm ${BUILD_TAG}-frnet ${BUILD_TAG}-ttcn3-fr-test +} + SUBNET=26 network_create $SUBNET @@ -25,7 +35,7 @@ echo Starting container with FRNET docker run \ - `# --rm is done in below` \ + `# --rm is done in clean_up()` \ --cap-add=NET_RAW --cap-add=SYS_RAWIO \ $(docker_network_params $SUBNET 10) \ --ulimit core=-1 \ @@ -45,7 +55,7 @@ echo Starting container with FR testsuite docker run \ - `# --rm is done in below` \ + `# --rm is done in clean_up()` \ --cap-add=NET_RAW --cap-add=SYS_RAWIO \ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ @@ -66,10 +76,3 @@ # emulate running container in foreground, which is no longer possible as we # must shift the net-devices into the container _after_ it is started docker logs -f ${BUILD_TAG}-ttcn3-fr-test -# kill the frnet container to avoid "You cannot remove a running container " below in 'rm' -docker kill ${BUILD_TAG}-frnet - -# store execution logs for both containers -docker logs --timestamps ${BUILD_TAG}-ttcn3-fr-test > $VOL_BASE_DIR/fr-tester/exec.log -docker logs --timestamps ${BUILD_TAG}-frnet > $VOL_BASE_DIR/frnet/exec.log -docker container rm ${BUILD_TAG}-frnet ${BUILD_TAG}-ttcn3-fr-test -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4624e37d5d2fa90b71b32d72067b3645f69805da Gerrit-Change-Number: 27284 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: ttcn3-fr-test/jenkins.sh: revert docker run --rm

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27283 ) Change subject: ttcn3-fr-test/jenkins.sh: revert docker run --rm ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27283 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I56dc07820ccfa8ad6936764262a7c6c272e59c37 Gerrit-Change-Number: 27283 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Feb 2022 11:56:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: ttcn3-fr-test/jenkins.sh: make use of clean_up()

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27284 ) Change subject: ttcn3-fr-test/jenkins.sh: make use of clean_up() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27284 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4624e37d5d2fa90b71b32d72067b3645f69805da Gerrit-Change-Number: 27284 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Feb 2022 11:56:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: jobs/ttcn3-testsuites.yml: add ttcn3-fr-test

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27285 ) Change subject: jobs/ttcn3-testsuites.yml: add ttcn3-fr-test ...................................................................... jobs/ttcn3-testsuites.yml: add ttcn3-fr-test Add a configuration for the job to the yml file. It looks like this job was created manually, or the configuration was just not pushed to gerrit. This makes e-mail notifications consistent and fixes missing colors in build output. Change-Id: I14995dea0a0d223b78e20b49953d5c814c1ad4a1 --- M jobs/ttcn3-testsuites.yml 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index dbf162b..5b915c7 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -151,6 +151,10 @@ blocking: "^(ttcn3|TTCN3-.*)-hnbgw-test.*" timer: 40 13 * * * disabled: true + - ttcn3-fr-test: + blocking: "^(ttcn3|TTCN3-.*)-fr-test.*" + timer: 40 10 * * * + node: hdlc # debian-stretch latest stable - nplab-m3ua-test-latest: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I14995dea0a0d223b78e20b49953d5c814c1ad4a1 Gerrit-Change-Number: 27285 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: jobs/ttcn3-testsuites.yml: add ttcn3-fr-test

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27285 ) Change subject: jobs/ttcn3-testsuites.yml: add ttcn3-fr-test ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27285 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I14995dea0a0d223b78e20b49953d5c814c1ad4a1 Gerrit-Change-Number: 27285 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Feb 2022 11:55:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in dahdi-linux[master]: enable PPP and DAHDI_MIRROR by default.

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/27264 ) Change subject: enable PPP and DAHDI_MIRROR by default. ...................................................................... enable PPP and DAHDI_MIRROR by default. There's not really any reason to disable those, from what I can tell. Change-Id: Ib03074062ada7b6da485afac53b1550d31f1a5ca --- M include/dahdi/dahdi_config.h 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved tnt: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/dahdi/dahdi_config.h b/include/dahdi/dahdi_config.h index 0a8f5a9..c441b62 100644 --- a/include/dahdi/dahdi_config.h +++ b/include/dahdi/dahdi_config.h @@ -80,6 +80,7 @@ * support. */ #define CONFIG_DAHDI_NET +#define CONFIG_DAHDI_PPP /* * Uncomment for Generic PPP support (i.e. DAHDIRAS) @@ -187,7 +188,7 @@ /* * Creates an interface for mirroring the raw channel data out to a pseudo-chan */ -/* #define CONFIG_DAHDI_MIRROR */ +#define CONFIG_DAHDI_MIRROR /* * Adds support for conference links. There are some non-Asterisk users of this -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ib03074062ada7b6da485afac53b1550d31f1a5ca Gerrit-Change-Number: 27264 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in dahdi-linux[master]: enable PPP and DAHDI_MIRROR by default.

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/27264 ) Change subject: enable PPP and DAHDI_MIRROR by default. ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/27264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ib03074062ada7b6da485afac53b1550d31f1a5ca Gerrit-Change-Number: 27264 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Feb 2022 11:54:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-bsc[master]: cosmetics around select_best_cipher()

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27250 ) Change subject: cosmetics around select_best_cipher() ...................................................................... cosmetics around select_best_cipher() Improve the function doc. Remove a comment at a caller, because that information is what the function doc is for. Rename the array to codec_by_strength, because it is not the codec strength but the codec number listed in the array. Related: SYS#5839 Change-Id: Iaed6b97c31e4ccb1f28ca7e64596d5e20563b392 --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 5 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 8acf293..cab78ed 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -393,17 +393,18 @@ return 0; } -/* select the best cipher permitted by the intersection of both masks */ +/* Select the best cipher permitted by the intersection of both masks. Return as the n in A5/n, or -1 if the + * intersection is empty. */ int select_best_cipher(uint8_t msc_mask, uint8_t bsc_mask) { /* A5/7 ... A5/3: We assume higher is better, * but: A5/1 is better than A5/2, which is better than A5/0 */ - const uint8_t codec_strength[8] = { 7, 6, 5, 4, 3, 1, 2, 0 }; + const uint8_t codec_by_strength[8] = { 7, 6, 5, 4, 3, 1, 2, 0 }; uint8_t intersection = msc_mask & bsc_mask; int i; - for (i = 0; i < ARRAY_SIZE(codec_strength); i++) { - uint8_t codec = codec_strength[i]; + for (i = 0; i < ARRAY_SIZE(codec_by_strength); i++) { + uint8_t codec = codec_by_strength[i]; if (intersection & (1 << codec)) return codec; } @@ -509,9 +510,6 @@ * a5_encryption == 2 --> 0x04 ... */ enc_bits_msc = data[0]; - /* The bit-mask of permitted ciphers from the MSC (sent in ASSIGNMENT COMMAND) is intersected - * with the vty-configured mask a the BSC. Finally, the best (highest) possible cipher is - * chosen. */ chosen_cipher = select_best_cipher(enc_bits_msc, bsc_gsmnet->a5_encryption_mask); if (chosen_cipher < 0) { LOGP(DMSC, LOGL_ERROR, "Reject: no overlapping A5 ciphers between BSC (0x%02x) " -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iaed6b97c31e4ccb1f28ca7e64596d5e20563b392 Gerrit-Change-Number: 27250 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log