December 2022 - gerrit-log - lists.osmocom.org

Change in docker-playground[master]: jenkins-common: tweak echo messages

by pespin

Attention is currently required from: osmith, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/30766 ) Change subject: jenkins-common: tweak echo messages ...................................................................... Patch Set 1: Code-Review+1 (2 comments) File jenkins-common.sh: https://gerrit.osmocom.org/c/docker-playground/+/30766/comment/5533b967_d06… PS1, Line 380: exit 1 yo still want to add sed -x here so that the exit 1 is printed. https://gerrit.osmocom.org/c/docker-playground/+/30766/comment/6cf4cab0_ef5… PS1, Line 458: exit 1 yo still want to add sed -x here so that the exit 1 is printed. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I213cb80bd1d9401281ae1fb7394b2319453550dd Gerrit-Change-Number: 30766 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 22 Dec 2022 14:56:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in docker-playground[master]: scripts/regen_doc: use SUBNET variable

by daniel

Attention is currently required from: osmith. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/30768 ) Change subject: scripts/regen_doc: use SUBNET variable ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3bda4bd7280469ad5ee02104295134a2e0b768e3 Gerrit-Change-Number: 30768 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Dec 2022 14:49:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-gsm-manuals[master]: rate counter: add StatsD note

by osmith

Attention is currently required from: msuraev. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/30715 ) Change subject: rate counter: add StatsD note ...................................................................... Patch Set 2: (5 comments) File common/chapters/counters-overview.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/30715/comment/b6e9fb54_fbe2… PS2, Line 127: does please use the same max line height as the rest of the file, it seems to be < 80 characters https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/30715/comment/ef86da2d_bed0… PS2, Line 129: StatsD * throughout the file it's written as "statsd" * missing "the" https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/30715/comment/49c1ec0a_887f… PS2, Line 130: via maybe add a colon at the end, so it's a full sentence? "via:" same below before the other URL https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/30715/comment/85c005cd_b20d… PS2, Line 130: Netdata the Netdata dashboard https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/30715/comment/99bc2a63_57c9… PS2, Line 131: statsD isavailable statsd is available -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/30715 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I124503c3707bbe005abbfb4245abe2829c6ff57c Gerrit-Change-Number: 30715 Gerrit-PatchSet: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Dec 2022 14:42:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: when doing packet access, log t1,t3,t2 and fn

by osmith

Attention is currently required from: neels, pespin, lynxis lazus, dexter. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29704 ) Change subject: abis_rsl: when doing packet access, log t1,t3,t2 and fn ...................................................................... Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I83d20ba9e0ce6488d458ccf4a85c8445c30e3a89 Gerrit-Change-Number: 29704 Gerrit-PatchSet: 8 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Dec 2022 14:33:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-smlc[master]: ctrl: take both address and port from vty config

by osmith

Attention is currently required from: msuraev. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-smlc/+/30672 ) Change subject: ctrl: take both address and port from vty config ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/30672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: I5d73257c0233ce6772847809a6163b6ca4c88f83 Gerrit-Change-Number: 30672 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Dec 2022 14:29:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-hlr[master]: ctrl: take both address and port from vty config

by osmith

Attention is currently required from: msuraev. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/30665 ) Change subject: ctrl: take both address and port from vty config ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/30665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Iecae15333a4e77b38d9bce8c8e591af3d5fcf347 Gerrit-Change-Number: 30665 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Dec 2022 14:28:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-hnbgw[master]: ctrl: take both address and port from vty config

by osmith

Attention is currently required from: msuraev. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/30670 ) Change subject: ctrl: take both address and port from vty config ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/30670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: If5b80364c28fb1ca2bc00f4ece851de64c8ce6b1 Gerrit-Change-Number: 30670 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Dec 2022 14:28:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-bsc[master]: ctrl: take both address and port from vty config

by osmith

Attention is currently required from: msuraev. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/30662 ) Change subject: ctrl: take both address and port from vty config ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/30662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic2c56ffee6237333d919c72bf26076ac24a1fa52 Gerrit-Change-Number: 30662 Gerrit-PatchSet: 3 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Dec 2022 14:28:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-ci[master]: jobs/update-osmo-ci-on-slaves-dp: fix node

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/30772 ) Change subject: jobs/update-osmo-ci-on-slaves-dp: fix node ...................................................................... jobs/update-osmo-ci-on-slaves-dp: fix node This trigger job can run on any node, don't have it require a debian9 label that doesn't exist anymore. Change-Id: I1a23a4c99fe007387f13e330b0b08f6941392829 --- M jobs/update-osmo-ci-on-slaves.yml 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/72/30772/1 diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml index bc195b5..8ab1e12 100644 --- a/jobs/update-osmo-ci-on-slaves.yml +++ b/jobs/update-osmo-ci-on-slaves.yml @@ -50,7 +50,6 @@ description: | Trigger <a href="https://jenkins.osmocom.org/jenkins/job/update-osmo-ci-on-slaves/">update-osmo-ci-on-slaves</a> on changes in docker-playground.git, so it can rebuild docker containers relevant for the jenkins slaves. - node: osmocom-master-debian9 scm: - git: url: https://gerrit.osmocom.org/docker-playground -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30772 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1a23a4c99fe007387f13e330b0b08f6941392829 Gerrit-Change-Number: 30772 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

Change in docker-playground[master]: jenkins-common: tweak echo messages

by osmith

Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/30766 ) Change subject: jenkins-common: tweak echo messages ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > maybe we should define a shell function for doing the set -x / echo / set +x? that would have the same problem: + echo_without_set_x Creating network ttcn3-bts-test Creating network ttcn3-bts-test -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I213cb80bd1d9401281ae1fb7394b2319453550dd Gerrit-Change-Number: 30766 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 22 Dec 2022 14:03:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in docker-playground[master]: scripts/regen_doc: use SUBNET variable

by laforge

Attention is currently required from: osmith, daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/30768 ) Change subject: scripts/regen_doc: use SUBNET variable ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3bda4bd7280469ad5ee02104295134a2e0b768e3 Gerrit-Change-Number: 30768 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Dec 2022 14:03:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in docker-playground[master]: ttcn3-ggsn-test: cp initrd-ggsn.sh to VOL_BASE_DIR

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/30767 ) Change subject: ttcn3-ggsn-test: cp initrd-ggsn.sh to VOL_BASE_DIR ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie4f35b77a2bff20f2a0479890a429754768cafd2 Gerrit-Change-Number: 30767 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Dec 2022 14:02:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in docker-playground[master]: jenkins-common: tweak echo messages

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/30766 ) Change subject: jenkins-common: tweak echo messages ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: maybe we should define a shell function for doing the set -x / echo / set +x? -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I213cb80bd1d9401281ae1fb7394b2319453550dd Gerrit-Change-Number: 30766 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Dec 2022 14:02:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-ci[master]: jobs/ttcn3: don't block on same testsuite running

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/30771 ) Change subject: jobs/ttcn3: don't block on same testsuite running ...................................................................... jobs/ttcn3: don't block on same testsuite running Don't block jobs if other jobs with the same testsuite are already running. This used to be necessary as we had subnets hardcoded per testsuite, and therefore couldn't run it twice on the same host (e.g. once against latest, once against nightly). Related: OS#5802 Depends: docker-playground I57152b08ef0f38e17e7019a8df032189b03f56cf Change-Id: I3159403e2ce2ec184ee48b4ff4f145e718e9b428 --- M jobs/ttcn3-testsuites-kernel-git.yml M jobs/ttcn3-testsuites.yml 2 files changed, 0 insertions(+), 107 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/71/30771/1 diff --git a/jobs/ttcn3-testsuites-kernel-git.yml b/jobs/ttcn3-testsuites-kernel-git.yml index e378122..60072fa 100644 --- a/jobs/ttcn3-testsuites-kernel-git.yml +++ b/jobs/ttcn3-testsuites-kernel-git.yml @@ -8,13 +8,11 @@ disabled: false description: "" node: ttcn3 - blocking: "^{job-name}.*" wipe_workspace: false jobs: - "{job-name}" job-name: - ttcn3-ggsn-test-kernel-git: - blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" # Cache the linux source tree in the workspace of one node node: ttcn3-ggsn-test-kernel-git description: | diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index e59611c..3b1b89f 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -13,8 +13,6 @@ TTCN3 Testsuite</a> for more information. timer: "@midnight" node: ttcn3 - # Block *-latest for all master jobs (without suffix) - blocking: "^{job-name}.*" wipe_workspace: true jobs: - "{job-name}" @@ -22,26 +20,20 @@ job-name: # debian nightly - order by time - nplab-m3ua-test: - blocking: "^(nplab|NPLAB-.*)-m3ua-test.*" timer: 10 03 * * * - nplab-sua-test: - blocking: "^(nplab|NPLAB-.*)-sua-test.*" timer: 15 03 * * * - ttcn3-ggsn-test: - blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" timer: 00 04 * * * - ttcn3-ggsn-test-kernel: - blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" timer: 10 04 * * * description: | Test osmo-ggsn master with the Debian kernel. - ttcn3-ggsn-test-kernel-latest: - blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" timer: 20 04 * * * description: | Test osmo-ggsn latest with the Debian kernel. - ttcn3-ggsn-test-kernel-latest-net-next: - blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" timer: 25 04 * * * # Cache the linux source tree in the workspace of one node wipe_workspace: false @@ -51,7 +43,6 @@ <a href="https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/"> net-next.git</a>. - ttcn3-ggsn-test-kernel-latest-torvalds: - blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" timer: 30 04 * * * # Cache the linux source tree in the workspace of one node wipe_workspace: false @@ -61,101 +52,71 @@ <a href="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/"> torvalds/linux.git</a>. - ttcn3-ggsn-test-ogs: - blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" timer: 35 04 * * * description: | Test open5gs-smfd + open5gs-upfd main. email: jenkins-notifications(a)lists.osmocom.org acetcom(a)gmail.com - ttcn3-msc-test: - blocking: "^(ttcn3|TTCN3-.*)-msc-test.*" timer: 40 04 * * * - ttcn3-pcu-test: - blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" timer: 00 05 * * * - ttcn3-pcu-test-sns: - blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" timer: 15 05 * * * - ttcn3-sgsn-test: - blocking: "^(ttcn3|TTCN3-.*)-sgsn-test.*" timer: 30 05 * * * - ttcn3-bsc-test: - blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" timer: 00 06 * * * - ttcn3-mgw-test: - blocking: "^(ttcn3|TTCN3-.*)-mgw-test.*" timer: 30 06 * * * - ttcn3-hlr-test: - blocking: "^(ttcn3|TTCN3-.*)-hlr-test.*" timer: 45 06 * * * - ttcn3-bts-test: - blocking: "^(ttcn3|TTCN3-.*)-bts-test.*" timer: 00 07 * * * - ttcn3-sip-test: - blocking: "^(ttcn3|TTCN3-.*)-sip-test.*" timer: 30 07 * * * - ttcn3-bscnat-test: - blocking: "^(ttcn3|TTCN3-.*)-bscnat-test.*" timer: 00 08 * * * disabled: true - ttcn3-bsc-test-sccplite: - blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" timer: 30 08 * * * - ttcn3-remsim-test: - blocking: "^(ttcn3|TTCN3-.*)-remsim-test.*" timer: 00 09 * * * - ttcn3-stp-test: - blocking: "^(ttcn3|TTCN3-.*)-stp-test.*" timer: 30 09 * * * - ttcn3-sccp-test: - blocking: "^(ttcn3|TTCN3-.*)-sccp-test.*" timer: 00 10 * * * - ttcn3-smlc-test: - blocking: "^(ttcn3|TTCN3-.*)-smlc-test.*" timer: 10 10 * * * - ttcn3-gbproxy-test: - blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test.*" timer: 20 10 * * * - ttcn3-gbproxy-test-fr: - blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test-fr.*" timer: 30 10 * * * node: hdlc - ttcn3-cbc-test: - blocking: "^(ttcn3|TTCN3-.*)-cbc-test.*" timer: 40 10 * * * - ttcn3-ns-test: - blocking: "^(ttcn3|TTCN3-.*)-ns-test.*" timer: 00 11 * * * - ttcn3-ns-test-sns: - blocking: "^(ttcn3|TTCN3-.*)-ns-test-sns.*" timer: 10 11 * * * - ttcn3-ns-test-fr: - blocking: "^(ttcn3|TTCN3-.*)-ns-test-fr.*" timer: 20 11 * * * node: hdlc - ttcn3-ns-test-sgsn-sns: - blocking: "^(ttcn3|TTCN3-.*)-ns-test-sgsn-sns.*" timer: 30 11 * * * - ttcn3-pcap-client-test: - blocking: "^(ttcn3|TTCN3-.*)-pcap-client-test.*" timer: 40 11 * * * - ttcn3-bsc-test-vamos: - blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" timer: 00 12 * * * - ttcn3-hnodeb-test: - blocking: "^(ttcn3|TTCN3-.*)-hnodeb-test.*" timer: 40 12 * * * - ttcn3-upf-test: - blocking: "^(ttcn3|TTCN3-.*)-upf-test.*" timer: 00 13 * * * - ttcn3-hnbgw-test: - blocking: "^(ttcn3|TTCN3-.*)-hnbgw-test.*" timer: 40 13 * * * - ttcn3-fr-test: - blocking: "^(ttcn3|TTCN3-.*)-fr-test.*" timer: 40 10 * * * node: hdlc - ttcn3-pgw-test: - blocking: "^(ttcn3|TTCN3-.*)-pgw-test.*" timer: 00 14 * * * description: | Test open5gs-smfd + open5gs-upfd PGW main. @@ -163,219 +124,153 @@ # debian latest stable - nplab-m3ua-test-latest: - blocking: "^(nplab|NPLAB-.*)-m3ua-test.*" timer: 10 03 * * * - nplab-sua-test-latest: - blocking: "^(nplab|NPLAB-.*)-sua-test.*" timer: 15 03 * * * - ttcn3-ggsn-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" timer: 00 04 * * * - ttcn3-msc-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-msc-test.*" timer: 30 04 * * * - ttcn3-pcu-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" timer: 00 05 * * * - ttcn3-pcu-test-sns-latest: - blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" timer: 15 05 * * * - ttcn3-sgsn-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-sgsn-test.*" timer: 30 05 * * * - ttcn3-bsc-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" timer: 00 06 * * * - ttcn3-mgw-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-mgw-test.*" timer: 30 06 * * * - ttcn3-hlr-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-hlr-test.*" timer: 45 06 * * * - ttcn3-bts-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-bts-test.*" timer: 00 07 * * * - ttcn3-sip-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-sip-test.*" timer: 30 07 * * * - ttcn3-bscnat-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-bscnat-test.*" timer: 00 08 * * * disabled: true - ttcn3-bsc-test-sccplite-latest: - blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" timer: 30 08 * * * - ttcn3-remsim-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-remsim-test.*" timer: 00 09 * * * - ttcn3-stp-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-stp-test.*" timer: 30 09 * * * - ttcn3-sccp-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-sccp-test.*" timer: 00 10 * * * - ttcn3-smlc-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-smlc-test.*" timer: 10 10 * * * - ttcn3-gbproxy-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test.*" timer: 20 10 * * * - ttcn3-gbproxy-test-fr-latest: - blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test-fr.*" timer: 30 10 * * * node: hdlc - ttcn3-cbc-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-cbc-test.*" timer: 40 10 * * * - ttcn3-pcap-client-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-pcap-client-test.*" timer: 40 11 * * * - ttcn3-hnodeb-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-hnodeb-test.*" timer: 40 12 * * * - ttcn3-upf-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-upf-test.*" timer: 00 13 * * * disabled: true - ttcn3-hnbgw-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-hnbgw-test.*" timer: 40 13 * * * # Jobs below use uppercase TTCN3-$DISTRO, so they get listed separately from the ttcn3-* (debian) jobs # centos7 nightly - TTCN3-centos7-pcap-client-test: - blocking: "^(ttcn3|TTCN3-.*)-pcap-client-test.*" timer: 10 13 * * * # centos7 latest - TTCN3-centos7-pcap-client-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" timer: 40 13 * * * # centos8 nightly - TTCN3-centos-ggsn-test: - blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" timer: 00 04 * * * - TTCN3-centos-msc-test: - blocking: "^(ttcn3|TTCN3-.*)-msc-test.*" timer: 30 04 * * * - TTCN3-centos-pcu-test: - blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" timer: 00 05 * * * - TTCN3-centos-pcu-test-sns: - blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" timer: 15 05 * * * - TTCN3-centos-sgsn-test: - blocking: "^(ttcn3|TTCN3-.*)-sgsn-test.*" timer: 30 05 * * * - TTCN3-centos-bsc-test: - blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" timer: 00 06 * * * - TTCN3-centos-mgw-test: - blocking: "^(ttcn3|TTCN3-.*)-mgw-test.*" timer: 30 06 * * * - TTCN3-centos-hlr-test: - blocking: "^(ttcn3|TTCN3-.*)-hlr-test.*" timer: 45 06 * * * - TTCN3-centos-bts-test: - blocking: "^(ttcn3|TTCN3-.*)-bts-test.*" timer: 00 07 * * * - TTCN3-centos-sip-test: - blocking: "^(ttcn3|TTCN3-.*)-sip-test.*" timer: 30 07 * * * - TTCN3-centos-bsc-test-sccplite: - blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" timer: 30 08 * * * - TTCN3-centos-remsim-test: - blocking: "^(ttcn3|TTCN3-.*)-remsim-test.*" timer: 00 09 * * * disabled: true - TTCN3-centos-stp-test: - blocking: "^(ttcn3|TTCN3-.*)-stp-test.*" timer: 30 09 * * * - TTCN3-centos-gbproxy-test: - blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test.*" timer: 20 10 * * * - TTCN3-centos-cbc-test: - blocking: "^(ttcn3|TTCN3-.*)-cbc-test.*" timer: 40 10 * * * # centos8 latest stable - TTCN3-centos-ggsn-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-ggsn-test.*" timer: 00 04 * * * - TTCN3-centos-msc-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-msc-test.*" timer: 30 04 * * * - TTCN3-centos-pcu-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" timer: 00 05 * * * - TTCN3-centos-pcu-test-sns-latest: - blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" timer: 15 05 * * * - TTCN3-centos-sgsn-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-sgsn-test.*" timer: 30 05 * * * - TTCN3-centos-bsc-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" timer: 00 06 * * * - TTCN3-centos-mgw-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-mgw-test.*" timer: 30 06 * * * - TTCN3-centos-hlr-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-hlr-test.*" timer: 45 06 * * * - TTCN3-centos-bts-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-bts-test.*" timer: 00 07 * * * - TTCN3-centos-sip-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-sip-test.*" timer: 30 07 * * * - TTCN3-centos-bsc-test-sccplite-latest: - blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" timer: 30 08 * * * - TTCN3-centos-remsim-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-remsim-test.*" timer: 00 09 * * * disabled: true - TTCN3-centos-stp-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-stp-test.*" timer: 30 09 * * * - TTCN3-centos-smlc-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-smlc-test.*" timer: 10 10 * * * - TTCN3-centos-sccp-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-sccp-test.*" timer: 00 10 * * * - TTCN3-centos-gbproxy-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test.*" timer: 20 10 * * * - TTCN3-centos-cbc-test-latest: - blocking: "^(ttcn3|TTCN3-.*)-cbc-test.*" timer: 40 10 * * * # centos8 2022q2 (SYS#6007) - TTCN3-centos-pcu-test-2022q2: - blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" timer: 00 17 * * * - TTCN3-centos-pcu-test-sns-2022q2: - blocking: "^(ttcn3|TTCN3-.*)-pcu-test.*" timer: 15 17 * * * - TTCN3-centos-bsc-test-2022q2: - blocking: "^(ttcn3|TTCN3-.*)-bsc-test.*" timer: 30 17 * * * - TTCN3-centos-mgw-test-2022q2: - blocking: "^(ttcn3|TTCN3-.*)-mgw-test.*" timer: 45 17 * * * - TTCN3-centos-bts-test-2022q2: - blocking: "^(ttcn3|TTCN3-.*)-bts-test.*" timer: 00 18 * * * - TTCN3-centos-smlc-test-2022q2: - blocking: "^(ttcn3|TTCN3-.*)-smlc-test.*" timer: 15 18 * * * - TTCN3-centos-gbproxy-test-2022q2: - blocking: "^(ttcn3|TTCN3-.*)-gbproxy-test.*" timer: 30 18 * * * - job-template: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30771 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3159403e2ce2ec184ee48b4ff4f145e718e9b428 Gerrit-Change-Number: 30771 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

