Harald Welte has submitted this change and it was merged.

Change subject: L1CTL: Have proper timeout during reset
......................................................................


L1CTL: Have proper timeout during reset

Change-Id: Ib6b33f522eddb1377e9857cc5d88363852732b46
---
M library/L1CTL_PortType.ttcn
1 file changed, 16 insertions(+), 3 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/library/L1CTL_PortType.ttcn b/library/L1CTL_PortType.ttcn
index 6c4fe70..ba47414 100644
--- a/library/L1CTL_PortType.ttcn
+++ b/library/L1CTL_PortType.ttcn
@@ -161,15 +161,28 @@
                pt.send(ts_L1CTL_DM_EST_REQ({ false, imm_ass.chan_desc.arfcn }, 
imm_ass.chan_desc.chan_nr, imm_ass.chan_desc.tsc));
        }
 
+       function f_L1CTL_RESET(L1CTL_PT pt, L1ctlResetType res_type := 
L1CTL_RES_T_FULL) {
+               timer T := 2.0;
+               pt.send(t_L1ctlResetReq(res_type));
+               T.start;
+               alt {
+                       [] pt.receive(tr_L1CTL_MsgType(L1CTL_RESET_CONF)) { }
+                       [] pt.receive { repeat; }
+                       [] T.timeout {
+                               setverdict(fail, "Timeout waiting for 
RESET.conf");
+                               self.stop;
+                               }
+               }
+
+       }
+
        function f_connect_reset(L1CTL_PT pt, charstring l1ctl_sock_path := 
m_l1ctl_sock_path) {
                var f_UD_getMsgLen vl_f := refers(f_L1CTL_getMsgLen);
                f_L1CTL_setGetMsgLen(pt, -1, vl_f, {});
                pt.send(L1CTL_connect:{path:=l1ctl_sock_path});
                pt.receive(L1CTL_connect_result:{result_code := SUCCESS, 
err:=omit});
                f_L1CTL_setGetMsgLen(pt, 0, vl_f, {});
-
-               pt.send(t_L1ctlResetReq(L1CTL_RES_T_FULL));
-               pt.receive;
+               f_L1CTL_RESET(pt);
        }
 
        private function L1CTL_to_UD_connect(in L1CTL_connect pin, out 
UD_connect pout) {

-- 
To view, visit https://gerrit.osmocom.org/7239
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6b33f522eddb1377e9857cc5d88363852732b46
Gerrit-PatchSet: 3
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Jenkins Builder

Reply via email to