- gerrit-log - lists.osmocom.org

[M] Change in ...osmo-s1gw[master]: pfcp_peer: implement Heartbeat Request procedure
by pespin 25 Oct '24

25 Oct '24

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38533?usp=email ) Change subject: pfcp_peer: implement Heartbeat Request procedure ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38533?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ie52d58ffcc169abe8e72ea106ab957c12af2e8b9 Gerrit-Change-Number: 38533 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Oct 2024 12:54:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-ttcn3-hacks[master]: Convert RAN_Conn_Prim from enum to union
by pespin 25 Oct '24

25 Oct '24

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/+/38540?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: Convert RAN_Conn_Prim from enum to union ...................................................................... Convert RAN_Conn_Prim from enum to union This will allow passing parameters in each primitive. This is needed eg. to pass the reason in DISCONNECT.req. Change-Id: I17994795b51efc7e6700238ddcf45594af653e42 --- M bsc-nat/BSC_MS_ConnectionHandler.ttcn M bsc-nat/MSC_ConnectionHandler.ttcn M bsc/BSC_Tests.ttcn M bsc/BSC_Tests_ASCI.ttcn M bsc/BSC_Tests_LCLS.ttcn M hnbgw/ConnHdlr.ttcn M hnbgw/HNBGW_Tests.ttcn M library/RAN_Emulation.ttcnpp M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M msc/MSC_Tests_Iu.ttcn M sgsn/BSSGP_ConnHdlr.ttcn M sgsn/SGSN_Tests_Iu.ttcn 13 files changed, 101 insertions(+), 71 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/40/38540/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38540?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: I17994795b51efc7e6700238ddcf45594af653e42 Gerrit-Change-Number: 38540 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in ...osmo-s1gw[master]: pfcp_peer: implement Heartbeat Request procedure
by fixeria 25 Oct '24

25 Oct '24

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38533?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: pfcp_peer: implement Heartbeat Request procedure ...................................................................... pfcp_peer: implement Heartbeat Request procedure Change-Id: Ie52d58ffcc169abe8e72ea106ab957c12af2e8b9 --- M src/pfcp_peer.erl 1 file changed, 139 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/33/38533/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38533?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Ie52d58ffcc169abe8e72ea106ab957c12af2e8b9 Gerrit-Change-Number: 38533 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XS] Change in ...osmo-s1gw[master]: s1gw_metrics: add a counter for unexpected PFCP PDUs
by fixeria 25 Oct '24

25 Oct '24

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38535?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: s1gw_metrics: add a counter for unexpected PFCP PDUs ...................................................................... s1gw_metrics: add a counter for unexpected PFCP PDUs Change-Id: I338662d0fe079f1c4222a70c5521eff2d237c793 --- M include/s1gw_metrics.hrl M src/pfcp_peer.erl M src/s1gw_metrics.erl 3 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/35/38535/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38535?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I338662d0fe079f1c4222a70c5521eff2d237c793 Gerrit-Change-Number: 38535 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XL] Change in docker-playground[master]: Remove ttcn3 testsuites ported to testenv, part 2
by pespin 25 Oct '24

25 Oct '24

Attention is currently required from: osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/docker-playground/+/38537?usp=email ) Change subject: Remove ttcn3 testsuites ported to testenv, part 2 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/38537?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I61fd5523dbd5664763b006d5ba9a368cd9caf9b9 Gerrit-Change-Number: 38537 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Oct 2024 12:49:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ttcn3-hacks[master]: hnbgw: Allow modifying RanOps during test startup
by pespin 25 Oct '24

25 Oct '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38539?usp=email ) Change subject: hnbgw: Allow modifying RanOps during test startup ...................................................................... hnbgw: Allow modifying RanOps during test startup This will be used by a test to skip response to CONNECT.ind, allowing transmission of DISCONNECT.req and hence transmitting CREF over the wire. Change-Id: Ib9462ba41b16375348b086d7ffe9f5755ae26f84 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/39/38539/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 4ab5a90..4606396 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -272,6 +272,8 @@ /* Counter state */ var CounterNameValsList g_ctr_cn; var CounterNameValsList g_ctr_hnb; + + var RanOps g_ran_ops := MSC_RanOps; } /* global altstep for global guard timer; */ @@ -394,7 +396,7 @@ * link for 'sgsn 3' = (ps_domain := true, cn_nr := 3) */ private function f_cn_nr_init(boolean ps_domain, integer cn_nr) runs on test_CT { - var RanOps ranops := MSC_RanOps; + var RanOps ranops := g_ran_ops; ranops.ps_domain := ps_domain; var integer cn_idx := f_cn_idx(ps_domain, cn_nr); var charstring msc_sgsn := "msc"; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38539?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: Ib9462ba41b16375348b086d7ffe9f5755ae26f84 Gerrit-Change-Number: 38539 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: RAN_Emulation: Introduce field ranap_connect_ind_auto_res
by pespin 25 Oct '24

