November 2024 - gerrit-log - lists.osmocom.org

[XS] Change in osmo-remsim[master]: contrib/jenkins: libosmo-abis after libosmo-netif

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/38889?usp=email ) Change subject: contrib/jenkins: libosmo-abis after libosmo-netif ...................................................................... contrib/jenkins: libosmo-abis after libosmo-netif Depends: libosmo-abis I079dc3999de508301dd37ed03e399356a58d3cab Depends: libosmo-netif I13d6e88158f6d9ce017986283183ee9c2cc68cae Change-Id: I72837fbde099f410eff69362155cb62e8a83c2c6 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/89/38889/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 37a779c..2aa56a4 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -29,8 +29,8 @@ export PATH="$inst/bin:$PATH" osmo-build-dep.sh libosmocore "" --disable-doxygen +osmo-build-dep.sh libosmo-netif "" --disable-doxygen osmo-build-dep.sh libosmo-abis -osmo-build-dep.sh libosmo-netif osmo-build-dep.sh simtrace2 # Additional configure options and depends -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/38889?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I72837fbde099f410eff69362155cb62e8a83c2c6 Gerrit-Change-Number: 38889 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

7 months

1
0
0 0

[XS] Change in osmo-smlc[master]: contrib/jenkins: libosmo-abis after libosmo-netif

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-smlc/+/38888?usp=email ) Change subject: contrib/jenkins: libosmo-abis after libosmo-netif ...................................................................... contrib/jenkins: libosmo-abis after libosmo-netif Depends: libosmo-abis I079dc3999de508301dd37ed03e399356a58d3cab Depends: libosmo-netif I13d6e88158f6d9ce017986283183ee9c2cc68cae Change-Id: I00f1dc510823d947992c8a5b2ce97a22c322b43b --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 19a08c8..88b03c4 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -31,8 +31,8 @@ export LD_LIBRARY_PATH="$inst/lib" export PATH="$inst/bin:$PATH" +osmo-build-dep.sh libosmo-netif "" --disable-doxygen osmo-build-dep.sh libosmo-abis -osmo-build-dep.sh libosmo-netif osmo-build-dep.sh libosmo-sigtran # Additional configure options and depends -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/38888?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: I00f1dc510823d947992c8a5b2ce97a22c322b43b Gerrit-Change-Number: 38888 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

7 months

1
0
0 0

[XS] Change in osmo-smlc[master]: contrib/jenkins: libosmo-abis after libosmo-netif

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-smlc/+/38888?usp=email ) Change subject: contrib/jenkins: libosmo-abis after libosmo-netif ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/38888?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: I00f1dc510823d947992c8a5b2ce97a22c322b43b Gerrit-Change-Number: 38888 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Nov 2024 12:35:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months

1
0
0 0

[XS] Change in osmo-smlc[master]: contrib/jenkins: libosmo-abis after libosmo-netif

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-smlc/+/38888?usp=email ) Change subject: contrib/jenkins: libosmo-abis after libosmo-netif ...................................................................... contrib/jenkins: libosmo-abis after libosmo-netif Depends: libosmo-abis I079dc3999de508301dd37ed03e399356a58d3cab Depends: libosmo-netif I13d6e88158f6d9ce017986283183ee9c2cc68cae Change-Id: I00f1dc510823d947992c8a5b2ce97a22c322b43b --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-smlc refs/changes/88/38888/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 19a08c8..88b03c4 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -31,8 +31,8 @@ export LD_LIBRARY_PATH="$inst/lib" export PATH="$inst/bin:$PATH" +osmo-build-dep.sh libosmo-netif "" --disable-doxygen osmo-build-dep.sh libosmo-abis -osmo-build-dep.sh libosmo-netif osmo-build-dep.sh libosmo-sigtran # Additional configure options and depends -- To view, visit https://gerrit.osmocom.org/c/osmo-smlc/+/38888?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-smlc Gerrit-Branch: master Gerrit-Change-Id: I00f1dc510823d947992c8a5b2ce97a22c322b43b Gerrit-Change-Number: 38888 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

7 months

1
0
0 0