Change in docker-playground[master]: ttcn3-*/jenkins*.sh: use $SUBNET everywhere

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/30769 ) Change subject: ttcn3-*/jenkins*.sh: use $SUBNET everywhere ...................................................................... ttcn3-*/jenkins*.sh: use $SUBNET everywhere Use the SUBNET variable instead of hardcoding it in some places. Split commands across multiple lines while at it to improve readability. Related: OS#5802 Change-Id: I08f83089ef97f5f92d4bbfa5743301e7375e9f0f --- M ttcn3-bsc-test-vamos/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-remsim-test/jenkins.sh M ttcn3-sccp-test/jenkins.sh 7 files changed, 45 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/69/30769/1 diff --git a/ttcn3-bsc-test-vamos/jenkins.sh b/ttcn3-bsc-test-vamos/jenkins.sh index e686710..3f7f1ec 100755 --- a/ttcn3-bsc-test-vamos/jenkins.sh +++ b/ttcn3-bsc-test-vamos/jenkins.sh @@ -60,7 +60,13 @@ --name ${BUILD_TAG}-bts$i -d \ $DOCKER_ARGS \ $REPO_USER/osmo-bts-$IMAGE_SUFFIX \ - /bin/sh -c "/usr/local/bin/respawn.sh osmo-bts-omldummy $BTS_FEATURES 172.18.31.20 $((i + 1234)) 1 >>/data/osmo-bts-omldummy-${i}.log 2>&1" + /bin/sh -c "/usr/local/bin/respawn.sh \ + osmo-bts-omldummy \ + $BTS_FEATURES \ + 172.18.$SUBNET.20 \ + $((i + 1234)) \ + 1 \ + >>/data/osmo-bts-omldummy-${i}.log 2>&1" done echo Starting container with BSC testsuite diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index e402b33..6dac56a 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -51,7 +51,13 @@ --name ${BUILD_TAG}-bts$1 -d \ $DOCKER_ARGS \ $REPO_USER/osmo-bts-$IMAGE_SUFFIX \ - /bin/sh -c "/usr/local/bin/respawn.sh osmo-bts-omldummy $BTS_FEATURES 172.18.12.20 $(($1 + 1234)) $2 >>/data/osmo-bts-omldummy-$1.log 2>&1" + /bin/sh -c "/usr/local/bin/respawn.sh \ + osmo-bts-omldummy \ + $BTS_FEATURES \ + 172.18.$SUBNET.20 \ + $(($1 + 1234)) \ + $2 \ + >>/data/osmo-bts-omldummy-$1.log 2>&1" done echo Starting container with BSC testsuite diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index c018046..2138169 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -60,7 +60,13 @@ --name ${BUILD_TAG}-bts$1 -d \ $DOCKER_ARGS \ $REPO_USER/osmo-bts-$IMAGE_SUFFIX \ - /bin/sh -c "/usr/local/bin/respawn.sh osmo-bts-omldummy $BTS_FEATURES 172.18.2.20 $(($1 + 1234)) $2 >>/data/osmo-bts-omldummy-$1.log 2>&1" + /bin/sh -c "/usr/local/bin/respawn.sh \ + osmo-bts-omldummy \ + $BTS_FEATURES \ + 172.18.$SUBNET.20 \ + $(($1 + 1234)) \ + $2 \ + >>/data/osmo-bts-omldummy-$1.log 2>&1" done echo Starting container with BSC testsuite diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 3438771..3f1f2f1 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -68,10 +68,12 @@ --log-file-level DEBUG \ --log-file-time \ --log-level INFO \ - -R 172.18.9.20 -r 172.18.9.22 \ - --trx TRX1@172.18.9.20:5700/1 \ - --trx TRX2@172.18.9.20:5700/2 \ - --trx TRX3@172.18.9.20:5700/3 >>/data/fake_trx.out 2>&1" + -R 172.18.$SUBNET.20 \ + -r 172.18.$SUBNET.22 \ + --trx TRX1@172.18.$SUBNET.20:5700/1 \ + --trx TRX2@172.18.$SUBNET.20:5700/2 \ + --trx TRX3@172.18.$SUBNET.20:5700/3 \ + >>/data/fake_trx.out 2>&1" } start_trxcon() { @@ -84,7 +86,10 @@ --name ${BUILD_TAG}-trxcon -d \ $DOCKER_ARGS \ $REPO_USER/osmocom-bb-host-master \ - /bin/sh -c "trxcon -i 172.18.9.21 -s /data/unix/osmocom_l2 >>/data/trxcon.log 2>&1" + /bin/sh -c "trxcon \ + -i 172.18.$SUBNET.21 \ + -s /data/unix/osmocom_l2 \ + >>/data/trxcon.log 2>&1" } start_virtphy() { diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index 4bd2480..dfcf403 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -32,7 +32,11 @@ --name ${BUILD_TAG}-pcu-sns -d \ $DOCKER_ARGS \ $REPO_USER/osmo-pcu-$IMAGE_SUFFIX \ - /bin/sh -c "/usr/local/bin/respawn.sh osmo-pcu -c /data/osmo-pcu.cfg -i 172.18.14.10 >>/data/osmo-pcu.log 2>&1" + /bin/sh -c "/usr/local/bin/respawn.sh \ + osmo-pcu \ + -c /data/osmo-pcu.cfg \ + -i 172.18.$SUBNET.10 \ + >>/data/osmo-pcu.log 2>&1" echo Starting container with PCU testsuite docker run --rm \ diff --git a/ttcn3-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh index 2a6a9d8..b9e74b4 100755 --- a/ttcn3-remsim-test/jenkins.sh +++ b/ttcn3-remsim-test/jenkins.sh @@ -30,7 +30,10 @@ --name ${BUILD_TAG}-bankd -d \ $DOCKER_ARGS \ $REPO_USER/osmo-remsim-$IMAGE_SUFFIX \ - /bin/sh -c "pcscd; osmo-remsim-bankd -i 172.18.17.10 >/data/osmo-remsim-bankd.log 2>&1" + /bin/sh -c "pcscd; \ + osmo-remsim-bankd \ + -i 172.18.$SUBNET.10 \ + >/data/osmo-remsim-bankd.log 2>&1" } start_client() { diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh index d1a9a11..3a3346a 100755 --- a/ttcn3-sccp-test/jenkins.sh +++ b/ttcn3-sccp-test/jenkins.sh @@ -28,7 +28,11 @@ --name ${BUILD_TAG}-stp -d \ $DOCKER_ARGS \ $REPO_USER/osmo-stp-master \ - /bin/sh -c "sccp_demo_user -l 172.18.22.200 -r 172.18.22.203 -C /data/sccp_demo_user.cfg >>/data/sccp_demo_user.log 2>&1" + /bin/sh -c "sccp_demo_user \ + -l 172.18.$SUBNET.200 \ + -r 172.18.$SUBNET.203 \ + -C /data/sccp_demo_user.cfg \ + >>/data/sccp_demo_user.log 2>&1" echo Starting container with SCCP testsuite -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I08f83089ef97f5f92d4bbfa5743301e7375e9f0f Gerrit-Change-Number: 30769 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

