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

[XS] Change in osmo-ttcn3-hacks[master]: hnbgw/expected-results: update

by osmith

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38593?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: hnbgw/expected-results: update ...................................................................... hnbgw/expected-results: update Add: * TC_hnb_disconnected_timeout * TC_mscpool_L3Compl_no_cn * TC_sgsnpool_L3Compl_no_cn Fixes: 25fc127c ("hnbgw: test for RUA Disconnect when there is no CN") Change-Id: Ib126ff53aa9edfeb94f5e7e058145bd4fbe7b604 --- M hnbgw/expected-results.xml 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/93/38593/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38593?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: Ib126ff53aa9edfeb94f5e7e058145bd4fbe7b604 Gerrit-Change-Number: 38593 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

4 months, 3 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: hnbgw/expected-results: update

by osmith

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38593?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: hnbgw/expected-results: update ...................................................................... hnbgw/expected-results: update Add: * TC_hnb_disconnected_timeout * TC_mscpool_L3Compl_no_cn * TC_sgsnpool_L3Compl_no_cn Fixes: 25fc127c ("hnbgw: test for RUA Disconnect when there is no CN") Change-Id: Ib126ff53aa9edfeb94f5e7e058145bd4fbe7b604 --- M hnbgw/expected-results.xml 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/93/38593/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38593?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: Ib126ff53aa9edfeb94f5e7e058145bd4fbe7b604 Gerrit-Change-Number: 38593 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

4 months, 3 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: hnbgw/expected-results: update

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38593?usp=email ) Change subject: hnbgw/expected-results: update ...................................................................... hnbgw/expected-results: update Add TC_mscpool_L3Compl_no_cn and TC_sgsnpool_L3Compl_no_cn. Fixes: 25fc127c ("hnbgw: test for RUA Disconnect when there is no CN") Change-Id: Ib126ff53aa9edfeb94f5e7e058145bd4fbe7b604 --- M hnbgw/expected-results.xml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/93/38593/1 diff --git a/hnbgw/expected-results.xml b/hnbgw/expected-results.xml index 7d8bbbf..fc164f5 100644 --- a/hnbgw/expected-results.xml +++ b/hnbgw/expected-results.xml @@ -33,6 +33,7 @@ <testcase classname='HNBGW_Tests' name='TC_mscpool_L3Complete_by_tmsi_valid_nri_msc_not_connected_round_robin' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_mscpool_L3Complete_by_tmsi_valid_nri_1' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_mscpool_L3Complete_by_tmsi_valid_nri_2' time='MASKED'/> + <testcase classname='HNBGW_Tests' name='TC_mscpool_L3Compl_no_cn' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_mscpool_LU_by_tmsi_from_other_PLMN' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_mscpool_paging_imsi' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_mscpool_paging_tmsi' time='MASKED'/> @@ -44,6 +45,7 @@ <testcase classname='HNBGW_Tests' name='TC_sgsnpool_L3Complete_no_nri_round_robin' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_sgsnpool_L3Complete_valid_nri_1' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_sgsnpool_L3Complete_valid_nri_2' time='MASKED'/> + <testcase classname='HNBGW_Tests' name='TC_sgsnpool_L3Compl_no_cn' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_sgsnpool_nri_from_other_PLMN' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_sgsnpool_sccp_n_pcstate_detaches_cnlink' time='MASKED'/> <testcase classname='HNBGW_Tests' name='TC_sgsnpool_sccp_n_pcstate_attaches_cnlink' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38593?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: Ib126ff53aa9edfeb94f5e7e058145bd4fbe7b604 Gerrit-Change-Number: 38593 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

4 months, 3 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: make podman stop more robust

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38592?usp=email ) Change subject: testenv: make podman stop more robust ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38592?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: I6c67273af5b6a80ae0c94e14cb92e3784807c21d Gerrit-Change-Number: 38592 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Oct 2024 13:52:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