[XS] Change in libosmocore[master]: osmo_io: Increase default queue max_length from 32 to 1024

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/38886?usp=email ) Change subject: osmo_io: Increase default queue max_length from 32 to 1024 ...................................................................... osmo_io: Increase default queue max_length from 32 to 1024 The default value is way too low, and can be hit easily by apps submitting several messages in one main loop run. This is the case for instance of the Abis OML protocol, where a cascade of "State Changed Event Reports" are sent for the whole object tree. Set the default to a saner bigger value. In the end, increasing the value doesn't hurt normal use of apps, and 1024 is still a fairly small number to avoid the app eating the whole system memory if something unexpected happens. Change-Id: I92d5369af523f6297d45d4b534bb0f349ae74485 --- M src/core/osmo_io.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/86/38886/1 diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index af096e6..98d8ef3 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -637,7 +637,7 @@ * The created osmo_io_fd is initialized with some default settings: * * msgb allocations size: OSMO_IO_DEFAULT_MSGB_SIZE (1024) * * msgb headroom: OSMO_IO_DEFAULT_MSGB_HEADROOM (128) - * * tx_queue depth: 32 + * * tx_queue depth: 1024 * * Those values may be adjusted from their defaults by using osmo_iofd_set_alloc_info() and * osmo_iofd_set_txqueue_max_length() on the osmo_io_fd. @@ -696,7 +696,7 @@ iofd->msgb_alloc.size = OSMO_IO_DEFAULT_MSGB_SIZE; iofd->msgb_alloc.headroom = OSMO_IO_DEFAULT_MSGB_HEADROOM; - iofd->tx_queue.max_length = 32; + iofd->tx_queue.max_length = 1024; INIT_LLIST_HEAD(&iofd->tx_queue.msg_queue); return iofd; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38886?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I92d5369af523f6297d45d4b534bb0f349ae74485 Gerrit-Change-Number: 38886 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months

1
0
0 0

[XS] Change in libosmocore[master]: gsmtap: Increase txqueue max_length from 64 to 1024

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/38887?usp=email ) Change subject: gsmtap: Increase txqueue max_length from 64 to 1024 ...................................................................... gsmtap: Increase txqueue max_length from 64 to 1024 The default value may be too low for main loop iterations writing a lot of output. Increase it to a saner value. Change-Id: Ie737e1d060ea3ee48631604bbae1b8b84cf787b9 --- M src/core/gsmtap_util.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/87/38887/1 diff --git a/src/core/gsmtap_util.c b/src/core/gsmtap_util.c index b64c7b0..62d3ffa 100644 --- a/src/core/gsmtap_util.c +++ b/src/core/gsmtap_util.c @@ -496,8 +496,8 @@ if (osmo_iofd_register(gti->out, gti->wq.bfd.fd) < 0) goto err_cleanup; - /* osmo write queue previously used was set up with value of 64 */ - osmo_iofd_set_txqueue_max_length(gti->out, 64); + /* Use a big enough tx queue to avoid gsmtap messages being dropped: */ + osmo_iofd_set_txqueue_max_length(gti->out, 1024); } return gti; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38887?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie737e1d060ea3ee48631604bbae1b8b84cf787b9 Gerrit-Change-Number: 38887 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months

1
0
0 0