Change in docker-playground[master]: network_create: find free subnet automatically

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/30770 ) Change subject: network_create: find free subnet automatically ...................................................................... network_create: find free subnet automatically Try multiple subnet numbers until successfully creating a network. This way we can run the same ttcn3 testsuite multiple times in parallel without conflicts (e.g. once against latest, once against nightly). Also we don't need to make sure each new testsuite has a unique subnet number anymore. I've considered also adjusting network_bridge_create, but that gets used exclusively by osmo-ran/jenkins.sh, a script which we don't actually run in jenkins. It seems that in this script it makes more sense to not get a random subnet number. Related: OS#5802 Change-Id: I57152b08ef0f38e17e7019a8df032189b03f56cf --- M jenkins-common.sh M nplab-m3ua-test/jenkins.sh M nplab-sua-test/jenkins.sh M osmo-gsm-tester/jenkins.sh M scripts/regen_doc.sh M ttcn3-bsc-test-vamos/jenkins.sh M ttcn3-bsc-test/jenkins-sccplite.sh M ttcn3-bsc-test/jenkins.sh M ttcn3-bscnat-test/jenkins.sh M ttcn3-bts-test/jenkins.sh M ttcn3-cbc-test/jenkins.sh M ttcn3-fr-test/jenkins.sh M ttcn3-gbproxy-test-fr/jenkins.sh M ttcn3-gbproxy-test/jenkins.sh M ttcn3-ggsn-test/jenkins-ogs.sh M ttcn3-ggsn-test/jenkins.sh M ttcn3-hlr-test/jenkins.sh M ttcn3-hnbgw-test/jenkins.sh M ttcn3-hnodeb-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-msc-test/jenkins.sh M ttcn3-nitb-sysinfo/jenkins.sh M ttcn3-ns-test/jenkins-fr.sh M ttcn3-ns-test/jenkins-sgsn-sns.sh M ttcn3-ns-test/jenkins-sns.sh M ttcn3-ns-test/jenkins.sh M ttcn3-pcap-client-test/jenkins.sh M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-pcu-test/jenkins.sh M ttcn3-pgw-test/jenkins.sh M ttcn3-remsim-test/jenkins.sh M ttcn3-sccp-test/jenkins.sh M ttcn3-sgsn-test/jenkins.sh M ttcn3-sip-test/jenkins.sh M ttcn3-smlc-test/jenkins.sh M ttcn3-stp-test/jenkins.sh M ttcn3-upf-test/jenkins.sh 37 files changed, 155 insertions(+), 95 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/70/30770/1 diff --git a/jenkins-common.sh b/jenkins-common.sh index 3a30ea0..758c4d0 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -195,8 +195,9 @@ docker network inspect $NET_NAME | grep Name | cut -d : -f2 | awk -F\" 'NR>1{print $2}' | xargs -rn1 docker kill } +# Create network and find a free subnet automatically. The global variable +# SUBNET gets set to the subnet number that has been used. network_create() { - NET=$1 if docker network ls | grep -q $NET_NAME; then set +x echo "Removing stale network and containers..." @@ -204,12 +205,33 @@ network_clean network_remove fi - SUB4="172.18.$NET.0/24" - SUB6="fd02:db8:$NET::/64" + + SUBNET="$PPID" + for i in $(seq 1 30); do + SUBNET="$(echo "($SUBNET + 1) % 256" | bc)" + SUB4="172.18.$SUBNET.0/24" + SUB6="fd02:db8:$SUBNET::/64" + set +x + echo "Creating network $NET_NAME, trying SUBNET=$SUBNET..." + set -x + if docker network create \ + --internal \ + --subnet "$SUB4" \ + --ipv6 \ + --subnet "$SUB6" \ + "$NET_NAME"; then + set +x + echo + echo "### Network $NET_NAME created (SUBNET=$SUBNET) ###" + echo + set -x + return + fi + done + set +x - echo "Creating network $NET_NAME" - set -x - docker network create --internal --subnet $SUB4 --ipv6 --subnet $SUB6 $NET_NAME + echo "ERROR: failed to create docker network" + exit 1 } network_bridge_create() { @@ -241,8 +263,40 @@ docker network remove $NET_NAME } +network_replace_subnet_in_configs() { + set +x + + local i + local files="$(find \ + "$VOL_BASE_DIR" \ + -name '*.cfg' -o \ + -name '*.conf' -o \ + -name '*.sh' -o \ + -name '*.txt' -o \ + -name '*.yaml' \ + )" + + if [ -z "$files" ]; then + echo "ERROR: network_replace_subnet_in_configs:" \ + "no config files found!" + exit 1 + fi + + for i in $files; do + echo "Applying SUBNET=$SUBNET to: $i" + sed \ + -i \ + -E \ + -e "s/172\.18\.[0-9]{1,3}\./172.18.$SUBNET./g" \ + -e "s/fd02:db8:[0-9]{1,3}:/fd02:db8:$SUBNET:/g" \ + "$i" + done + + set -x +} + # Generates list of params to pass to "docker run" to configure IP addresses -# $1: SUBNET to use, same as passed to network_create() +# $1: SUBNET to use, same as set by network_create() # $2: Address suffix from SUBNET to apply to the container docker_network_params() { NET=$1 diff --git a/nplab-m3ua-test/jenkins.sh b/nplab-m3ua-test/jenkins.sh index 87035f3..1b71671 100755 --- a/nplab-m3ua-test/jenkins.sh +++ b/nplab-m3ua-test/jenkins.sh @@ -18,8 +18,8 @@ mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ -SUBNET=7 -network_create $SUBNET +network_create +network_replace_subnet_in_configs # start container with STP in background docker run --rm \ diff --git a/nplab-sua-test/jenkins.sh b/nplab-sua-test/jenkins.sh index 4be00c8..6ee52ee 100755 --- a/nplab-sua-test/jenkins.sh +++ b/nplab-sua-test/jenkins.sh @@ -18,8 +18,8 @@ mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ -SUBNET=6 -network_create $SUBNET +network_create +network_replace_subnet_in_configs # start container with STP in background docker run --rm \ diff --git a/osmo-gsm-tester/jenkins.sh b/osmo-gsm-tester/jenkins.sh index 85e6a69..cbfd921 100755 --- a/osmo-gsm-tester/jenkins.sh +++ b/osmo-gsm-tester/jenkins.sh @@ -72,8 +72,8 @@ set_clean_up_trap set -e -SUBNET=50 -network_create $SUBNET +network_create +network_replace_subnet_in_configs mkdir $VOL_BASE_DIR/ogt-slave cp osmo-gsm-tester-slave.sh $VOL_BASE_DIR/ogt-slave/ diff --git a/scripts/regen_doc.sh b/scripts/regen_doc.sh index 012c12a..27c3138 100755 --- a/scripts/regen_doc.sh +++ b/scripts/regen_doc.sh @@ -21,8 +21,7 @@ docker_images_require \ "$NAME-$IMAGE_SUFFIX" -SUBNET=16 -network_create "$SUBNET" +network_create container_create() { CONTAINERNAME=$1 diff --git a/ttcn3-bsc-test-vamos/jenkins.sh b/ttcn3-bsc-test-vamos/jenkins.sh index 3f7f1ec..c859fd6 100755 --- a/ttcn3-bsc-test-vamos/jenkins.sh +++ b/ttcn3-bsc-test-vamos/jenkins.sh @@ -23,8 +23,8 @@ mkdir $VOL_BASE_DIR/bts-omldummy -SUBNET=31 -network_create $SUBNET +network_create +network_replace_subnet_in_configs echo Starting container with STP docker run --rm \ diff --git a/ttcn3-bsc-test/jenkins-sccplite.sh b/ttcn3-bsc-test/jenkins-sccplite.sh index 6dac56a..2343b4a 100755 --- a/ttcn3-bsc-test/jenkins-sccplite.sh +++ b/ttcn3-bsc-test/jenkins-sccplite.sh @@ -22,8 +22,8 @@ mkdir $VOL_BASE_DIR/bts-omldummy -SUBNET=12 -network_create $SUBNET +network_create +network_replace_subnet_in_configs echo Starting container with BSC docker run --rm \ diff --git a/ttcn3-bsc-test/jenkins.sh b/ttcn3-bsc-test/jenkins.sh index 2138169..149e0d1 100755 --- a/ttcn3-bsc-test/jenkins.sh +++ b/ttcn3-bsc-test/jenkins.sh @@ -23,8 +23,8 @@ mkdir $VOL_BASE_DIR/bts-omldummy -SUBNET=2 -network_create $SUBNET +network_create +network_replace_subnet_in_configs echo Starting container with STP docker run --rm \ diff --git a/ttcn3-bscnat-test/jenkins.sh b/ttcn3-bscnat-test/jenkins.sh index a63cdad..7837476 100755 --- a/ttcn3-bscnat-test/jenkins.sh +++ b/ttcn3-bscnat-test/jenkins.sh @@ -17,8 +17,8 @@ cp osmo-bsc-nat.cfg $VOL_BASE_DIR/bscnat/ cp bscs.config $VOL_BASE_DIR/bscnat/ -SUBNET=15 -network_create $SUBNET +network_create +network_replace_subnet_in_configs echo Starting container with BSCNAT docker run --rm \ diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 3f1f2f1..691c753 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -121,8 +121,7 @@ $REPO_USER/ttcn3-bts-test } -SUBNET=9 -network_create $SUBNET +network_create mkdir $VOL_BASE_DIR/bts-tester-generic cp generic/BTS_Tests.cfg $VOL_BASE_DIR/bts-tester-generic/ @@ -162,6 +161,7 @@ mkdir $VOL_BASE_DIR/virtphy # 1) classic test suite with BSC for OML and trxcon+fake_trx +network_replace_subnet_in_configs start_bsc start_bts trx 1 start_fake_trx @@ -180,6 +180,7 @@ sed -i "/^ logging level osmux info/d" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg sed -i "/^ osmux/{N;N;N;N;d;}" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg fi +network_replace_subnet_in_configs start_bts virtual 0 start_virtphy # ... and execute the testsuite again with different cfg @@ -197,6 +198,7 @@ sed -i "/^ logging level osmux info/d" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg sed -i "/^ osmux/{N;N;N;N;d;}" $VOL_BASE_DIR/bts/osmo-bts.gen.cfg fi +network_replace_subnet_in_configs start_bts trx 1 start_fake_trx start_trxcon @@ -213,6 +215,7 @@ fi # restart the BSC/BTS and run the testsuite again docker container kill ${BUILD_TAG}-bts +network_replace_subnet_in_configs start_bsc start_bts trx 1 start_testsuite hopping diff --git a/ttcn3-cbc-test/jenkins.sh b/ttcn3-cbc-test/jenkins.sh index 63bf3f9..e1958ef 100755 --- a/ttcn3-cbc-test/jenkins.sh +++ b/ttcn3-cbc-test/jenkins.sh @@ -16,8 +16,8 @@ mkdir $VOL_BASE_DIR/cbc cp osmo-cbc.cfg $VOL_BASE_DIR/cbc/ -SUBNET=27 -network_create $SUBNET +network_create +network_replace_subnet_in_configs echo Starting container with CBC docker run --rm \ diff --git a/ttcn3-fr-test/jenkins.sh b/ttcn3-fr-test/jenkins.sh index 182f512..9122063 100755 --- a/ttcn3-fr-test/jenkins.sh +++ b/ttcn3-fr-test/jenkins.sh @@ -18,9 +18,6 @@ docker container rm ${BUILD_TAG}-frnet ${BUILD_TAG}-ttcn3-fr-test } -SUBNET=26 -network_create $SUBNET - mkdir $VOL_BASE_DIR/fr-tester # if we don't change permissions, dumpcap fails to write (despite starting it as root!) chmod a+w $VOL_BASE_DIR/fr-tester @@ -33,6 +30,9 @@ mkdir $VOL_BASE_DIR/unix +network_create +network_replace_subnet_in_configs + echo Starting container with FRNET docker run \ `# --rm is done in clean_up()` \ diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh index f4827a8..ab62bc1 100755 --- a/ttcn3-gbproxy-test-fr/jenkins.sh +++ b/ttcn3-gbproxy-test-fr/jenkins.sh @@ -22,9 +22,6 @@ set_clean_up_trap set -e -SUBNET=25 -network_create $SUBNET - mkdir $VOL_BASE_DIR/gbproxy-tester # if we don't change permissions, dumpcap fails to write (despite starting it as root!) chmod a+w $VOL_BASE_DIR/gbproxy-tester @@ -36,6 +33,9 @@ mkdir $VOL_BASE_DIR/unix +network_create +network_replace_subnet_in_configs + echo Starting container with gbproxy docker run --rm \ --cap-add=NET_RAW --cap-add=SYS_RAWIO \ diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh index f8fae0f..0ee7a5f 100755 --- a/ttcn3-gbproxy-test/jenkins.sh +++ b/ttcn3-gbproxy-test/jenkins.sh @@ -9,9 +9,6 @@ set_clean_up_trap set -e -SUBNET=24 -network_create $SUBNET - mkdir $VOL_BASE_DIR/gbproxy-tester # if we don't change permissions, dumpcap fails to write (despite starting it as root!) chmod a+w $VOL_BASE_DIR/gbproxy-tester @@ -24,6 +21,9 @@ mkdir $VOL_BASE_DIR/unix +network_create +network_replace_subnet_in_configs + echo Starting container with gbproxy docker run --rm \ $(docker_network_params $SUBNET 10) \ diff --git a/ttcn3-ggsn-test/jenkins-ogs.sh b/ttcn3-ggsn-test/jenkins-ogs.sh index b6500f0..93cc33a 100755 --- a/ttcn3-ggsn-test/jenkins-ogs.sh +++ b/ttcn3-ggsn-test/jenkins-ogs.sh @@ -24,8 +24,8 @@ cp ogs/upfd.sh $VOL_BASE_DIR/ggsn/ cp ogs/upfd-setup.sh $VOL_BASE_DIR/ggsn/ -SUBNET=3 -network_create $SUBNET +network_create +network_replace_subnet_in_configs # start container with ggsn (smf+upf) in background docker run --cap-add=NET_ADMIN \ diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index 0797f76..00995bf 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -23,8 +23,7 @@ mkdir $VOL_BASE_DIR/ggsn -SUBNET=3 -network_create $SUBNET +network_create # start container with ggsn in background GGSN_CMD="osmo-ggsn -c /data/osmo-ggsn.cfg" @@ -32,6 +31,7 @@ if [ "$KERNEL_TEST" = "1" ]; then cp osmo-ggsn-kernel-gtp.cfg $VOL_BASE_DIR/ggsn/osmo-ggsn.cfg cp initrd-ggsn.sh $VOL_BASE_DIR/ggsn/ + network_replace_subnet_in_configs kernel_test_prepare \ "defconfig" \ @@ -50,6 +50,7 @@ OSMO_SUT_HOST="172.18.$SUBNET.200" else cp osmo-ggsn.cfg $VOL_BASE_DIR/ggsn/ + network_replace_subnet_in_configs GGSN_DOCKER_ARGS=" $(docker_network_params $SUBNET 201) diff --git a/ttcn3-hlr-test/jenkins.sh b/ttcn3-hlr-test/jenkins.sh index 317f141..66d102e 100755 --- a/ttcn3-hlr-test/jenkins.sh +++ b/ttcn3-hlr-test/jenkins.sh @@ -9,9 +9,6 @@ set_clean_up_trap set -e -SUBNET=10 -network_create $SUBNET - mkdir $VOL_BASE_DIR/hlr-tester cp HLR_Tests.cfg $VOL_BASE_DIR/hlr-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/hlr-tester/HLR_Tests.cfg" @@ -19,6 +16,9 @@ mkdir $VOL_BASE_DIR/hlr cp osmo-hlr.cfg $VOL_BASE_DIR/hlr/ +network_create +network_replace_subnet_in_configs + echo Starting container with HLR docker run --rm \ $(docker_network_params $SUBNET 20) \ diff --git a/ttcn3-hnbgw-test/jenkins.sh b/ttcn3-hnbgw-test/jenkins.sh index fee2728..5a40e5b 100755 --- a/ttcn3-hnbgw-test/jenkins.sh +++ b/ttcn3-hnbgw-test/jenkins.sh @@ -19,8 +19,7 @@ $VOL_BASE_DIR_PFCP/hnbgw-tester/junit-xml-with-pfcp-*.log } -SUBNET=35 -network_create $SUBNET +network_create run_tests() { base_dir="$1" @@ -42,6 +41,8 @@ mkdir $base_dir/unix + network_replace_subnet_in_configs + echo Starting container with STP docker run --rm \ $(docker_network_params $SUBNET 200) \ diff --git a/ttcn3-hnodeb-test/jenkins.sh b/ttcn3-hnodeb-test/jenkins.sh index 358280d..21e72c0 100755 --- a/ttcn3-hnodeb-test/jenkins.sh +++ b/ttcn3-hnodeb-test/jenkins.sh @@ -20,8 +20,8 @@ mkdir $VOL_BASE_DIR/unix -SUBNET=33 -network_create $SUBNET +network_create +network_replace_subnet_in_configs echo Starting container with HNodeB docker run --rm \ diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index 2dee534..7b31f6d 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -20,8 +20,8 @@ sed -i "/^ osmux bind-ip-v6 fd02:db8:4::180/d" $VOL_BASE_DIR/mgw/osmo-mgw.cfg fi -SUBNET=4 -network_create $SUBNET +network_create +network_replace_subnet_in_configs # start container with mgw in background docker run --rm \ diff --git a/ttcn3-msc-test/jenkins.sh b/ttcn3-msc-test/jenkins.sh index a8e6229..6a0f3d5 100755 --- a/ttcn3-msc-test/jenkins.sh +++ b/ttcn3-msc-test/jenkins.sh @@ -10,9 +10,6 @@ set_clean_up_trap set -e -SUBNET=20 -network_create $SUBNET - mkdir $VOL_BASE_DIR/msc-tester mkdir $VOL_BASE_DIR/msc-tester/unix cp MSC_Tests.cfg $VOL_BASE_DIR/msc-tester/ @@ -27,6 +24,9 @@ mkdir $VOL_BASE_DIR/unix +network_create +network_replace_subnet_in_configs + echo Starting container with STP docker run --rm \ $(docker_network_params $SUBNET 200) \ diff --git a/ttcn3-nitb-sysinfo/jenkins.sh b/ttcn3-nitb-sysinfo/jenkins.sh index e2cc494..7a912f8 100755 --- a/ttcn3-nitb-sysinfo/jenkins.sh +++ b/ttcn3-nitb-sysinfo/jenkins.sh @@ -19,8 +19,8 @@ docker container stop -t 0 ${BUILD_TAG}-sysinfo-helper } -SUBNET=5 -network_create $SUBNET +network_create +network_replace_subnet_in_configs # start container with nitb in background docker volume rm nitb-vol diff --git a/ttcn3-ns-test/jenkins-fr.sh b/ttcn3-ns-test/jenkins-fr.sh index e30f6f9..3b609ab 100755 --- a/ttcn3-ns-test/jenkins-fr.sh +++ b/ttcn3-ns-test/jenkins-fr.sh @@ -22,9 +22,6 @@ set_clean_up_trap set -e -SUBNET=30 -network_create $SUBNET - mkdir $VOL_BASE_DIR/ns-tester cp fr/NS_Tests.cfg $VOL_BASE_DIR/ns-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/ns-tester/NS_Tests.cfg" @@ -32,6 +29,9 @@ mkdir $VOL_BASE_DIR/ns cp fr/osmo-ns-dummy.cfg $VOL_BASE_DIR/ns/ +network_create +network_replace_subnet_in_configs + echo Starting container with osmo-ns-dummy docker run --rm \ --cap-add=NET_RAW --cap-add=SYS_RAWIO \ diff --git a/ttcn3-ns-test/jenkins-sgsn-sns.sh b/ttcn3-ns-test/jenkins-sgsn-sns.sh index 4f90421..712b38c 100755 --- a/ttcn3-ns-test/jenkins-sgsn-sns.sh +++ b/ttcn3-ns-test/jenkins-sgsn-sns.sh @@ -9,9 +9,6 @@ set_clean_up_trap set -e -SUBNET=32 -network_create $SUBNET - mkdir $VOL_BASE_DIR/ns-tester cp sgsn-sns/NS_Tests.cfg $VOL_BASE_DIR/ns-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/ns-tester/NS_Tests.cfg" @@ -19,6 +16,9 @@ mkdir $VOL_BASE_DIR/ns cp sgsn-sns/osmo-ns-dummy.cfg $VOL_BASE_DIR/ns/ +network_create +network_replace_subnet_in_configs + echo Starting container with osmo-ns-dummy docker run --rm \ $(docker_network_params $SUBNET 101) \ diff --git a/ttcn3-ns-test/jenkins-sns.sh b/ttcn3-ns-test/jenkins-sns.sh index c2fd651..1ed983b 100755 --- a/ttcn3-ns-test/jenkins-sns.sh +++ b/ttcn3-ns-test/jenkins-sns.sh @@ -9,9 +9,6 @@ set_clean_up_trap set -e -SUBNET=29 -network_create $SUBNET - mkdir $VOL_BASE_DIR/ns-tester cp sns/NS_Tests.cfg $VOL_BASE_DIR/ns-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/ns-tester/NS_Tests.cfg" @@ -19,6 +16,9 @@ mkdir $VOL_BASE_DIR/ns cp sns/osmo-ns-dummy.cfg $VOL_BASE_DIR/ns/ +network_create +network_replace_subnet_in_configs + echo Starting container with osmo-ns-dummy docker run --rm \ $(docker_network_params $SUBNET 101) \ diff --git a/ttcn3-ns-test/jenkins.sh b/ttcn3-ns-test/jenkins.sh index af0552c..755af51 100755 --- a/ttcn3-ns-test/jenkins.sh +++ b/ttcn3-ns-test/jenkins.sh @@ -9,9 +9,6 @@ set_clean_up_trap set -e -SUBNET=28 -network_create $SUBNET - mkdir $VOL_BASE_DIR/ns-tester cp NS_Tests.cfg $VOL_BASE_DIR/ns-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/ns-tester/NS_Tests.cfg" @@ -19,6 +16,9 @@ mkdir $VOL_BASE_DIR/ns cp osmo-ns-dummy.cfg $VOL_BASE_DIR/ns/ +network_create +network_replace_subnet_in_configs + echo Starting container with osmo-ns-dummy docker run --rm \ $(docker_network_params $SUBNET 101) \ diff --git a/ttcn3-pcap-client-test/jenkins.sh b/ttcn3-pcap-client-test/jenkins.sh index 253b6c2..a5769a4 100755 --- a/ttcn3-pcap-client-test/jenkins.sh +++ b/ttcn3-pcap-client-test/jenkins.sh @@ -16,8 +16,8 @@ mkdir $VOL_BASE_DIR/pcap-client cp osmo-pcap-client.cfg $VOL_BASE_DIR/pcap-client/ -SUBNET=31 -network_create $SUBNET +network_create +network_replace_subnet_in_configs echo Starting container with pcap-client docker run --rm \ diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index dfcf403..393e828 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -9,9 +9,6 @@ set_clean_up_trap set -e -SUBNET=14 -network_create $SUBNET - mkdir $VOL_BASE_DIR/pcu-tester mkdir $VOL_BASE_DIR/pcu-tester/unix cp sns/PCU_Tests.cfg $VOL_BASE_DIR/pcu-tester/ @@ -23,6 +20,9 @@ mkdir $VOL_BASE_DIR/unix +network_create +network_replace_subnet_in_configs + echo Starting container with PCU docker run --rm \ $(docker_network_params $SUBNET 101) \ diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index 4c0455d..ee53bb7 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -9,9 +9,6 @@ set_clean_up_trap set -e -SUBNET=13 -network_create $SUBNET - mkdir $VOL_BASE_DIR/pcu-tester mkdir $VOL_BASE_DIR/pcu-tester/unix cp PCU_Tests.cfg $VOL_BASE_DIR/pcu-tester/ @@ -23,6 +20,9 @@ mkdir $VOL_BASE_DIR/unix +network_create +network_replace_subnet_in_configs + echo Starting container with PCU docker run --rm \ $(docker_network_params $SUBNET 101) \ diff --git a/ttcn3-pgw-test/jenkins.sh b/ttcn3-pgw-test/jenkins.sh index 2810899..a61584d 100755 --- a/ttcn3-pgw-test/jenkins.sh +++ b/ttcn3-pgw-test/jenkins.sh @@ -19,8 +19,8 @@ cp upfd.sh $VOL_BASE_DIR/pgw/ cp upfd-setup.sh $VOL_BASE_DIR/pgw/ -SUBNET=18 -network_create $SUBNET +network_create +network_replace_subnet_in_configs # start container with open5gs-nrfd in background docker run --rm \ diff --git a/ttcn3-remsim-test/jenkins.sh b/ttcn3-remsim-test/jenkins.sh index b9e74b4..a7325e7 100755 --- a/ttcn3-remsim-test/jenkins.sh +++ b/ttcn3-remsim-test/jenkins.sh @@ -62,8 +62,7 @@ $REPO_USER/ttcn3-remsim-test } -SUBNET=17 -network_create $SUBNET +network_create mkdir $VOL_BASE_DIR/remsim-tester @@ -76,23 +75,26 @@ # 1) server test suite -start_server cp REMSIM_Tests.cfg $VOL_BASE_DIR/remsim-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/remsim-tester/REMSIM_Tests.cfg" +network_replace_subnet_in_configs +start_server start_testsuite docker container kill ${BUILD_TAG}-server # 2) bankd test suite echo "Changing to bankd configuration" -start_bankd cp bankd/REMSIM_Tests.cfg $VOL_BASE_DIR/remsim-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/remsim-tester/REMSIM_Tests.cfg" +network_replace_subnet_in_configs +start_bankd start_testsuite docker container kill ${BUILD_TAG}-bankd # 3) client test suite echo "Changing to client configuration" -start_client cp client/REMSIM_Tests.cfg $VOL_BASE_DIR/remsim-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/remsim-tester/REMSIM_Tests.cfg" +network_replace_subnet_in_configs +start_client start_testsuite diff --git a/ttcn3-sccp-test/jenkins.sh b/ttcn3-sccp-test/jenkins.sh index 3a3346a..7eadd5d 100755 --- a/ttcn3-sccp-test/jenkins.sh +++ b/ttcn3-sccp-test/jenkins.sh @@ -17,8 +17,8 @@ mkdir $VOL_BASE_DIR/sccp cp sccp_demo_user.cfg $VOL_BASE_DIR/sccp/ -SUBNET=22 -network_create $SUBNET +network_create +network_replace_subnet_in_configs echo Starting container with sccp_demo_user docker run --rm \ diff --git a/ttcn3-sgsn-test/jenkins.sh b/ttcn3-sgsn-test/jenkins.sh index dde90a2..9238096 100755 --- a/ttcn3-sgsn-test/jenkins.sh +++ b/ttcn3-sgsn-test/jenkins.sh @@ -10,9 +10,6 @@ set_clean_up_trap set -e -SUBNET=8 -network_create $SUBNET - mkdir $VOL_BASE_DIR/sgsn-tester cp SGSN_Tests.cfg $VOL_BASE_DIR/sgsn-tester/ write_mp_osmo_repo "$VOL_BASE_DIR/sgsn-tester/SGSN_Tests.cfg" @@ -25,6 +22,9 @@ mkdir $VOL_BASE_DIR/unix +network_create +network_replace_subnet_in_configs + echo Starting container with STP docker run --rm \ $(docker_network_params $SUBNET 200) \ diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index 334f791..2a20dcc 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -9,9 +9,6 @@ set_clean_up_trap set -e -SUBNET=11 -network_create $SUBNET - mkdir $VOL_BASE_DIR/sip-tester mkdir $VOL_BASE_DIR/sip-tester/unix cp SIP_Tests.cfg $VOL_BASE_DIR/sip-tester/ @@ -23,6 +20,9 @@ mkdir $VOL_BASE_DIR/unix +network_create +network_replace_subnet_in_configs + echo Starting container with osmo-sip-connector docker run --rm \ $(docker_network_params $SUBNET 10) \ diff --git a/ttcn3-smlc-test/jenkins.sh b/ttcn3-smlc-test/jenkins.sh index 8aeed92..33a1293 100755 --- a/ttcn3-smlc-test/jenkins.sh +++ b/ttcn3-smlc-test/jenkins.sh @@ -20,8 +20,8 @@ mkdir $VOL_BASE_DIR/smlc cp osmo-smlc.cfg $VOL_BASE_DIR/smlc/ -SUBNET=23 -network_create $SUBNET +network_create +network_replace_subnet_in_configs echo Starting container with STP docker run --rm \ diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index 23434f3..006bb3b 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -16,8 +16,8 @@ mkdir $VOL_BASE_DIR/stp cp osmo-stp.cfg $VOL_BASE_DIR/stp/ -SUBNET=19 -network_create $SUBNET +network_create +network_replace_subnet_in_configs echo Starting container with STP docker run --rm \ diff --git a/ttcn3-upf-test/jenkins.sh b/ttcn3-upf-test/jenkins.sh index 2fb6d43..f814975 100755 --- a/ttcn3-upf-test/jenkins.sh +++ b/ttcn3-upf-test/jenkins.sh @@ -16,8 +16,8 @@ mkdir $VOL_BASE_DIR/upf cp osmo-upf.cfg $VOL_BASE_DIR/upf/ -SUBNET=34 -network_create $SUBNET +network_create +network_replace_subnet_in_configs echo Starting container with UPF docker run --rm \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30770 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I57152b08ef0f38e17e7019a8df032189b03f56cf Gerrit-Change-Number: 30770 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

