- gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: stp: Expect and answer M3UA BEAT from IUT

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40462?usp=email ) Change subject: stp: Expect and answer M3UA BEAT from IUT ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40462?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idb70acde0683bc053db20781ce4926fbc318f51f Gerrit-Change-Number: 40462 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 16 Jun 2025 17:36:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 week

1
0
0 0

[M] Change in libosmo-sigtran[master]: ipa: Implement ASP Hearbeat procedure

by pespin

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40460?usp=email ) Change subject: ipa: Implement ASP Hearbeat procedure ...................................................................... Patch Set 5: (1 comment) Patchset: PS5: This has been validated with ttcn3 tests and can be merged. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40460?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I0947977b192447d433ecf6b3ccb830141d8ae04d Gerrit-Change-Number: 40460 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 16 Jun 2025 17:10:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: stp: IPA: Introduce test TC_beat

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40472?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: stp: IPA: Introduce test TC_beat ...................................................................... stp: IPA: Introduce test TC_beat Similar to the one already available in STP_Tests_M3UA, but testing PING/PONG in IPA. Change-Id: I3d762fb4780aaa9931c3841cce69da6ee95529f3 --- M stp/STP_Tests_IPA.ttcn M stp/expected-results.xml 2 files changed, 43 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/72/40472/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40472?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3d762fb4780aaa9931c3841cce69da6ee95529f3 Gerrit-Change-Number: 40472 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: stp: Introduce test TC_(m3ua_tcp(clnt_))beat_timeout

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40474?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: stp: Introduce test TC_(m3ua_tcp(clnt_))beat_timeout ...................................................................... stp: Introduce test TC_(m3ua_tcp(clnt_))beat_timeout Related: SYS#7501 Related: OS#4072 Change-Id: Ie0c430b7992881e8ae506fe6434f06946f8f6278 --- M stp/STP_Tests_M3UA.ttcn M stp/STP_Tests_M3UA_TCP.ttcn M stp/expected-results.xml 3 files changed, 97 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/74/40474/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40474?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie0c430b7992881e8ae506fe6434f06946f8f6278 Gerrit-Change-Number: 40474 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 week

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: stp: Expect and answer M3UA BEAT from IUT

by pespin

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40462?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: stp: Expect and answer M3UA BEAT from IUT ...................................................................... stp: Expect and answer M3UA BEAT from IUT This fixes tests failing with newer versions of libosmo-sigtran where HEARTBEAT procedure is enabled by default. Change-Id: Idb70acde0683bc053db20781ce4926fbc318f51f --- M stp/STP_Tests_M3UA.ttcn 1 file changed, 17 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/40462/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40462?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idb70acde0683bc053db20781ce4926fbc318f51f Gerrit-Change-Number: 40462 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 week

1
0
0 0

