- gerrit-log - lists.osmocom.org

[XS] Change in osmo-hnbgw[master]: Revert "hnb_persistent: Use incrementing counter for rate_ctr + stat_...
by laforge 07 Oct '24

07 Oct '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38002?usp=email ) Change subject: Revert "hnb_persistent: Use incrementing counter for rate_ctr + stat_item index" ...................................................................... Revert "hnb_persistent: Use incrementing counter for rate_ctr + stat_item index" This reverts commit 61e278a452bf4fd240e45f1fe8c094a4b3795317 as it created errors in our test suite. Let's live with the cosmetic error message but have working tests instead. We should probably consider removing the printing of the message from libosmocore, at least in case the counters also have names set? Closes: OS#6557 Change-Id: I2f7d3f3c88775e2926661e4760ec1d8723c0400c --- M src/osmo-hnbgw/hnbgw.c 1 file changed, 2 insertions(+), 5 deletions(-) Approvals: neels: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index 90b8147..d4515a8 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -497,22 +497,19 @@ osmo_timer_schedule(&hnbp->disconnected_timeout, period_s, 0); } -static unsigned int g_hnbp_ctr_id; - struct hnb_persistent *hnb_persistent_alloc(const struct umts_cell_id *id) { struct hnb_persistent *hnbp = talloc_zero(g_hnbgw, struct hnb_persistent); - unsigned int ctr_id = g_hnbp_ctr_id++; if (!hnbp) return NULL; hnbp->id = *id; hnbp->id_str = talloc_strdup(hnbp, umts_cell_id_to_str(id)); - hnbp->ctrs = rate_ctr_group_alloc(hnbp, &hnb_ctrg_desc, ctr_id); + hnbp->ctrs = rate_ctr_group_alloc(hnbp, &hnb_ctrg_desc, 0); if (!hnbp->ctrs) goto out_free; rate_ctr_group_set_name(hnbp->ctrs, hnbp->id_str); - hnbp->statg = osmo_stat_item_group_alloc(hnbp, &hnb_statg_desc, ctr_id); + hnbp->statg = osmo_stat_item_group_alloc(hnbp, &hnb_statg_desc, 0); if (!hnbp->statg) goto out_free_ctrs; osmo_stat_item_group_set_name(hnbp->statg, hnbp->id_str); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38002?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I2f7d3f3c88775e2926661e4760ec1d8723c0400c Gerrit-Change-Number: 38002 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-hnbgw[master]: Revert "hnb_persistent: Use incrementing counter for rate_ctr + stat_...
by laforge 07 Oct '24

07 Oct '24

Attention is currently required from: fixeria. laforge has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38002?usp=email ) Change subject: Revert "hnb_persistent: Use incrementing counter for rate_ctr + stat_item index" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38002?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I2f7d3f3c88775e2926661e4760ec1d8723c0400c Gerrit-Change-Number: 38002 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Oct 2024 16:51:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in ...pyosmocom[master]: tlv/cosmetic: improve import of osmocom functions
by laforge 07 Oct '24

07 Oct '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/python/pyosmocom/+/38288?usp=email ) Change subject: tlv/cosmetic: improve import of osmocom functions ...................................................................... tlv/cosmetic: improve import of osmocom functions We can import osmocom and then reference build/parse_construct using osmocom.construct.build/parse_construct. Change-Id: I6ce3cffbce9b276de7b223d88268d35cf2706d6a --- M src/osmocom/tlv.py 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: osmith: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmocom/tlv.py b/src/osmocom/tlv.py index d24f2aa..93e4e87 100644 --- a/src/osmocom/tlv.py +++ b/src/osmocom/tlv.py @@ -21,7 +21,7 @@ import re from typing import List, Tuple, Optional -from osmocom.construct import build_construct, parse_construct +import osmocom ######################################################################### # poor man's COMPREHENSION-TLV decoder. @@ -383,9 +383,9 @@ if self.decoded is None: do = b'' elif self._construct: - do = build_construct(self._construct, self.decoded, context) + do = osmocom.construct.build_construct(self._construct, self.decoded, context) elif self.__class__._construct: - do = build_construct(self.__class__._construct, self.decoded, context) + do = osmocom.construct.build_construct(self.__class__._construct, self.decoded, context) else: do = self._to_bytes() self.encoded = do @@ -402,9 +402,9 @@ if self.encoded == b'': self.decoded = None elif self._construct: - self.decoded = parse_construct(self._construct, do, context=context) + self.decoded = osmocom.construct.parse_construct(self._construct, do, context=context) elif self.__class__._construct: - self.decoded = parse_construct(self.__class__._construct, do, context=context) + self.decoded = osmocom.construct.parse_construct(self.__class__._construct, do, context=context) else: self.decoded = self._from_bytes(do) return self.decoded -- To view, visit https://gerrit.osmocom.org/c/python/pyosmocom/+/38288?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: python/pyosmocom Gerrit-Branch: master Gerrit-Change-Id: I6ce3cffbce9b276de7b223d88268d35cf2706d6a Gerrit-Change-Number: 38288 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(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>

1 0

