fixeria has uploaded this change for review.

View Change

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(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/49/39849/1

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 change 39849. To unsubscribe, or for help writing mail filters, visit settings.