Change in docker-playground[master]: ttcn3-ggsn-test: cp initrd-ggsn.sh to VOL_BASE_DIR

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/30767 ) Change subject: ttcn3-ggsn-test: cp initrd-ggsn.sh to VOL_BASE_DIR ...................................................................... ttcn3-ggsn-test: cp initrd-ggsn.sh to VOL_BASE_DIR Prepare for a future patch where a free subnet will be figured out automatically instead of having a hardcoded one, by moving initrd-ggsn.sh to $VOL_BASE_DIR as the subnet will be replaced in files in this directory. Related: OS#5802 Change-Id: Ie4f35b77a2bff20f2a0479890a429754768cafd2 --- M ttcn3-ggsn-test/jenkins.sh 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/67/30767/1 diff --git a/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index c8968ad..0797f76 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -31,11 +31,12 @@ GGSN_DOCKER_ARGS="" if [ "$KERNEL_TEST" = "1" ]; then cp osmo-ggsn-kernel-gtp.cfg $VOL_BASE_DIR/ggsn/osmo-ggsn.cfg + cp initrd-ggsn.sh $VOL_BASE_DIR/ggsn/ kernel_test_prepare \ "defconfig" \ "fragment.config" \ - "initrd-ggsn.sh" \ + "$VOL_BASE_DIR/ggsn/initrd-ggsn.sh" \ "$REPO_USER/osmo-ggsn-$IMAGE_SUFFIX" \ -v $VOL_BASE_DIR/ggsn:/data -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie4f35b77a2bff20f2a0479890a429754768cafd2 Gerrit-Change-Number: 30767 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