25 Oct '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38538?usp=email ) Change subject: RAN_Emulation: Introduce field ranap_connect_ind_auto_res ...................................................................... RAN_Emulation: Introduce field ranap_connect_ind_auto_res This field allows skipping automatic response of the connect_ind, hence allowing ConnHdlr to totally skip it, delay it, or generate a CREF by means of sending RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ to RAN_Emulation, as per ITU Q.711 Figure 8. Change-Id: I5a69990e3a0839dd3c25c7dc66e6bcf66123fbff --- M hnbgw/HNBGW_Tests.ttcn M library/RAN_Emulation.ttcnpp M msc/BSC_ConnectionHandler.ttcn M sgsn/SGSN_Tests.ttcn 4 files changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/38538/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 30e624f..4ab5a90 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -232,6 +232,7 @@ const RanOps MSC_RanOps := { ranap_create_cb := refers(RAN_Emulation.RanapExpectedCreateCallback), ranap_unitdata_cb := refers(MSC_UnitdataCallback), + ranap_connect_ind_auto_res := true, ps_domain := false, decode_dtap := false, role_ms := false, diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp index fbe921d..c221c72 100644 --- a/library/RAN_Emulation.ttcnpp +++ b/library/RAN_Emulation.ttcnpp @@ -734,6 +734,9 @@ #ifdef RAN_EMULATION_RANAP RanapCreateCallback ranap_create_cb optional, RanapUnitdataCallback ranap_unitdata_cb optional, + /* Set to false if want to handle response to RANAP_N_CONNECT_ind. + * This is useful to eg. trigger SCCP CREF. */ + boolean ranap_connect_ind_auto_res, boolean ps_domain, #endif boolean decode_dtap, @@ -1000,8 +1003,10 @@ /* Notify client that we received an SCCP CR without user data */ CLIENT.send(ts_RANAP_Conn_Req(rconn_ind.callingAddress, rconn_ind.calledAddress, omit)); } - /* confirm connection establishment */ - RANAP.send(ts_RANAP_CONNECT_res(rconn_ind.connectionId, omit)); + if (g_ran_ops.ranap_connect_ind_auto_res) { + /* confirm connection establishment */ + RANAP.send(ts_RANAP_CONNECT_res(rconn_ind.connectionId, omit)); + } } /* SCCP -> Client: connection-oriented data in existing connection */ [] RANAP.receive(RANAP_N_DATA_ind:?) -> value rdata_ind { diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 467f387..e436117 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -273,6 +273,7 @@ unitdata_cb := refers(BscUnitdataCallback), ranap_create_cb := refers(RAN_Emulation.RanapExpectedCreateCallback), ranap_unitdata_cb := refers(RncUnitdataCallback), + ranap_connect_ind_auto_res := true, ps_domain := false, decode_dtap := true, role_ms := true, diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 1099798..0f5da29 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -437,6 +437,7 @@ const RanOps RNC_RanOps := { ranap_create_cb := refers(RAN_Emulation.RanapExpectedCreateCallback), ranap_unitdata_cb := refers(RncUnitdataCallback), + ranap_connect_ind_auto_res := true, ps_domain := true, decode_dtap := true, role_ms := true, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38538?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: I5a69990e3a0839dd3c25c7dc66e6bcf66123fbff Gerrit-Change-Number: 38538 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: RAN_Emulation: Allow setting reason in primitive MSC_CONN_PRIM_DISC_REQ
by pespin 25 Oct '24