4 months, 3 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: testenv: make podman stop more robust

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38592?usp=email ) Change subject: testenv: make podman stop more robust ...................................................................... testenv: make podman stop more robust Terminate the watchdog process before killing the podman container. This avoids bogus errors from a race condition where the container gets killed first, and then the watchdog process tries to feed the watchdog and fails: [testenv] Stopping podman container [testenv] + ['podman', 'kill', 'testenv-hnbgw-all-osmocom-latest-20241031-1222-f34534a5-1'] e41700779a8ca5daf18ac5daa27d59a84d8442196e352f2756a19baf0592cf89 Error: no container with name or ID testenv-hnbgw-all-osmocom-latest-20241031-1222-f34534a5-1 found: no such container [testenv] podman container crashed! While at it, use "check=False" with the "podman kill" command, so we avoid additional error messages if the container was already killed at that point (could happen through a bug). If we fail to kill it here, it is not a problem because the watchdog will ensure it terminates shortly after the watchdog process was stopped. Related: OS#6607 Change-Id: I6c67273af5b6a80ae0c94e14cb92e3784807c21d --- M _testenv/testenv/podman.py 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/92/38592/1 diff --git a/_testenv/testenv/podman.py b/_testenv/testenv/podman.py index f849408..538ec41 100644 --- a/_testenv/testenv/podman.py +++ b/_testenv/testenv/podman.py @@ -311,6 +311,7 @@ global container_name global run_shell_on_stop global restart_count + global feed_watchdog_process if not is_running(): return @@ -329,10 +330,13 @@ restart_msg = " (restart)" if restart else "" logging.info(f"Stopping podman container{restart_msg}") - testenv.cmd.run(["podman", "kill", container_name], no_podman=True) if feed_watchdog_process: feed_watchdog_process.terminate() + feed_watchdog_process.wait() + feed_watchdog_process = None + + testenv.cmd.run(["podman", "kill", container_name], no_podman=True, check=False) if restart: testenv.cmd.run(["podman", "wait", container_name], no_podman=True, check=False) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38592?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: I6c67273af5b6a80ae0c94e14cb92e3784807c21d Gerrit-Change-Number: 38592 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