[M] Change in libosmo-sigtran[master]: asp: Introduce VTY configurations 'timer xua (ack|beat)'

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40459?usp=email ) Change subject: asp: Introduce VTY configurations 'timer xua (ack|beat)' ...................................................................... asp: Introduce VTY configurations 'timer xua (ack|beat)' T(beat) is not yet implemented in this commit, will be done in a future step. Related: OS#4072 Change-Id: Id83446a1846847e68745b29c8dd4388aedcc0660 --- M src/sccp_vty.c M src/ss7_asp.c M src/ss7_asp.h M src/ss7_asp_vty.c M src/xua_asp_fsm.c M src/xua_internal.h M tests/vty/osmo_stp_test.vty 7 files changed, 132 insertions(+), 15 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/sccp_vty.c b/src/sccp_vty.c index 49f3577..d809c1f 100644 --- a/src/sccp_vty.c +++ b/src/sccp_vty.c @@ -42,6 +42,7 @@ #include "xua_internal.h" #include "sccp_internal.h" #include "ss7_instance.h" +#include "ss7_vty.h" static void show_user(struct vty *vty, struct osmo_sccp_user *user) { diff --git a/src/ss7_asp.c b/src/ss7_asp.c index 61e5415..71e5627 100644 --- a/src/ss7_asp.c +++ b/src/ss7_asp.c @@ -113,6 +113,29 @@ } /*********************************************************************** + * Timer Handling + ***********************************************************************/ + +const struct osmo_tdef ss7_asp_xua_timer_defaults[SS7_ASP_XUA_TIMERS_LEN] = { + { .T = SS7_ASP_XUA_T_ACK, .default_val = SS7_ASP_XUA_DEFAULT_T_ACK_SEC, .unit = OSMO_TDEF_S, + .desc = "Resend ASP Up/Down/Active/Inactive after timeout waiting for ASP Up/Down/Active/Inactive ACK (ASP role)(s)" }, + { .T = SS7_ASP_XUA_T_BEAT, .default_val = SS7_ASP_XUA_DEFAULT_T_BEAT_SEC, .unit = OSMO_TDEF_S, + .desc = "Heartbeat Timer (0 = disabled) (s)" }, + {} +}; + +/* Appendix C.4 of ITU-T Q.714 */ +const struct value_string ss7_asp_xua_timer_names[] = { + { SS7_ASP_XUA_T_ACK, "ack" }, + { SS7_ASP_XUA_T_BEAT, "beat" }, + {} +}; + +osmo_static_assert(ARRAY_SIZE(ss7_asp_xua_timer_defaults) == (SS7_ASP_XUA_TIMERS_LEN) && + ARRAY_SIZE(ss7_asp_xua_timer_names) == (SS7_ASP_XUA_TIMERS_LEN), + assert_ss7_asp_xua_timer_count); + +/*********************************************************************** * SS7 Application Server Process ***********************************************************************/ @@ -570,6 +593,9 @@ asp->cfg.proto = proto; asp->cfg.name = talloc_strdup(asp, name); + asp->cfg.T_defs_xua = talloc_memdup(asp, ss7_asp_xua_timer_defaults, + sizeof(ss7_asp_xua_timer_defaults)); + osmo_tdefs_reset(asp->cfg.T_defs_xua); asp->cfg.T_defs_lm = talloc_memdup(asp, ss7_asp_lm_timer_defaults, sizeof(ss7_asp_lm_timer_defaults)); osmo_tdefs_reset(asp->cfg.T_defs_lm); diff --git a/src/ss7_asp.h b/src/ss7_asp.h index 2e25f97..889b5c9 100644 --- a/src/ss7_asp.h +++ b/src/ss7_asp.h @@ -19,6 +19,20 @@ struct osmo_ss7_instance; struct osmo_xua_layer_manager; +enum ss7_asp_xua_timer { + /* 0 kept unused on purpose since it's handled specially by osmo_fsm */ + SS7_ASP_XUA_T_ACK = 1, /* RFC3868 & RFC4666 timer T(ack) */ + SS7_ASP_XUA_T_BEAT, /* RFC3868 & RFC4666 timer T(beat) */ + /* This must remain the last item: */ + SS7_ASP_XUA_TIMERS_LEN +}; +extern const struct value_string ss7_asp_xua_timer_names[]; +extern const struct osmo_tdef ss7_asp_xua_timer_defaults[SS7_ASP_XUA_TIMERS_LEN]; +/* According to SUA RFC3868 Section 8, M3UA RFC4666 Section 4.3.4.1 */ +#define SS7_ASP_XUA_DEFAULT_T_ACK_SEC 2 +/* According to SUA RFC3868 Section 8 */ +#define SS7_ASP_XUA_DEFAULT_T_BEAT_SEC 30 + enum ss7_asp_ctr { SS7_ASP_CTR_PKT_RX_TOTAL, SS7_ASP_CTR_PKT_RX_UNKNOWN, @@ -100,6 +114,9 @@ uint32_t quirks; /* T_defs used by the default_lm: */ + struct osmo_tdef *T_defs_xua; + + /* T_defs used by the default_lm: */ struct osmo_tdef *T_defs_lm; struct { diff --git a/src/ss7_asp_vty.c b/src/ss7_asp_vty.c index 2934ea3..3e22465 100644 --- a/src/ss7_asp_vty.c +++ b/src/ss7_asp_vty.c @@ -519,9 +519,65 @@ return CMD_SUCCESS; } +/* timer xua <name> <1-999999> + * (cmdstr and doc are dynamically generated from ss7_asp_xua_timer_names.) */ +DEFUN_ATTR(asp_timer_xua, asp_timer_xua_cmd, + NULL, NULL, CMD_ATTR_IMMEDIATE) +{ + struct osmo_ss7_asp *asp = vty->index; + enum ss7_asp_xua_timer timer = get_string_value(ss7_asp_xua_timer_names, argv[0]); + + if (timer <= 0 || timer >= SS7_ASP_XUA_TIMERS_LEN) { + vty_out(vty, "%% Invalid timer: %s%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + + osmo_tdef_set(asp->cfg.T_defs_xua, timer, atoi(argv[1]), OSMO_TDEF_S); + return CMD_SUCCESS; +} + +static void gen_asp_timer_xua_cmd_strs(struct cmd_element *cmd) +{ + int i; + char *cmd_str = NULL; + char *doc_str = NULL; + + OSMO_ASSERT(cmd->string == NULL); + OSMO_ASSERT(cmd->doc == NULL); + + osmo_talloc_asprintf(tall_vty_ctx, cmd_str, "timer xua ("); + osmo_talloc_asprintf(tall_vty_ctx, doc_str, + "Configure ASP default timer values\n" + "Configure ASP default xua timer values\n"); + + for (i = 0; ss7_asp_xua_timer_names[i].str; i++) { + const struct osmo_tdef *def; + enum ss7_asp_xua_timer timer; + + timer = ss7_asp_xua_timer_names[i].value; + def = osmo_tdef_get_entry((struct osmo_tdef *)&ss7_asp_xua_timer_defaults, timer); + OSMO_ASSERT(def); + + osmo_talloc_asprintf(tall_vty_ctx, cmd_str, "%s%s", + i ? "|" : "", + ss7_asp_xua_timer_names[i].str); + osmo_talloc_asprintf(tall_vty_ctx, doc_str, "%s (default: %lu)\n", + def->desc, + def->default_val); + } + + osmo_talloc_asprintf(tall_vty_ctx, cmd_str, ") <1-999999>"); + osmo_talloc_asprintf(tall_vty_ctx, doc_str, + "Timer value, in seconds\n"); + + cmd->string = cmd_str; + cmd->doc = doc_str; +} + + /* timer lm <name> <1-999999> * (cmdstr and doc are dynamically generated from ss7_asp_lm_timer_names.) */ -DEFUN_ATTR(asp_timer, asp_timer_cmd, +DEFUN_ATTR(asp_timer_lm, asp_timer_lm_cmd, NULL, NULL, CMD_ATTR_IMMEDIATE) { struct osmo_ss7_asp *asp = vty->index; @@ -536,7 +592,7 @@ return CMD_SUCCESS; } -static void gen_asp_timer_cmd_strs(struct cmd_element *cmd) +static void gen_asp_timer_lm_cmd_strs(struct cmd_element *cmd) { int i; char *cmd_str = NULL; @@ -574,7 +630,23 @@ cmd->doc = doc_str; } -static void write_asp_timers(struct vty *vty, const char *indent, +static void write_asp_timers_xua(struct vty *vty, const char *indent, + struct osmo_ss7_asp *asp) +{ + int i; + + for (i = 0; ss7_asp_xua_timer_names[i].str; i++) { + const struct osmo_tdef *tdef = osmo_tdef_get_entry(asp->cfg.T_defs_xua, ss7_asp_xua_timer_names[i].value); + if (!tdef) + continue; + if (tdef->val == tdef->default_val) + continue; + vty_out(vty, "%stimer xua %s %lu%s", indent, ss7_asp_xua_timer_names[i].str, + tdef->val, VTY_NEWLINE); + } +} + +static void write_asp_timers_lm(struct vty *vty, const char *indent, struct osmo_ss7_asp *asp) { int i; @@ -1074,7 +1146,8 @@ continue; vty_out(vty, " quirk %s%s", get_value_string(asp_quirk_names, (1 << i)), VTY_NEWLINE); } - write_asp_timers(vty, " ", asp); + write_asp_timers_xua(vty, " ", asp); + write_asp_timers_lm(vty, " ", asp); switch (asp->cfg.adm_state) { case OSMO_SS7_ASP_ADM_S_SHUTDOWN: @@ -1155,8 +1228,10 @@ install_lib_element(L_CS7_ASP_NODE, &asp_no_sctp_param_init_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_quirk_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_no_quirk_cmd); - gen_asp_timer_cmd_strs(&asp_timer_cmd); - install_lib_element(L_CS7_ASP_NODE, &asp_timer_cmd); + gen_asp_timer_xua_cmd_strs(&asp_timer_xua_cmd); + install_lib_element(L_CS7_ASP_NODE, &asp_timer_xua_cmd); + gen_asp_timer_lm_cmd_strs(&asp_timer_lm_cmd); + install_lib_element(L_CS7_ASP_NODE, &asp_timer_lm_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_block_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_shutdown_cmd); install_lib_element(L_CS7_ASP_NODE, &asp_no_shutdown_cmd); diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index f7117d3..1d6b078 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -44,9 +44,6 @@ * * */ -/* According to SUA RFC3868 Section 8, M3UA RFC4666 Section 4.3.4.1 */ -#define XUA_T_ACK_SEC 2 - static const struct value_string xua_asp_event_names[] = { { XUA_ASP_E_M_ASP_UP_REQ, "M-ASP_UP.req" }, { XUA_ASP_E_M_ASP_ACTIVE_REQ, "M-ASP_ACTIVE.req" }, @@ -317,6 +314,7 @@ { struct osmo_fsm_inst *fi = data; struct xua_asp_fsm_priv *xafp = fi->priv; + uint32_t timeout_sec; LOGPFSML(fi, LOGL_INFO, "T(ack) callback: re-transmitting event %s\n", osmo_fsm_event_name(fi->fsm, xafp->t_ack.out_event)); @@ -325,13 +323,15 @@ peer_send(fi, xafp->t_ack.out_event, NULL); /* Re-start the timer */ - osmo_timer_schedule(&xafp->t_ack.timer, XUA_T_ACK_SEC, 0); + timeout_sec = osmo_tdef_get(xafp->asp->cfg.T_defs_xua, SS7_ASP_XUA_T_ACK, OSMO_TDEF_S, -1); + osmo_timer_schedule(&xafp->t_ack.timer, timeout_sec, 0); } static int peer_send_and_start_t_ack(struct osmo_fsm_inst *fi, int out_event) { struct xua_asp_fsm_priv *xafp = fi->priv; + uint32_t timeout_sec; int rc; rc = peer_send(fi, out_event, NULL); @@ -342,7 +342,8 @@ xafp->t_ack.timer.cb = xua_t_ack_cb, xafp->t_ack.timer.data = fi; - osmo_timer_schedule(&xafp->t_ack.timer, XUA_T_ACK_SEC, 0); + timeout_sec = osmo_tdef_get(xafp->asp->cfg.T_defs_xua, SS7_ASP_XUA_T_ACK, OSMO_TDEF_S, -1); + osmo_timer_schedule(&xafp->t_ack.timer, timeout_sec, 0); return rc; } diff --git a/src/xua_internal.h b/src/xua_internal.h index 4d99231..60d751c 100644 --- a/src/xua_internal.h +++ b/src/xua_internal.h @@ -111,10 +111,6 @@ extern const struct value_string m3ua_rkm_reg_status_vals[]; extern const struct value_string m3ua_rkm_dereg_status_vals[]; -#define CS7_STR "ITU-T Signaling System 7\n" -#define PC_STR "Point Code\n" -#define INST_STR "An instance of the SS7 stack\n" - int xua_as_transmit_msg(struct osmo_ss7_as *as, struct xua_msg *xua); int xua_find_as_for_asp(struct osmo_ss7_as **as, const struct osmo_ss7_asp *asp, diff --git a/tests/vty/osmo_stp_test.vty b/tests/vty/osmo_stp_test.vty index c22eea9..be2beb5 100644 --- a/tests/vty/osmo_stp_test.vty +++ b/tests/vty/osmo_stp_test.vty @@ -285,6 +285,7 @@ no sctp-param init (num-ostreams|max-instreams|max-attempts|timeout) quirk (no_notify|daud_in_asp|snm_inactive) no quirk (no_notify|daud_in_asp|snm_inactive) + timer xua (ack|beat) <1-999999> timer lm (wait_asp_up|wait_notify|wait_notify_rkm|wait_rk_reg_resp) <1-999999> block shutdown -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40459?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Id83446a1846847e68745b29c8dd4388aedcc0660 Gerrit-Change-Number: 40459 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 week

