Change in ...libosmocore[master]: vty: command.c: Fix is_cmd_ambiguous() returning always 0
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/14422 to look at the new patch set (#2). Change subject: vty: command.c: Fix is_cmd_ambiguous() returning always 0 .. vty: command.c: Fix is_cmd_ambiguous() returning always 0 inner block defined variable "enum match_type ret" was being masking outter block variable "int ret = 0". The ret variable was being given non zero values only inside the inner block, so that change was done on the inner variable and not the outer one, which is returned. Fixes: 5314c513f23688462d7f7937e5ae5e0d5cd4548e Change-Id: Iec87d7db49a096d07e38ff8a060b923a52bfd6ba --- M src/vty/command.c M tests/tdef/tdef_vty_test_config_root.vty M tests/vty/vty_transcript_test.vty 3 files changed, 14 insertions(+), 43 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/22/14422/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iec87d7db49a096d07e38ff8a060b923a52bfd6ba Gerrit-Change-Number: 14422 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...libosmocore[master]: vty: command.c: Fix is_cmd_ambiguous() returning always 0
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/14422
Change subject: vty: command.c: Fix is_cmd_ambiguous() returning always 0
..
vty: command.c: Fix is_cmd_ambiguous() returning always 0
inner block defined variable "enum match_type ret" was being masking
outter block variable "int ret = 0". The ret variable was being given
non zero values only inside the inner block, so that change was done on
the inner variable and not the outer one, which is returned.
Change-Id: Iec87d7db49a096d07e38ff8a060b923a52bfd6ba
---
M src/vty/command.c
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/22/14422/1
diff --git a/src/vty/command.c b/src/vty/command.c
index 6380487..e9690bb 100644
--- a/src/vty/command.c
+++ b/src/vty/command.c
@@ -1521,7 +1521,7 @@
if (!desc)
continue;
- enum match_type ret;
+ enum match_type mtype;
const char *str = desc->cmd;
if (CMD_OPTION(str)) {
@@ -1573,10 +1573,10 @@
match++;
break;
case ipv6_prefix_match:
- if ((ret =
+ if ((mtype =
cmd_ipv6_prefix_match
(command)) != no_match) {
- if (ret == partly_match) {
+ if (mtype == partly_match) {
ret = 2;/*
There is incomplete match. */
goto free_and_return;
}
@@ -1590,10 +1590,10 @@
match++;
break;
case ipv4_prefix_match:
- if ((ret =
+ if ((mtype =
cmd_ipv4_prefix_match
(command)) != no_match) {
- if (ret == partly_match) {
+ if (mtype == partly_match) {
ret = 2;/*
There is incomplete match. */
goto free_and_return;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14422
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Iec87d7db49a096d07e38ff8a060b923a52bfd6ba
Gerrit-Change-Number: 14422
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in ...libosmocore[master]: vty: command.c: Get rid of huge indentation block
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/14421
Change subject: vty: command.c: Get rid of huge indentation block
..
vty: command.c: Get rid of huge indentation block
Huge conditional block inside foor loop is negated in this patch
together with a "continue" keyword.
Change-Id: I9715734ed276f002fdc8c3b9742531ad36b2ef9e
---
M src/vty/command.c
1 file changed, 91 insertions(+), 88 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/21/14421/1
diff --git a/src/vty/command.c b/src/vty/command.c
index 87f2abc..6380487 100644
--- a/src/vty/command.c
+++ b/src/vty/command.c
@@ -1516,97 +1516,100 @@
descvec = vector_slot(cmd_element->strvec, index);
- for (j = 0; j < vector_active(descvec); j++)
- if ((desc = vector_slot(descvec, j))) {
- enum match_type ret;
- const char *str = desc->cmd;
+ for (j = 0; j < vector_active(descvec); j++) {
+ desc = vector_slot(descvec, j);
+ if (!desc)
+ continue;
- if (CMD_OPTION(str)) {
- if (!cmd_deopt_ctx)
- cmd_deopt_ctx =
-
talloc_named_const(tall_vty_cmd_ctx, 0,
-
__func__);
- str = cmd_deopt(cmd_deopt_ctx,
str);
- if (str == NULL)
- continue;
- }
+ enum match_type ret;
+ const char *str = desc->cmd;
- switch (type) {
- case exact_match:
- if (!(CMD_VARIABLE (str))
- && strcmp(command, str) == 0)
- match++;
- break;
- case partly_match:
- if (!(CMD_VARIABLE (str))
- && strncmp(command, str,
strlen (command)) == 0)
- {
- if (matched
- && strcmp(matched,
- str) !=
0) {
- ret = 1; /*
There is ambiguous match. */
- goto
free_and_return;
- } else
- matched = str;
- match++;
- }
- break;
- case range_match:
- if (cmd_range_match
- (str, command)) {
- if (matched
- && strcmp(matched,
- str) !=
0) {
- ret = 1;
- goto
free_and_return;
- } else
- matched = str;
- match++;
- }
- break;
-#ifdef HAVE_IPV6
- case ipv6_match:
- if (CMD_IPV6(str))
- match++;
- break;
- case ipv6_prefix_match:
- if ((ret =
-cmd_ipv6_prefix_match
-(command)) != no_match) {
-
Change in ...osmo-ttcn3-hacks[master]: library/L1CTL_PortType.ttcn: clarify and unify timeout messages
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14420
Change subject: library/L1CTL_PortType.ttcn: clarify and unify timeout messages
..
library/L1CTL_PortType.ttcn: clarify and unify timeout messages
It's way more cleaner when you see:
Timeout waiting for L1CTL_RACH_CONF
instead of:
Timeout in RACH.
Change-Id: I25e8230c2e4b29b2583bf8954d0dedaa18e5d6ae
---
M library/L1CTL_PortType.ttcn
1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/20/14420/1
diff --git a/library/L1CTL_PortType.ttcn b/library/L1CTL_PortType.ttcn
index 7af680c..2423715 100644
--- a/library/L1CTL_PortType.ttcn
+++ b/library/L1CTL_PortType.ttcn
@@ -59,7 +59,7 @@
}
[] pt.receive { repeat; };
[] T.timeout {
- setverdict(fail, "Timeout in FBSB")
+ setverdict(fail, "Timeout waiting for
L1CTL_FBSB_CONF");
mtc.stop;
};
}
@@ -74,7 +74,7 @@
[] pt.receive(tr_L1CTL_CCCH_MODE_CONF) { }
[] pt.receive { repeat; }
[] T.timeout {
- setverdict(fail, "Timeout in CCH_MODE");
+ setverdict(fail, "Timeout waiting for
L1CTL_CCCH_MODE_CONF");
mtc.stop;
}
}
@@ -93,7 +93,7 @@
[] pt.receive(tr_L1CTL_RACH_CONF) -> value rc { fn :=
rc.dl_info.frame_nr };
[] pt.receive { repeat; };
[] T.timeout {
- setverdict(fail, "Timeout in RACH");
+ setverdict(fail, "Timeout waiting for
L1CTL_RACH_CONF");
mtc.stop;
}
}
@@ -114,7 +114,7 @@
[] pt.receive(tr_L1CTL_RACH_CONF) -> value rc { fn :=
rc.dl_info.frame_nr };
[] pt.receive { repeat; };
[] T.timeout {
- setverdict(fail, "Timeout in extended RACH");
+ setverdict(fail, "Timeout waiting for
(extended) L1CTL_RACH_CONF");
mtc.stop;
}
}
@@ -168,7 +168,7 @@
};
[] pt.receive { repeat };
[] T.timeout {
- setverdict(fail, "Timeout waiting for IMM ASS");
+ setverdict(fail, "Timeout waiting for TBF IMM
ASS");
mtc.stop;
}
}
@@ -184,7 +184,7 @@
[] pt.receive(tr_L1CTL_TBF_CFG_CONF(is_uplink)) {}
[] pt.receive { repeat };
[] T.timeout {
- setverdict(fail, "Timeout waiting for
TBF-CFG.conf");
+ setverdict(fail, "Timeout waiting for
L1CTL_TBF_CFG_CONF");
mtc.stop;
};
}
@@ -213,7 +213,7 @@
[] pt.receive(tr_L1CTL_MsgType(L1CTL_RESET_CONF)) { }
[] pt.receive { repeat; }
[] T.timeout {
- setverdict(fail, "Timeout waiting for
RESET.conf");
+ setverdict(fail, "Timeout waiting for
L1CTL_RESET_CONF");
mtc.stop;
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14420
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I25e8230c2e4b29b2583bf8954d0dedaa18e5d6ae
Gerrit-Change-Number: 14420
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in ...osmo-ttcn3-hacks[master]: bts: more lapdm tests
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14419 to look at the new patch set (#2). Change subject: bts: more lapdm tests .. bts: more lapdm tests Change-Id: I0db71de5f600022935f47573aa919990de4bfec0 --- M bts/BTS_Tests_LAPDm.ttcn 1 file changed, 266 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/19/14419/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0db71de5f600022935f47573aa919990de4bfec0 Gerrit-Change-Number: 14419 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: bts: more lapdm tests
Hoernchen has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14419
Change subject: bts: more lapdm tests
..
bts: more lapdm tests
Change-Id: I0db71de5f600022935f47573aa919990de4bfec0
---
M bts/BTS_Tests_LAPDm.ttcn
1 file changed, 267 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/19/14419/1
diff --git a/bts/BTS_Tests_LAPDm.ttcn b/bts/BTS_Tests_LAPDm.ttcn
index edbd37b..69ca24c 100644
--- a/bts/BTS_Tests_LAPDm.ttcn
+++ b/bts/BTS_Tests_LAPDm.ttcn
@@ -548,12 +548,13 @@
}
}
/* all of the above */
-private altstep as_ignore_background(boolean want_dcch := true) runs on
ConnHdlr {
+private altstep as_ignore_background(boolean want_dcch := true, boolean
ignore_rsl_errors := false) runs on ConnHdlr {
[want_dcch] as_lapdm_acch();
[not want_dcch] as_lapdm_dcch();
[] as_lapdm_idle();
[] as_rsl_meas_rep();
- [] as_rsl_fail_err();
+ [not ignore_rsl_errors] as_rsl_fail_err();
+ [ignore_rsl_errors] RSL.receive(tr_RSL_ERROR_IND(g_chan_nr, ?, ?)) {
repeat;}
}
/* Test the operation of Layer 2 sequence numbering.
@@ -641,7 +642,7 @@
fp_common_init();
/* some common altstep for meas res and other background noise */
- d := activate(as_ignore_background());
+ d := activate(as_ignore_background(ignore_rsl_errors := true));
RSL.clear;
LAPDM.clear;
@@ -720,6 +721,266 @@
f_testmatrix_each_chan(pars, refers(f_TC_iframe_timer_recovery));
}
+/* 25.2.6.1 ns sequence error
+sends wrong N(S), expects REJ, sends wrong N(S) with P=1, expects REJ with F=1
*/
+private function f_TC_ns_seq_error(charstring id) runs on ConnHdlr {
+ const integer sapi := 0;
+ var RslLinkId link_id := valueof(ts_RslLinkID_DCCH(sapi));
+ var default d;
+ timer T := 3.0;
+
+ fp_common_init();
+
+ /* some common altstep for meas res and other background noise */
+ d := activate(as_ignore_background(ignore_rsl_errors := true));
+ RSL.clear;
+ LAPDM.clear;
+
+ var octetstring l3_mo := f_rnd_octstring(12);
+ var octetstring l3_mt := f_rnd_octstring(12);
+
+ /* 1) The BTS is brought into the multiple frame established state */
+
+ /* MO Establish Request via LADPm: SAPI = 0, C = 0, P = 1, M = 0, 0 ≤ L
≤ N201.. */
+ LAPDM.send(t_PH_DATA(0, false, ts_LAPDm_SABM(sapi, c_r:=cr_MO_CMD,
p:=true, l3:=l3_mo)));
+ RSL.receive(tr_RSL_EST_IND(g_chan_nr, link_id, l3_mo));
+ /* UA: SAPI = 0, R = 0, F = 1, M = 0, L = L of SABM. */
+ LAPDM.receive(t_PH_DATA(0, false, tr_LAPDm_UA(sapi, cr_MT_RSP, f:=true,
l3:=l3_mo)));
+
+ /* 2) The MS sends an L3 Request to the BTS */
+ l3_mo := f_rnd_octstring(18);
+ /* SAPI = 0, C = 1, P = 0, M = 0, 0 ≤ L ≤ N201, N(S) = 0, N(R) = 0. *
*/
+ LAPDM.send(t_PH_DATA(0, false, ts_LAPDm_I(sapi, c_r:=cr_MO_CMD,
p:=false,
+ nr:=0, ns:=0, l3:=l3_mo)));
+ RSL.receive(tr_RSL_DATA_IND(g_chan_nr, link_id, l3_mo));
+ /* 3) The BTS shall respond with a RR frame though this may be
incorporated with
+ the L3 Response I frame. */
+ RSL.send(ts_RSL_DATA_REQ(g_chan_nr, link_id, l3_mt));
+ alt {
+ /* SAPI = 0, R = 1, F = 0, M = 0, L = 0, N(R) = 1. */
+ [] LAPDM.receive(t_PH_DATA(0, false, tr_LAPDm_RR(sapi, c_r:=cr_MT_RSP,
p:=false, nr:=1))) {
+ repeat;
+ }
+ /* SAPI = 0, C = 0, P = 0, M = 0, 0 ≤ L ≤ N201, N(R) = 1, N(S) = 0 */
+ [] LAPDM.receive(t_PH_DATA(0, false, tr_LAPDm_I(sapi, c_r:=cr_MT_CMD,
p:=false,
+ nr:=1, ns:=0,
l3:=l3_mt)));
+ }
+
+ /* 4) The MS shall then send an I frame containing Identity Request
with incorrect N(S)
+ but correctly acknowledging the MS's I frame; P bit set to zero. */
+ LAPDM.send(t_PH_DATA(0, false, ts_LAPDm_I(sapi, c_r:=cr_MO_CMD,
p:=false,
+ nr:=1, ns:=0, l3:=l3_mo)));
+
+ /* no rsl data ind due to wrong ns */
+
+ /* The BTS shall send a REJ frame. */
+ timer T1 := 2.0;
+ T1.start;
+ alt{
+ [] LAPDM.receive(t_PH_DATA(0, false, tr_LAPDm_REJ(sapi, c_r:=cr_MT_RSP,
p:=false, nr:=1)));
+ [] T1.timeout{ setverdict(fail, "Missing first REJ")}
+ }
+
+ f_sleep(2.0); // T200
+
+ /* The MS shall, after T200, send another I frame with incorrect N(S),
P bit set to 1 this time. */
+ LAPDM.send(t_PH_DATA(0, false, ts_LAPDm_I(sapi, c_r:=cr_MO_CMD, p:=true,
+ nr:=1, ns:=0, l3:=l3_mo)));
+
+ /* The BTS shall respond with a REJ, F bit set to 1. */
+ T1.start;
+ alt{
+ [] LAPDM.receive(t_PH_DATA(0, false, tr_LAPDm_REJ(sapi,
Change in ...osmo-ttcn3-hacks[master]: BTS: add some dynamic power control tests
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14417 to look at the new patch set (#3). Change subject: BTS: add some dynamic power control tests .. BTS: add some dynamic power control tests Change-Id: I57489ba22542d859ced767e856634f9060c060f0 --- M bts/BTS_Tests.ttcn M library/RSL_Types.ttcn 2 files changed, 380 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/17/14417/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I57489ba22542d859ced767e856634f9060c060f0 Gerrit-Change-Number: 14417 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in ...osmo-remsim[master]: osmo-remsim-client: add systemd service script template and etc/defau...
pespin has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-remsim/+/14267 )
Change subject: osmo-remsim-client: add systemd service script template and
etc/default config
..
Patch Set 1:
(1 comment)
https://gerrit.osmocom.org/#/c/14267/1/contrib/systemd/osmo-remsim-client_.service
File contrib/systemd/osmo-remsim-client_.service:
https://gerrit.osmocom.org/#/c/14267/1/contrib/systemd/osmo-remsim-client_.service@8
PS1, Line 8: 2-1.1
> yes - but this is a template to be copied n (number of modems) times and
> modified to fit the specifi […]
So if I understand correctly, you need to change several parameters per process
instance launched and not only the "2-1.1" part, right?
What about using: EnvironmentFile=/etc/default/osmo-remsim-client-%i
And then have /etc/default/osmo-remsim-client-{0..N} files, each defining env
variables with different values?
For instance, /etc/default/osmo-remsim-client-0:
REMSIM_H="2-1.1"
REMSIM_C="0"
and then in this sytemd template:
EnvironmentFile=/etc/default/osmo-remsim-client-%i
ExecStart=/usr/bin/osmo-remsim-client-st2 $CLIENT_OPTS -I 0 -H $REMSIM_H -c
$REMSIM_C
--
To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/14267
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-remsim
Gerrit-Branch: master
Gerrit-Change-Id: I243f3d8e090d49ca3a1d0a8cf568750b76273c03
Gerrit-Change-Number: 14267
Gerrit-PatchSet: 1
Gerrit-Owner: roh
Gerrit-Assignee: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: roh
Gerrit-CC: laforge
Gerrit-CC: pespin
Gerrit-Comment-Date: Tue, 11 Jun 2019 16:46:47 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: roh
Comment-In-Reply-To: laforge
Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: bscnat: Introduce test TC_ctrl_location
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14414 ) Change subject: bscnat: Introduce test TC_ctrl_location .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If28aba011a1903788cacbc10c0b62954925d4b1f Gerrit-Change-Number: 14414 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 11 Jun 2019 16:25:47 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-remsim[master]: osmo-remsim-client: add systemd service script template and etc/defau...
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/14267 ) Change subject: osmo-remsim-client: add systemd service script template and etc/default config .. Patch Set 1: assigning to pespin, whom I believe to know more systemd voodoo -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/14267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I243f3d8e090d49ca3a1d0a8cf568750b76273c03 Gerrit-Change-Number: 14267 Gerrit-PatchSet: 1 Gerrit-Owner: roh Gerrit-Assignee: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: roh Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 11 Jun 2019 14:57:35 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: hlr: add Check IMEI tests
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14402 ) Change subject: hlr: add Check IMEI tests .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I97c8462f0817149feadd0c4865e3df6c2af92a80 Gerrit-Change-Number: 14402 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 11 Jun 2019 14:56:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: SGSN_Tests: f_detach_mo(): fail when receiving any unhandled layer 3 ...
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13989 ) Change subject: SGSN_Tests: f_detach_mo(): fail when receiving any unhandled layer 3 message for normal detach .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I957994376583959758417dccf419a55c43a0c61b Gerrit-Change-Number: 13989 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 11 Jun 2019 14:53:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: hlr: add f_vty_subscr_show_nomatch()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14401 ) Change subject: hlr: add f_vty_subscr_show_nomatch() .. Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/14401/2/hlr/HLR_Tests.ttcn File hlr/HLR_Tests.ttcn: https://gerrit.osmocom.org/#/c/14401/2/hlr/HLR_Tests.ttcn@308 PS2, Line 308: setverdict(fail, "Non-matching VTY response: ", ret, ", should *not* have matched: ", exp_ret); It's actually "Matching VTY response" here? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I176d8fd2ee74e1eb7ac797f931cd6005d398740f Gerrit-Change-Number: 14401 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 11 Jun 2019 14:55:05 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...docker-playground[master]: bscnat: Bind bsc-nat CTRL on 0.0.0.0
pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/docker-playground/+/14415 ) Change subject: bscnat: Bind bsc-nat CTRL on 0.0.0.0 .. bscnat: Bind bsc-nat CTRL on 0.0.0.0 Other tests already do it, and allows using the CTRL iface in docker setups where 127.0.0.1 is not used. Change-Id: I6f16dc322d38f9f0870241f3416c81df8ec5481b --- M ttcn3-bscnat-test/osmo-bsc-nat.cfg 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Verified diff --git a/ttcn3-bscnat-test/osmo-bsc-nat.cfg b/ttcn3-bscnat-test/osmo-bsc-nat.cfg index ffc3ff0..80d7095 100644 --- a/ttcn3-bscnat-test/osmo-bsc-nat.cfg +++ b/ttcn3-bscnat-test/osmo-bsc-nat.cfg @@ -14,6 +14,9 @@ no login bind 0.0.0.0 ! +ctrl + bind 0.0.0.0 +! mgcp bind ip 172.18.15.20 bind port 2427 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6f16dc322d38f9f0870241f3416c81df8ec5481b Gerrit-Change-Number: 14415 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in ...osmo-ttcn3-hacks[master]: SGSN_Tests: f_detach_mo(): fail when receiving any unhandled layer 3 ...
laforge has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13989 )
Change subject: SGSN_Tests: f_detach_mo(): fail when receiving any unhandled
layer 3 message for normal detach
..
SGSN_Tests: f_detach_mo(): fail when receiving any unhandled layer 3 message
for normal detach
Merge the case with the fail when doing a power-off detach.
Change-Id: I957994376583959758417dccf419a55c43a0c61b
---
M sgsn/SGSN_Tests.ttcn
1 file changed, 8 insertions(+), 4 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index 1f63dfa..03c9d05 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -924,10 +924,6 @@
mtc.stop;
/* TODO: check if any PDP contexts are deactivated on network
side? */
}
- [power_off] BSSGP[bssgp_index].receive(tr_BD_L3_MT(?)) -> value bd {
- setverdict(fail, "Unexpected Layer 3 package received in
power-off DETACH");
- mtc.stop;
- }
[power_off] T.timeout {
setverdict(pass);
}
@@ -936,6 +932,14 @@
setverdict(pass);
/* TODO: check if any PDP contexts are deactivated on network
side? */
}
+ [] BSSGP[bssgp_index].receive(tr_BD_L3_MT(?)) -> value bd {
+ if (power_off) {
+ setverdict(fail, "Unexpected Layer 3 package received
in power-off DETACH");
+ } else {
+ setverdict(fail, "Unexpected Layer 3 package received
in normal DETACH");
+ }
+ mtc.stop;
+ }
[] BSSGP[bssgp_index].receive { repeat; }
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/13989
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I957994376583959758417dccf419a55c43a0c61b
Gerrit-Change-Number: 13989
Gerrit-PatchSet: 3
Gerrit-Owner: lynxis lazus
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in ...osmo-ttcn3-hacks[master]: BTS: add some dynamic power control tests
laforge has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14417 )
Change subject: BTS: add some dynamic power control tests
..
Patch Set 2:
(6 comments)
https://gerrit.osmocom.org/#/c/14417/2/bts/BTS_Tests.ttcn
File bts/BTS_Tests.ttcn:
https://gerrit.osmocom.org/#/c/14417/2/bts/BTS_Tests.ttcn@1974
PS2, Line 1974: pp := valueof(ts_RSL_IE_MS_Power_Parameters('aabbcc'O));
I would consider sending an empty octet string ''O to ensure we're not
confusing the receiver. Sure, at them moment OsmoBTs doesn't implement any
parameters, but in the future we might. Using an empty IE fulfills the
requirement of having that element present (and hence enabling BTS-side power
control), but at the same time has low risk of breaking something that actually
might interpret aabbcc as actual parameters.
https://gerrit.osmocom.org/#/c/14417/2/bts/BTS_Tests.ttcn@2028
PS2, Line 2028:
I would avoid the 'rsl' variable here. As RSL.send() can take the send template
directly, it also means you save the valueof(). Sure, it's just stylistic, not
important...
https://gerrit.osmocom.org/#/c/14417/2/bts/BTS_Tests.ttcn@2062
PS2, Line 2062:
: var RSL_IE_MS_Power ms_power;
: ms_power := valueof(ts_RSL_IE_MS_Power(pwr_var));
: var RSL_IE pwr;
: pwr := valueof(t_RSL_IE(RSL_IE_MS_POWER,
RSL_IE_Body:{ms_power := ms_power}));
again here I'd typically try to avoid the local variables, as they force you to
do valueof() all the time, which sort of makes templates less nice to use. The
alternative if you want the local variables would be to define them as template
variables, so 'var template RSL_IE_MS_Power ms_power :=
ts_RSL_IE_MS_Power(pwr_var);' would do the trick, maybe even var template
(value) ...
https://gerrit.osmocom.org/#/c/14417/2/bts/BTS_Tests.ttcn@2165
PS2, Line 2165: if((band == "GSM450")
if if were a function, one wouldn't have spaces before the parenthesis :P
https://gerrit.osmocom.org/#/c/14417/2/bts/BTS_Tests.ttcn@2166
PS2, Line 2166: or (band == "GSM480")
I would typically have used a select/case construct here, not having to repeat
"band ==" in every line. The nice part about the select/case in TTCN3 is that
every "case" is a template match. So you can define a charstring template
matching all those bands that equal in their treatment and then have a single
line. case (t_my_bands) { ... }
But once again, just a stylistic comment, no absolute need to change the code.
https://gerrit.osmocom.org/#/c/14417/2/bts/BTS_Tests.ttcn@2264
PS2, Line 2264:
unrelated whitespace
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14417
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I57489ba22542d859ced767e856634f9060c060f0
Gerrit-Change-Number: 14417
Gerrit-PatchSet: 2
Gerrit-Owner: Hoernchen
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: laforge
Gerrit-Comment-Date: Tue, 11 Jun 2019 14:53:26 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Change in ...docker-playground[master]: bscnat: Bind bsc-nat CTRL on 0.0.0.0
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/14415 ) Change subject: bscnat: Bind bsc-nat CTRL on 0.0.0.0 .. Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6f16dc322d38f9f0870241f3416c81df8ec5481b Gerrit-Change-Number: 14415 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 11 Jun 2019 14:49:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: lib/IPA_Emulation: Build IPA_CTRL conditionally based on define
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14418 to look at the new patch set (#7). Change subject: lib/IPA_Emulation: Build IPA_CTRL conditionally based on define .. lib/IPA_Emulation: Build IPA_CTRL conditionally based on define Change-Id: I4d1eca6b0008a395b7f7449e6ea3f9b6d41133c7 --- M bts/regen_makefile.sh M library/IPA_Emulation.ttcnpp M msc/regen_makefile.sh M sccp/regen_makefile.sh M selftest/regen_makefile.sh M sgsn/regen_makefile.sh M sip/regen_makefile.sh 7 files changed, 14 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/18/14418/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4d1eca6b0008a395b7f7449e6ea3f9b6d41133c7 Gerrit-Change-Number: 14418 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: bsc: Introduce test TC_ctrl_location
Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14407 to look at the new patch set (#4). Change subject: bsc: Introduce test TC_ctrl_location .. bsc: Introduce test TC_ctrl_location Related: OS#2012 Change-Id: I3640f6889e3b6adc3b4601082f948543c64a2fe3 --- M bsc/BSC_Tests.ttcn M bsc/expected-results.xml M bsc/regen_makefile.sh M library/Osmocom_CTRL_Adapter.ttcn 4 files changed, 38 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/07/14407/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14407 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3640f6889e3b6adc3b4601082f948543c64a2fe3 Gerrit-Change-Number: 14407 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in ...docker-playground[master]: bscnat: Bind bsc-nat CTRL on 0.0.0.0
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/14415 ) Change subject: bscnat: Bind bsc-nat CTRL on 0.0.0.0 .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6f16dc322d38f9f0870241f3416c81df8ec5481b Gerrit-Change-Number: 14415 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 11 Jun 2019 14:42:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: bscnat: Introduce test TC_ctrl_location
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14414 ) Change subject: bscnat: Introduce test TC_ctrl_location .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If28aba011a1903788cacbc10c0b62954925d4b1f Gerrit-Change-Number: 14414 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 11 Jun 2019 14:39:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: bscnat: Add function to run actions on test per BSC component
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14413 ) Change subject: bscnat: Add function to run actions on test per BSC component .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I97e743c79e5e9e7613ab91a1aa9ce2377a237fd5 Gerrit-Change-Number: 14413 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 11 Jun 2019 14:38:55 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-remsim[master]: osmo-remsim-client: add systemd service script template and etc/defau...
roh has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/14267 ) Change subject: osmo-remsim-client: add systemd service script template and etc/default config .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/14267/1/contrib/systemd/osmo-remsim-client_.service File contrib/systemd/osmo-remsim-client_.service: https://gerrit.osmocom.org/#/c/14267/1/contrib/systemd/osmo-remsim-client_.service@8 PS1, Line 8: 2-1.1 > wouldn't that mandate that it is attached at a certain position in the bus? yes - but this is a template to be copied n (number of modems) times and modified to fit the specific modem served. i am open to better ideas for iterators of this than hardcoding it in config -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/14267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I243f3d8e090d49ca3a1d0a8cf568750b76273c03 Gerrit-Change-Number: 14267 Gerrit-PatchSet: 1 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: roh Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 11 Jun 2019 14:30:41 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in ...osmo-trx[master]: Add VTY commands to set error ctr thresholds
pespin has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmo-trx/+/14168 )
Change subject: Add VTY commands to set error ctr thresholds
..
Add VTY commands to set error ctr thresholds
osmo-trx will validate over time that those thresholds are not reached.
If they are reached, osmo-trx will die. As a result, osmo-bts-trx will
notice and will end up notifying the BSC about it (for instance because
it will also restart its process).
For instance:
"""
ctr-error-threshold rx_drop_events 2 minute
ctr-error-threshold rx_underruns 10 second
"""
In those cases above, osmo-trx will die if rate_ctr rx_drop_events went
to a value higher than 2 per minute, or it will die to if rx_underruns
went higher than 10 per second.
Change-Id: I4bcf44dbf064e2e86dfc3b8a2ad18fea76fbd51a
---
M CommonLibs/trx_rate_ctr.cpp
M CommonLibs/trx_rate_ctr.h
M CommonLibs/trx_vty.c
M doc/manuals/chapters/counters.adoc
M doc/manuals/chapters/counters_generated.adoc
M doc/manuals/vty/trx_vty_reference.xml
6 files changed, 391 insertions(+), 11 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
roh: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/CommonLibs/trx_rate_ctr.cpp b/CommonLibs/trx_rate_ctr.cpp
index 711b904..d98caff 100644
--- a/CommonLibs/trx_rate_ctr.cpp
+++ b/CommonLibs/trx_rate_ctr.cpp
@@ -56,6 +56,7 @@
#include
#include
#include
+#include
#include "osmo_signal.h"
#include "trx_vty.h"
@@ -68,18 +69,34 @@
(non-pending) counter data */
#define PENDING_CHAN_NONE SIZE_MAX
+static void *trx_rate_ctr_ctx;
+
static struct rate_ctr_group** rate_ctrs;
static struct device_counters* ctrs_pending;
static size_t chan_len;
static struct osmo_fd rate_ctr_timerfd;
static Mutex rate_ctr_mutex;
-enum {
- TRX_CTR_RX_UNDERRUNS,
- TRX_CTR_RX_OVERRUNS,
- TRX_CTR_TX_UNDERRUNS,
- TRX_CTR_RX_DROP_EV,
- TRX_CTR_RX_DROP_SMPL,
+struct osmo_timer_list threshold_timer;
+static LLIST_HEAD(threshold_list);
+static int threshold_timer_sched_secs;
+static bool threshold_initied;
+
+const struct value_string rate_ctr_intv[] = {
+ { RATE_CTR_INTV_SEC,"per-second" },
+ { RATE_CTR_INTV_MIN,"per-minute" },
+ { RATE_CTR_INTV_HOUR, "per-hour" },
+ { RATE_CTR_INTV_DAY,"per-day" },
+ { 0, NULL }
+};
+
+const struct value_string trx_chan_ctr_names[] = {
+ { TRX_CTR_RX_UNDERRUNS, "rx_underruns" },
+ { TRX_CTR_RX_OVERRUNS, "rx_overruns" },
+ { TRX_CTR_TX_UNDERRUNS, "tx_underruns" },
+ { TRX_CTR_RX_DROP_EV, "rx_drop_events" },
+ { TRX_CTR_RX_DROP_SMPL, "rx_drop_samples" },
+ { 0, NULL }
};
static const struct rate_ctr_desc trx_chan_ctr_desc[] = {
@@ -155,10 +172,99 @@
return 0;
}
-/* Init rate_ctr subsystem. Expected to be called during process start by main
thread */
+/
+ * ctr_threshold APIs
+ /
+static const char* ctr_threshold_2_vty_str(struct ctr_threshold *ctr)
+{
+ static char buf[256];
+ int rc = 0;
+ rc += snprintf(buf, sizeof(buf), "ctr-error-threshold %s",
get_value_string(trx_chan_ctr_names, ctr->ctr_id));
+ rc += snprintf(buf + rc, sizeof(buf) - rc, " %d %s", ctr->val,
get_value_string(rate_ctr_intv, ctr->intv));
+ return buf;
+}
+
+static void threshold_timer_cb(void *data)
+{
+ struct ctr_threshold *ctr_thr;
+ struct rate_ctr *rate_ctr;
+ size_t chan;
+ LOGC(DMAIN, DEBUG) << "threshold_timer_cb fired!";
+
+ llist_for_each_entry(ctr_thr, _list, list) {
+ for (chan = 0; chan < chan_len; chan++) {
+ rate_ctr = _ctrs[chan]->ctr[ctr_thr->ctr_id];
+ LOGCHAN(chan, DMAIN, INFO) << "checking threshold: " <<
ctr_threshold_2_vty_str(ctr_thr)
+ << " ("<<
rate_ctr->intv[ctr_thr->intv].rate << " vs " << ctr_thr->val << ")";
+ if (rate_ctr->intv[ctr_thr->intv].rate >= ctr_thr->val)
{
+ LOGCHAN(chan, DMAIN, FATAL) << "threshold
reached, stopping! " << ctr_threshold_2_vty_str(ctr_thr)
+ << " ("<<
rate_ctr->intv[ctr_thr->intv].rate << " vs " << ctr_thr->val << ")";
+ osmo_signal_dispatch(SS_MAIN,
S_MAIN_STOP_REQUIRED, NULL);
+ return;
+ }
+ }
+ }
+ osmo_timer_schedule(_timer, threshold_timer_sched_secs, 0);
+}
+
+static size_t ctr_threshold_2_seconds(struct ctr_threshold *ctr)
+{
+ size_t mult = 0;
+ switch (ctr->intv) {
+ case RATE_CTR_INTV_SEC:
+ mult = 1;
+ break;
+ case RATE_CTR_INTV_MIN:
+ mult
Change in ...osmo-trx[master]: Add VTY commands to set error ctr thresholds
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/14168 ) Change subject: Add VTY commands to set error ctr thresholds .. Patch Set 3: Code-Review+2 +1+1 = +2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14168 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4bcf44dbf064e2e86dfc3b8a2ad18fea76fbd51a Gerrit-Change-Number: 14168 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: roh Gerrit-Comment-Date: Tue, 11 Jun 2019 14:28:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: bscnat: Refactor BSC_MS side code to allow different actions per test
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14411 ) Change subject: bscnat: Refactor BSC_MS side code to allow different actions per test .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14411 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic82ca333267535c5859e6439deacbf3b1d1fe391 Gerrit-Change-Number: 14411 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 11 Jun 2019 14:25:46 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: bscnat: Refactor MSC side code to allow different actions per test
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14412 ) Change subject: bscnat: Refactor MSC side code to allow different actions per test .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14412 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic429420d0d95b6aacb6e5c44031b49c942ed544d Gerrit-Change-Number: 14412 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 11 Jun 2019 14:26:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: lib/RAN: Introduce CTRL_CLIENT port to access CTRL muxed in RAN IPA conn
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14406 ) Change subject: lib/RAN: Introduce CTRL_CLIENT port to access CTRL muxed in RAN IPA conn .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id90c1609f0439b00379166fb9e4028d181fc023e Gerrit-Change-Number: 14406 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 11 Jun 2019 14:21:35 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: bsc: Fix trailing whitespace
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14408 ) Change subject: bsc: Fix trailing whitespace .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I97c6cc290d6cc23611ac38e7e370b5b0b88cca1d Gerrit-Change-Number: 14408 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 11 Jun 2019 14:21:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: lib/CTRL: Improve and add more helper templates and functions
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14409 ) Change subject: lib/CTRL: Improve and add more helper templates and functions .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icc6ac860ebd6a719f9e0cb5c5345fb4d39a864ce Gerrit-Change-Number: 14409 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 11 Jun 2019 14:24:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: bscnat: Move generic code to wait for test into its own function
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14410 ) Change subject: bscnat: Move generic code to wait for test into its own function .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia95ec02d7ca631e037abfbcfc7881b57e37aef5b Gerrit-Change-Number: 14410 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 11 Jun 2019 14:24:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: bsc: Introduce test TC_ctrl_location
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14407 ) Change subject: bsc: Introduce test TC_ctrl_location .. Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/14407/3/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/#/c/14407/3/bsc/BSC_Tests.ttcn@1221 PS3, Line 1221: vc_conn := f_start_handler(refers(f_tc_ctrl_location)); why are we even starting that ConnHandler with an empty function? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14407 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3640f6889e3b6adc3b4601082f948543c64a2fe3 Gerrit-Change-Number: 14407 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 11 Jun 2019 14:23:15 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-trx[master]: Add VTY commands to set error ctr thresholds
roh has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/14168 ) Change subject: Add VTY commands to set error ctr thresholds .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14168 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I4bcf44dbf064e2e86dfc3b8a2ad18fea76fbd51a Gerrit-Change-Number: 14168 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Reviewer: roh Gerrit-Comment-Date: Tue, 11 Jun 2019 14:20:52 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: lib/IPA_Emulation: Build IPA_CTRL conditionally based on define
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14418 to look at the new patch set (#6). Change subject: lib/IPA_Emulation: Build IPA_CTRL conditionally based on define .. lib/IPA_Emulation: Build IPA_CTRL conditionally based on define Change-Id: I4d1eca6b0008a395b7f7449e6ea3f9b6d41133c7 --- M bts/regen_makefile.sh M library/IPA_Emulation.ttcnpp M msc/regen_makefile.sh M sccp/regen_makefile.sh M selftest/regen_makefile.sh 5 files changed, 12 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/18/14418/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4d1eca6b0008a395b7f7449e6ea3f9b6d41133c7 Gerrit-Change-Number: 14418 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: lib/IPA_Emulation: Build IPA_CTRL conditionally based on define
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14418 to look at the new patch set (#5). Change subject: lib/IPA_Emulation: Build IPA_CTRL conditionally based on define .. lib/IPA_Emulation: Build IPA_CTRL conditionally based on define Change-Id: I4d1eca6b0008a395b7f7449e6ea3f9b6d41133c7 --- M bts/regen_makefile.sh M library/IPA_Emulation.ttcnpp M msc/regen_makefile.sh M sccp/regen_makefile.sh 4 files changed, 11 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/18/14418/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4d1eca6b0008a395b7f7449e6ea3f9b6d41133c7 Gerrit-Change-Number: 14418 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: lib/IPA_Emulation: Build IPA_CTRL conditionally based on define
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14418 to look at the new patch set (#4). Change subject: lib/IPA_Emulation: Build IPA_CTRL conditionally based on define .. lib/IPA_Emulation: Build IPA_CTRL conditionally based on define Change-Id: I4d1eca6b0008a395b7f7449e6ea3f9b6d41133c7 --- M bts/regen_makefile.sh M library/IPA_Emulation.ttcnpp M msc/regen_makefile.sh 3 files changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/18/14418/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4d1eca6b0008a395b7f7449e6ea3f9b6d41133c7 Gerrit-Change-Number: 14418 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: lib/IPA_Emulation: Build IPA_CTRL conditionally based on define
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14418 to look at the new patch set (#3). Change subject: lib/IPA_Emulation: Build IPA_CTRL conditionally based on define .. lib/IPA_Emulation: Build IPA_CTRL conditionally based on define Change-Id: I4d1eca6b0008a395b7f7449e6ea3f9b6d41133c7 --- M bts/regen_makefile.sh M library/IPA_Emulation.ttcnpp M msc/regen_makefile.sh 3 files changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/18/14418/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4d1eca6b0008a395b7f7449e6ea3f9b6d41133c7 Gerrit-Change-Number: 14418 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: lib/IPA_Emulation: Build IPA_CTRL conditionally based on define
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14418 to look at the new patch set (#2). Change subject: lib/IPA_Emulation: Build IPA_CTRL conditionally based on define .. lib/IPA_Emulation: Build IPA_CTRL conditionally based on define Change-Id: I4d1eca6b0008a395b7f7449e6ea3f9b6d41133c7 --- M bts/regen_makefile.sh M library/IPA_Emulation.ttcnpp 2 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/18/14418/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4d1eca6b0008a395b7f7449e6ea3f9b6d41133c7 Gerrit-Change-Number: 14418 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: bscnat: Add function to run actions on test per BSC component
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14413 ) Change subject: bscnat: Add function to run actions on test per BSC component .. Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I97e743c79e5e9e7613ab91a1aa9ce2377a237fd5 Gerrit-Change-Number: 14413 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 11 Jun 2019 14:03:13 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: bscnat: Introduce test TC_ctrl_location
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14414 ) Change subject: bscnat: Introduce test TC_ctrl_location .. Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If28aba011a1903788cacbc10c0b62954925d4b1f Gerrit-Change-Number: 14414 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 11 Jun 2019 14:03:06 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: bsc: Fix trailing whitespace
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14408 to look at the new patch set (#2). Change subject: bsc: Fix trailing whitespace .. bsc: Fix trailing whitespace Change-Id: I97c6cc290d6cc23611ac38e7e370b5b0b88cca1d --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn M library/IPA_Emulation.ttcnpp M library/Osmocom_CTRL_Functions.ttcn 4 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/08/14408/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14408 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I97c6cc290d6cc23611ac38e7e370b5b0b88cca1d Gerrit-Change-Number: 14408 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: lib/RAN: Introduce CTRL_CLIENT port to access CTRL muxed in RAN IPA conn
Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14406 to look at the new patch set (#3). Change subject: lib/RAN: Introduce CTRL_CLIENT port to access CTRL muxed in RAN IPA conn .. lib/RAN: Introduce CTRL_CLIENT port to access CTRL muxed in RAN IPA conn This is the case for SCCPlite between BSC and MSC (or BSC-NAT). MGCP and CTRL can be multiplexed over the same underlaying IPA conn. Related: OS#2012 Change-Id: Id90c1609f0439b00379166fb9e4028d181fc023e --- M library/RAN_Adapter.ttcnpp M library/RAN_Emulation.ttcnpp 2 files changed, 48 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/06/14406/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14406 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id90c1609f0439b00379166fb9e4028d181fc023e Gerrit-Change-Number: 14406 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: lib/IPA_Emulation: Build IPA_CTRL conditionally based on define
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14418
Change subject: lib/IPA_Emulation: Build IPA_CTRL conditionally based on define
..
lib/IPA_Emulation: Build IPA_CTRL conditionally based on define
Change-Id: I4d1eca6b0008a395b7f7449e6ea3f9b6d41133c7
---
M library/IPA_Emulation.ttcnpp
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/18/14418/1
diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp
index 3ec6922..2305b7b 100644
--- a/library/IPA_Emulation.ttcnpp
+++ b/library/IPA_Emulation.ttcnpp
@@ -186,8 +186,10 @@
/* up-facing port for OML */
port IPA_OML_PT IPA_OML_PORT;
#endif
+#ifdef IPA_EMULATION_CTRL
/* up-facing port for CTRL */
port IPA_CTRL_PT IPA_CTRL_PORT;
+#endif
#ifdef IPA_EMULATION_GSUP
/* up-facing port for GSUP */
port IPA_GSUP_PT IPA_GSUP_PORT;
@@ -300,9 +302,11 @@
IPA_OML_PORT.send(evt);
}
#endif
+#ifdef IPA_EMULATION_CTRL
if (IPA_CTRL_PORT.checkstate("Connected")) {
IPA_CTRL_PORT.send(evt);
}
+#endif
#ifdef IPA_EMULATION_GSUP
if (IPA_GSUP_PORT.checkstate("Connected")) {
IPA_GSUP_PORT.send(evt);
@@ -497,10 +501,12 @@
ScanEvents();
}
+#ifdef IPA_EMULATION_CTRL
private function f_ctrl_to_user(octetstring msg) runs on IPA_Emulation_CT {
var charstring msg_ch := oct2char(msg);
IPA_CTRL_PORT.send(dec_CtrlMessage(msg_ch));
}
+#endif
#ifdef IPA_EMULATION_GSUP
private function f_gsup_to_user(octetstring msg) runs on IPA_Emulation_CT {
@@ -703,11 +709,13 @@
}
#endif
+#ifdef IPA_EMULATION_CTRL
[] IPA_CTRL_PORT.receive(CtrlMessage:?) -> value ctrl_msg {
payload := char2oct(enc_CtrlMessage(ctrl_msg));
ipa_ud := valueof(t_ASP_IPA_UD(IPAC_PROTO_OSMO,
payload, IPAC_PROTO_EXT_CTRL));
IPA_PORT.send(f_from_asp(g_ipa_conn_id, ipa_ud));
}
+#endif
#ifdef IPA_EMULATION_GSUP
[] IPA_GSUP_PORT.receive(GSUP_PDU:?) -> value gsup_msg {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14418
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I4d1eca6b0008a395b7f7449e6ea3f9b6d41133c7
Gerrit-Change-Number: 14418
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-MessageType: newchange
Change in ...osmo-ttcn3-hacks[master]: lib/CTRL: Improve and add more helper templates and functions
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14409 to look at the new patch set (#2). Change subject: lib/CTRL: Improve and add more helper templates and functions .. lib/CTRL: Improve and add more helper templates and functions Change-Id: Icc6ac860ebd6a719f9e0cb5c5345fb4d39a864ce --- M library/Osmocom_CTRL_Functions.ttcn M library/Osmocom_CTRL_Types.ttcn 2 files changed, 75 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/09/14409/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icc6ac860ebd6a719f9e0cb5c5345fb4d39a864ce Gerrit-Change-Number: 14409 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: lib/CTRL: Add more helper templates and functions
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14409 ) Change subject: lib/CTRL: Add more helper templates and functions .. Patch Set 1: Code-Review-1 Fix in progress -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14409 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icc6ac860ebd6a719f9e0cb5c5345fb4d39a864ce Gerrit-Change-Number: 14409 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 11 Jun 2019 13:17:59 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: BTS: add some dynamic power control tests
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14417 to look at the new patch set (#2). Change subject: BTS: add some dynamic power control tests .. BTS: add some dynamic power control tests Change-Id: I57489ba22542d859ced767e856634f9060c060f0 --- M bts/BTS_Tests.ttcn M library/RSL_Types.ttcn 2 files changed, 392 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/17/14417/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I57489ba22542d859ced767e856634f9060c060f0 Gerrit-Change-Number: 14417 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: BTS: add some dynamic power control tests
Hoernchen has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14417
Change subject: BTS: add some dynamic power control tests
..
BTS: add some dynamic power control tests
Change-Id: I57489ba22542d859ced767e856634f9060c060f0
---
M bts/BTS_Tests.ttcn
M library/RSL_Types.ttcn
2 files changed, 392 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/17/14417/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 3244b48..01170f0 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -193,7 +193,8 @@
float t_guard,
ConnL1Pars l1_pars,
TestSpecUnion spec optional,
- RSL_IE_EncryptionInfo encr optional
+ RSL_IE_EncryptionInfo encr optional,
+ BtsBand bts0_band optional
}
/* Test-specific parameters */
@@ -594,7 +595,8 @@
ms_actual_ta := mp_ms_actual_ta_exp
},
spec := omit,
- encr := omit
+ encr := omit,
+ bts0_band := omit
}
/***
@@ -1890,6 +1892,363 @@
f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr);
}
+/* target level -100, first rssi -90, ms power 7, expected increase to 7+6
within 6 seconds,
+second rssi -110, ms power 7+6, expected decrease to 7 within 6 seconds,
+These power levels are valid for all bands and require no special handling */
+function f_TC_rsl_ms_pwr_dyn_ass_updown(charstring id) runs on ConnHdlr {
+ var uint5_t pwr_var := 7;
+ var L1ctlDlMessage l1_dl;
+
+ f_trxc_fake_rssi(rxlev2dbm(10));
+ f_l1_tune(L1CTL);
+ RSL.clear;
+
+ var RSL_IE_List addl_ies;
+ var RSL_IE_MS_Power_Parameters pp;
+ pp := valueof(ts_RSL_IE_MS_Power_Parameters('aabbcc'O));
+
+ addl_ies := {
+ valueof(t_RSL_IE(RSL_IE_MS_POWER, RSL_IE_Body:{ms_power :=
ts_RSL_IE_MS_Power(pwr_var)})),
+ valueof(t_RSL_IE(RSL_IE_MS_POWER_PARAM,
RSL_IE_Body:{ms_power_params := pp}))
+ };
+
+ /* establish with power parameters */
+ f_est_dchan(more_ies := addl_ies);
+
+ /* set a high value to ensure L1 power control level increases */
+ f_trxc_fake_rssi(rxlev2dbm(20));
+
+ timer T2 := 6.0;
+ T2.start;
+ alt {
+ [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?)))
-> value l1_dl {
+ if( not(oct2int(l1_dl.payload.data_ind.payload[0]) >
(pwr_var+6))){
+ repeat;
+ }
+ T2.stop;
+ }
+ [] L1CTL.receive { repeat; }
+ [] T2.timeout {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ "Power Level in L1 header has not increased
sufficiently");
+ }
+ }
+
+ /* set a low value to ensure L1 power control level decreases */
+ f_trxc_fake_rssi(rxlev2dbm(0));
+
+ timer T4 := 6.0;
+ T4.start;
+ alt {
+ [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?)))
-> value l1_dl {
+ if( not(oct2int(l1_dl.payload.data_ind.payload[0]) <=
(pwr_var))){
+ repeat;
+ }
+ T4.stop;
+ setverdict(pass, "Power level in L1 decreased/increased as
expected");
+ }
+ [] L1CTL.receive { repeat; }
+ [] T4.timeout {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ "Power Level in L1 header has not decreased
sufficiently");
+ }
+ }
+
+ f_rsl_chan_deact();
+ f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr);
+
+}
+
+/* check that we do not exceed the max power */
+function f_TC_rsl_ms_pwr_dyn_max(charstring id) runs on ConnHdlr {
+ var uint5_t pwr_var := 7;
+ var L1ctlDlMessage l1_dl;
+
+ /* set a low value to ensure power increases */
+ f_trxc_fake_rssi(rxlev2dbm(10));
+ f_l1_tune(L1CTL);
+ RSL.clear;
+
+ var RSL_IE_List addl_ies;
+ var RSL_IE_MS_Power_Parameters pp;
+ pp := valueof(ts_RSL_IE_MS_Power_Parameters('aabbcc'O));
+
+ addl_ies := {
+ valueof(t_RSL_IE(RSL_IE_MS_POWER, RSL_IE_Body:{ms_power :=
ts_RSL_IE_MS_Power(pwr_var)})),
+ valueof(t_RSL_IE(RSL_IE_MS_POWER_PARAM,
RSL_IE_Body:{ms_power_params := pp}))
+ };
+
+ /* establish with power parameters */
+ f_est_dchan(more_ies := addl_ies);
+
+ timer T1 := 10.0;
+ T1.start;
+ alt {
+ [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?)))
-> value l1_dl { repeat; }
+ [] L1CTL.receive { repeat; }
+ [] T1.timeout {
+ if( oct2int(l1_dl.payload.data_ind.payload[0]) != pwr_var){
+ setverdict(fail, "Power level in L1 header should not
have changed");
+
Change in ...osmo-ttcn3-hacks[master]: BTS: add some dynamic power control tests
Hoernchen has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14416 ) Change subject: BTS: add some dynamic power control tests .. Abandoned i broke my git -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8a860e6a0371f7e6bbe06d69bd78df607922ef7f Gerrit-Change-Number: 14416 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon
Change in ...osmo-ttcn3-hacks[master]: BTS: add some dynamic power control tests
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14416 to look at the new patch set (#2). Change subject: BTS: add some dynamic power control tests .. BTS: add some dynamic power control tests Change-Id: I8a860e6a0371f7e6bbe06d69bd78df607922ef7f --- M bts/BTS_Tests.ttcn M library/RSL_Types.ttcn 2 files changed, 392 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/16/14416/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8a860e6a0371f7e6bbe06d69bd78df607922ef7f Gerrit-Change-Number: 14416 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: BTS: add some dynamic power control tests
Hoernchen has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14416
Change subject: BTS: add some dynamic power control tests
..
BTS: add some dynamic power control tests
Change-Id: I8a860e6a0371f7e6bbe06d69bd78df607922ef7f
---
M bts/BTS_Tests.ttcn
M library/RSL_Types.ttcn
2 files changed, 408 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/16/14416/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 3244b48..10574a8 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -193,7 +193,8 @@
float t_guard,
ConnL1Pars l1_pars,
TestSpecUnion spec optional,
- RSL_IE_EncryptionInfo encr optional
+ RSL_IE_EncryptionInfo encr optional,
+ BtsBand bts0_band optional
}
/* Test-specific parameters */
@@ -594,7 +595,8 @@
ms_actual_ta := mp_ms_actual_ta_exp
},
spec := omit,
- encr := omit
+ encr := omit,
+ bts0_band := omit
}
/***
@@ -1890,6 +1892,363 @@
f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr);
}
+/* target level -100, first rssi -90, ms power 7, expected increase to 7+6
within 6 seconds,
+second rssi -110, ms power 7+6, expected decrease to 7 within 6 seconds,
+These power levels are valid for all bands and require no special handling */
+function f_TC_rsl_ms_pwr_dyn_ass_updown(charstring id) runs on ConnHdlr {
+ var uint5_t pwr_var := 7;
+ var L1ctlDlMessage l1_dl;
+
+ f_trxc_fake_rssi(rxlev2dbm(10));
+ f_l1_tune(L1CTL);
+ RSL.clear;
+
+ var RSL_IE_List addl_ies;
+ var RSL_IE_MS_Power_Parameters pp;
+ pp := valueof(ts_RSL_IE_MS_Power_Parameters('aabbcc'O));
+
+ addl_ies := {
+ valueof(t_RSL_IE(RSL_IE_MS_POWER, RSL_IE_Body:{ms_power :=
ts_RSL_IE_MS_Power(pwr_var)})),
+ valueof(t_RSL_IE(RSL_IE_MS_POWER_PARAM,
RSL_IE_Body:{ms_power_params := pp}))
+ };
+
+ /* establish with power parameters */
+ f_est_dchan(more_ies := addl_ies);
+
+ /* set a high value to ensure L1 power control level increases */
+ f_trxc_fake_rssi(rxlev2dbm(20));
+
+ timer T2 := 6.0;
+ T2.start;
+ alt {
+ [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?)))
-> value l1_dl {
+ if( not(oct2int(l1_dl.payload.data_ind.payload[0]) >
(pwr_var+6))){
+ repeat;
+ }
+ T2.stop;
+ }
+ [] L1CTL.receive { repeat; }
+ [] T2.timeout {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ "Power Level in L1 header has not increased
sufficiently");
+ }
+ }
+
+ /* set a low value to ensure L1 power control level decreases */
+ f_trxc_fake_rssi(rxlev2dbm(0));
+
+ timer T4 := 6.0;
+ T4.start;
+ alt {
+ [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?)))
-> value l1_dl {
+ if( not(oct2int(l1_dl.payload.data_ind.payload[0]) <=
(pwr_var))){
+ repeat;
+ }
+ T4.stop;
+ setverdict(pass, "Power level in L1 decreased/increased as
expected");
+ }
+ [] L1CTL.receive { repeat; }
+ [] T4.timeout {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ "Power Level in L1 header has not decreased
sufficiently");
+ }
+ }
+
+ f_rsl_chan_deact();
+ f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr);
+
+}
+
+/* check that we do not exceed the max power */
+function f_TC_rsl_ms_pwr_dyn_max(charstring id) runs on ConnHdlr {
+ var uint5_t pwr_var := 7;
+ var L1ctlDlMessage l1_dl;
+
+ /* set a low value to ensure power increases */
+ f_trxc_fake_rssi(rxlev2dbm(10));
+ f_l1_tune(L1CTL);
+ RSL.clear;
+
+ var RSL_IE_List addl_ies;
+ var RSL_IE_MS_Power_Parameters pp;
+ pp := valueof(ts_RSL_IE_MS_Power_Parameters('aabbcc'O));
+
+ addl_ies := {
+ valueof(t_RSL_IE(RSL_IE_MS_POWER, RSL_IE_Body:{ms_power :=
ts_RSL_IE_MS_Power(pwr_var)})),
+ valueof(t_RSL_IE(RSL_IE_MS_POWER_PARAM,
RSL_IE_Body:{ms_power_params := pp}))
+ };
+
+ /* establish with power parameters */
+ f_est_dchan(more_ies := addl_ies);
+
+ timer T1 := 10.0;
+ T1.start;
+ alt {
+ [] L1CTL.receive(tr_L1CTL_DATA_IND(g_chan_nr, tr_RslLinkID_SACCH(?)))
-> value l1_dl { repeat; }
+ [] L1CTL.receive { repeat; }
+ [] T1.timeout {
+ if( oct2int(l1_dl.payload.data_ind.payload[0]) != pwr_var){
+ setverdict(pass, "Power level in L1 header should not
have changed");
+
Change in ...docker-playground[master]: bscnat: Bind bsc-nat CTRL on 0.0.0.0
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/14415 Change subject: bscnat: Bind bsc-nat CTRL on 0.0.0.0 .. bscnat: Bind bsc-nat CTRL on 0.0.0.0 Other tests already do it, and allows using the CTRL iface in docker setups where 127.0.0.1 is not used. Change-Id: I6f16dc322d38f9f0870241f3416c81df8ec5481b --- M ttcn3-bscnat-test/osmo-bsc-nat.cfg 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/15/14415/1 diff --git a/ttcn3-bscnat-test/osmo-bsc-nat.cfg b/ttcn3-bscnat-test/osmo-bsc-nat.cfg index ffc3ff0..80d7095 100644 --- a/ttcn3-bscnat-test/osmo-bsc-nat.cfg +++ b/ttcn3-bscnat-test/osmo-bsc-nat.cfg @@ -14,6 +14,9 @@ no login bind 0.0.0.0 ! +ctrl + bind 0.0.0.0 +! mgcp bind ip 172.18.15.20 bind port 2427 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/14415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6f16dc322d38f9f0870241f3416c81df8ec5481b Gerrit-Change-Number: 14415 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in ...osmo-hlr[master]: rx_check_imei_req(): fix IMEI bounds checking
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/14399 ) Change subject: rx_check_imei_req(): fix IMEI bounds checking .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/14399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I060a8db98fb882e4815d1709a5d85bc0143a73a6 Gerrit-Change-Number: 14399 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 11 Jun 2019 08:43:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: hlr: add Check IMEI tests
Hello fixeria, pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14402 to look at the new patch set (#3). Change subject: hlr: add Check IMEI tests .. hlr: add Check IMEI tests Create tests for most code paths of rx_check_imei_req() in hlr.c (except for subscriber create on demand, this will be in an upcoming patch). Add missing message types to GSUP_Types.ttcn, and adjust the IMEI and IMEI_Result IEs for consistency with the existing IEs, and to make the tests compile. Related: OS#2541 Change-Id: I97c8462f0817149feadd0c4865e3df6c2af92a80 --- M hlr/HLR_Tests.ttcn M library/GSUP_Types.ttcn 2 files changed, 139 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/02/14402/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I97c8462f0817149feadd0c4865e3df6c2af92a80 Gerrit-Change-Number: 14402 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: hlr: add f_vty_subscr_show_nomatch()
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14401 ) Change subject: hlr: add f_vty_subscr_show_nomatch() .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/14401/1/hlr/HLR_Tests.ttcn File hlr/HLR_Tests.ttcn: https://gerrit.osmocom.org/#/c/14401/1/hlr/HLR_Tests.ttcn@297 PS1, Line 297: function f_vty_transceive_match(TELNETasp_PT pt, charstring cmd, template charstring exp_ret, > I think it's a bit odd to have a function called 'match' which then has an > "invert" parameter. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I176d8fd2ee74e1eb7ac797f931cd6005d398740f Gerrit-Change-Number: 14401 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 11 Jun 2019 07:32:51 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: hlr: add Check IMEI tests
osmith has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14402 )
Change subject: hlr: add Check IMEI tests
..
Patch Set 2:
(3 comments)
https://gerrit.osmocom.org/#/c/14402/1/hlr/HLR_Tests.ttcn
File hlr/HLR_Tests.ttcn:
https://gerrit.osmocom.org/#/c/14402/1/hlr/HLR_Tests.ttcn@364
PS1, Line 364: f_vty_transceive(VTY, "configure terminal");
: f_vty_transceive(VTY, "hlr");
: if (enable) {
: f_vty_transceive(VTY, "store-imei");
: } else {
: f_vty_transceive(VTY, "no store-imei");
: }
> we do have elegant helper functions for this, see f_vty_config() for simple
> cases in the root node, […]
Done
https://gerrit.osmocom.org/#/c/14402/1/hlr/HLR_Tests.ttcn@602
PS1, Line 602: setverdict(fail, "Unexpected CHECK IMEI ERROR Cause");
> if you have the data aleady in 'ret', it might be useful to append it to the
> setverdict statement li […]
Done
https://gerrit.osmocom.org/#/c/14402/1/hlr/HLR_Tests.ttcn@1175
PS1, Line 1175: res
> So you return GSUP_PDU, but never use it?
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14402
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I97c8462f0817149feadd0c4865e3df6c2af92a80
Gerrit-Change-Number: 14402
Gerrit-PatchSet: 2
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Tue, 11 Jun 2019 07:32:24 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: fixeria
Comment-In-Reply-To: laforge
Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: hlr: add f_vty_subscr_show_nomatch()
Hello fixeria, pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14401 to look at the new patch set (#2). Change subject: hlr: add f_vty_subscr_show_nomatch() .. hlr: add f_vty_subscr_show_nomatch() Allow to check if a certain pattern does not match the "show subscriber" output. This will be used by upcoming tests for the check IMEI GSUP message type, to check if the IMEI was not stored, depending on the OsmoHLR configuration. Change-Id: I176d8fd2ee74e1eb7ac797f931cd6005d398740f --- M hlr/HLR_Tests.ttcn 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/14401/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I176d8fd2ee74e1eb7ac797f931cd6005d398740f Gerrit-Change-Number: 14401 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: hlr: add Check IMEI tests
Hello fixeria, pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14402 to look at the new patch set (#2). Change subject: hlr: add Check IMEI tests .. hlr: add Check IMEI tests Create tests for most code paths of rx_check_imei_req() in hlr.c (except for subscriber create on demand, this will be in an upcoming patch). Add missing message types to GSUP_Types.ttcn, and adjust the IMEI and IMEI_Result IEs for consistency with the existing IEs, and to make the tests compile. Related: OS#2541 Change-Id: I97c8462f0817149feadd0c4865e3df6c2af92a80 --- M hlr/HLR_Tests.ttcn M library/GSUP_Types.ttcn 2 files changed, 147 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/02/14402/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14402 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I97c8462f0817149feadd0c4865e3df6c2af92a80 Gerrit-Change-Number: 14402 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-hlr[master]: rx_check_imei_req(): fix IMEI bounds checking
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/14399 ) Change subject: rx_check_imei_req(): fix IMEI bounds checking .. Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/14399/1/src/hlr.c File src/hlr.c: https://gerrit.osmocom.org/#/c/14399/1/src/hlr.c@483 PS1, Line 483: gsm48_decode_bcd_number2 > > [...] we would need to add another if() block beforehand [...] […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/14399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I060a8db98fb882e4815d1709a5d85bc0143a73a6 Gerrit-Change-Number: 14399 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 11 Jun 2019 06:47:28 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: osmith Gerrit-MessageType: comment
Change in ...osmo-hlr[master]: rx_check_imei_req(): fix IMEI bounds checking
Hello fixeria, pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hlr/+/14399 to look at the new patch set (#3). Change subject: rx_check_imei_req(): fix IMEI bounds checking .. rx_check_imei_req(): fix IMEI bounds checking IMEIs (without the checksum) always have 14 digits. Replace the previous check (length <= 14) with a proper one (length == 14) and set the buffer to the right size. While at it, add the return code of gsm48_decode_bc_number2() to the error log message. I have tested with new TTCN3 tests, that the length check is working properly now. Related: OS#2541 Change-Id: I060a8db98fb882e4815d1709a5d85bc0143a73a6 --- M src/hlr.c 1 file changed, 17 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/99/14399/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/14399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I060a8db98fb882e4815d1709a5d85bc0143a73a6 Gerrit-Change-Number: 14399 Gerrit-PatchSet: 3 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