[S] Change in libosmocore[master]: ctrl: logging improvements

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/38885?usp=email ) Change subject: ctrl: logging improvements ...................................................................... ctrl: logging improvements Change-Id: Id555fe0dc27e49af3c931ffb33124a15784ccfb3 --- M src/ctrl/control_cmd.c M src/ctrl/control_if.c 2 files changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/38885/1 diff --git a/src/ctrl/control_cmd.c b/src/ctrl/control_cmd.c index db20551..b630620 100644 --- a/src/ctrl/control_cmd.c +++ b/src/ctrl/control_cmd.c @@ -425,7 +425,7 @@ osmo_escape_str(var, -1)); goto err; } - LOGP(DLCTRL, LOGL_DEBUG, "Command: GET %s\n", cmd->variable); + LOGP(DLCTRL, LOGL_DEBUG, "Command: GET %s %s\n", cmd->id, cmd->variable); break; case CTRL_TYPE_SET: var = strtok_r(NULL, " ", &saveptr); @@ -457,7 +457,7 @@ goto err; } - LOGP(DLCTRL, LOGL_DEBUG, "Command: SET %s = \"%s\"\n", cmd->variable, + LOGP(DLCTRL, LOGL_DEBUG, "Command: SET %s %s = \"%s\"\n", cmd->id, cmd->variable, osmo_escape_str(cmd->value, -1)); break; #define REPLY_CASE(TYPE, NAME) \ @@ -481,11 +481,11 @@ cmd->reply = talloc_strdup(cmd, val); \ if (!cmd->variable || !cmd->reply) \ goto oom; \ - LOGP(DLCTRL, LOGL_DEBUG, "Command: " NAME " %s: %s\n", cmd->variable, \ + LOGP(DLCTRL, LOGL_DEBUG, "Command: " NAME " %s %s: %s\n", cmd->id, cmd->variable, \ osmo_escape_str(cmd->reply, -1)); \ break - REPLY_CASE(CTRL_TYPE_GET_REPLY, "GET REPLY"); - REPLY_CASE(CTRL_TYPE_SET_REPLY, "SET REPLY"); + REPLY_CASE(CTRL_TYPE_GET_REPLY, "GET_REPLY"); + REPLY_CASE(CTRL_TYPE_SET_REPLY, "SET_REPLY"); REPLY_CASE(CTRL_TYPE_TRAP, "TRAP"); #undef REPLY_CASE case CTRL_TYPE_ERROR: diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c index c265c3a..83148c3 100644 --- a/src/ctrl/control_if.c +++ b/src/ctrl/control_if.c @@ -445,10 +445,10 @@ if (!cmd) { /* should never happen */ + LOGP(DLCTRL, LOGL_ERROR, "Command parser error: %s\n", msgb_hexdump(msg)); cmd = talloc_zero(ccon, struct ctrl_cmd); if (!cmd) return -ENOMEM; - LOGP(DLCTRL, LOGL_ERROR, "Command parser error.\n"); cmd->type = CTRL_TYPE_ERROR; cmd->id = "err"; cmd->reply = "Command parser error."; @@ -474,6 +474,8 @@ send_reply: /* There is a reply or error that should be reported back to the sender. */ + LOGP(DLCTRL, LOGL_DEBUG, "Tx Command reply: %s %s %s %s\n", + get_value_string(ctrl_type_vals, cmd->type), cmd->id, cmd->variable, cmd->reply); ctrl_cmd_send2(ccon, cmd); just_free: talloc_free(cmd); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38885?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id555fe0dc27e49af3c931ffb33124a15784ccfb3 Gerrit-Change-Number: 38885 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months

1
0
0 0

[S] Change in pysim[master]: pySim-shell: change Prompt character to "#" after "verify_adm"

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/38884?usp=email ) Change subject: pySim-shell: change Prompt character to "#" after "verify_adm" ...................................................................... pySim-shell: change Prompt character to "#" after "verify_adm" Let's change the prompt from ">" to "#" when the user gains admin privilegs using verify_adm. Related: OS#6640 Change-Id: I957b9df7b5069b6fce5bf958c94e8ffda833c77f --- M pySim-shell.py 1 file changed, 13 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/84/38884/1 diff --git a/pySim-shell.py b/pySim-shell.py index 08f00f9..c05e552 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -109,6 +109,7 @@ self.py_locals = {'card': self.card, 'rs': self.rs, 'lchan': self.lchan} self.sl = sl self.ch = ch + self.adm_verified = False self.numeric_path = False self.conserve_write = True @@ -218,18 +219,23 @@ self.cmd2.poutput("<- %s: %s" % (sw, resp)) def update_prompt(self): + if self.adm_verified: + prompt_char = '#' + else: + prompt_char = '>' + if self.lchan: path_str = self.lchan.selected_file.fully_qualified_path_str(not self.numeric_path) scp = self.lchan.scc.scp if scp: - self.prompt = 'pySIM-shell (%s:%02u:%s)> ' % (str(scp), self.lchan.lchan_nr, path_str) + self.prompt = 'pySIM-shell (%s:%02u:%s)%c ' % (str(scp), self.lchan.lchan_nr, path_str, prompt_char) else: - self.prompt = 'pySIM-shell (%02u:%s)> ' % (self.lchan.lchan_nr, path_str) + self.prompt = 'pySIM-shell (%02u:%s)%c ' % (self.lchan.lchan_nr, path_str, prompt_char) else: if self.card: - self.prompt = 'pySIM-shell (no card profile)> ' + self.prompt = 'pySIM-shell (no card profile)%c ' % prompt_char else: - self.prompt = 'pySIM-shell (no card)> ' + self.prompt = 'pySIM-shell (no card)%c ' % prompt_char @cmd2.with_category(CUSTOM_CATEGORY) def do_intro(self, _): @@ -292,6 +298,7 @@ else: atr = self.rs.reset(self) self.poutput('Card ATR: %s' % atr) + self.adm_verified = False self.update_prompt() class InterceptStderr(list): @@ -854,6 +861,8 @@ self._cmd.lchan.scc.verify_chv(adm_chv_num, h2b(pin_adm)) else: raise ValueError("error: cannot authenticate, no adm-pin!") + self._cmd.adm_verified = True + self._cmd.update_prompt() def do_cardinfo(self, opts): """Display information about the currently inserted card""" -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38884?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I957b9df7b5069b6fce5bf958c94e8ffda833c77f Gerrit-Change-Number: 38884 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