1
0
0 0

[M] Change in libosmo-sigtran[master]: ipa: Implement ASP Hearbeat procedure

by pespin

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40460?usp=email ) Change subject: ipa: Implement ASP Hearbeat procedure ...................................................................... Patch Set 5: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40460?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I0947977b192447d433ecf6b3ccb830141d8ae04d Gerrit-Change-Number: 40460 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 16 Jun 2025 16:38:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: stp: IPA: Introduce test TC_clnt_beat_timeout

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40475?usp=email ) Change subject: stp: IPA: Introduce test TC_clnt_beat_timeout ...................................................................... stp: IPA: Introduce test TC_clnt_beat_timeout Change-Id: I5a41857dbd9f0bfe40a3a539aaed8361bc29fd6b Related: SYS#7501 Related: OS#4072 --- M stp/STP_Tests_IPA.cfg M stp/STP_Tests_IPA.ttcn M stp/expected-results.xml M stp/osmo-stp-ipa.confmerge 4 files changed, 55 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/40475/1 diff --git a/stp/STP_Tests_IPA.cfg b/stp/STP_Tests_IPA.cfg index 5399093..9e9538e 100644 --- a/stp/STP_Tests_IPA.cfg +++ b/stp/STP_Tests_IPA.cfg @@ -60,6 +60,13 @@ is_server := false, remote_port := 5000, local_port := 20007 + }, + { + asp_name := "ipa-asp-client0", + as_name := "ipa-as-client0", + is_server := true, + remote_port := 7001, + local_port := 6001 } } diff --git a/stp/STP_Tests_IPA.ttcn b/stp/STP_Tests_IPA.ttcn index 54a64d8..a34fd6d 100644 --- a/stp/STP_Tests_IPA.ttcn +++ b/stp/STP_Tests_IPA.ttcn @@ -203,6 +203,30 @@ } } +friend function f_listen_ipa(integer idx) runs on IPA_CT { + vc_IPA[idx].start(IPA_Emulation.main_server(mp_local_ipa_ip, + g_ipa_configs[idx].local_port)); + + /* wait for incoming connection to IPA port before proceeding */ + var integer st := 0; + timer T := 10.0; + T.start; + alt { + [st == 0] IPA_CTRL[idx].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_UP)) { + st := 1; repeat; + } + [st == 1] IPA_CTRL[idx].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_ID_RESP)) { + st := 2; repeat; + } + [st == 2] IPA_CTRL[idx].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_ID_ACK)) { + setverdict(pass); + } + [] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("No connection to IPA[", idx, "] Port")); + } + } +} /* "accept-asp-connections pre-configured" and client from unknown ASP source * (but known AS/ipa_unit_name) */ @@ -564,11 +588,10 @@ f_vty_cs7_ipa_asp_cmd(ipa_configs[0], "timer xua beat 3"); if (ipa_configs[0].is_server) { - /* TODO */ + f_listen_ipa(0); } else { f_connect_ipa(0); } - f_sleep(3.0); /* receive CCM IPA PING: */ f_ipa_cfg_chg_ccm_enabled(IPA_CFG[0], false); @@ -610,6 +633,12 @@ f_TC_beat_timeout(asps); } +/* Test the IUT sends heartbeat procedure when needed. */ +testcase TC_clnt_beat_timeout() runs on IPA_CT { + var Misc_Helpers.ro_charstring asps := { "ipa-asp-client0" }; + f_TC_beat_timeout(asps); +} + control { execute( TC_unknown_client_nodynamic() ); execute( TC_unknown_as_client_nodynamic() ); @@ -624,6 +653,7 @@ execute( TC_beat() ); execute( TC_beat_timeout() ); + execute( TC_clnt_beat_timeout() ); } diff --git a/stp/expected-results.xml b/stp/expected-results.xml index db36ab4..db4cbec 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<testsuite name='STP_Tests' tests='54' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='STP_Tests' tests='55' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='STP_Tests_M3UA' name='TC_connect_asp_up' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_beat' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_beat_payload' time='MASKED'/> @@ -56,6 +56,7 @@ <testcase classname='STP_Tests_IPA' name='TC_unknown_client_dynamic_tmt_loadshare' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_beat' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_beat_timeout' time='MASKED'/> + <testcase classname='STP_Tests_IPA' name='TC_clnt_beat_timeout' time='MASKED'/> <testcase classname='STP_Tests_IPA_M3UA' name='TC_m3ua_to_ipa' time='MASKED'/> <testcase classname='STP_Tests_IPA_M3UA' name='TC_ipa_to_m3ua' time='MASKED'/> <testcase classname='STP_Tests_IPA_M3UA' name='TC_ipa_to_m3ua_ni' time='MASKED'/> diff --git a/stp/osmo-stp-ipa.confmerge b/stp/osmo-stp-ipa.confmerge index 500f5ac..954f175 100644 --- a/stp/osmo-stp-ipa.confmerge +++ b/stp/osmo-stp-ipa.confmerge @@ -17,12 +17,12 @@ local-ip 127.0.0.1 remote-ip 127.0.0.1 role sg - sctp-role server + transport-role server asp ipa-asp-loadshare-receiver1 20003 5000 ipa local-ip 127.0.0.1 remote-ip 127.0.0.1 role sg - sctp-role server + transport-role server as ipa-as-loadshare-receiver ipa traffic-mode loadshare routing-key 0 7 @@ -41,18 +41,28 @@ local-ip 127.0.0.1 remote-ip 127.0.0.1 role sg - sctp-role server + transport-role server asp ipa-asp-override-receiver1 20007 5000 ipa local-ip 127.0.0.1 remote-ip 127.0.0.1 role sg - sctp-role server + transport-role server as ipa-as-override-receiver ipa traffic-mode override routing-key 0 8 point-code override dpc 34 asp ipa-asp-override-receiver0 asp ipa-asp-override-receiver1 + asp ipa-asp-client0 6001 7001 ipa + local-ip 127.0.0.1 + remote-ip 127.0.0.1 + role asp + transport-role client + as ipa-as-client ipa + traffic-mode override + routing-key 0 9 + point-code override dpc 35 + asp ipa-asp-client0 ! ! ROUTING TABLE: ! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40475?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: I5a41857dbd9f0bfe40a3a539aaed8361bc29fd6b Gerrit-Change-Number: 40475 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: stp: Introduce test TC_(m3ua_tcp(clnt_))beat_timeout

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40474?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: stp: Introduce test TC_(m3ua_tcp(clnt_))beat_timeout ...................................................................... stp: Introduce test TC_(m3ua_tcp(clnt_))beat_timeout Related: SYS#7501 Related: OS#4072 Change-Id: Ie0c430b7992881e8ae506fe6434f06946f8f6278 --- M stp/STP_Tests_M3UA.ttcn M stp/STP_Tests_M3UA_TCP.ttcn M stp/expected-results.xml 3 files changed, 97 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/74/40474/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40474?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie0c430b7992881e8ae506fe6434f06946f8f6278 Gerrit-Change-Number: 40474 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 week

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: stp: Introduce test TC_(m3ua_tcp(clnt_))beat_timeout

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40474?usp=email ) Change subject: stp: Introduce test TC_(m3ua_tcp(clnt_))beat_timeout ...................................................................... stp: Introduce test TC_(m3ua_tcp(clnt_))beat_timeout Related: SYS#7501 Related: OS#4072 Change-Id: Ie0c430b7992881e8ae506fe6434f06946f8f6278 --- M stp/STP_Tests_M3UA.ttcn M stp/STP_Tests_M3UA_TCP.ttcn M stp/expected-results.xml 3 files changed, 97 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/74/40474/1 diff --git a/stp/STP_Tests_M3UA.ttcn b/stp/STP_Tests_M3UA.ttcn index 40fee55..269bec5 100644 --- a/stp/STP_Tests_M3UA.ttcn +++ b/stp/STP_Tests_M3UA.ttcn @@ -158,12 +158,12 @@ } } -friend function f_M3UA_exp(integer idx, template (present) PDU_M3UA msg) runs on RAW_M3UA_CT { +friend function f_M3UA_exp(integer idx, template (present) PDU_M3UA msg, float timeout_val := 5.0, boolean answer_beat := true) runs on RAW_M3UA_CT return M3UA_RecvFrom { var M3UA_RecvFrom rx; - timer T := 5.0; + timer T := timeout_val; T.start; alt { - [] M3UA[idx].receive(t_M3UA_RecvFrom(msg)) { + [] M3UA[idx].receive(t_M3UA_RecvFrom(msg)) -> value rx { setverdict(pass); } [answer_beat] as_m3ua_beat_answer(idx); @@ -177,6 +177,7 @@ log2str("Timeout waiting for M3UA[", idx, "] ", msg)); } } + return rx; } /* flush any number of queued messages matching 'msg' */ @@ -495,6 +496,71 @@ f_clear_m3ua(); } +friend function f_TC_beat_timeout(Misc_Helpers.ro_charstring asps) runs on RAW_M3UA_CT +{ + var M3uaConfigs m3ua_configs := m3ua_build_configs(asps); + var M3UA_RecvFrom rx; + var template (omit) M3UA_Heartbeat_Data hbd := omit; + var float timeout_val := 3.0 + 1.0; + + f_init_m3ua(answer_beat := false, m3ua_configs := m3ua_configs); + f_vty_cs7_asp_cmd(g_m3ua_configs[0], "timer xua beat 3"); + + if (m3ua_configs[0].is_server) { + f_init_m3ua_srv(); + f_M3UA_CLNT_asp_up_act(0, rctx := int2oct(m3ua_configs[0].routing_ctx, 4)); + } else { + f_M3UA_asp_up(0); + f_M3UA_exp(0, tr_M3UA_NOTIFY(c_M3UA_ST_T_STATE_CHG, c_M3UA_ST_I_AS_INACTIVE, *)); + } + + rx := f_M3UA_exp(0, tr_M3UA_BEAT(*), timeout_val := timeout_val, answer_beat := false); + log("1st BEAT received"); + if (ispresent(rx.msg.m3UA_BEAT.messageParameters.heartbeat_Data)) { + hbd := rx.msg.m3UA_BEAT.messageParameters.heartbeat_Data; + } + f_M3UA_send(0, ts_M3UA_BEAT_ACK(hbd)); + /* Make sure next HEARBEAT arrives around the time we configured. + * Do not answer this nor next heardbeat: */ + rx := f_M3UA_exp(0, tr_M3UA_BEAT(*), timeout_val := timeout_val, answer_beat := false); + log("2nd BEAT received"); + rx := f_M3UA_exp(0, tr_M3UA_BEAT(*), timeout_val := timeout_val, answer_beat := false); + log("3rd BEAT received"); + + /* After 2*T(beat), IUT should figure out peer is not responding and terminate the conn: */ + timer T := timeout_val; + T.start; + alt { + [] M3UA[0].receive(PortEvent:{connClosed := ?}) { + setverdict(pass); /* TCP */ + } + [] M3UA[0].receive(tr_SctpShutDownEvent(g_m3ua_conn_id[0])) { + setverdict(pass); /* SCTP */ + } + [] M3UA[0].receive(tr_SctpAssocChange) { repeat; } + [] M3UA[0].receive(tr_SctpPeerAddrChange) { repeat; } + [] M3UA[0].receive(t_M3UA_RecvFrom(?)) -> value rx { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Received unexpected M3UA ", rx, " while waiting for SctpShutDownEvent")); + } + [] T.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Timeout waiting for M3UA SctpShutDownEvent")); + } + } + + /* return to default value: */ + f_vty_cs7_asp_cmd(g_m3ua_configs[0], "timer xua beat 30"); + + f_clear_m3ua(); +} + +/* Test the IUT sends heartbeat procedure when needed. */ +testcase TC_beat_timeout() runs on RAW_M3UA_CT { + var Misc_Helpers.ro_charstring asps := { "asp-sender" }; + f_TC_beat_timeout(asps); +} + /* Test the ASP-ACTIVATE procedure (without traffic-mode or routing ctx) */ testcase TC_asp_act() runs on RAW_M3UA_CT { f_init_m3ua(); @@ -1137,6 +1203,12 @@ f_clear_m3ua(); } +/* Test the IUT sends heartbeat procedure when needed. */ +testcase TC_clnt_beat_timeout() runs on RAW_M3UA_CT { + var Misc_Helpers.ro_charstring asps := { "asp-client0" }; + f_TC_beat_timeout(asps); +} + /* Expect inbound connection from ASP/SCTP-client, followed by ASP-UP + ASP-ACT */ testcase TC_clnt_asp_act() runs on RAW_M3UA_CT { var Misc_Helpers.ro_charstring asps := { "asp-client0" }; @@ -1586,6 +1658,7 @@ execute( TC_connect_asp_up() ); execute( TC_beat() ); execute( TC_beat_payload() ); + execute( TC_beat_timeout() ); execute( TC_asp_act() ); execute( TC_asp_act_override() ); execute( TC_asp_act_loadshare() ); @@ -1616,6 +1689,7 @@ /* Test STP as SCTP client + M3UA ASP role */ execute( TC_clnt_connect_asp_up() ); + execute( TC_clnt_beat_timeout() ); execute( TC_clnt_asp_act() ); execute( TC_clnt_sg_to_asp() ); execute( TC_clnt_asp_to_sg() ); diff --git a/stp/STP_Tests_M3UA_TCP.ttcn b/stp/STP_Tests_M3UA_TCP.ttcn index a5e4c2a..1da65cc 100644 --- a/stp/STP_Tests_M3UA_TCP.ttcn +++ b/stp/STP_Tests_M3UA_TCP.ttcn @@ -116,12 +116,27 @@ f_TC_m3ua_tcp(0, 1); } +/* Test the IUT sends heartbeat procedure when needed. */ +testcase TC_m3ua_tcp_beat_timeout() runs on RAW_M3UA_CT { + var Misc_Helpers.ro_charstring asps := { "asp-sender-tcp" }; + f_TC_beat_timeout(asps); +} + +/* Test the IUT sends heartbeat procedure when needed. */ +testcase TC_m3ua_tcp_clnt_beat_timeout() runs on RAW_M3UA_CT { + var Misc_Helpers.ro_charstring asps := { "asp-client0-tcp" }; + f_TC_beat_timeout(asps); +} + control { /* M3UA TCP Tests */ execute( TC_m3ua_tcp_cli() ); execute( TC_m3ua_tcp_cli_srv() ); execute( TC_m3ua_tcp_srv() ); execute( TC_m3ua_tcp_srv_cli() ); + + execute( TC_m3ua_tcp_beat_timeout() ); + execute( TC_m3ua_tcp_clnt_beat_timeout() ); } } \ No newline at end of file diff --git a/stp/expected-results.xml b/stp/expected-results.xml index db36ab4..0fb7c17 100644 --- a/stp/expected-results.xml +++ b/stp/expected-results.xml @@ -1,8 +1,9 @@ <?xml version="1.0"?> -<testsuite name='STP_Tests' tests='54' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> +<testsuite name='STP_Tests' tests='58' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> <testcase classname='STP_Tests_M3UA' name='TC_connect_asp_up' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_beat' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_beat_payload' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_beat_timeout' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_asp_act' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_asp_act_override' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_asp_act_loadshare' time='MASKED'/> @@ -23,6 +24,7 @@ <testcase classname='STP_Tests_M3UA' name='TC_dyn_asp_as_rkm_permitted' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_dyn_2asp_as_rkm_permitted' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_clnt_connect_asp_up' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_clnt_beat_timeout' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_clnt_asp_act' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_clnt_sg_to_asp' time='MASKED'/> <testcase classname='STP_Tests_M3UA' name='TC_clnt_asp_to_sg' time='MASKED'/> @@ -44,6 +46,8 @@ <testcase classname='STP_Tests_M3UA_TCP' name='TC_m3ua_tcp_cli_srv' time='MASKED'/> <testcase classname='STP_Tests_M3UA_TCP' name='TC_m3ua_tcp_srv' time='MASKED'/> <testcase classname='STP_Tests_M3UA_TCP' name='TC_m3ua_tcp_srv_cli' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_m3ua_tcp_beat_timeout' time='MASKED'/> + <testcase classname='STP_Tests_M3UA' name='TC_m3ua_tcp_clnt_beat_timeout' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_unknown_client_nodynamic' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_unknown_as_client_nodynamic' time='MASKED'/> <testcase classname='STP_Tests_IPA' name='TC_known_client_nodynamic' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40474?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: Ie0c430b7992881e8ae506fe6434f06946f8f6278 Gerrit-Change-Number: 40474 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log