Change in docker-playground[master]: scripts/regen_doc: use SUBNET variable

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/30768 ) Change subject: scripts/regen_doc: use SUBNET variable ...................................................................... scripts/regen_doc: use SUBNET variable Add a $SUBNET parameter and use it throughout the script, similar to other ttcn3-*/jenkins.sh scripts. This is in preparation for figuring out a free network in network_create() automatically in a future patch. Related: OS#5802 Change-Id: I3bda4bd7280469ad5ee02104295134a2e0b768e3 --- M scripts/regen_doc.sh 1 file changed, 11 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/68/30768/1 diff --git a/scripts/regen_doc.sh b/scripts/regen_doc.sh index cd3c560..012c12a 100755 --- a/scripts/regen_doc.sh +++ b/scripts/regen_doc.sh @@ -21,7 +21,8 @@ docker_images_require \ "$NAME-$IMAGE_SUFFIX" -network_create 16 +SUBNET=16 +network_create "$SUBNET" container_create() { CONTAINERNAME=$1 @@ -35,15 +36,21 @@ } -container_create "$NAME-$IMAGE_SUFFIX" 172.18.16.23 +container_create "$NAME-$IMAGE_SUFFIX" "172.18.$SUBNET.23" # Get asciidoc counter info ${OSMO_INTERACT_VTY} \ - -c "enable;show asciidoc counters" -p "$PORT" -H 172.18.16.23 -O "$COUNTERFILE" + -c "enable;show asciidoc counters" \ + -p "$PORT" \ + -H "172.18.$SUBNET.23" \ + -O "$COUNTERFILE" # Get vty reference ${OSMO_INTERACT_VTY} \ - -X -p "$PORT" -H 172.18.16.23 -O "$VTYFILE" + -X \ + -p "$PORT" \ + -H "172.18.$SUBNET.23" \ + -O "$VTYFILE" docker container kill "${BUILD_TAG}-$NAME-$IMAGE_SUFFIX" -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3bda4bd7280469ad5ee02104295134a2e0b768e3 Gerrit-Change-Number: 30768 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

Change in docker-playground[master]: jenkins-common: tweak echo messages

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/30766 ) Change subject: jenkins-common: tweak echo messages ...................................................................... jenkins-common: tweak echo messages Use 'set +x' before echo, so messages are not printed twice and the output becomes more readable. Example: + echo Creating network ttcn3-bts-test Creating network ttcn3-bts-test Related: OS#5802 Change-Id: I213cb80bd1d9401281ae1fb7394b2319453550dd --- M jenkins-common.sh 1 file changed, 23 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/66/30766/1 diff --git a/jenkins-common.sh b/jenkins-common.sh index 33b1a67..3a30ea0 100644 --- a/jenkins-common.sh +++ b/jenkins-common.sh @@ -168,7 +168,9 @@ pull_arg="" fi + set +x echo "Building image: $i (export NO_DOCKER_IMAGE_BUILD=1 to prevent this)" + set -x make -C "${IMAGE_DIR_PREFIX}/${dir}" \ BUILD_ARGS="$pull_arg" \ UPSTREAM_DISTRO="$upstream_distro_arg" \ @@ -179,6 +181,7 @@ # Detect missing images (build skipped) if ! docker_image_exists "$i"; then + set +x echo "ERROR: missing image: $i" exit 1 fi @@ -195,26 +198,34 @@ network_create() { NET=$1 if docker network ls | grep -q $NET_NAME; then - echo removing stale network and containers... + set +x + echo "Removing stale network and containers..." + set -x network_clean network_remove fi SUB4="172.18.$NET.0/24" SUB6="fd02:db8:$NET::/64" - echo Creating network $NET_NAME + set +x + echo "Creating network $NET_NAME" + set -x docker network create --internal --subnet $SUB4 --ipv6 --subnet $SUB6 $NET_NAME } network_bridge_create() { NET=$1 if docker network ls | grep -q $NET_NAME; then - echo removing stale network and containers... + set +x + echo "Removing stale network and containers..." + set -x network_clean network_remove fi SUB4="172.18.$NET.0/24" SUB6="fd02:db8:$NET::/64" - echo Creating network $NET_NAME + set +x + echo "Creating network $NET_NAME" + set -x docker network create \ --driver=bridge \ --subnet $SUB4 \ @@ -224,7 +235,9 @@ } network_remove() { - echo Removing network $NET_NAME + set +x + echo "Removing network $NET_NAME" + set -x docker network remove $NET_NAME } @@ -238,7 +251,9 @@ } fix_perms() { - echo Fixing permissions + set +x + echo "Fixing permissions" + set -x docker run --rm \ -v $VOL_BASE_DIR:/data \ -v $CACHE_DIR:/cache \ @@ -360,6 +375,7 @@ done # Let clean_up_common kill the VM + set +x echo "Timeout while waiting for kernel test VM" exit 1 } @@ -437,6 +453,7 @@ fi if [ ! -d "$VOL_BASE_DIR" ]; then + set +x echo "ERROR: \$VOL_BASE_DIR does not exist: '$VOL_BASE_DIR'" exit 1 fi -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/30766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I213cb80bd1d9401281ae1fb7394b2319453550dd Gerrit-Change-Number: 30766 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

Change in libosmo-netif[master]: Introduce utils/osmo-amr-inspect program

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30757 ) Change subject: Introduce utils/osmo-amr-inspect program ...................................................................... Patch Set 7: Code-Review+1 (1 comment) File utils/osmo-amr-inspect.c: https://gerrit.osmocom.org/c/libosmo-netif/+/30757/comment/85c3ce71_091762e4 PS6, Line 2: paylods > payloads Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iffa6cc2e5391b77e3097d4c3b8d3f5211427dbe2 Gerrit-Change-Number: 30757 Gerrit-PatchSet: 7 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-Comment-Date: Thu, 22 Dec 2022 13:11:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in libosmo-netif[master]: Introduce utils/osmo-amr-inspect program

by pespin

Attention is currently required from: pespin. Hello osmith, Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/30757 to look at the new patch set (#7). Change subject: Introduce utils/osmo-amr-inspect program ...................................................................... Introduce utils/osmo-amr-inspect program This program allows inspecting a list of AMR PDUs in hexstring format present in a text file. This allows easily finding out the properties of the PDU as well as finding potential errors on the data. It also allows forcing decode in different formats (octet-aligned, bandwidth-efficient) in order to detect which may be the correct one. Related: SYS#6161 Change-Id: Iffa6cc2e5391b77e3097d4c3b8d3f5211427dbe2 --- M Makefile.am M configure.ac M contrib/libosmo-netif.spec.in A utils/Makefile.am A utils/osmo-amr-inspect.c 5 files changed, 342 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/57/30757/7 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iffa6cc2e5391b77e3097d4c3b8d3f5211427dbe2 Gerrit-Change-Number: 30757 Gerrit-PatchSet: 7 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-MessageType: newpatchset

1 year, 4 months

1
0
0 0

Change in libosmo-netif[master]: amr: Clarify size of AMR BWE header and ToC

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30758 ) Change subject: amr: Clarify size of AMR BWE header and ToC ...................................................................... amr: Clarify size of AMR BWE header and ToC Change-Id: I34c76b18ee45e12dba92864715e8ef91e6de3b01 --- M include/osmocom/netif/amr.h M src/amr.c 2 files changed, 8 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, approved diff --git a/include/osmocom/netif/amr.h b/include/osmocom/netif/amr.h index e8f08d4..9b8fb79 100644 --- a/include/osmocom/netif/amr.h +++ b/include/osmocom/netif/amr.h @@ -43,6 +43,9 @@ uint8_t data[0]; } __attribute__((packed)); +/* See diagram above: CMR (4) + F (1) + FT (4) + Q (1) = 10 */ +#define AMR_HDR_BWE_LEN_BITS 10 + /* * 4.4. Octet-aligned Mode: * diff --git a/src/amr.c b/src/amr.c index e4f0dd8..18e699c 100644 --- a/src/amr.c +++ b/src/amr.c @@ -188,7 +188,7 @@ } /* Calculate new payload length */ - bwe_payload_len = (10 + osmo_amr_bits(ft) + 7) / 8; + bwe_payload_len = (AMR_HDR_BWE_LEN_BITS + osmo_amr_bits(ft) + 7) / 8; return bwe_payload_len; } @@ -266,7 +266,8 @@ amr_speech_len_bits = osmo_amr_bits(ft); amr_speech_len_bytes = osmo_amr_bytes(ft); - required_len_bits = amr_speech_len_bits + 10; /* shift of 10 bits */ + /* shift of AMR_HDR_BWE_LEN_BITS (10) bits, aka remove BWE Hdr + ToC: */ + required_len_bits = AMR_HDR_BWE_LEN_BITS + amr_speech_len_bits; if (payload_len < (required_len_bits + 7)/8) return -1; @@ -288,7 +289,7 @@ int osmo_amr_iuup_to_bwe(uint8_t *payload, unsigned int payload_len, unsigned int payload_maxlen) { - /* shift all bits by 10 */ + /* shift all bits by AMR_HDR_BWE_LEN_BITS (10) */ unsigned int i, required_len_bits, required_len_bytes; int ft = osmo_amr_bytes_to_ft(payload_len); @@ -303,7 +304,7 @@ i = payload_len + 1; payload[i] = (payload[i - 2] << 6); for (i = payload_len; i >= 2; i--) { - /* we have to shift the payload by 10 bits to get only the Class A, B, C bits */ + /* we have to shift the payload by AMR_HDR_BWE_LEN_BITS (10) bits to prepend BWE Hdr + ToC */ payload[i] = (payload[i - 1] >> 2) | (payload[i - 2] << 6); } payload[i] = (payload[i - 1] >> 2); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I34c76b18ee45e12dba92864715e8ef91e6de3b01 Gerrit-Change-Number: 30758 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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

