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

[S] Change in osmo-ci[master]: jobs/gerrit,master: osmo-hnbgw: add nftables var

by osmith

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/36528?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: jobs/gerrit,master: osmo-hnbgw: add nftables var ...................................................................... jobs/gerrit,master: osmo-hnbgw: add nftables var Build with and without nftables. Related: OS#6425 Change-Id: I9828b70708dbe466c37df6ffb87b04362f14c71c --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 22 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/28/36528/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36528?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9828b70708dbe466c37df6ffb87b04362f14c71c Gerrit-Change-Number: 36528 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 2 months

1
0
0 0

[S] Change in osmo-ci[master]: jobs/gerrit: osmo-hnbgw: build with/without nftables

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/36528?usp=email ) Change subject: jobs/gerrit: osmo-hnbgw: build with/without nftables ...................................................................... jobs/gerrit: osmo-hnbgw: build with/without nftables Related: OS#6425 Change-Id: I9828b70708dbe466c37df6ffb87b04362f14c71c --- M jobs/gerrit-verifications.yml 1 file changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/28/36528/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 3be106d..607e909 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -383,13 +383,16 @@ a1: !!python/tuple ["1", "0"] a2_name: WITH_MANUALS a2: !!python/tuple ["1", "0"] + a3_name: NFTABLES + a3: !!python/tuple ["1", "0"] combination_filter: > - (PFCP == "1" && WITH_MANUALS == "1") || - (PFCP == "0" && WITH_MANUALS == "0") + (PFCP == "1" && WITH_MANUALS == "1" && NFTABLES == "1") || + (PFCP == "0" && WITH_MANUALS == "0" && NFTABLES == "0") cmd: | {docker_run_ccache} \ -e PFCP="$PFCP" \ -e WITH_MANUALS="$WITH_MANUALS" \ + -e NFTABLES="$NFTABLES" \ {docker_img} {timeout_cmd} /build/contrib/jenkins.sh - osmo-upf: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36528?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9828b70708dbe466c37df6ffb87b04362f14c71c Gerrit-Change-Number: 36528 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 2 months

1
0
0 0