[M] Change in osmo-ttcn3-hacks[master]: ggsn: testenv: support running osmo-ggsn in QEMU
by laforge 07 Oct '24

07 Oct '24

Attention is currently required from: osmith. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38344?usp=email ) Change subject: ggsn: testenv: support running osmo-ggsn in QEMU ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38344?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3f9db4325d5928c809cc99bc82d9cb82bf9e71eb Gerrit-Change-Number: 38344 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Oct 2024 16:50:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[L] Change in osmo-ttcn3-hacks[master]: testenv: support running SUT in QEMU
by laforge 07 Oct '24

07 Oct '24

Attention is currently required from: osmith. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38343?usp=email ) Change subject: testenv: support running SUT in QEMU ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38343?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic9cb7092fd029b7ba530fc755b5d4d73a9d86350 Gerrit-Change-Number: 38343 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Oct 2024 16:50:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: osmo-dev: build with gtp_linux.opts
by laforge 07 Oct '24

07 Oct '24

Attention is currently required from: osmith. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38342?usp=email ) Change subject: testenv: osmo-dev: build with gtp_linux.opts ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38342?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia8ea5494597e0fedae93f501c8bc7d6115543f36 Gerrit-Change-Number: 38342 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Oct 2024 16:49:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[L] Change in osmo-ci[master]: jobs/build-kernels-testenv: new jobs
by laforge 07 Oct '24

07 Oct '24

Attention is currently required from: osmith. laforge has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/38345?usp=email ) Change subject: jobs/build-kernels-testenv: new jobs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38345?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id64a1a778fa38eec20498c36b390332f75d7d3f5 Gerrit-Change-Number: 38345 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Oct 2024 16:49:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmo-sigtran[master]: tests/vty/osmo_stp_test.vty: Add some more lines to test 'update rout...
by fixeria 07 Oct '24

07 Oct '24

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38349?usp=email ) Change subject: tests/vty/osmo_stp_test.vty: Add some more lines to test 'update route' cmd ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38349?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ie3632da3949eeafd234634849249c4d7c8a332d1 Gerrit-Change-Number: 38349 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Oct 2024 16:45:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ttcn3-hacks[master]: ggsn: testenv: run SUT on bridge instead of lo
by fixeria 07 Oct '24

07 Oct '24

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38341?usp=email ) Change subject: ggsn: testenv: run SUT on bridge instead of lo ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: IIUC, it will no more be possible to run the GGSN testsuite locally without docker/podman? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38341?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib768603b0050fe62baff39cab982a850eb91f49a Gerrit-Change-Number: 38341 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 07 Oct 2024 16:37:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[S] Change in libosmo-sigtran[master]: src/osmo_ss7_vty.c: Improve error formatting in 'update route' cmd
by pespin 07 Oct '24

07 Oct '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38350?usp=email ) Change subject: src/osmo_ss7_vty.c: Improve error formatting in 'update route' cmd ...................................................................... src/osmo_ss7_vty.c: Improve error formatting in 'update route' cmd Change-Id: I4fd5b30093425f1831348282d3563467c889e27f --- M src/osmo_ss7_vty.c M tests/vty/osmo_stp_test.vty 2 files changed, 10 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/50/38350/1 diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index fb224d1..80b899c 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -364,18 +364,18 @@ unsigned int argind; if (dpc < 0) { - vty_out(vty, "Invalid point code (%s)%s", argv[0], VTY_NEWLINE); + vty_out(vty, "%% Invalid point code (%s)%s", argv[0], VTY_NEWLINE); return CMD_WARNING; } if (mask < 0) { - vty_out(vty, "Invalid point code (%s)%s", argv[1], VTY_NEWLINE); + vty_out(vty, "%% Invalid point code (%s)%s", argv[1], VTY_NEWLINE); return CMD_WARNING; } rt = osmo_ss7_route_create(rtable, dpc, mask, ls_name); if (!rt) { - vty_out(vty, "cannot create route %s/%s to %s%s", + vty_out(vty, "%% Cannot create route %s/%s to %s%s", argv[0], argv[1], argv[2], VTY_NEWLINE); return CMD_WARNING; } @@ -394,7 +394,12 @@ return CMD_WARNING; break; /* Parse values below */ default: + { + char *cmd = argv_concat(argv, argc, 0); + vty_out(vty, "%% Invalid arg count %d ('%s') in '%s'%s", argc, cmd, self->string, VTY_NEWLINE); + talloc_free(cmd); return CMD_WARNING; + } } argind = 3; diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index 8aac9c1..40eb41e 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -621,3 +621,5 @@ ... route-table system ... !update route 3.2.1 7.255.7 linkset my-ass priority 5 qos-class 1 +OsmoSTP(config-cs7-rt)# update route 3.2.1 7.255.7 linkset my-ass priority +% Invalid arg count 4 ('3.2.1 7.255.7 my-ass priority') in 'update route POINT_CODE MASK linkset LS_NAME [priority] [PRIO] [qos-class] [(CLASS|default)]' -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38350?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I4fd5b30093425f1831348282d3563467c889e27f Gerrit-Change-Number: 38350 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log