1 year, 4 months

1
0
0 0

Change in libosmo-netif[master]: amr: osmo_amr_bwe_to_oa(): validate input data is long enough

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30756 ) Change subject: amr: osmo_amr_bwe_to_oa(): validate input data is long enough ...................................................................... amr: osmo_amr_bwe_to_oa(): validate input data is long enough Change-Id: I2d11ce71c29ae046c2feab1e59045d97dc3e5099 --- M src/amr.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/amr.c b/src/amr.c index 81bcd08..f201e8a 100644 --- a/src/amr.c +++ b/src/amr.c @@ -221,6 +221,8 @@ ft = (bwe_hdr->ft_hi << 1) | bwe_hdr->ft_lo; if (!osmo_amr_ft_valid(ft)) return -1; + if (OSMO_BYTES_FOR_BITS(AMR_HDR_BWE_LEN_BITS + osmo_amr_bits(ft)) > payload_len) + return -1; memset(buf, 0, sizeof(buf)); oa_hdr = (struct amr_hdr *)buf; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I2d11ce71c29ae046c2feab1e59045d97dc3e5099 Gerrit-Change-Number: 30756 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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

1 year, 4 months

1
0
0 0

Change in libosmo-netif[master]: amr: use OSMO_BYTES_FOR_BITS()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30759 ) Change subject: amr: use OSMO_BYTES_FOR_BITS() ...................................................................... amr: use OSMO_BYTES_FOR_BITS() Change-Id: Ib92856ede3f493615c24d883954989e952c51157 --- M src/amr.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, approved diff --git a/src/amr.c b/src/amr.c index 18e699c..81bcd08 100644 --- a/src/amr.c +++ b/src/amr.c @@ -188,7 +188,7 @@ } /* Calculate new payload length */ - bwe_payload_len = (AMR_HDR_BWE_LEN_BITS + osmo_amr_bits(ft) + 7) / 8; + bwe_payload_len = OSMO_BYTES_FOR_BITS(AMR_HDR_BWE_LEN_BITS + osmo_amr_bits(ft)); return bwe_payload_len; } @@ -268,7 +268,7 @@ /* shift of AMR_HDR_BWE_LEN_BITS (10) bits, aka remove BWE Hdr + ToC: */ required_len_bits = AMR_HDR_BWE_LEN_BITS + amr_speech_len_bits; - if (payload_len < (required_len_bits + 7)/8) + if (payload_len < OSMO_BYTES_FOR_BITS(required_len_bits)) return -1; for (i = 0; i < amr_speech_len_bytes; i++) { @@ -297,7 +297,7 @@ return ft; required_len_bits = osmo_amr_bits(ft) + 10; - required_len_bytes = (required_len_bits + 7)/8; + required_len_bytes = OSMO_BYTES_FOR_BITS(required_len_bits); if (payload_maxlen < required_len_bytes) return -1; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ib92856ede3f493615c24d883954989e952c51157 Gerrit-Change-Number: 30759 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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

1 year, 4 months

1
0
0 0

Change in libosmo-netif[master]: amr: Add missing header stdbool.h

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30753 ) Change subject: amr: Add missing header stdbool.h ...................................................................... amr: Add missing header stdbool.h Change-Id: I84e447960c4912147d2f3a6170393370d354625b --- M include/osmocom/netif/amr.h 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/netif/amr.h b/include/osmocom/netif/amr.h index 1cc4385..47f7f3d 100644 --- a/include/osmocom/netif/amr.h +++ b/include/osmocom/netif/amr.h @@ -2,6 +2,7 @@ #define _OSMO_AMR_H_ #include <stddef.h> +#include <stdbool.h> #include <stdint.h> #include <osmocom/core/endian.h> -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I84e447960c4912147d2f3a6170393370d354625b Gerrit-Change-Number: 30753 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