[S] Change in docker-playground[master]: debian-bookworm-build: add libnftnl-dev

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36527?usp=email ) Change subject: debian-bookworm-build: add libnftnl-dev ...................................................................... debian-bookworm-build: add libnftnl-dev For osmo-hnbgw, osmo-upf. Related: OS#6425 Change-Id: I5fdaa634d12bc6c8643c130a43d30e840890d572 --- M debian-bookworm-build/Dockerfile 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/27/36527/1 diff --git a/debian-bookworm-build/Dockerfile b/debian-bookworm-build/Dockerfile index 4f8a142..d847bf1 100644 --- a/debian-bookworm-build/Dockerfile +++ b/debian-bookworm-build/Dockerfile @@ -110,6 +110,7 @@ libncurses5-dev \ libnewlib-arm-none-eabi \ libnftables-dev \ + libnftnl-dev \ libnl-3-dev \ libnl-route-3-dev \ liboping-dev \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36527?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I5fdaa634d12bc6c8643c130a43d30e840890d572 Gerrit-Change-Number: 36527 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 2 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Use "NAS/Normal" as default release cause

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36523?usp=email ) Change subject: hnbgw: Use "NAS/Normal" as default release cause ...................................................................... hnbgw: Use "NAS/Normal" as default release cause We shouldn't run all of our tests with a rather exotic release cause value (O&M intervention) but assume a normal/orderly NAS triggered release, unless a specific test case explicitly tests an abnormal release cause. Change-Id: I8ddd1dccc5637431e3a8c6e607e0e45faa82b5b5 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/23/36523/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 518dee9..808db75 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -1054,7 +1054,7 @@ private template (value) TestHdlrParams t_pars(integer imsi_suffix, boolean ps_domain := false, integer hnb_idx := 0, boolean expect_separate_sccp_cr := false, integer tx_sccp_cr_data_len := 0, - integer cn_nr := 0, template (value) RANAP_IEs.Cause rab_rel_cause := ts_RanapCause_om_intervention) := { + integer cn_nr := 0, template (value) RANAP_IEs.Cause rab_rel_cause := ts_RanapCause_nas_normal) := { hnb_idx := hnb_idx, cn_idx := f_cn_idx(ps_domain, cn_nr), imsi := f_gen_imsi(imsi_suffix), @@ -1477,7 +1477,7 @@ g_num_hnbs := 1; f_init(); - vc_conn := f_start_handler_with_pars(refers(f_tc_rab_assign_fail), t_pars(4)); + vc_conn := f_start_handler_with_pars(refers(f_tc_rab_assign_fail), t_pars(4, rab_rel_cause := ts_RanapCause_radio_conn_lost)); vc_conn.done; f_shutdown_helper(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36523?usp=email 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: I8ddd1dccc5637431e3a8c6e607e0e45faa82b5b5 Gerrit-Change-Number: 36523 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 2 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Make RAB release cause configurable

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36522?usp=email ) Change subject: hnbgw: Make RAB release cause configurable ...................................................................... hnbgw: Make RAB release cause configurable Change-Id: Ie072dafbc3378739d41411632e33a8a1ec1ed572 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 22 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/22/36522/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index cc46021..518dee9 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -290,7 +290,9 @@ octetstring nas_pdu optional, /* local and remote SCCP addresses, used in TC_mscpool_paging_* */ SCCP_PAR_Address sccp_addr_msc optional, - SCCP_PAR_Address sccp_addr_hnbgw optional + SCCP_PAR_Address sccp_addr_hnbgw optional, + /* RAB release cause */ + RANAP_IEs.Cause rab_rel_cause } /* We extend: @@ -1052,7 +1054,7 @@ private template (value) TestHdlrParams t_pars(integer imsi_suffix, boolean ps_domain := false, integer hnb_idx := 0, boolean expect_separate_sccp_cr := false, integer tx_sccp_cr_data_len := 0, - integer cn_nr := 0) := { + integer cn_nr := 0, template (value) RANAP_IEs.Cause rab_rel_cause := ts_RanapCause_om_intervention) := { hnb_idx := hnb_idx, cn_idx := f_cn_idx(ps_domain, cn_nr), imsi := f_gen_imsi(imsi_suffix), @@ -1064,7 +1066,8 @@ pfcp_local_addr := mp_pfcp_ip_local, nas_pdu := omit, sccp_addr_msc := omit, - sccp_addr_hnbgw := omit + sccp_addr_hnbgw := omit, + rab_rel_cause := rab_rel_cause } /* Create an Iuh connection; send InitialUE; expect it to appear on new SCCP conenction */ @@ -1417,7 +1420,7 @@ f_create_rab(pars.mgcp_pars); /* Send Iu Release */ - tx := valueof(ts_RANAP_IuReleaseCommand(ts_RanapCause_om_intervention)); + tx := valueof(ts_RANAP_IuReleaseCommand(pars.rab_rel_cause)); f_iu2iuh(tx); T.start; @@ -1457,7 +1460,7 @@ f_rab_ass_req(pars.mgcp_pars); /* Send RAB failed list in response */ - tx := valueof(ts_RANAP_RabAssResp(rab_fl := ts_RAB_FL(t_RAB_id(23), ts_RanapCause_om_intervention))); + tx := valueof(ts_RANAP_RabAssResp(rab_fl := ts_RAB_FL(t_RAB_id(23), pars.rab_rel_cause))); f_iuh2iu(tx); T.start; @@ -1494,7 +1497,7 @@ f_create_rab(pars.mgcp_pars); /* Send RAB Release */ - tx := valueof(ts_RANAP_RabAssReq(rab_rl := ts_RAB_RL(t_RAB_id(23), ts_RanapCause_om_intervention))); + tx := valueof(ts_RANAP_RabAssReq(rab_rl := ts_RAB_RL(t_RAB_id(23), pars.rab_rel_cause))); BSSAP.send(tx); T.start; @@ -1553,7 +1556,7 @@ } /* Send Iu Release */ - tx := valueof(ts_RANAP_IuReleaseCommand(ts_RanapCause_om_intervention)); + tx := valueof(ts_RANAP_IuReleaseCommand(pars.rab_rel_cause)); f_iu2iuh(tx); tx := valueof(ts_RANAP_IuReleaseComplete()); @@ -1805,7 +1808,7 @@ f_bssap_expect(tr_RANAP_RabAssResp(rab_smdl)); f_sleep(2.0); - tx := valueof(ts_RANAP_IuReleaseCommand(ts_RanapCause_om_intervention)); + tx := valueof(ts_RANAP_IuReleaseCommand(pars.rab_rel_cause)); f_iu2iuh(tx); tx := valueof(ts_RANAP_IuReleaseComplete()); @@ -1872,7 +1875,7 @@ f_bssap_expect(tr_RANAP_RabAssResp(rab_smdl)); f_sleep(2.0); - tx := valueof(ts_RANAP_IuReleaseCommand(ts_RanapCause_om_intervention)); + tx := valueof(ts_RANAP_IuReleaseCommand(pars.rab_rel_cause)); f_iu2iuh(tx); tx := valueof(ts_RANAP_IuReleaseComplete()); @@ -2749,7 +2752,7 @@ f_bssap_expect(tx); /* Send Iu Release */ - tx := valueof(ts_RANAP_IuReleaseCommand(ts_RanapCause_om_intervention)); + tx := valueof(ts_RANAP_IuReleaseCommand(pars.rab_rel_cause)); f_iu2iuh(tx); T.start; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36522?usp=email 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: Ie072dafbc3378739d41411632e33a8a1ec1ed572 Gerrit-Change-Number: 36522 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 2 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Add TC_ue_register_tmsi_lai for UE Registration without IMSI

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36521?usp=email ) Change subject: hnbgw: Add TC_ue_register_tmsi_lai for UE Registration without IMSI ...................................................................... hnbgw: Add TC_ue_register_tmsi_lai for UE Registration without IMSI Change-Id: I1712a3db791c07767eba10fcea3ce15b898670df --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/21/36521/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index cfdf923..cc46021 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -1007,6 +1007,19 @@ f_shutdown_helper(); } +/* regular UE registration (UE Identity: TMSI+LAI) */ +testcase TC_ue_register_tmsi_lai() runs on test_CT { + var UE_Identity ue_id := { tMSILAI := { tMSI := oct2bit(f_gen_tmsi(0)), + lAI := { pLMNID := '00F110'O, lAC := '2342'O } + } + }; + g_num_hnbs := 1; + f_init(start_hnb := true); + f_hnbap_ue_register(0, ue_id); + f_shutdown_helper(); +} + + /* UE registration from unregistered HNB */ testcase TC_ue_register_before_hnb_register() runs on test_CT { var UE_Identity ue_id := { iMSI := imsi_hex2oct(f_gen_imsi(1)) }; @@ -2767,6 +2780,7 @@ execute(TC_hnb_register_duplicate()); execute(TC_hnb_register_duplicate_reuse_sctp_assoc()); execute(TC_ue_register()); + execute(TC_ue_register_tmsi_lai()); execute(TC_ue_register_before_hnb_register()); execute(TC_ranap_cs_initial_ue()); execute(TC_ranap_ps_initial_ue()); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36521?usp=email 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: I1712a3db791c07767eba10fcea3ce15b898670df Gerrit-Change-Number: 36521 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 2 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Test normal and abnormal RAB release

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36524?usp=email ) Change subject: hnbgw: Test normal and abnormal RAB release ...................................................................... hnbgw: Test normal and abnormal RAB release Change-Id: I7b57d4f9bd39820829ae9d52ae6e2f098e75de71 --- M hnbgw/HNBGW_Tests.ttcn M library/ranap/RANAP_Templates.ttcn 2 files changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/24/36524/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 808db75..97c5644 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -1513,6 +1513,7 @@ f_rua_expect(tx); } +/* RAB release with Cause NAS/Normal (successful/orderly release) */ testcase TC_rab_release() runs on test_CT { var ConnHdlr vc_conn; g_num_hnbs := 1; @@ -1524,6 +1525,18 @@ f_shutdown_helper(); } +/* RAB release with Cause abnormal */ +testcase TC_rab_release_abnormal() runs on test_CT { + var ConnHdlr vc_conn; + g_num_hnbs := 1; + f_init(); + + vc_conn := f_start_handler_with_pars(refers(f_tc_rab_release), t_pars(8, rab_rel_cause := ts_RanapCause_radio_conn_lost)); + vc_conn.done; + + f_shutdown_helper(); +} + friend function f_tc_rab_assign_mgcp_to(charstring id, TestHdlrParams pars) runs on ConnHdlr { var MgcpCommand mgcp_cmd; var RANAP_PDU tx; @@ -2793,6 +2806,7 @@ execute(TC_ranap_ps_bidir()); execute(TC_rab_assignment()); execute(TC_rab_release()); + execute(TC_rab_release_abnormal()); execute(TC_rab_assign_fail()); execute(TC_rab_assign_mgcp_to()); execute(TC_rab_assign_mgw_iuup_addr_chg()); diff --git a/library/ranap/RANAP_Templates.ttcn b/library/ranap/RANAP_Templates.ttcn index 018cb81..8e6c8f3 100644 --- a/library/ranap/RANAP_Templates.ttcn +++ b/library/ranap/RANAP_Templates.ttcn @@ -12,6 +12,8 @@ import from RANAP_PDU_Descriptions all; template (value) Cause ts_RanapCause_om_intervention := { misc := 113 }; +template (value) Cause ts_RanapCause_nas_normal := { nAS := 83 }; +template (value) Cause ts_RanapCause_radio_conn_lost := { radioNetwork := 46 }; /***************************************************************************************************** * Reset -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36524?usp=email 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: I7b57d4f9bd39820829ae9d52ae6e2f098e75de71 Gerrit-Change-Number: 36524 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 2 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Use iddentical LAC/RAC/SAC values

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36525?usp=email ) Change subject: hnbgw: Use iddentical LAC/RAC/SAC values ...................................................................... hnbgw: Use iddentical LAC/RAC/SAC values Let's not use different values on RANAP and HNBAP, but derive on from the other. Change-Id: If4d82dc350c072e3528097d850304514adf65340 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/25/36525/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 97c5644..b4430cc 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -895,11 +895,11 @@ timer T := 2.0; HNBAP[hnb_idx].send(ts_HNBAP_HNBRegisterRequest(char2oct("TTCN3-HNB-" & int2str(hnb_idx)), - '00F110'O, + hex2oct(g_hnb_cfg[hnb_idx].lai.mcc_mnc), int2bit(1 + cell_id, 28), - int2oct(2, 2), - int2oct(3, 1), - int2oct(4, 2))); + int2oct(g_hnb_cfg[hnb_idx].lai.lac, 2), + int2oct(0, 1), + int2oct(g_hnb_cfg[hnb_idx].sac, 2))); T.start; alt { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36525?usp=email 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: If4d82dc350c072e3528097d850304514adf65340 Gerrit-Change-Number: 36525 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 2 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: Implement validation of [some] counters

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36526?usp=email ) Change subject: hnbgw: Implement validation of [some] counters ...................................................................... hnbgw: Implement validation of [some] counters Let's use the StatsD_Checker to verify that counters increment when we expect them to. Change-Id: Ib0e2dd23802b18f4bd417150d0b62954b1d459a4 --- M hnbgw/HNBGW_Tests.default M hnbgw/HNBGW_Tests.ttcn M hnbgw/osmo-hnbgw.cfg 3 files changed, 90 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/26/36526/1 diff --git a/hnbgw/HNBGW_Tests.default b/hnbgw/HNBGW_Tests.default index 02cbcb1..51bcdac 100644 --- a/hnbgw/HNBGW_Tests.default +++ b/hnbgw/HNBGW_Tests.default @@ -13,7 +13,7 @@ *.HNBGWVTY.PROMPT1 := "OsmoHNBGW> " *.STATSVTY.CTRL_MODE := "client" *.STATSVTY.CTRL_HOSTNAME := "127.0.0.1" -*.STATSVTY.CTRL_PORTNUM := "4262" +*.STATSVTY.CTRL_PORTNUM := "4261" *.STATSVTY.CTRL_LOGIN_SKIPPED := "yes" *.STATSVTY.CTRL_DETECT_SERVER_DISCONNECTED := "yes" *.STATSVTY.CTRL_READMODE := "buffered" diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index b4430cc..ae8d5fb 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -88,6 +88,7 @@ charstring mp_hnbgw_ip := "127.0.0.1"; integer mp_hnbgw_iuh_port := 29169; integer mp_hnbgw_ctrl_port := 4262; + integer mp_hnbgw_statsd_port := 8125; charstring mp_mgw_ip := "127.0.0.1"; integer mp_mgw_port := 2427; @@ -299,8 +300,9 @@ * RUA_ConnHdlr (for the Iuh side, emulating the HNB) * RAN_ConnHdlr (for the Iu side, emulating the MSC) * MGCP_ConnHdlr (for the MGCP side, emulating the MGW) + * StatsD_ConnHdlr (for the statsd interface, verifying counters) */ -type component ConnHdlr extends RAN_ConnHdlr, MGCP_ConnHdlr, RUA_ConnHdlr, PFCP_ConnHdlr { +type component ConnHdlr extends RAN_ConnHdlr, MGCP_ConnHdlr, RUA_ConnHdlr, PFCP_ConnHdlr, StatsD_ConnHdlr { var integer g_sccp_conn_id; var TestHdlrParams g_pars; timer g_Tguard; @@ -328,7 +330,7 @@ integer sac } -type component test_CT extends CTRL_Adapter_CT { +type component test_CT extends CTRL_Adapter_CT, StatsD_Checker_CT { var boolean g_initialized := false; /********************* Iu side */ @@ -344,6 +346,7 @@ var MGCP_Emulation_CT vc_MGCP; port TELNETasp_PT HNBGWVTY; + var StatsD_Checker_CT vc_STATSD; /* global test case guard timer (actual timeout value is set in f_init()) */ timer T_guard := 30.0; @@ -488,6 +491,8 @@ T_guard.start(guard_timeout); activate(as_Tguard()); + f_init_statsd("VirtHNBGW", vc_STATSD, mp_hnbgw_ip, mp_hnbgw_statsd_port); + /* RUA/RANAP emulation on top of lower-layer Iuh */ var RuaOps rua_ops := { create_cb := refers(IuhRanapCreateCallback), @@ -602,6 +607,8 @@ connect(vc_conn:MGCP, vc_MGCP:MGCP_CLIENT); connect(vc_conn:MGCP_PROC, vc_MGCP:MGCP_PROC); + connect(vc_conn:STATSD_PROC, vc_STATSD:STATSD_PROC); + return vc_conn; } @@ -1407,6 +1414,7 @@ } friend function f_tc_rab_assignment(charstring id, TestHdlrParams pars) runs on ConnHdlr { + const charstring hnb0_ctr_prefix := "TTCN3.hnb.001-01-L2342-R0-S55-C1."; var MgcpCommand mgcp_cmd; var RANAP_PDU tx; timer T := 5.0; @@ -1414,11 +1422,28 @@ f_init_handler(pars); f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); + f_statsd_reset(); + tx := f_build_initial_ue(g_pars); f_iuh2iu_connect(tx); + /* Expect stats to be 0 */ + var StatsDExpects expect := { + {name := hnb0_ctr_prefix & "ranap.cs.rab_act.req", mtype := "c", min := 0, max := 0}, + {name := hnb0_ctr_prefix & "ranap.cs.rab_act.cnf", mtype := "c", min := 0, max := 0}, + {name := hnb0_ctr_prefix & "ranap.cs.rab_act.fail", mtype := "c", min := 0, max := 0} + }; + f_statsd_expect(expect); + f_create_rab(pars.mgcp_pars); + expect := { + {name := hnb0_ctr_prefix & "ranap.cs.rab_act.req", mtype := "c", min := 1, max := 1}, + {name := hnb0_ctr_prefix & "ranap.cs.rab_act.cnf", mtype := "c", min := 1, max := 1}, + {name := hnb0_ctr_prefix & "ranap.cs.rab_act.fail", mtype := "c", min := 0, max := 0} + }; + f_statsd_expect(expect); + /* Send Iu Release */ tx := valueof(ts_RANAP_IuReleaseCommand(pars.rab_rel_cause)); f_iu2iuh(tx); @@ -1447,6 +1472,7 @@ } friend function f_tc_rab_assign_fail(charstring id, TestHdlrParams pars) runs on ConnHdlr { + const charstring hnb0_ctr_prefix := "TTCN3.hnb.001-01-L2342-R0-S55-C1."; var MgcpCommand mgcp_cmd; var RANAP_PDU tx; timer T := 5.0; @@ -1454,15 +1480,33 @@ f_init_handler(pars); f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); + f_statsd_reset(); + tx := f_build_initial_ue(g_pars); f_iuh2iu_connect(tx); + /* Expect stats to be 0 */ + var StatsDExpects expect := { + {name := hnb0_ctr_prefix & "ranap.cs.rab_act.req", mtype := "c", min := 0, max := 0}, + {name := hnb0_ctr_prefix & "ranap.cs.rab_act.cnf", mtype := "c", min := 0, max := 0}, + {name := hnb0_ctr_prefix & "ranap.cs.rab_act.fail", mtype := "c", min := 0, max := 0} + }; + f_statsd_expect(expect); + f_rab_ass_req(pars.mgcp_pars); /* Send RAB failed list in response */ tx := valueof(ts_RANAP_RabAssResp(rab_fl := ts_RAB_FL(t_RAB_id(23), pars.rab_rel_cause))); f_iuh2iu(tx); + expect := { + {name := hnb0_ctr_prefix & "ranap.cs.rab_act.req", mtype := "c", min := 1, max := 1}, + {name := hnb0_ctr_prefix & "ranap.cs.rab_act.cnf", mtype := "c", min := 0, max := 0}, + {name := hnb0_ctr_prefix & "ranap.cs.rab_act.fail", mtype := "c", min := 1, max := 1} + }; + f_statsd_expect(expect); + + T.start; alt { [] as_mgcp_dlcx(pars) {} @@ -1484,6 +1528,7 @@ } friend function f_tc_rab_release(charstring id, TestHdlrParams pars) runs on ConnHdlr { + const charstring hnb0_ctr_prefix := "TTCN3.hnb.001-01-L2342-R0-S55-C1."; var MgcpCommand mgcp_cmd; var RANAP_PDU tx; timer T := 15.0; @@ -1491,15 +1536,35 @@ f_init_handler(pars); f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); + f_statsd_reset(); + tx := f_build_initial_ue(g_pars); f_iuh2iu_connect(tx); f_create_rab(pars.mgcp_pars); + var charstring ctr_name; + if (pars.rab_rel_cause == valueof(ts_RanapCause_nas_normal)) { + ctr_name := "ranap.cs.rab_rel.req.normal"; + } else { + ctr_name := "ranap.cs.rab_rel.req.abnormal"; + } + + /* Expect stats to be 0 */ + var StatsDExpects expect := { + {name := hnb0_ctr_prefix & ctr_name, mtype := "c", min := 0, max := 0} + }; + f_statsd_expect(expect); + /* Send RAB Release */ tx := valueof(ts_RANAP_RabAssReq(rab_rl := ts_RAB_RL(t_RAB_id(23), pars.rab_rel_cause))); BSSAP.send(tx); + expect := { + {name := hnb0_ctr_prefix & ctr_name, mtype := "c", min := 1, max := 1} + }; + f_statsd_expect(expect); + T.start; alt { diff --git a/hnbgw/osmo-hnbgw.cfg b/hnbgw/osmo-hnbgw.cfg index 60f0aba..8a9774b 100644 --- a/hnbgw/osmo-hnbgw.cfg +++ b/hnbgw/osmo-hnbgw.cfg @@ -16,6 +16,16 @@ no login ! +stats interval 0 +stats reporter statsd + prefix TTCN3 + level subscriber + remote-ip 127.0.0.1 + remote-port 8125 + flush-period 1 + mtu 1024 + enable + cs7 instance 0 point-code 0.23.5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36526?usp=email 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: Ib0e2dd23802b18f4bd417150d0b62954b1d459a4 Gerrit-Change-Number: 36526 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 2 months

1
0
0 0

[S] Change in osmo-msc[master]: fixup for re-est: do not succeed on acceptance fail

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/36520?usp=email ) Change subject: fixup for re-est: do not succeed on acceptance fail ...................................................................... Patch Set 1: (1 comment) File src/libmsc/msc_a.c: https://gerrit.osmocom.org/c/osmo-msc/+/36520/comment/80bb0660_a2739f1f PS1, Line 165: if (conn_accepted) { > the argument goes both ways. […] and because it's a bikeshed not even about the current patch, SCNR =) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36520?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I3679162143e8d7d8c0878de2102faa11eadfccfc Gerrit-Change-Number: 36520 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Apr 2024 23:31:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2024