25 Oct '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38541?usp=email ) Change subject: RAN_Emulation: Allow setting reason in primitive MSC_CONN_PRIM_DISC_REQ ...................................................................... RAN_Emulation: Allow setting reason in primitive MSC_CONN_PRIM_DISC_REQ This allows setting a specific reason in the CREF transmitted on the wire, other than "End user originted (0)". A follow-up commit will add a test in HNBGW_Tests where an emulated MSC answers with CREF reason "End user failure (0x02)". Change-Id: I1fa1148135625d840426b52450bf52da10448471 --- M library/RAN_Emulation.ttcnpp 1 file changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/41/38541/1 diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp index 58d1c78..95f8b17 100644 --- a/library/RAN_Emulation.ttcnpp +++ b/library/RAN_Emulation.ttcnpp @@ -77,6 +77,7 @@ /* we tell SCCP to release connection */ type record MSC_CONN_PRIM_DISC_REQ { + SCCP_PAR_Reason reason }; /* Connection confirmed indication */ @@ -100,8 +101,10 @@ template (present) RAN_Conn_Prim tr_MSC_CONN_PRIM_DISC_REQ := { disc_req := ? } -template (value) RAN_Conn_Prim ts_MSC_CONN_PRIM_DISC_REQ := { - disc_req := {} +template (value) RAN_Conn_Prim ts_MSC_CONN_PRIM_DISC_REQ(template (value) SCCP_PAR_Reason reason := 0) := { + disc_req := { + reason := reason + } } template (present) RAN_Conn_Prim tr_MSC_CONN_PRIM_CONF_IND := { @@ -1007,6 +1010,7 @@ var RANAP_Conn_Req creq; var RANAP_PDU ranap; var RANAP_N_UNITDATA_req ranap_ud; + var RAN_Conn_Prim ran_conn_prim; var RAN_ConnHdlr vc_conn; var PDU_DTAP_PS_MO ps_mo; var PDU_DTAP_PS_MT ps_mt; @@ -1080,9 +1084,9 @@ } /* Disconnect request client -> SCCP */ - [] CLIENT.receive(tr_MSC_CONN_PRIM_DISC_REQ) -> sender vc_conn { + [] CLIENT.receive(tr_MSC_CONN_PRIM_DISC_REQ) -> value ran_conn_prim sender vc_conn { var integer conn_id := f_conn_id_by_comp(vc_conn); - RANAP.send(ts_RANAP_DISC_req(conn_id, 0)); + RANAP.send(ts_RANAP_DISC_req(conn_id, ran_conn_prim.disc_req.reason)); f_conn_table_del(conn_id); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38541?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: I1fa1148135625d840426b52450bf52da10448471 Gerrit-Change-Number: 38541 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: Convert RAN_Conn_Prim from enum to union
by pespin 25 Oct '24