Change in libosmo-netif[master]: amr: use struct bwe_hdr in osmo_amr_bwe_to_oa()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30755 ) Change subject: amr: use struct bwe_hdr in osmo_amr_bwe_to_oa() ...................................................................... amr: use struct bwe_hdr in osmo_amr_bwe_to_oa() The header conversion is now much clearer. Take the chance to delay the memset(buf) after the checks. Change-Id: I5042dc628ac70eca62b4980f4acae991dd976528 --- M src/amr.c 1 file changed, 15 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/amr.c b/src/amr.c index b648d54..e4f0dd8 100644 --- a/src/amr.c +++ b/src/amr.c @@ -203,11 +203,14 @@ { uint8_t buf[256]; /* The header is only valid after shifting first two bytes to OA mode */ + struct amr_hdr_bwe *bwe_hdr = (struct amr_hdr_bwe *)payload; struct amr_hdr *oa_hdr; unsigned int i; unsigned int oa_payload_len; + uint8_t ft; - memset(buf, 0, sizeof(buf)); + if (payload_len < sizeof(struct amr_hdr_bwe)) + return -1; if (payload_len + 1 > payload_maxlen) return -1; @@ -215,15 +218,19 @@ if (payload_len + 1 > sizeof(buf)) return -1; - buf[0] = payload[0] & 0xf0; - buf[1] = payload[0] << 4; - buf[1] |= (payload[1] >> 4) & 0x0c; + ft = (bwe_hdr->ft_hi << 1) | bwe_hdr->ft_lo; + if (!osmo_amr_ft_valid(ft)) + return -1; + + memset(buf, 0, sizeof(buf)); + oa_hdr = (struct amr_hdr *)buf; + oa_hdr->cmr = bwe_hdr->cmr; + oa_hdr->f = bwe_hdr->f; + oa_hdr->ft = ft; + oa_hdr->q = bwe_hdr->q; /* Calculate new payload length */ - oa_hdr = (struct amr_hdr *)buf; - if (!osmo_amr_ft_valid(oa_hdr->ft)) - return -1; - oa_payload_len = 2 + osmo_amr_bytes(oa_hdr->ft); + oa_payload_len = 2 + osmo_amr_bytes(ft); for (i = 2; i < oa_payload_len - 1; i++) { buf[i] = payload[i - 1] << 2; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I5042dc628ac70eca62b4980f4acae991dd976528 Gerrit-Change-Number: 30755 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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

1 year, 4 months

1
0
0 0

Change in libosmo-netif[master]: amr: constify input buffer in osmo_amr_is_oa()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30754 ) Change subject: amr: constify input buffer in osmo_amr_is_oa() ...................................................................... amr: constify input buffer in osmo_amr_is_oa() Change-Id: I72ef6fc700f628ea158ea888a5f1e9dc8776ab7e --- M include/osmocom/netif/amr.h M src/amr.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/include/osmocom/netif/amr.h b/include/osmocom/netif/amr.h index 47f7f3d..e8f08d4 100644 --- a/include/osmocom/netif/amr.h +++ b/include/osmocom/netif/amr.h @@ -159,7 +159,7 @@ size_t osmo_amr_bytes(uint8_t amr_cmr); size_t osmo_amr_bits(uint8_t amr_ft); -bool osmo_amr_is_oa(uint8_t *payload, unsigned int payload_len); +bool osmo_amr_is_oa(const uint8_t *payload, unsigned int payload_len); int osmo_amr_oa_to_bwe(uint8_t *payload, unsigned int payload_len); int osmo_amr_bwe_to_oa(uint8_t *payload, unsigned int payload_len, unsigned int payload_maxlen); diff --git a/src/amr.c b/src/amr.c index 66f41c6..b648d54 100644 --- a/src/amr.c +++ b/src/amr.c @@ -113,7 +113,7 @@ * \param[inout] payload user provided memory containing the AMR payload. * \param[in] payload_len overall length of the AMR payload. * \returns true when the payload is octet aligned. */ -bool osmo_amr_is_oa(uint8_t *payload, unsigned int payload_len) +bool osmo_amr_is_oa(const uint8_t *payload, unsigned int payload_len) { /* NOTE: The distinction between octet-aligned and bandwith-efficient * mode normally relys on out of band methods that explicitly select -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I72ef6fc700f628ea158ea888a5f1e9dc8776ab7e Gerrit-Change-Number: 30754 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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

1 year, 4 months

1
0
0 0

Change in osmo-e1d[master]: DAHDI trunkdev support

by pespin

Attention is currently required from: manawyrm, laforge, tnt. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/30068 ) Change subject: DAHDI trunkdev support ...................................................................... Patch Set 5: Code-Review+1 (1 comment) File src/log.c: https://gerrit.osmocom.org/c/osmo-e1d/+/30068/comment/74bb7d11_e1669364 PS5, Line 41: [DTRUNK] = { DTRUNKDEV would match better the terminology used here. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/30068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ib15a7313fcd63e1ed9f2f5b349df967bc4335ec2 Gerrit-Change-Number: 30068 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Thu, 22 Dec 2022 12:53:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-trx[master]: ctrl: take both address and port from vty config

by msuraev

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30671 ) Change subject: ctrl: take both address and port from vty config ...................................................................... ctrl: take both address and port from vty config Change-Id: Id7d1425e603cc62a62a63d1057291861f02782ba --- M Transceiver52M/osmo-trx.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index b6f378b..18e9051 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -655,7 +655,7 @@ if (rc < 0) exit(1); - g_ctrlh = ctrl_interface_setup_dynip(NULL, ctrl_vty_get_bind_addr(), OSMO_CTRL_PORT_TRX, NULL); + g_ctrlh = ctrl_interface_setup(NULL, OSMO_CTRL_PORT_TRX, NULL); if (!g_ctrlh) { LOG(ERROR) << "Failed to create CTRL interface.\n"; exit(1); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id7d1425e603cc62a62a63d1057291861f02782ba Gerrit-Change-Number: 30671 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

Change in osmo-mgw[master]: ctrl: take both address and port from vty config

by msuraev

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/30666 ) Change subject: ctrl: take both address and port from vty config ...................................................................... ctrl: take both address and port from vty config Change-Id: Id053bc02e0a6359e52a0f5e110128d3bb87ed151 --- M include/osmocom/mgcp/Makefile.am D include/osmocom/mgcp/mgcp_ctrl.h M src/libosmo-mgcp/Makefile.am D src/libosmo-mgcp/mgcp_ctrl.c M src/osmo-mgw/mgw_main.c 5 files changed, 2 insertions(+), 65 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/mgcp/Makefile.am b/include/osmocom/mgcp/Makefile.am index 60f29c6..15ff01a 100644 --- a/include/osmocom/mgcp/Makefile.am +++ b/include/osmocom/mgcp/Makefile.am @@ -6,7 +6,6 @@ mgcp_endp.h \ mgcp_sdp.h \ mgcp_codec.h \ - mgcp_ctrl.h \ mgcp_trunk.h \ debug.h \ mgcp_ratectr.h \ diff --git a/include/osmocom/mgcp/mgcp_ctrl.h b/include/osmocom/mgcp/mgcp_ctrl.h deleted file mode 100644 index d7ab7cb..0000000 --- a/include/osmocom/mgcp/mgcp_ctrl.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * (C) 2020 by Harald Welte <laforge(a)gnumonks.org> - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ - -#pragma once - -struct ctrl_handle *mgw_ctrl_interface_setup(struct mgcp_config *cfg, - const char *bind_addr, uint16_t port); - diff --git a/src/libosmo-mgcp/Makefile.am b/src/libosmo-mgcp/Makefile.am index de42c0e..309ae3f 100644 --- a/src/libosmo-mgcp/Makefile.am +++ b/src/libosmo-mgcp/Makefile.am @@ -45,7 +45,6 @@ mgcp_stat.c \ mgcp_endp.c \ mgcp_trunk.c \ - mgcp_ctrl.c \ mgcp_ratectr.c \ mgcp_e1.c \ mgcp_iuup.c \ diff --git a/src/libosmo-mgcp/mgcp_ctrl.c b/src/libosmo-mgcp/mgcp_ctrl.c deleted file mode 100644 index 0ba231b..0000000 --- a/src/libosmo-mgcp/mgcp_ctrl.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * (C) 2020 by Harald Welte <laforge(a)gnumonks.org> - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ - -#include <osmocom/ctrl/control_if.h> -#include <osmocom/mgcp/mgcp.h> - - -static int mgw_ctrl_node_lookup(void *data, vector vline, int *node_type, - void **node_data, int *i) -{ - return 0; -} - - -struct ctrl_handle *mgw_ctrl_interface_setup(struct mgcp_config *cfg, - const char *bind_addr, uint16_t port) -{ - return ctrl_interface_setup_dynip2(cfg, bind_addr, port, mgw_ctrl_node_lookup, - _LAST_CTRL_NODE); -} diff --git a/src/osmo-mgw/mgw_main.c b/src/osmo-mgw/mgw_main.c index 7a76210..cd9d75d 100644 --- a/src/osmo-mgw/mgw_main.c +++ b/src/osmo-mgw/mgw_main.c @@ -41,7 +41,6 @@ #include <osmocom/mgcp/debug.h> #include <osmocom/mgcp/mgcp_endp.h> #include <osmocom/mgcp/mgcp_trunk.h> -#include <osmocom/mgcp/mgcp_ctrl.h> #include <osmocom/core/application.h> #include <osmocom/core/msgb.h> @@ -51,7 +50,7 @@ #include <osmocom/core/rate_ctr.h> #include <osmocom/core/logging.h> #include <osmocom/core/socket.h> - +#include <osmocom/ctrl/control_if.h> #include <osmocom/ctrl/control_vty.h> #include <osmocom/vty/telnet_interface.h> @@ -366,7 +365,7 @@ if (rc < 0) return rc; - cfg->ctrl = mgw_ctrl_interface_setup(cfg, ctrl_vty_get_bind_addr(), OSMO_CTRL_PORT_MGW); + cfg->ctrl = ctrl_interface_setup(cfg, OSMO_CTRL_PORT_MGW, NULL); if (!cfg->ctrl) { fprintf(stderr, "Failed to init the control interface on %s:%u. Exiting\n", ctrl_vty_get_bind_addr(), OSMO_CTRL_PORT_MGW); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/30666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id053bc02e0a6359e52a0f5e110128d3bb87ed151 Gerrit-Change-Number: 30666 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

Change in osmo-msc[master]: ctrl: take both address and port from vty config

by msuraev

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/30664 ) Change subject: ctrl: take both address and port from vty config ...................................................................... ctrl: take both address and port from vty config Change-Id: I31e971270a6658366651b29c99ec5247656c62c6 --- M src/osmo-msc/msc_main.c 1 file changed, 1 insertion(+), 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/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index c6514c2..5e44e9b 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -693,8 +693,7 @@ /* start control interface after reading config for * ctrl_vty_get_bind_addr() */ - msc_network->ctrl = ctrl_interface_setup_dynip(msc_network, ctrl_vty_get_bind_addr(), - OSMO_CTRL_PORT_MSC, NULL); + msc_network->ctrl = ctrl_interface_setup(msc_network, OSMO_CTRL_PORT_MSC, NULL); if (!msc_network->ctrl) { fprintf(stderr, "Failed to initialize control interface. Exiting.\n"); return -1; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/30664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I31e971270a6658366651b29c99ec5247656c62c6 Gerrit-Change-Number: 30664 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

Change in osmo-gbproxy[master]: ctrl: take both address and port from vty config

by msuraev

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/30669 ) Change subject: ctrl: take both address and port from vty config ...................................................................... ctrl: take both address and port from vty config Change-Id: I9bb88fa53a91cc96440d83958450729fa433a04b --- M src/gb_proxy_main.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/gb_proxy_main.c b/src/gb_proxy_main.c index ba49a77..da69f9c 100644 --- a/src/gb_proxy_main.c +++ b/src/gb_proxy_main.c @@ -341,7 +341,7 @@ /* Start control interface after getting config for * ctrl_vty_get_bind_addr() */ - ctrl = ctrl_interface_setup_dynip(gbcfg, ctrl_vty_get_bind_addr(), OSMO_CTRL_PORT_GBPROXY, NULL); + ctrl = ctrl_interface_setup(gbcfg, OSMO_CTRL_PORT_GBPROXY, NULL); if (!ctrl) { LOGP(DGPRS, LOGL_FATAL, "Failed to create CTRL interface.\n"); exit(1); -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/30669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I9bb88fa53a91cc96440d83958450729fa433a04b Gerrit-Change-Number: 30669 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

Change in osmo-ggsn[master]: ctrl: take both address and port from vty config

by msuraev

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/30667 ) Change subject: ctrl: take both address and port from vty config ...................................................................... ctrl: take both address and port from vty config Change-Id: Ib31d67591657e308eebd1e6b7e23f79e6a3656e9 --- M ggsn/ggsn_main.c 1 file changed, 1 insertion(+), 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/ggsn/ggsn_main.c b/ggsn/ggsn_main.c index 2d917c1..bc9e0c3 100644 --- a/ggsn/ggsn_main.c +++ b/ggsn/ggsn_main.c @@ -227,8 +227,7 @@ if (rc < 0) exit(1); - g_ctrlh = ctrl_interface_setup_dynip(NULL, ctrl_vty_get_bind_addr(), - OSMO_CTRL_PORT_GGSN, NULL); + g_ctrlh = ctrl_interface_setup(NULL, OSMO_CTRL_PORT_GGSN, NULL); if (!g_ctrlh) { LOGP(DGGSN, LOGL_ERROR, "Failed to create CTRL interface.\n"); exit(1); -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/30667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ib31d67591657e308eebd1e6b7e23f79e6a3656e9 Gerrit-Change-Number: 30667 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

Change in osmo-sgsn[master]: ctrl: take both address and port from vty config

by msuraev

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30668 ) Change subject: ctrl: take both address and port from vty config ...................................................................... ctrl: take both address and port from vty config Change-Id: Ie1330b152a2e5cdcdb80a1c958e7c1d784b78eab --- M src/sgsn/sgsn_main.c 1 file changed, 1 insertion(+), 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/src/sgsn/sgsn_main.c b/src/sgsn/sgsn_main.c index af9757a..c775922 100644 --- a/src/sgsn/sgsn_main.c +++ b/src/sgsn/sgsn_main.c @@ -479,8 +479,7 @@ /* start control interface after reading config for * ctrl_vty_get_bind_addr() */ - g_ctrlh = ctrl_interface_setup_dynip(NULL, ctrl_vty_get_bind_addr(), - OSMO_CTRL_PORT_SGSN, NULL); + g_ctrlh = ctrl_interface_setup(NULL, OSMO_CTRL_PORT_SGSN, NULL); if (!g_ctrlh) { LOGP(DGPRS, LOGL_ERROR, "Failed to create CTRL interface.\n"); exit(1); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ie1330b152a2e5cdcdb80a1c958e7c1d784b78eab Gerrit-Change-Number: 30668 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

Change in osmo-bts[master]: ctrl: take both address and port from vty config

by msuraev

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/30663 ) Change subject: ctrl: take both address and port from vty config ...................................................................... ctrl: take both address and port from vty config Change-Id: Ieca05004255c40287e6427560c2636b39529cf07 --- M include/osmo-bts/control_if.h M src/common/bts_ctrl_lookup.c M src/common/main.c 3 files changed, 4 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/include/osmo-bts/control_if.h b/include/osmo-bts/control_if.h index 490c87a..f6d877b 100644 --- a/include/osmo-bts/control_if.h +++ b/include/osmo-bts/control_if.h @@ -1,5 +1,4 @@ #pragma once int bts_ctrl_cmds_install(struct gsm_bts *bts); -struct ctrl_handle *bts_controlif_setup(struct gsm_bts *bts, - const char *bind_addr, uint16_t port); +struct ctrl_handle *bts_controlif_setup(struct gsm_bts *bts, uint16_t port); diff --git a/src/common/bts_ctrl_lookup.c b/src/common/bts_ctrl_lookup.c index a3e3c8b..7a1dfdf 100644 --- a/src/common/bts_ctrl_lookup.c +++ b/src/common/bts_ctrl_lookup.c @@ -88,14 +88,12 @@ return -ERANGE; } -struct ctrl_handle *bts_controlif_setup(struct gsm_bts *bts, - const char *bind_addr, uint16_t port) +struct ctrl_handle *bts_controlif_setup(struct gsm_bts *bts, uint16_t port) { struct ctrl_handle *hdl; int rc = 0; - hdl = ctrl_interface_setup_dynip(bts, bind_addr, port, - bts_ctrl_node_lookup); + hdl = ctrl_interface_setup(bts, port, bts_ctrl_node_lookup); if (!hdl) return NULL; diff --git a/src/common/main.c b/src/common/main.c index ea6c61e..a67364e 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -365,7 +365,7 @@ gsmtap_source_add_sink(g_bts->gsmtap.inst); } - bts_controlif_setup(g_bts, ctrl_vty_get_bind_addr(), OSMO_CTRL_PORT_BTS); + bts_controlif_setup(g_bts, OSMO_CTRL_PORT_BTS); rc = telnet_init_dynif(tall_bts_ctx, NULL, vty_get_bind_addr(), g_vty_port_num); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/30663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ieca05004255c40287e6427560c2636b39529cf07 Gerrit-Change-Number: 30663 Gerrit-PatchSet: 3 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

Change in osmo-upf[master]: ctrl: take both address and port from vty config

by msuraev

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/30673 ) Change subject: ctrl: take both address and port from vty config ...................................................................... ctrl: take both address and port from vty config Change-Id: Ia652ce820e1299b23055f032f8cd0a87a8d60ba3 --- M src/osmo-pfcp-tool/osmo_pfcp_tool_main.c M src/osmo-upf/osmo_upf_main.c 2 files 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/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c b/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c index e950f7f..9a760d4 100644 --- a/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c +++ b/src/osmo-pfcp-tool/osmo_pfcp_tool_main.c @@ -305,7 +305,7 @@ return 2; /* start control interface, after reading config for ctrl_vty_get_bind_addr() */ - g_pfcp_tool->ctrl = ctrl_interface_setup_dynip(g_pfcp_tool, ctrl_vty_get_bind_addr(), OSMO_CTRL_PORT_PFCP_TOOL, NULL); + g_pfcp_tool->ctrl = ctrl_interface_setup(g_pfcp_tool, OSMO_CTRL_PORT_PFCP_TOOL, NULL); if (!g_pfcp_tool->ctrl) { fprintf(stderr, "Failed to initialize control interface. Exiting.\n"); return -1; diff --git a/src/osmo-upf/osmo_upf_main.c b/src/osmo-upf/osmo_upf_main.c index 65a0e84..40dbf09 100644 --- a/src/osmo-upf/osmo_upf_main.c +++ b/src/osmo-upf/osmo_upf_main.c @@ -310,7 +310,7 @@ return 2; /* start control interface, after reading config for ctrl_vty_get_bind_addr() */ - g_upf->ctrl = ctrl_interface_setup_dynip(g_upf, ctrl_vty_get_bind_addr(), OSMO_CTRL_PORT_UPF, NULL); + g_upf->ctrl = ctrl_interface_setup(g_upf, OSMO_CTRL_PORT_UPF, NULL); if (!g_upf->ctrl) { fprintf(stderr, "Failed to initialize control interface. Exiting.\n"); return -1; -- To view, visit https://gerrit.osmocom.org/c/osmo-upf/+/30673 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-upf Gerrit-Branch: master Gerrit-Change-Id: Ia652ce820e1299b23055f032f8cd0a87a8d60ba3 Gerrit-Change-Number: 30673 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

Change in osmo-ci[master]: don't report every unstable TTCN3 build

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30764 ) Change subject: don't report every unstable TTCN3 build ...................................................................... don't report every unstable TTCN3 build This saves deleting >= 80 e-mails every day. Closes: OS#5841 Change-Id: I9593a3c3a94ab3f66ed4cd92906e7428a9d04bf5 --- M jobs/ttcn3-testsuites-kernel-git.yml M jobs/ttcn3-testsuites.yml 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/jobs/ttcn3-testsuites-kernel-git.yml b/jobs/ttcn3-testsuites-kernel-git.yml index e378122..80f8840 100644 --- a/jobs/ttcn3-testsuites-kernel-git.yml +++ b/jobs/ttcn3-testsuites-kernel-git.yml @@ -105,7 +105,7 @@ results: '**/junit-xml-*.log' allow-empty-results: false - email: - notify-every-unstable-build: true + notify-every-unstable-build: false recipients: laforge(a)gnumonks.org osmith(a)sysmocom.de send-to-individuals: false - archive: diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index e59611c..e8b40e8 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -477,7 +477,7 @@ results: '**/junit-xml-*.log' allow-empty-results: false - email: - notify-every-unstable-build: true + notify-every-unstable-build: false recipients: '{obj:email}' send-to-individuals: false - archive: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9593a3c3a94ab3f66ed4cd92906e7428a9d04bf5 Gerrit-Change-Number: 30764 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

Change in osmo-ci[master]: ttcn3-testsuites-kernel-git: Use normal e-mail address

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30765 ) Change subject: ttcn3-testsuites-kernel-git: Use normal e-mail address ...................................................................... ttcn3-testsuites-kernel-git: Use normal e-mail address There's no need for a hard-coded special list of e-mail addresses for kernel related tests. Change-Id: Ida4313997c9ecee13af22414e6a1799a2d9dd2af --- M jobs/ttcn3-testsuites-kernel-git.yml 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/jobs/ttcn3-testsuites-kernel-git.yml b/jobs/ttcn3-testsuites-kernel-git.yml index 80f8840..6bbd111 100644 --- a/jobs/ttcn3-testsuites-kernel-git.yml +++ b/jobs/ttcn3-testsuites-kernel-git.yml @@ -106,7 +106,7 @@ allow-empty-results: false - email: notify-every-unstable-build: false - recipients: laforge(a)gnumonks.org osmith(a)sysmocom.de + recipients: '{obj:email}' send-to-individuals: false - archive: allow-empty: false @@ -128,5 +128,6 @@ wrappers: - ansicolor: colormap: xterm + email: jenkins-notifications(a)lists.osmocom.org # vim: expandtab tabstop=2 shiftwidth=2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ida4313997c9ecee13af22414e6a1799a2d9dd2af Gerrit-Change-Number: 30765 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

Change in libosmo-netif[master]: Introduce utils/osmo-amr-inspect program

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30757 ) Change subject: Introduce utils/osmo-amr-inspect program ...................................................................... Patch Set 6: Code-Review+1 (1 comment) File utils/osmo-amr-inspect.c: https://gerrit.osmocom.org/c/libosmo-netif/+/30757/comment/eeeaa542_7c7ef42f PS6, Line 2: paylods payloads -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iffa6cc2e5391b77e3097d4c3b8d3f5211427dbe2 Gerrit-Change-Number: 30757 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: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Dec 2022 08:22:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-ci[master]: ttcn3-testsuites-kernel-git: Use normal e-mail address

by osmith

Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30765 ) Change subject: ttcn3-testsuites-kernel-git: Use normal e-mail address ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ida4313997c9ecee13af22414e6a1799a2d9dd2af Gerrit-Change-Number: 30765 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 22 Dec 2022 07:59:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-ci[master]: don't report every unstable TTCN3 build