7 months

1
0
0 0

[XS] Change in osmo-bts[master]: bts-omldummy: print category names isntead of hex values

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/38883?usp=email ) Change subject: bts-omldummy: print category names isntead of hex values ...................................................................... bts-omldummy: print category names isntead of hex values Change-Id: I6082409f25e33cdf4480455bae16b5ac6c5bc1a4 --- M src/osmo-bts-omldummy/main.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/83/38883/1 diff --git a/src/osmo-bts-omldummy/main.c b/src/osmo-bts-omldummy/main.c index 088fa52..8701895 100644 --- a/src/osmo-bts-omldummy/main.c +++ b/src/osmo-bts-omldummy/main.c @@ -132,6 +132,8 @@ msgb_talloc_ctx_init(tall_bts_ctx, 10*1024); osmo_init_logging2(tall_bts_ctx, &bts_log_info); + log_set_print_category(osmo_stderr_target, 1); + log_set_print_category_hex(osmo_stderr_target, 0); parse_cmdline(argc, argv); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38883?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6082409f25e33cdf4480455bae16b5ac6c5bc1a4 Gerrit-Change-Number: 38883 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: Osmocom_CTRL_Functions.ttcn: Use Misc_Helpers.f_shutdown() everywhere

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38882?usp=email ) Change subject: Osmocom_CTRL_Functions.ttcn: Use Misc_Helpers.f_shutdown() everywhere ...................................................................... Osmocom_CTRL_Functions.ttcn: Use Misc_Helpers.f_shutdown() everywhere Change-Id: I3b11a4dee35da89b2fec0cc66021dd57db04beb4 --- M library/Osmocom_CTRL_Functions.ttcn 1 file changed, 27 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/82/38882/1 diff --git a/library/Osmocom_CTRL_Functions.ttcn b/library/Osmocom_CTRL_Functions.ttcn index cf19f7e..ac18695 100644 --- a/library/Osmocom_CTRL_Functions.ttcn +++ b/library/Osmocom_CTRL_Functions.ttcn @@ -21,6 +21,7 @@ import from Osmocom_CTRL_Types all; + import from Misc_Helpers all; import from IPA_Emulation all; type record of charstring charstring_list; @@ -42,15 +43,15 @@ [] pt.receive(tr_CtrlMsgTrap) { repeat; } [] pt.receive(tr_CtrlMsgError) -> value rx { if (istemplatekind(on_err, "omit")) { - setverdict(fail, "Error in CTRL GET ", variable, ": ", rx.err.reason); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Error in CTRL GET ", variable, ": ", rx.err.reason)); } else { rx.resp.val := valueof(on_err); } } [] T.timeout { - setverdict(fail, "Timeout waiting for CTRL GET REPLY ", variable); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Timeout waiting for CTRL GET REPLY ", variable)); } } return rx.resp.val; @@ -67,12 +68,12 @@ [] pt.receive(tr_CtrlMsgSetRepl(id, variable, val)) { } [] pt.receive(tr_CtrlMsgTrap) { repeat; } [] pt.receive(tr_CtrlMsgError) -> value rx { - setverdict(fail, "Error in CTRL SET ", variable, ": ", rx.err.reason); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Error in CTRL SET ", variable, ": ", rx.err.reason)); } [] T.timeout { - setverdict(fail, "Timeout waiting for CTRL SET REPLY ", variable); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Timeout waiting for CTRL SET REPLY ", variable)); } } } @@ -93,8 +94,8 @@ [] pt.receive(tr_CtrlMsgTrap(variable, val)) -> value rx { } [] T.timeout { - setverdict(fail, "Timeout waiting for TRAP ", variable); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Timeout waiting for TRAP ", variable)); } } return rx.trap.val; @@ -116,8 +117,8 @@ } } [] T.timeout { - setverdict(fail, "Timeout waiting for SET ", variable); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Timeout waiting for SET ", variable)); } } return rx.cmd.val; @@ -137,8 +138,8 @@ } } [] T.timeout { - setverdict(fail, "Timeout waiting for GET ", variable); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Timeout waiting for GET ", variable)); } } } @@ -148,8 +149,8 @@ var charstring ctrl_resp; ctrl_resp := f_ctrl_get(pt, variable); if (not match(ctrl_resp, exp)) { - setverdict(fail, "Unexpected " & variable & ":" & ctrl_resp); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Unexpected ", variable, ":", ctrl_resp, " vs exp ", exp)); } } @@ -168,8 +169,8 @@ var CtrlVariable variable := valueof(ts_ctrl_ratectr(grp, instance, name)); ctrl_resp := f_ctrl_get(pt, variable); if (not match(str2int(ctrl_resp), exp)) { - setverdict(fail, variable & " value " & ctrl_resp & " didn't match ", exp); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str(variable & " value " & ctrl_resp & " didn't match ", exp)); } } @@ -310,12 +311,13 @@ var CounterNameVals last := f_counter_name_vals_get(pt, instance_name, instance_nr, vals); for (var integer i := 0; i < lengthof(vals); i := i + 1) { if (last[i].name != vals[i].name) { - setverdict(fail, "Internal error"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Internal error"); } if (last[i].val != vals[i].val) { - setverdict(fail, "Rate counter mismatch: " & instance_name & " " & int2str(instance_nr) - & " " & vals[i].name & " is " & f_counter_val_to_str(last[i].val) - & " but expected " & f_counter_val_to_str(vals[i].val)); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Rate counter mismatch: " & instance_name & " " & int2str(instance_nr) + & " " & vals[i].name & " is " & f_counter_val_to_str(last[i].val) + & " but expected " & f_counter_val_to_str(vals[i].val)); } } setverdict(pass); @@ -338,7 +340,7 @@ var CounterNameVals last := f_counter_name_vals_get(pt, instance_name, instance_nr, vals); for (var integer i := 0; i < lengthof(vals); i := i + 1) { if (last[i].name != vals[i].name) { - setverdict(fail, "Internal error"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Internal error"); } if (last[i].val != vals[i].val) { changed := changed & { instance_name & "." & int2str(instance_nr) & "." & vals[i].name }; @@ -400,7 +402,8 @@ } if (lengthof(diff) > 0) { log("ERROR\nExpected: ", expect_list, "\nGot: ", got_list); - setverdict(fail, "Rate counters did not change as expected:" & diff); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "Rate counters did not change as expected:" & diff); } else { setverdict(pass); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38882?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3b11a4dee35da89b2fec0cc66021dd57db04beb4 Gerrit-Change-Number: 38882 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024