25 Oct '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38540?usp=email ) Change subject: Convert RAN_Conn_Prim from enum to union ...................................................................... Convert RAN_Conn_Prim from enum to union This will allow passing parameters in each primitive. This is needed eg. to pass the reason in DISCONNECT.req. Change-Id: I17994795b51efc7e6700238ddcf45594af653e42 --- M bsc-nat/BSC_MS_ConnectionHandler.ttcn M bsc-nat/MSC_ConnectionHandler.ttcn M bsc/BSC_Tests.ttcn M bsc/BSC_Tests_ASCI.ttcn M bsc/BSC_Tests_LCLS.ttcn M hnbgw/ConnHdlr.ttcn M hnbgw/HNBGW_Tests.ttcn M library/RAN_Emulation.ttcnpp M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn M msc/MSC_Tests_Iu.ttcn M sgsn/BSSGP_ConnHdlr.ttcn M sgsn/SGSN_Tests_Iu.ttcn 13 files changed, 99 insertions(+), 69 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/40/38540/1 diff --git a/bsc-nat/BSC_MS_ConnectionHandler.ttcn b/bsc-nat/BSC_MS_ConnectionHandler.ttcn index 8aea74a..882caf8 100644 --- a/bsc-nat/BSC_MS_ConnectionHandler.ttcn +++ b/bsc-nat/BSC_MS_ConnectionHandler.ttcn @@ -190,16 +190,16 @@ log("Unhandled DTAP ", l3); } - [g_state == BSC_STATE_WAIT_DISC_IND] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND) { + [g_state == BSC_STATE_WAIT_DISC_IND] BSSAP.receive(tr_MSC_CONN_PRIM_DISC_IND) { setverdict(pass); self.stop; } - [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND) { + [] BSSAP.receive(tr_MSC_CONN_PRIM_CONF_IND) { } /* disconnect in invalid state */ - [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND) { + [] BSSAP.receive(tr_MSC_CONN_PRIM_DISC_IND) { setverdict(fail); self.stop; } diff --git a/bsc-nat/MSC_ConnectionHandler.ttcn b/bsc-nat/MSC_ConnectionHandler.ttcn index fdf08de..0fe7c23 100644 --- a/bsc-nat/MSC_ConnectionHandler.ttcn +++ b/bsc-nat/MSC_ConnectionHandler.ttcn @@ -181,14 +181,14 @@ } [g_state == MSC_STATE_WAIT_DLCX_ACK] BSSAP.receive(tr_DLCX_ACK) { - BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); + BSSAP.send(ts_MSC_CONN_PRIM_DISC_REQ); setverdict(pass); self.stop; } /* TODO: CLEAR REQUEST from BSS */ - [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND) { + [] BSSAP.receive(tr_MSC_CONN_PRIM_DISC_IND) { setverdict(fail); self.stop; } @@ -199,7 +199,7 @@ /* Guard timer has expired, close connection */ [] T.timeout { - BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); + BSSAP.send(ts_MSC_CONN_PRIM_DISC_REQ); setverdict(fail, "Timeout of guard timer"); self.stop; } diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 8dcff83..4d60ea8 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -5964,7 +5964,7 @@ f_rslem_unregister(0, g_chan_nr, PT := RSL1_PROC); } [] BSSAP.receive(tr_BSSMAP_ClearComplete) { - BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); + BSSAP.send(ts_MSC_CONN_PRIM_DISC_REQ); } } @@ -6085,7 +6085,7 @@ [] RSL.receive(tr_RSL_DEACT_SACCH(g_chan_nr)); [] RSL.receive(tr_RSL_RF_CHAN_REL(g_chan_nr)); [] BSSAP.receive(tr_BSSMAP_ClearComplete) { - BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); + BSSAP.send(ts_MSC_CONN_PRIM_DISC_REQ); } } setverdict(pass); @@ -6373,7 +6373,7 @@ f_expect_dlcx_conns(); BSSAP.receive(tr_BSSMAP_ClearComplete); - BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); + BSSAP.send(ts_MSC_CONN_PRIM_DISC_REQ); setverdict(pass); f_sleep(1.0); @@ -6422,10 +6422,10 @@ enc := g_pars.encr); if (g_pars.inter_bsc_ho_in__ho_req_in_initial_sccp_cr) { BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc, ho_req)); - BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + BSSAP.receive(tr_MSC_CONN_PRIM_CONF_IND); } else { BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc, omit)); - BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + BSSAP.receive(tr_MSC_CONN_PRIM_CONF_IND); BSSAP.send(ho_req); } @@ -6824,7 +6824,7 @@ BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc, f_gen_handover_req())); - BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + BSSAP.receive(tr_MSC_CONN_PRIM_CONF_IND); /* The RSL Emulation magically accepts the Chan Activ behind the scenes. */ @@ -6867,7 +6867,7 @@ f_expect_dlcx_conns(); BSSAP.receive(tr_BSSMAP_ClearComplete); - BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); + BSSAP.send(ts_MSC_CONN_PRIM_DISC_REQ); setverdict(pass); f_sleep(1.0); @@ -6914,7 +6914,7 @@ BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc, f_gen_handover_req())); - BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + BSSAP.receive(tr_MSC_CONN_PRIM_CONF_IND); /* The RSL Emulation magically accepts the Chan Activ behind the scenes. */ @@ -6961,7 +6961,7 @@ f_expect_dlcx_conns(); BSSAP.receive(tr_BSSMAP_ClearComplete); - BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); + BSSAP.send(ts_MSC_CONN_PRIM_DISC_REQ); f_sleep(1.0); } @@ -7001,7 +7001,7 @@ BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc, f_gen_handover_req())); - BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + BSSAP.receive(tr_MSC_CONN_PRIM_CONF_IND); /* The RSL Emulation magically accepts the Chan Activ behind the scenes. */ @@ -7051,7 +7051,7 @@ f_expect_dlcx_conns(); BSSAP.receive(tr_BSSMAP_ClearComplete); - BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); + BSSAP.send(ts_MSC_CONN_PRIM_DISC_REQ); f_sleep(1.0); } @@ -7093,7 +7093,7 @@ BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc, f_gen_handover_req())); - BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + BSSAP.receive(tr_MSC_CONN_PRIM_CONF_IND); /* The RSL Emulation magically accepts the Chan Activ behind the scenes. */ @@ -7135,7 +7135,7 @@ }; f_expect_dlcx_conns(); BSSAP.receive(tr_BSSMAP_ClearComplete); - BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); + BSSAP.send(ts_MSC_CONN_PRIM_DISC_REQ); f_sleep(1.0); } @@ -8548,7 +8548,7 @@ [] BSSAP.receive(tr_BSSMAP_ClearComplete) { f_logp(BSCVTY, "Got BSSMAP Clear Complete"); /* Also drop the SCCP connection */ - BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); + BSSAP.send(ts_MSC_CONN_PRIM_DISC_REQ); } [] rsl_pt.receive(tr_RSL_RF_CHAN_REL(g_chan_nr)) { f_logp(BSCVTY, "Got RSL RF Chan Rel, sending Rel Ack"); @@ -8575,7 +8575,7 @@ [] BSSAP.receive(tr_BSSMAP_ClearComplete) { f_logp(BSCVTY, "Got BSSMAP Clear Complete"); /* Also drop the SCCP connection */ - BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); + BSSAP.send(ts_MSC_CONN_PRIM_DISC_REQ); } [] rsl_pt.receive(tr_RSL_RF_CHAN_REL(g_chan_nr)) { f_logp(BSCVTY, "Got RSL RF Chan Rel, sending Rel Ack"); @@ -8594,7 +8594,7 @@ BSSAP.receive(tr_BSSMAP_ClearComplete); f_logp(BSCVTY, "Got BSSMAP Clear Complete"); /* Also drop the SCCP connection */ - BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); + BSSAP.send(ts_MSC_CONN_PRIM_DISC_REQ); } friend function f_perform_clear_test_ct(DchanTuple dt) @@ -10374,7 +10374,7 @@ var BssmapCause cause := 0; BSSAP.send(ts_BSSMAP_ClearCommand(cause)); BSSAP.receive(tr_BSSMAP_ClearComplete); - BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); + BSSAP.send(ts_MSC_CONN_PRIM_DISC_REQ); timer no_more_bssap := 5.0; no_more_bssap.start; @@ -10424,7 +10424,7 @@ BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc, valueof(ts_BSSMAP_Perform_Location_Request(ts_BSSMAP_Imsi(g_pars.imsi), ts_CellId_CGI('001'H, '01'H, 1, 0))))); - BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + BSSAP.receive(tr_MSC_CONN_PRIM_CONF_IND); var PDU_BSSAP_LE plr; BSSAP_LE.receive(tr_BSSMAP_LE_PerfLocReq(BSSMAP_LE_LOC_INFO_CURRENT_GEOGRAPHIC_LOC, ?, ?)) -> value(plr); @@ -10485,7 +10485,7 @@ BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc, valueof(ts_BSSMAP_Perform_Location_Request(omit, ts_CellId_CGI('262'H, '42'H, 23, 42))))); - BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + BSSAP.receive(tr_MSC_CONN_PRIM_CONF_IND); /* BSC tells MSC about failure */ BSSAP.receive(tr_BSSMAP_Perform_Location_Response( @@ -10597,7 +10597,7 @@ BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc, valueof(ts_BSSMAP_Perform_Location_Request(ts_BSSMAP_Imsi(g_pars.imsi), ts_CellId_CGI('001'H, '01'H, 1, 0))))); - BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + BSSAP.receive(tr_MSC_CONN_PRIM_CONF_IND); var PDU_BSSAP_LE plr; BSSAP_LE.receive(tr_BSSMAP_LE_PerfLocReq(BSSMAP_LE_LOC_INFO_CURRENT_GEOGRAPHIC_LOC, ?, ?)) -> value(plr); @@ -10664,7 +10664,7 @@ BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc, valueof(ts_BSSMAP_Perform_Location_Request(ts_BSSMAP_Imsi(g_pars.imsi), ts_CellId_CGI('001'H, '01'H, 1, 0))))); - BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + BSSAP.receive(tr_MSC_CONN_PRIM_CONF_IND); var PDU_BSSAP_LE plr; BSSAP_LE.receive(tr_BSSMAP_LE_PerfLocReq(BSSMAP_LE_LOC_INFO_CURRENT_GEOGRAPHIC_LOC, ?, ?)) -> value(plr); @@ -11119,7 +11119,7 @@ f_rslem_unregister(0, g_chan_nr); } [] BSSAP.receive(tr_BSSMAP_ClearComplete) { - BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); + BSSAP.send(ts_MSC_CONN_PRIM_DISC_REQ); } } f_expect_dlcx_conns(); @@ -11821,7 +11821,7 @@ BSSAP.send(ts_BSSMAP_ClearCommand(0)); BSSAP.receive(tr_BSSMAP_ClearComplete); - BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); + BSSAP.send(ts_MSC_CONN_PRIM_DISC_REQ); var MgcpCommand mgcp; var MGCP_RecvFrom mrf; diff --git a/bsc/BSC_Tests_ASCI.ttcn b/bsc/BSC_Tests_ASCI.ttcn index 8c8b66c..eb4a9dc 100644 --- a/bsc/BSC_Tests_ASCI.ttcn +++ b/bsc/BSC_Tests_ASCI.ttcn @@ -118,7 +118,7 @@ /* VGCS/VBS SETUP REQ in SCCP CR (must be the first message) */ BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc, setup_req)); - BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + BSSAP.receive(tr_MSC_CONN_PRIM_CONF_IND); alt { [] BSSAP.receive(tr_BSSMAP_VGCS_VBS_SetupAck) -> value rx_bssap { @@ -129,7 +129,7 @@ } BSSAP.send(ts_BSSMAP_ClearCommand(0)); BSSAP.receive(tr_BSSMAP_ClearComplete); - BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); + BSSAP.send(ts_MSC_CONN_PRIM_DISC_REQ); setverdict(pass); return; } @@ -237,7 +237,7 @@ COORD.send(COORD_VGCS_CHANNEL_REL); BSSAP.send(ts_BSSMAP_ClearCommand(0)); BSSAP.receive(tr_BSSMAP_ClearComplete); - BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); + BSSAP.send(ts_MSC_CONN_PRIM_DISC_REQ); if (g_pars.asci_test.vgcs_assign_ok) { if (not assign_res) { @@ -412,7 +412,7 @@ group_call_ref := bit2oct(encvalue(callref))); /* VGCS/VBS ASS REQ in SCCP CR (must be the first message) */ BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_bsc, g_pars.sccp_addr_msc, ass_req)); - BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND); + BSSAP.receive(tr_MSC_CONN_PRIM_CONF_IND); alt { [] BSSAP.receive(tr_BSSMAP_VGCS_VBS_AssignmentRes(res_ch_type, res_cell_id)) -> value rx_bssap { @@ -456,7 +456,7 @@ COORD.receive(COORD_VGCS_CHANNEL_REL); BSSAP.send(ts_BSSMAP_ClearCommand(0)); BSSAP.receive(tr_BSSMAP_ClearComplete); - BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); + BSSAP.send(ts_MSC_CONN_PRIM_DISC_REQ); return; } [] COORD.receive(COORD_VGCS_CHANNEL_REL) { diff --git a/bsc/BSC_Tests_LCLS.ttcn b/bsc/BSC_Tests_LCLS.ttcn index 2b9886b..30aef99 100644 --- a/bsc/BSC_Tests_LCLS.ttcn +++ b/bsc/BSC_Tests_LCLS.ttcn @@ -717,7 +717,7 @@ } } [] CONN_A.receive(tr_BSSMAP_ClearComplete) { - CONN_A.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); + CONN_A.send(ts_MSC_CONN_PRIM_DISC_REQ); } [] CONN_B.receive(tr_BSSMAP_LclsNotificationSts(LCLS_STS_not_possible_ls)); } diff --git a/hnbgw/ConnHdlr.ttcn b/hnbgw/ConnHdlr.ttcn index b304f18..93875bd 100644 --- a/hnbgw/ConnHdlr.ttcn +++ b/hnbgw/ConnHdlr.ttcn @@ -367,7 +367,7 @@ /* expect disconnect on the Iu side */ T.start; alt { - [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND) { + [] BSSAP.receive(tr_MSC_CONN_PRIM_DISC_IND) { setverdict(pass); } [] T.timeout { diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 4606396..6606d3b 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -2294,7 +2294,7 @@ /* We modified the SCCP configuration, expect disconnect of UE that was active on the aborted link. */ RUA.receive(RUA_Disc_Ind:?); - BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND); + BSSAP.receive(tr_MSC_CONN_PRIM_DISC_IND); /* Would be nice to test reconnection on the other point-code, too. That would require another cnlink in * osmo-stp.cfg and module parameters... */ diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp index c221c72..58d1c78 100644 --- a/library/RAN_Emulation.ttcnpp +++ b/library/RAN_Emulation.ttcnpp @@ -71,14 +71,44 @@ port RAN_PROC_PT BSSAP_PROC; } +/* SCCP tell us that connection was released */ +type record MSC_CONN_PRIM_DISC_IND { +}; + +/* we tell SCCP to release connection */ +type record MSC_CONN_PRIM_DISC_REQ { +}; + +/* Connection confirmed indication */ +type record MSC_CONN_PRIM_CONF_IND { +}; + /* Auxiliary primitive that can happen on the port between per-connection client and this dispatcher */ -type enumerated RAN_Conn_Prim { - /* SCCP tell us that connection was released */ - MSC_CONN_PRIM_DISC_IND, - /* we tell SCCP to release connection */ - MSC_CONN_PRIM_DISC_REQ, - /* Connection confirmed indication */ - MSC_CONN_PRIM_CONF_IND +type union RAN_Conn_Prim { + MSC_CONN_PRIM_DISC_IND disc_ind, + MSC_CONN_PRIM_DISC_REQ disc_req, + MSC_CONN_PRIM_CONF_IND conf_ind +} + +template (present) RAN_Conn_Prim tr_MSC_CONN_PRIM_DISC_IND := { + disc_ind := ? +} +template (value) RAN_Conn_Prim ts_MSC_CONN_PRIM_DISC_IND := { + disc_ind := {} +} + +template (present) RAN_Conn_Prim tr_MSC_CONN_PRIM_DISC_REQ := { + disc_req := ? +} +template (value) RAN_Conn_Prim ts_MSC_CONN_PRIM_DISC_REQ := { + disc_req := {} +} + +template (present) RAN_Conn_Prim tr_MSC_CONN_PRIM_CONF_IND := { + conf_ind := ? +} +template (value) RAN_Conn_Prim ts_MSC_CONN_PRIM_CONF_IND := { + conf_ind := {} } type enumerated RAN_Transport { @@ -915,7 +945,7 @@ } /* Disconnect request client -> SCCP */ - [] CLIENT.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ) -> sender vc_conn { + [] CLIENT.receive(tr_MSC_CONN_PRIM_DISC_REQ) -> sender vc_conn { var integer conn_id := f_conn_id_by_comp(vc_conn); BSSAP.send(ts_BSSAP_DISC_req(conn_id, 0)); f_conn_table_del(conn_id); @@ -1022,7 +1052,7 @@ f_handle_userData_RANAP(vc_conn, rdisc_ind.userData); } /* notify client about termination */ - var RAN_Conn_Prim prim := MSC_CONN_PRIM_DISC_IND; + var RAN_Conn_Prim prim := valueof(ts_MSC_CONN_PRIM_DISC_IND); CLIENT.send(prim) to vc_conn; f_conn_table_del(rdisc_ind.connectionId); /* TOOD: return confirm to other side? */ @@ -1030,7 +1060,7 @@ /* SCCP -> Client: connection confirm for outbound connection */ [] RANAP.receive(RANAP_N_CONNECT_cfm:?) -> value rconn_cfm { vc_conn := f_comp_by_conn_id(rconn_cfm.connectionId); - var RAN_Conn_Prim prim := MSC_CONN_PRIM_CONF_IND; + var RAN_Conn_Prim prim := valueof(ts_MSC_CONN_PRIM_CONF_IND); CLIENT.send(prim) to vc_conn; /* handle user payload */ if (ispresent(rconn_cfm.userData)) { @@ -1050,7 +1080,7 @@ } /* Disconnect request client -> SCCP */ - [] CLIENT.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ) -> sender vc_conn { + [] CLIENT.receive(tr_MSC_CONN_PRIM_DISC_REQ) -> sender vc_conn { var integer conn_id := f_conn_id_by_comp(vc_conn); RANAP.send(ts_RANAP_DISC_req(conn_id, 0)); f_conn_table_del(conn_id); @@ -1565,7 +1595,7 @@ [] BSSAP.receive(tr_RANAP_IuReleaseCommand(?)) { BSSAP.send(ts_RANAP_IuReleaseComplete); alt { - [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND) { + [] BSSAP.receive(tr_MSC_CONN_PRIM_DISC_IND) { setverdict(pass); } [] BSSAP.receive { diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index e436117..b7d1b94 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -307,8 +307,8 @@ BSSAP.send(ts_BSSAP_Conn_Req(g_pars.sccp_addr_peer, g_pars.sccp_addr_own, valueof(ts_BSSMAP_ComplL3(g_pars.cell_id, l3_enc)))); alt { - [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND) {} - [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND) { + [] BSSAP.receive(tr_MSC_CONN_PRIM_CONF_IND) {} + [] BSSAP.receive(tr_MSC_CONN_PRIM_DISC_IND) { setverdict(fail, "DISC.ind from SCCP"); mtc.stop; } @@ -356,8 +356,8 @@ ranap := valueof(ts_RANAP_initialUE_CS(lai, sai, l3_enc, sigc_id, grnc_id)); BSSAP.send(ts_RANAP_Conn_Req(g_pars.sccp_addr_peer, g_pars.sccp_addr_own, ranap)); alt { - [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND) {} - [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND) { + [] BSSAP.receive(tr_MSC_CONN_PRIM_CONF_IND) {} + [] BSSAP.receive(tr_MSC_CONN_PRIM_DISC_IND) { setverdict(fail, "DISC.ind from SCCP"); mtc.stop; } @@ -1445,7 +1445,7 @@ [] MNCC.receive(tr_MNCC_REL_ind(cpars.mncc_callref)); [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_CC_DISC(cpars.transaction_id))); [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_CC_RELEASE(cpars.transaction_id))); - [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND); + [] BSSAP.receive(tr_MSC_CONN_PRIM_DISC_IND); [] BSSAP.receive(tr_BSSMAP_ClearCommand); [] BSSAP.receive(tr_BSSMAP_ClearCommandCSFB); [] BSSAP.receive(tr_RANAP_IuReleaseCommand(?)); @@ -1917,14 +1917,14 @@ [g_pars.ran_is_geran] BSSAP.receive(t_clear) { log("f_call_hangup 5: rx BSSAP Clear Command"); BSSAP.send(ts_BSSMAP_ClearComplete); - BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND); + BSSAP.receive(tr_MSC_CONN_PRIM_DISC_IND); log("f_call_hangup 6: rx SCCP DISC"); setverdict(pass); } [not g_pars.ran_is_geran] BSSAP.receive(tr_RANAP_IuReleaseCommand(?)) { log("f_call_hangup 5.iu: rx Iu Release Command"); BSSAP.send(ts_RANAP_IuReleaseComplete); - BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND); + BSSAP.receive(tr_MSC_CONN_PRIM_DISC_IND); log("f_call_hangup 6.iu: rx SCCP DISC"); setverdict(pass); } @@ -2036,7 +2036,7 @@ [] BSSAP.receive(tr_BSSMAP_ClearCommand) { BSSAP.send(ts_BSSMAP_ClearComplete); alt { - [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND) { + [] BSSAP.receive(tr_MSC_CONN_PRIM_DISC_IND) { setverdict(pass); } [] BSSAP.receive { diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 283ced6..b4b3614 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -819,7 +819,7 @@ /* Expect the channel cleared upon T(iar) triggered: */ T_wait_iar.start; alt { - [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND) { + [] BSSAP.receive(tr_MSC_CONN_PRIM_DISC_IND) { T_wait_iar.stop setverdict(pass); } @@ -951,7 +951,7 @@ mtc.stop; repeat; } - [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND) {} + [] BSSAP.receive(tr_MSC_CONN_PRIM_DISC_IND) {} } setverdict(pass); } @@ -1043,7 +1043,7 @@ f_sleep(1.0); /* send clear request in the middle of the LU */ - BSSAP.send(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_REQ); + BSSAP.send(ts_MSC_CONN_PRIM_DISC_REQ); setverdict(pass); f_sleep(1.0); } @@ -1512,10 +1512,10 @@ timer T := 5.0; T.start; alt { - [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND) {} + [] BSSAP.receive(tr_MSC_CONN_PRIM_DISC_IND) {} /* Expect LU REJECT with Cause == Illegal MS */ [] BSSAP.receive(tr_PDU_DTAP_MT(?)) { repeat; } - [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND) { repeat; } + [] BSSAP.receive(tr_MSC_CONN_PRIM_CONF_IND) { repeat; } [] as_clear_cmd_compl_disc(); [] T.timeout { setverdict(fail, "Timeout waiting for ClearCommand or SCCP Release"); @@ -1551,9 +1551,9 @@ T.start; alt { /* Immediate disconnect */ - [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND) {} + [] BSSAP.receive(tr_MSC_CONN_PRIM_DISC_IND) {} [] BSSAP.receive(tr_PDU_DTAP_MT(?)) { repeat; } - [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND) { repeat; } + [] BSSAP.receive(tr_MSC_CONN_PRIM_CONF_IND) { repeat; } [] as_clear_cmd_compl_disc(); [] T.timeout { setverdict(fail, "Timeout waiting for ClearCommand or SCCP Release"); @@ -6843,7 +6843,7 @@ [] BSSAP.receive(tr_BSSMAP_ClearCommand) { BSSAP.send(ts_BSSMAP_ClearComplete); } - [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND); + [] BSSAP.receive(tr_MSC_CONN_PRIM_DISC_IND); } f_sleep(1.0); diff --git a/msc/MSC_Tests_Iu.ttcn b/msc/MSC_Tests_Iu.ttcn index 361dd83..229ebb6 100644 --- a/msc/MSC_Tests_Iu.ttcn +++ b/msc/MSC_Tests_Iu.ttcn @@ -141,7 +141,7 @@ mtc.stop; repeat; } - [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND) {} + [] BSSAP.receive(tr_MSC_CONN_PRIM_DISC_IND) {} } setverdict(pass); } diff --git a/sgsn/BSSGP_ConnHdlr.ttcn b/sgsn/BSSGP_ConnHdlr.ttcn index 78a81bc..2a434aa 100644 --- a/sgsn/BSSGP_ConnHdlr.ttcn +++ b/sgsn/BSSGP_ConnHdlr.ttcn @@ -215,8 +215,8 @@ ranap := valueof(ts_RANAP_initialUE_PS(lai, rac, sai, l3_enc, sigc_id, grnc_id)); BSSAP.send(ts_RANAP_Conn_Req(g_pars.sccp_addr_peer, g_pars.sccp_addr_local, ranap)); alt { - [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_CONF_IND) {} - [] BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND) { + [] BSSAP.receive(tr_MSC_CONN_PRIM_CONF_IND) {} + [] BSSAP.receive(tr_MSC_CONN_PRIM_DISC_IND) { setverdict(fail, "DISC.ind from SCCP"); mtc.stop; } diff --git a/sgsn/SGSN_Tests_Iu.ttcn b/sgsn/SGSN_Tests_Iu.ttcn index 7a7ee7c..400b717 100644 --- a/sgsn/SGSN_Tests_Iu.ttcn +++ b/sgsn/SGSN_Tests_Iu.ttcn @@ -393,7 +393,7 @@ apars.ggsn_tei_c, GTP_CAUSE_REQUEST_ACCEPTED)); - BSSAP.receive(RAN_Conn_Prim:MSC_CONN_PRIM_DISC_IND); + BSSAP.receive(tr_MSC_CONN_PRIM_DISC_IND); g_pars.rnc_send_initial_ue := true; BSSAP.receive(tr_RANAP_Paging(ps_domain, imsi_hex2oct(g_pars.imsi))); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38540?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: I17994795b51efc7e6700238ddcf45594af653e42 Gerrit-Change-Number: 38540 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XL] Change in docker-playground[master]: Remove ttcn3 testsuites ported to testenv, part 2
by osmith 25 Oct '24

25 Oct '24

Attention is currently required from: pespin. osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/docker-playground/+/38537?usp=email ) Change subject: Remove ttcn3 testsuites ported to testenv, part 2 ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: added ttcn3-pcap-client back, as the centos7 version is still using docker-playground -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/38537?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I61fd5523dbd5664763b006d5ba9a368cd9caf9b9 Gerrit-Change-Number: 38537 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 25 Oct 2024 12:09:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

2026

2025

2024

2023

2022

gerrit-log