by osmith

Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30764 ) Change subject: don't report every unstable TTCN3 build ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9593a3c3a94ab3f66ed4cd92906e7428a9d04bf5 Gerrit-Change-Number: 30764 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 22 Dec 2022 07:59:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-ci[master]: ttcn3-testsuites-kernel-git: Use normal e-mail address

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/30765 ) Change subject: ttcn3-testsuites-kernel-git: Use normal e-mail address ...................................................................... ttcn3-testsuites-kernel-git: Use normal e-mail address There's no need for a hard-coded special list of e-mail addresses for kernel related tests. Change-Id: Ida4313997c9ecee13af22414e6a1799a2d9dd2af --- M jobs/ttcn3-testsuites-kernel-git.yml 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/65/30765/1 diff --git a/jobs/ttcn3-testsuites-kernel-git.yml b/jobs/ttcn3-testsuites-kernel-git.yml index 80f8840..6bbd111 100644 --- a/jobs/ttcn3-testsuites-kernel-git.yml +++ b/jobs/ttcn3-testsuites-kernel-git.yml @@ -106,7 +106,7 @@ allow-empty-results: false - email: notify-every-unstable-build: false - recipients: laforge(a)gnumonks.org osmith(a)sysmocom.de + recipients: '{obj:email}' send-to-individuals: false - archive: allow-empty: false @@ -128,5 +128,6 @@ wrappers: - ansicolor: colormap: xterm + email: jenkins-notifications(a)lists.osmocom.org # vim: expandtab tabstop=2 shiftwidth=2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ida4313997c9ecee13af22414e6a1799a2d9dd2af Gerrit-Change-Number: 30765 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

Change in osmo-ci[master]: don't report every unstable TTCN3 build

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/30764 ) Change subject: don't report every unstable TTCN3 build ...................................................................... don't report every unstable TTCN3 build This saves deleting >= 80 e-mails every day. Closes: OS#5841 Change-Id: I9593a3c3a94ab3f66ed4cd92906e7428a9d04bf5 --- M jobs/ttcn3-testsuites-kernel-git.yml M jobs/ttcn3-testsuites.yml 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/64/30764/1 diff --git a/jobs/ttcn3-testsuites-kernel-git.yml b/jobs/ttcn3-testsuites-kernel-git.yml index e378122..80f8840 100644 --- a/jobs/ttcn3-testsuites-kernel-git.yml +++ b/jobs/ttcn3-testsuites-kernel-git.yml @@ -105,7 +105,7 @@ results: '**/junit-xml-*.log' allow-empty-results: false - email: - notify-every-unstable-build: true + notify-every-unstable-build: false recipients: laforge(a)gnumonks.org osmith(a)sysmocom.de send-to-individuals: false - archive: diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index e59611c..e8b40e8 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -477,7 +477,7 @@ results: '**/junit-xml-*.log' allow-empty-results: false - email: - notify-every-unstable-build: true + notify-every-unstable-build: false recipients: '{obj:email}' send-to-individuals: false - archive: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9593a3c3a94ab3f66ed4cd92906e7428a9d04bf5 Gerrit-Change-Number: 30764 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

Change in libosmo-netif[master]: Introduce utils/osmo-amr-inspect program

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30757 ) Change subject: Introduce utils/osmo-amr-inspect program ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iffa6cc2e5391b77e3097d4c3b8d3f5211427dbe2 Gerrit-Change-Number: 30757 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Dec 2022 06:48:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in libosmocore[master]: isdn: Add V.110 encoder/decoder

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30762 ) Change subject: isdn: Add V.110 encoder/decoder ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/isdn/libosmoisdn.map: https://gerrit.osmocom.org/c/libosmocore/+/30762/comment/4a2ad699_0425b434 PS1, Line 26: sync_ra1 no osmo_ prefix? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1b5fd3847d3bfb0a0f763e0574893962ec699680 Gerrit-Change-Number: 30762 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 22 Dec 2022 01:09:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in libosmo-netif[master]: Introduce utils/osmo-amr-inspect program

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30757 ) Change subject: Introduce utils/osmo-amr-inspect program ...................................................................... Patch Set 6: (1 comment) File utils/osmo-amr-inspect.c: https://gerrit.osmocom.org/c/libosmo-netif/+/30757/comment/d309fbd4_24591ab8 PS2, Line 2: Utility program for ARFCN / frequency calculations > FIXME Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iffa6cc2e5391b77e3097d4c3b8d3f5211427dbe2 Gerrit-Change-Number: 30757 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Dec 2022 01:00:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in libosmo-netif[master]: amr: use OSMO_BYTES_FOR_BITS()

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30759 ) Change subject: amr: use OSMO_BYTES_FOR_BITS() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ib92856ede3f493615c24d883954989e952c51157 Gerrit-Change-Number: 30759 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Dec 2022 01:00:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in libosmo-netif[master]: amr: Clarify size of AMR BWE header and ToC

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30758 ) Change subject: amr: Clarify size of AMR BWE header and ToC ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I34c76b18ee45e12dba92864715e8ef91e6de3b01 Gerrit-Change-Number: 30758 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Dec 2022 00:59:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in libosmo-netif[master]: amr: osmo_amr_bwe_to_oa(): validate input data is long enough

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30756 ) Change subject: amr: osmo_amr_bwe_to_oa(): validate input data is long enough ...................................................................... Patch Set 2: Code-Review+2 (1 comment) File src/amr.c: https://gerrit.osmocom.org/c/libosmo-netif/+/30756/comment/866e962b_2de084f6 PS1, Line 224: 10 > It's the header size of amr_bwe_hdr in bits. […] A lot cleaner now, thanks! -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I2d11ce71c29ae046c2feab1e59045d97dc3e5099 Gerrit-Change-Number: 30756 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Dec 2022 00:56:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

Change in osmo-bts[master]: shutdown_fsm: Add power_ramp_force() to jump straight to the tgt power

by daniel

daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/30689 ) Change subject: shutdown_fsm: Add power_ramp_force() to jump straight to the tgt power ...................................................................... shutdown_fsm: Add power_ramp_force() to jump straight to the tgt power Both power_ramp_start() and power_ramp_force() are now small macros around _power_ramp_start() The new behavior is: * ramp down power when stopping bts through Ctrl-C * the other shutdown causes skip power ramping This will cause the bts to reconnect faster when the oml link is dropped and power ramping is enabled. Change-Id: Ida1d7bbf094958b9142af306dbf84206729a609e Related: SYS#6237 --- M include/osmo-bts/bts.h M include/osmo-bts/tx_power.h M src/common/bts_shutdown_fsm.c M src/common/main.c M src/common/tx_power.c M src/osmo-bts-trx/l1_if.c 6 files changed, 24 insertions(+), 10 deletions(-) Approvals: daniel: Looks good to me, approved fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index b1a594c..0ecec1e 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -374,6 +374,7 @@ struct osmo_fsm_inst *shutdown_fi; /* FSM instance to manage shutdown procedure during process exit */ bool shutdown_fi_exit_proc; /* exit process when shutdown_fsm is finished? */ + bool shutdown_fi_skip_power_ramp; /* Skip power ramping and change power in one step? */ struct osmo_fsm_inst *abis_link_fi; /* FSM instance to manage abis connection during process startup and link failure */ struct osmo_tdef *T_defs; /* Timer defines */ @@ -396,7 +397,7 @@ int bts_init(struct gsm_bts *bts); void bts_shutdown(struct gsm_bts *bts, const char *reason); -void bts_shutdown_ext(struct gsm_bts *bts, const char *reason, bool exit_proc); +void bts_shutdown_ext(struct gsm_bts *bts, const char *reason, bool exit_proc, bool skip_power_ramp); int bts_link_estab(struct gsm_bts *bts); diff --git a/include/osmo-bts/tx_power.h b/include/osmo-bts/tx_power.h index a7f846e..73134c8 100644 --- a/include/osmo-bts/tx_power.h +++ b/include/osmo-bts/tx_power.h @@ -77,7 +77,12 @@ int get_p_trxout_actual_mdBm(const struct gsm_bts_trx *trx, uint8_t bs_power_red); int get_p_trxout_actual_mdBm_lchan(const struct gsm_lchan *lchan); -int power_ramp_start(struct gsm_bts_trx *trx, int p_total_tgt_mdBm, int bypass, ramp_compl_cb_t ramp_compl_cb); +int _power_ramp_start(struct gsm_bts_trx *trx, int p_total_tgt_mdBm, int bypass_max_power, ramp_compl_cb_t ramp_compl_cb, bool skip_ramping); +#define power_ramp_start(trx, p_total_tgt_mdBm, bypass_max_power, ramp_compl_cb) \ + _power_ramp_start(trx, p_total_tgt_mdBm, bypass_max_power, ramp_compl_cb, false) +#define power_ramp_force(trx, p_total_tgt_mdBm, bypass_max_power, ramp_compl_cb) \ + _power_ramp_start(trx, p_total_tgt_mdBm, bypass_max_power, ramp_compl_cb, true) + void power_ramp_abort(struct gsm_bts_trx *trx); void power_trx_change_compl(struct gsm_bts_trx *trx, int p_trxout_cur_mdBm); diff --git a/src/common/bts_shutdown_fsm.c b/src/common/bts_shutdown_fsm.c index 0c6d80c..55e0b19 100644 --- a/src/common/bts_shutdown_fsm.c +++ b/src/common/bts_shutdown_fsm.c @@ -89,7 +89,10 @@ llist_for_each_entry(trx, &bts->trx_list, list) { if (trx->mo.nm_state.operational != NM_OPSTATE_ENABLED) continue; - power_ramp_start(trx, to_mdB(BTS_SHUTDOWN_POWER_RAMP_TGT), 1, ramp_down_compl_cb); + if (bts->shutdown_fi_skip_power_ramp) + power_ramp_force(trx, to_mdB(BTS_SHUTDOWN_POWER_RAMP_TGT), 1, ramp_down_compl_cb); + else + power_ramp_start(trx, to_mdB(BTS_SHUTDOWN_POWER_RAMP_TGT), 1, ramp_down_compl_cb); } } @@ -250,7 +253,7 @@ return fi->state != BTS_SHUTDOWN_ST_NONE; } -void bts_shutdown_ext(struct gsm_bts *bts, const char *reason, bool exit_proc) +void bts_shutdown_ext(struct gsm_bts *bts, const char *reason, bool exit_proc, bool skip_power_ramp) { struct osmo_fsm_inst *fi = bts->shutdown_fi; if (bts_shutdown_in_progress(bts)) { @@ -260,6 +263,7 @@ return; } bts->shutdown_fi_exit_proc = exit_proc; + bts->shutdown_fi_skip_power_ramp = skip_power_ramp; LOGPFSML(fi, LOGL_NOTICE, "Shutting down BTS, exit %u, reason: %s\n", exit_proc, reason); osmo_fsm_inst_dispatch(fi, BTS_SHUTDOWN_EV_START, NULL); @@ -267,7 +271,7 @@ void bts_shutdown(struct gsm_bts *bts, const char *reason) { - bts_shutdown_ext(bts, reason, true); + bts_shutdown_ext(bts, reason, true, true); } void bts_model_trx_close_cb(struct gsm_bts_trx *trx, int rc) diff --git a/src/common/main.c b/src/common/main.c index 954cc34..ea6c61e 100644 --- a/src/common/main.c +++ b/src/common/main.c @@ -233,7 +233,7 @@ oml_tx_failure_event_rep(&g_bts->mo, NM_SEVER_CRITICAL, OSMO_EVT_CRIT_PROC_STOP, "BTS: SIGINT received -> shutdown"); - bts_shutdown(g_bts, "SIGINT"); + bts_shutdown_ext(g_bts, "SIGINT", true, false); } quit++; break; diff --git a/src/common/tx_power.c b/src/common/tx_power.c index 0307422..dd64613 100644 --- a/src/common/tx_power.c +++ b/src/common/tx_power.c @@ -239,8 +239,7 @@ osmo_timer_schedule(&tpp->ramp.step_timer, tpp->ramp.step_interval_sec, 0); } - -int power_ramp_start(struct gsm_bts_trx *trx, int p_total_tgt_mdBm, int bypass, ramp_compl_cb_t ramp_compl_cb) +int _power_ramp_start(struct gsm_bts_trx *trx, int p_total_tgt_mdBm, int bypass, ramp_compl_cb_t ramp_compl_cb, bool skip_ramping) { struct trx_power_params *tpp = &trx->power_params; @@ -265,7 +264,12 @@ tpp->p_total_tgt_mdBm = p_total_tgt_mdBm; tpp->ramp.compl_cb = ramp_compl_cb; - if (we_are_ramping_up(trx)) { + if (skip_ramping) { + /* Jump straight to the target power */ + tpp->p_total_cur_mdBm = p_total_tgt_mdBm; + tpp->ramp.attenuation_mdB = 0; + power_ramp_timer_cb(trx); + } else if (we_are_ramping_up(trx)) { if (tpp->p_total_tgt_mdBm <= tpp->ramp.max_initial_pout_mdBm) { LOGPTRX(trx, DL1C, LOGL_INFO, "target_power (%d mdBm) is below or equal to 'power ramp max-initial' power (%d mdBm)\n", diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 8c364c3..ae4fe70 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -195,7 +195,7 @@ { /* Go into shutdown state deactivating transceivers until Abis link * becomes up again */ - bts_shutdown_ext(bts, "Abis close", false); + bts_shutdown_ext(bts, "Abis close", false, true); } int bts_model_adjst_ms_pwr(struct gsm_lchan *lchan) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/30689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ida1d7bbf094958b9142af306dbf84206729a609e Gerrit-Change-Number: 30689 Gerrit-PatchSet: 3 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 4 months

1
0
0 0

2024

2023

2022

gerrit-log December 2022