fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39849?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: s1gw: derive altsteps from f_ConnHdlr_rx_s1ap_from_{enb,mme}() ...................................................................... s1gw: derive altsteps from f_ConnHdlr_rx_s1ap_from_{enb,mme}() Change-Id: I8637a8abed0f0152abf2dce63ac28aa90f85bdc7 Related: SYS#7288 --- M s1gw/S1GW_ConnHdlr.ttcn 1 file changed, 22 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index 3414315..d0dbc06 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -137,6 +137,12 @@ S1AP_CONN.send(pdu); } +altstep as_ConnHdlr_s1ap_from_enb(out S1AP_PDU pdu, + template (present) S1AP_PDU tr_pdu := ?) +runs on ConnHdlr { + [] S1AP_CONN.receive(tr_pdu) -> value pdu; +} + function f_ConnHdlr_rx_s1ap_from_enb(out S1AP_PDU pdu, template (present) S1AP_PDU tr_pdu := ?, float Tval := 3.0) @@ -145,11 +151,11 @@ T.start; alt { - [] S1AP_CONN.receive(tr_pdu) -> value pdu { + [] as_ConnHdlr_s1ap_from_enb(pdu, tr_pdu) { setverdict(pass); T.stop; } - [] S1AP_CONN.receive(S1AP_PDU:?) -> value pdu { + [] as_ConnHdlr_s1ap_from_enb(pdu) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Rx unexpected S1AP PDU from eNB: ", pdu)); } @@ -160,22 +166,29 @@ } } +altstep as_ConnHdlr_s1ap_from_mme(out S1AP_PDU pdu, + template (present) S1AP_PDU tr_pdu := ?) +runs on ConnHdlr { + var S1AP_RecvFrom recv; + + [] S1AP_ENB.receive(t_S1AP_RecvFrom(tr_pdu)) -> value recv { + pdu := recv.msg; + } +} + function f_ConnHdlr_rx_s1ap_from_mme(out S1AP_PDU pdu, template (present) S1AP_PDU tr_pdu := ?, float Tval := 3.0) runs on ConnHdlr { - var S1AP_RecvFrom recv; timer T := Tval; T.start; alt { - [] S1AP_ENB.receive(t_S1AP_RecvFrom(tr_pdu)) -> value recv { - pdu := recv.msg; + [] as_ConnHdlr_s1ap_from_mme(pdu, tr_pdu) { setverdict(pass); T.stop; } - [] S1AP_ENB.receive(t_S1AP_RecvFrom(?)) -> value recv { - pdu := recv.msg; + [] as_ConnHdlr_s1ap_from_mme(pdu) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Rx unexpected S1AP PDU from MME: ", pdu)); } @@ -204,7 +217,7 @@ T.start(Tval); alt { [] S1AP_CONN.receive(S1APSRV_Event:S1APSRV_EVENT_CONN_UP) { repeat; } - [] S1AP_CONN.receive(tr_S1AP_SetupReq) { + [] as_ConnHdlr_s1ap_from_enb(pdu, tr_S1AP_SetupReq) { var template (value) PLMNidentity plmn_id := '00f110'O; var template (value) MME_Group_ID mme_group_id := '0011'O; var template (value) MME_Code mme_code := '55'O; @@ -217,7 +230,7 @@ f_ConnHdlr_rx_s1ap_from_mme(pdu, tr_S1AP_SetupResp({ gummei }, 1)); T.stop; } - [] S1AP_CONN.receive(S1AP_PDU:?) -> value pdu { + [] as_ConnHdlr_s1ap_from_enb(pdu) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Rx unexpected S1AP PDU: ", pdu)); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39849?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: I8637a8abed0f0152abf2dce63ac28aa90f85bdc7 Gerrit-Change-Number: 39849 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>