4 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Rename RAB helper functions to be CS specific

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38587?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: hnbgw: Rename RAB helper functions to be CS specific ...................................................................... hnbgw: Rename RAB helper functions to be CS specific Change-Id: If8a97fe847083e95a480006d147ff59be695b713 --- M hnbgw/ConnHdlr.ttcn M hnbgw/HNBGW_Tests.ttcn 2 files changed, 10 insertions(+), 10 deletions(-) Approvals: pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/hnbgw/ConnHdlr.ttcn b/hnbgw/ConnHdlr.ttcn index 6168716..cc798e7 100644 --- a/hnbgw/ConnHdlr.ttcn +++ b/hnbgw/ConnHdlr.ttcn @@ -567,7 +567,7 @@ return mgcp_resp; } -function f_rab_ass_req(inout MgcpParameters pars) runs on ConnHdlr { +function f_rab_ass_req_cs(inout MgcpParameters pars) runs on ConnHdlr { var MgcpCommand mgcp_cmd; var RANAP_PDU tx; var template RAB_SetupOrModifyList rab_sml; @@ -599,7 +599,7 @@ f_rua_expect(tx); } -friend function f_rab_ass_resp(inout MgcpParameters pars) runs on ConnHdlr { +friend function f_rab_ass_resp_cs(inout MgcpParameters pars) runs on ConnHdlr { var MgcpCommand mgcp_cmd; var RANAP_PDU tx; var template RAB_SetupOrModifiedList rab_smdl; @@ -661,9 +661,9 @@ f_bssap_expect(tx); } -function f_create_rab(inout MgcpParameters pars) runs on ConnHdlr { - f_rab_ass_req(pars); - f_rab_ass_resp(pars); +function f_create_rab_cs(inout MgcpParameters pars) runs on ConnHdlr { + f_rab_ass_req_cs(pars); + f_rab_ass_resp_cs(pars); } altstep as_mgcp_dlcx() runs on ConnHdlr { diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 7ba4c6f..6c16cec 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -994,7 +994,7 @@ }; f_statsd_expect(expect); - f_create_rab(g_pars.mgcp_pars); + f_create_rab_cs(g_pars.mgcp_pars); expect := { {name := hnb0_ctr_prefix & "ranap.cs.rab_act.req", mtype := "c", min := 1, max := 1}, @@ -1052,7 +1052,7 @@ }; f_statsd_expect(expect); - f_rab_ass_req(g_pars.mgcp_pars); + f_rab_ass_req_cs(g_pars.mgcp_pars); /* Send RAB failed list in response */ tx := valueof(ts_RANAP_RabAssResp(rab_fl := ts_RAB_FL(t_RAB_id(23), g_pars.rab_rel_cause))); @@ -1100,7 +1100,7 @@ tx := f_build_initial_ue(g_pars); f_iuh2iu_connect(tx); - f_create_rab(g_pars.mgcp_pars); + f_create_rab_cs(g_pars.mgcp_pars); var charstring ctr_name; if (g_pars.rab_rel_cause == valueof(ts_RanapCause_nas_normal)) { @@ -1340,7 +1340,7 @@ tx := f_build_initial_ue(g_pars); f_iuh2iu_connect(tx); - f_create_rab(g_pars.mgcp_pars); + f_create_rab_cs(g_pars.mgcp_pars); RUA.send(ts_RANAP_IuReleaseRequest(ts_RanapCause_radio_rab_preempted)); BSSAP.receive(tr_RANAP_IuReleaseRequest(ts_RanapCause_radio_rab_preempted)); @@ -2391,7 +2391,7 @@ tx := f_build_initial_ue(g_pars); f_iuh2iu_connect(tx); - f_create_rab(g_pars.mgcp_pars); + f_create_rab_cs(g_pars.mgcp_pars); /* Now send a second RAB Assignment with different subflows and omitting transportLayerInformation. (Assuming * the first RAB Assignment's transportLayerInformation remains in use unchanged.) */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38587?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: If8a97fe847083e95a480006d147ff59be695b713 Gerrit-Change-Number: 38587 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: Use g_pars.mgcp_pars directly during RAB CS setup

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38588?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: hnbgw: Use g_pars.mgcp_pars directly during RAB CS setup ...................................................................... hnbgw: Use g_pars.mgcp_pars directly during RAB CS setup Change-Id: I1f699e197e29f912ad06378f10563063aa291af3 --- M hnbgw/ConnHdlr.ttcn M hnbgw/HNBGW_Tests.ttcn 2 files changed, 28 insertions(+), 28 deletions(-) Approvals: pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/hnbgw/ConnHdlr.ttcn b/hnbgw/ConnHdlr.ttcn index cc798e7..adbfcae 100644 --- a/hnbgw/ConnHdlr.ttcn +++ b/hnbgw/ConnHdlr.ttcn @@ -158,7 +158,7 @@ integer cn_idx, hexstring imsi, boolean ps_domain, - MgcpParameters mgcp_pars optional, + MgcpParameters mgcp_pars, HnbConfig hnb optional, boolean expect_separate_sccp_cr, integer tx_sccp_cr_data_len, @@ -567,14 +567,14 @@ return mgcp_resp; } -function f_rab_ass_req_cs(inout MgcpParameters pars) runs on ConnHdlr { +function f_rab_ass_req_cs() runs on ConnHdlr { var MgcpCommand mgcp_cmd; var RANAP_PDU tx; var template RAB_SetupOrModifyList rab_sml; timer T := 5.0; /* Send RAB Assignment Request */ - rab_sml := ts_RAB_SML(t_RAB_id(23), f_ts_RAB_TLA(pars.cn_rtp_ip), t_RAB_binding_port(pars.cn_rtp_port)); + rab_sml := ts_RAB_SML(t_RAB_id(23), f_ts_RAB_TLA(g_pars.mgcp_pars.cn_rtp_ip), t_RAB_binding_port(g_pars.mgcp_pars.cn_rtp_port)); tx := valueof(ts_RANAP_RabAssReq(rab_sml)); BSSAP.send(tx); T.start; @@ -583,7 +583,7 @@ alt { [] MGCP.receive(tr_CRCX) -> value mgcp_cmd { log("CRCX1", mgcp_cmd); - var template MgcpResponse mgcp_rsp := f_handle_crcx(pars, mgcp_cmd); + var template MgcpResponse mgcp_rsp := f_handle_crcx(g_pars.mgcp_pars, mgcp_cmd); MGCP.send(valueof(mgcp_rsp)); } [] T.timeout { @@ -593,77 +593,77 @@ T.stop; /* Expect RAB Assignment Request with IP/port from CRCX ACK via Iuh */ - rab_sml := ts_RAB_SML(t_RAB_id(23), f_ts_RAB_TLA(pars.mgw_conn_ran.mgw_rtp_ip), t_RAB_binding_port(pars.mgw_conn_ran.mgw_rtp_port)); + rab_sml := ts_RAB_SML(t_RAB_id(23), f_ts_RAB_TLA(g_pars.mgcp_pars.mgw_conn_ran.mgw_rtp_ip), t_RAB_binding_port(g_pars.mgcp_pars.mgw_conn_ran.mgw_rtp_port)); tx := valueof(ts_RANAP_RabAssReq(rab_sml)); f_rua_expect(tx); } -friend function f_rab_ass_resp_cs(inout MgcpParameters pars) runs on ConnHdlr { +friend function f_rab_ass_resp_cs() runs on ConnHdlr { var MgcpCommand mgcp_cmd; var RANAP_PDU tx; var template RAB_SetupOrModifiedList rab_smdl; /* Send back RAB Assignment Response via Iuh */ - rab_smdl := ts_RAB_SMdL(t_RAB_id(23), f_ts_RAB_TLA(pars.hnb_rtp_ip), t_RAB_binding_port(pars.hnb_rtp_port)); + rab_smdl := ts_RAB_SMdL(t_RAB_id(23), f_ts_RAB_TLA(g_pars.mgcp_pars.hnb_rtp_ip), t_RAB_binding_port(g_pars.mgcp_pars.hnb_rtp_port)); tx := valueof(ts_RANAP_RabAssResp(rab_smdl)); RUA.send(tx); interleave { /* Expect MDCX with IP/port from RAB Assignment Response */ - [] MGCP.receive(tr_MDCX(tr_SDP(pars.hnb_rtp_ip, pars.hnb_rtp_port))) -> value mgcp_cmd { + [] MGCP.receive(tr_MDCX(tr_SDP(g_pars.mgcp_pars.hnb_rtp_ip, g_pars.mgcp_pars.hnb_rtp_port))) -> value mgcp_cmd { var HostName mgw_rtp_ip; var boolean exp_rua_rab_reass := false; log("MDCX1", mgcp_cmd); - if (ispresent(pars.mgw_conn_ran.mgw_rtp_ip_mdcx)) { - mgw_rtp_ip := pars.mgw_conn_ran.mgw_rtp_ip_mdcx; - if (pars.mgw_conn_ran.mgw_rtp_ip != pars.mgw_conn_ran.mgw_rtp_ip_mdcx) { + if (ispresent(g_pars.mgcp_pars.mgw_conn_ran.mgw_rtp_ip_mdcx)) { + mgw_rtp_ip := g_pars.mgcp_pars.mgw_conn_ran.mgw_rtp_ip_mdcx; + if (g_pars.mgcp_pars.mgw_conn_ran.mgw_rtp_ip != g_pars.mgcp_pars.mgw_conn_ran.mgw_rtp_ip_mdcx) { exp_rua_rab_reass := true; } } else { - mgw_rtp_ip := pars.mgw_conn_ran.mgw_rtp_ip; + mgw_rtp_ip := g_pars.mgcp_pars.mgw_conn_ran.mgw_rtp_ip; } /* Verify SDP of MDCX */ - var SDP_Message sdp := valueof(ts_SDP(mgw_rtp_ip, mgw_rtp_ip, hex2str(pars.mgcp_call_id), "42", pars.mgw_conn_ran.mgw_rtp_port, - { int2str(pars.rtp_payload_type) }, { valueof(ts_SDP_rtpmap(pars.rtp_payload_type, pars.rtp_sdp_format)), valueof(ts_SDP_ptime(20)) } )); - var template MgcpResponse mgcp_rsp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, pars.mgw_conn_ran.mgcp_connection_id, sdp); + var SDP_Message sdp := valueof(ts_SDP(mgw_rtp_ip, mgw_rtp_ip, hex2str(g_pars.mgcp_pars.mgcp_call_id), "42", g_pars.mgcp_pars.mgw_conn_ran.mgw_rtp_port, + { int2str(g_pars.mgcp_pars.rtp_payload_type) }, { valueof(ts_SDP_rtpmap(g_pars.mgcp_pars.rtp_payload_type, g_pars.mgcp_pars.rtp_sdp_format)), valueof(ts_SDP_ptime(20)) } )); + var template MgcpResponse mgcp_rsp := ts_MDCX_ACK(mgcp_cmd.line.trans_id, g_pars.mgcp_pars.mgw_conn_ran.mgcp_connection_id, sdp); MGCP.send(valueof(mgcp_rsp)); /* If IP address changed, we expect HNBGW to Modify the RAB through RAB-Ass-Req: */ if (exp_rua_rab_reass) { var template RAB_SetupOrModifyList rab_sml; /* Expect RAB Assignment Request with IP/port from MDCX ACK via Iuh */ - rab_sml := ts_RAB_SML(t_RAB_id(23), f_ts_RAB_TLA(pars.mgw_conn_ran.mgw_rtp_ip_mdcx), t_RAB_binding_port(pars.mgw_conn_ran.mgw_rtp_port)); + rab_sml := ts_RAB_SML(t_RAB_id(23), f_ts_RAB_TLA(g_pars.mgcp_pars.mgw_conn_ran.mgw_rtp_ip_mdcx), t_RAB_binding_port(g_pars.mgcp_pars.mgw_conn_ran.mgw_rtp_port)); tx := valueof(ts_RANAP_RabAssReq(rab_sml)); f_rua_expect(tx); /* Send back RAB Assignment Response via Iuh */ - rab_smdl := ts_RAB_SMdL(t_RAB_id(23), f_ts_RAB_TLA(pars.hnb_rtp_ip), t_RAB_binding_port(pars.hnb_rtp_port)); + rab_smdl := ts_RAB_SMdL(t_RAB_id(23), f_ts_RAB_TLA(g_pars.mgcp_pars.hnb_rtp_ip), t_RAB_binding_port(g_pars.mgcp_pars.hnb_rtp_port)); tx := valueof(ts_RANAP_RabAssResp(rab_smdl)); RUA.send(tx); /* This shouldn't trigger any MGCP, since nothing changed on the HNB IP side. Continue below. */ } } /* Handle CRCX for second leg of endpoint, answer with IP/port */ - [] MGCP.receive(tr_CRCX(pars.mgcp_ep, tr_SDP(pars.cn_rtp_ip, pars.cn_rtp_port))) -> value mgcp_cmd { + [] MGCP.receive(tr_CRCX(g_pars.mgcp_pars.mgcp_ep, tr_SDP(g_pars.mgcp_pars.cn_rtp_ip, g_pars.mgcp_pars.cn_rtp_port))) -> value mgcp_cmd { log("CRCX2", mgcp_cmd); /* Verify SDP of CRCX */ - var template MgcpResponse mgcp_rsp := f_handle_crcx(pars, mgcp_cmd); + var template MgcpResponse mgcp_rsp := f_handle_crcx(g_pars.mgcp_pars, mgcp_cmd); MGCP.send(valueof(mgcp_rsp)); } } /* Expect RAB Assignment Response with IP/port from second CRCX ACK */ - rab_smdl := ts_RAB_SMdL(t_RAB_id(23), f_ts_RAB_TLA(pars.mgw_conn_cn.mgw_rtp_ip), t_RAB_binding_port(pars.mgw_conn_cn.mgw_rtp_port)); + rab_smdl := ts_RAB_SMdL(t_RAB_id(23), f_ts_RAB_TLA(g_pars.mgcp_pars.mgw_conn_cn.mgw_rtp_ip), t_RAB_binding_port(g_pars.mgcp_pars.mgw_conn_cn.mgw_rtp_port)); tx := valueof(ts_RANAP_RabAssResp(rab_smdl)); f_bssap_expect(tx); } -function f_create_rab_cs(inout MgcpParameters pars) runs on ConnHdlr { - f_rab_ass_req_cs(pars); - f_rab_ass_resp_cs(pars); +function f_create_rab_cs() runs on ConnHdlr { + f_rab_ass_req_cs(); + f_rab_ass_resp_cs(); } altstep as_mgcp_dlcx() runs on ConnHdlr { diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 6c16cec..3d0907a 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -994,7 +994,7 @@ }; f_statsd_expect(expect); - f_create_rab_cs(g_pars.mgcp_pars); + f_create_rab_cs(); expect := { {name := hnb0_ctr_prefix & "ranap.cs.rab_act.req", mtype := "c", min := 1, max := 1}, @@ -1052,7 +1052,7 @@ }; f_statsd_expect(expect); - f_rab_ass_req_cs(g_pars.mgcp_pars); + f_rab_ass_req_cs(); /* Send RAB failed list in response */ tx := valueof(ts_RANAP_RabAssResp(rab_fl := ts_RAB_FL(t_RAB_id(23), g_pars.rab_rel_cause))); @@ -1100,7 +1100,7 @@ tx := f_build_initial_ue(g_pars); f_iuh2iu_connect(tx); - f_create_rab_cs(g_pars.mgcp_pars); + f_create_rab_cs(); var charstring ctr_name; if (g_pars.rab_rel_cause == valueof(ts_RanapCause_nas_normal)) { @@ -1340,7 +1340,7 @@ tx := f_build_initial_ue(g_pars); f_iuh2iu_connect(tx); - f_create_rab_cs(g_pars.mgcp_pars); + f_create_rab_cs(); RUA.send(ts_RANAP_IuReleaseRequest(ts_RanapCause_radio_rab_preempted)); BSSAP.receive(tr_RANAP_IuReleaseRequest(ts_RanapCause_radio_rab_preempted)); @@ -2391,7 +2391,7 @@ tx := f_build_initial_ue(g_pars); f_iuh2iu_connect(tx); - f_create_rab_cs(g_pars.mgcp_pars); + f_create_rab_cs(); /* Now send a second RAB Assignment with different subflows and omitting transportLayerInformation. (Assuming * the first RAB Assignment's transportLayerInformation remains in use unchanged.) */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38588?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1f699e197e29f912ad06378f10563063aa291af3 Gerrit-Change-Number: 38588 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: Use g_pars.mgcp_pars directly during RAB CS setup

by pespin

Hello Jenkins Builder, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38588?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: hnbgw: Use g_pars.mgcp_pars directly during RAB CS setup ...................................................................... hnbgw: Use g_pars.mgcp_pars directly during RAB CS setup Change-Id: I1f699e197e29f912ad06378f10563063aa291af3 --- M hnbgw/ConnHdlr.ttcn M hnbgw/HNBGW_Tests.ttcn 2 files changed, 28 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/38588/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38588?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: I1f699e197e29f912ad06378f10563063aa291af3 Gerrit-Change-Number: 38588 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 3 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: Move gtp_pars to Connhdlr

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38591?usp=email ) Change subject: hnbgw: Move gtp_pars to Connhdlr ...................................................................... hnbgw: Move gtp_pars to Connhdlr Change-Id: I40f723256b592d0d9141dfd192a1623a4804b4ea --- M hnbgw/ConnHdlr.ttcn M hnbgw/HNBGW_Tests.ttcn 2 files changed, 64 insertions(+), 67 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/91/38591/1 diff --git a/hnbgw/ConnHdlr.ttcn b/hnbgw/ConnHdlr.ttcn index adbfcae..46cd6f2 100644 --- a/hnbgw/ConnHdlr.ttcn +++ b/hnbgw/ConnHdlr.ttcn @@ -146,6 +146,53 @@ got_osmux_count := 0 } +type record FTeid { + HostName addr, + OCT4 teid +} + +type record FTeids { + FTeid local, + FTeid remote +} + +/* 'local' and 'remote' refer to the GTP information from the UPF's point of view: + * HNB UPF CN + * access.remote <---> access.local | core.local <---> core.remote + */ +type record GtpParameters { + FTeids core, + FTeids access +} + +/* HNB UPF CN + * access.remote <---> access.local | core.local <---> core.remote + * 127.0.0.4 127.0.0.3 127.0.0.2 127.0.0.1 + * 0x44004400 0x30303030 0x22002200 0x10101010 + */ +template (value) GtpParameters t_GtpParams := { + core := { + local := { + addr := "127.0.0.2", + teid := '22002200'O + }, + remote := { + addr := "127.0.0.1", + teid := '10101010'O + } + }, + access := { + local := { + addr := "127.0.0.3", + teid := '30303030'O + }, + remote := { + addr := "127.0.0.4", + teid := '44004400'O + } + } +} + type record HnbConfig { LocationAreaIdentification lai, integer sac @@ -159,6 +206,7 @@ hexstring imsi, boolean ps_domain, MgcpParameters mgcp_pars, + GtpParameters gtp_pars, HnbConfig hnb optional, boolean expect_separate_sccp_cr, integer tx_sccp_cr_data_len, @@ -193,6 +241,7 @@ imsi := f_gen_imsi(imsi_suffix), ps_domain := ps_domain, mgcp_pars := t_MgcpParams, + gtp_pars := t_GtpParams, hnb := omit, /* filled in later */ expect_separate_sccp_cr := expect_separate_sccp_cr, tx_sccp_cr_data_len := tx_sccp_cr_data_len, diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 3d0907a..a4c9703 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -1379,54 +1379,6 @@ f_shutdown_helper(); } -type record FTeid { - HostName addr, - OCT4 teid -} - -type record FTeids { - FTeid local, - FTeid remote -} - - -/* 'local' and 'remote' refer to the GTP information from the UPF's point of view: - * HNB UPF CN - * access.remote <---> access.local | core.local <---> core.remote - */ -type record GtpParameters { - FTeids core, - FTeids access -} - -/* HNB UPF CN - * access.remote <---> access.local | core.local <---> core.remote - * 127.0.0.4 127.0.0.3 127.0.0.2 127.0.0.1 - * 0x44004400 0x30303030 0x22002200 0x10101010 - */ -template GtpParameters t_GtpParameters := { - core := { - local := { - addr := "127.0.0.2", - teid := '22002200'O - }, - remote := { - addr := "127.0.0.1", - teid := '10101010'O - } - }, - access := { - local := { - addr := "127.0.0.3", - teid := '30303030'O - }, - remote := { - addr := "127.0.0.4", - teid := '44004400'O - } - } -} - friend function f_tc_ps_rab_assignment_with_pfcp(charstring id) runs on ConnHdlr { const OCT8 c_SEID0 := '0000000000000000'O; const OCT8 c_SEID1 := '1111111111111111'O; @@ -1453,11 +1405,9 @@ tx := f_build_initial_ue(g_pars); f_iuh2iu_connect(tx); - var GtpParameters gtp_pars := valueof(t_GtpParameters); - var template RAB_SetupOrModifyList rab_sml; - /* Send RAB Assignment Request */ - rab_sml := ts_RAB_SML_ps(t_RAB_id(23), f_ts_RAB_TLA(gtp_pars.core.remote.addr), gtp_pars.core.remote.teid); + var template RAB_SetupOrModifyList rab_sml; + rab_sml := ts_RAB_SML_ps(t_RAB_id(23), f_ts_RAB_TLA(g_pars.gtp_pars.core.remote.addr), g_pars.gtp_pars.core.remote.teid); tx := valueof(ts_RANAP_RabAssReq(rab_sml)); BSSAP.send(tx); @@ -1474,10 +1424,10 @@ /* Acting as UPF, invent a new PFCP SEID to send to HNBGW. Respond to the Session Establishment. * The PFCP response must have the same sequence_number as the request. */ var template F_SEID up_f_seid := ts_PFCP_F_SEID_ipv4(f_inet_addr("127.0.0.1"), c_SEID1); - var template F_TEID f_teid1 := ts_PFCP_F_TEID_ipv4(gtp_pars.core.local.teid, - f_inet_addr(gtp_pars.core.local.addr)); - var template F_TEID f_teid2 := ts_PFCP_F_TEID_ipv4(gtp_pars.access.local.teid, - f_inet_addr(gtp_pars.access.local.addr)); + var template F_TEID f_teid1 := ts_PFCP_F_TEID_ipv4(g_pars.gtp_pars.core.local.teid, + f_inet_addr(g_pars.gtp_pars.core.local.addr)); + var template F_TEID f_teid2 := ts_PFCP_F_TEID_ipv4(g_pars.gtp_pars.access.local.teid, + f_inet_addr(g_pars.gtp_pars.access.local.addr)); var template Created_PDR pdr1 := ts_PFCP_Created_PDR(pdr_id := serq.create_PDR_list[0].grouped_ie.pdr_id, local_F_TEID := f_teid1); var template Created_PDR pdr2 := ts_PFCP_Created_PDR(pdr_id := serq.create_PDR_list[1].grouped_ie.pdr_id, @@ -1490,15 +1440,15 @@ PFCP.send(r); /* Expect on Iuh: RAB Assignment Request with IP/port from PFCP Session Est Resp */ - rab_sml := ts_RAB_SML_ps(t_RAB_id(23), f_ts_RAB_TLA(gtp_pars.access.local.addr), - gtp_pars.access.local.teid); + rab_sml := ts_RAB_SML_ps(t_RAB_id(23), f_ts_RAB_TLA(g_pars.gtp_pars.access.local.addr), + g_pars.gtp_pars.access.local.teid); rx := valueof(ts_RANAP_RabAssReq(rab_sml)); f_rua_expect(rx); /* Send back RAB Assignment Response via Iuh */ var template RAB_SetupOrModifiedList rab_smdl; - rab_smdl := ts_RAB_SMdL_ps(t_RAB_id(23), f_ts_RAB_TLA(gtp_pars.access.remote.addr), - gtp_pars.access.remote.teid); + rab_smdl := ts_RAB_SMdL_ps(t_RAB_id(23), f_ts_RAB_TLA(g_pars.gtp_pars.access.remote.addr), + g_pars.gtp_pars.access.remote.teid); tx := valueof(ts_RANAP_RabAssResp(rab_smdl)); RUA.send(tx); @@ -1506,7 +1456,7 @@ r := ts_PFCP_Session_Mod_Resp(m.sequence_number, hnbgw_f_seid.seid); PFCP.send(r); - rab_smdl := ts_RAB_SMdL_ps(t_RAB_id(23), f_ts_RAB_TLA(gtp_pars.core.local.addr), gtp_pars.core.local.teid); + rab_smdl := ts_RAB_SMdL_ps(t_RAB_id(23), f_ts_RAB_TLA(g_pars.gtp_pars.core.local.addr), g_pars.gtp_pars.core.local.teid); f_bssap_expect(tr_RANAP_RabAssResp(rab_smdl)); f_sleep(2.0); @@ -1550,11 +1500,9 @@ tx := f_build_initial_ue(g_pars); f_iuh2iu_connect(tx); - var GtpParameters gtp_pars := valueof(t_GtpParameters); - var template RAB_SetupOrModifyList rab_sml; - /* Send RAB Assignment Request */ - rab_sml := ts_RAB_SML_ps(t_RAB_id(23), f_ts_RAB_TLA(gtp_pars.core.remote.addr), gtp_pars.core.remote.teid); + var template RAB_SetupOrModifyList rab_sml; + rab_sml := ts_RAB_SML_ps(t_RAB_id(23), f_ts_RAB_TLA(g_pars.gtp_pars.core.remote.addr), g_pars.gtp_pars.core.remote.teid); tx := valueof(ts_RANAP_RabAssReq(rab_sml)); BSSAP.send(tx); @@ -1564,8 +1512,8 @@ /* Send back RAB Assignment Response via Iuh */ var template RAB_SetupOrModifiedList rab_smdl; - rab_smdl := ts_RAB_SMdL_ps(t_RAB_id(23), f_ts_RAB_TLA(gtp_pars.access.remote.addr), - gtp_pars.access.remote.teid); + rab_smdl := ts_RAB_SMdL_ps(t_RAB_id(23), f_ts_RAB_TLA(g_pars.gtp_pars.access.remote.addr), + g_pars.gtp_pars.access.remote.teid); tx := valueof(ts_RANAP_RabAssResp(rab_smdl)); RUA.send(tx); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38591?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: I40f723256b592d0d9141dfd192a1623a4804b4ea Gerrit-Change-Number: 38591 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

4 months, 3 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Rename RAB helper functions to be CS specific

by pespin

Hello Jenkins Builder, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38587?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: hnbgw: Rename RAB helper functions to be CS specific ...................................................................... hnbgw: Rename RAB helper functions to be CS specific Change-Id: If8a97fe847083e95a480006d147ff59be695b713 --- M hnbgw/ConnHdlr.ttcn M hnbgw/HNBGW_Tests.ttcn 2 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/87/38587/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38587?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: If8a97fe847083e95a480006d147ff59be695b713 Gerrit-Change-Number: 38587 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

4 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log October 2024