gbproxy: Introduce global guard timer in test_CT
We did have a guard time in each ConnHdlr, but not in the MTC (test_CT). However, we do have tests that don't use any ConnHdlr, and those were so far ran without a guard timeout. Fix that. Change-Id: Iee90fc26a151c692d3c6f3eb6ad80f528f8d939f
This commit is contained in:
parent
158becf9cb
commit
425d376387
|
@ -279,6 +279,7 @@ type component test_CT {
|
||||||
var boolean g_use_echo := false;
|
var boolean g_use_echo := false;
|
||||||
|
|
||||||
var ro_integer g_roi := {};
|
var ro_integer g_roi := {};
|
||||||
|
timer g_Tguard;
|
||||||
};
|
};
|
||||||
|
|
||||||
type component BSSGP_ConnHdlr {
|
type component BSSGP_ConnHdlr {
|
||||||
|
@ -414,7 +415,7 @@ private function ro_integer_contains(ro_integer r, integer x) return boolean {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
function f_init() runs on test_CT {
|
function f_init(float t_guard := 30.0) runs on test_CT {
|
||||||
var ro_integer bvci_unblocked := {};
|
var ro_integer bvci_unblocked := {};
|
||||||
var BssgpStatusIndication bsi;
|
var BssgpStatusIndication bsi;
|
||||||
var integer i;
|
var integer i;
|
||||||
|
@ -424,6 +425,9 @@ function f_init() runs on test_CT {
|
||||||
}
|
}
|
||||||
g_initialized := true;
|
g_initialized := true;
|
||||||
|
|
||||||
|
g_Tguard.start(t_guard);
|
||||||
|
activate(as_gTguard(g_Tguard));
|
||||||
|
|
||||||
g_sgsn[0].cfg := {
|
g_sgsn[0].cfg := {
|
||||||
nsei := mp_nsconfig_sgsn[0].nsei,
|
nsei := mp_nsconfig_sgsn[0].nsei,
|
||||||
sgsn_role := true,
|
sgsn_role := true,
|
||||||
|
@ -503,6 +507,9 @@ function f_init() runs on test_CT {
|
||||||
mtc.stop;
|
mtc.stop;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* re-start guard timer after all BVCs are up, so it only counts the actual test case */
|
||||||
|
g_Tguard.start(t_guard);
|
||||||
}
|
}
|
||||||
|
|
||||||
function f_cleanup() runs on test_CT {
|
function f_cleanup() runs on test_CT {
|
||||||
|
@ -574,8 +581,8 @@ private function f_connect_to_sgsn_bvc(integer port_idx, BSSGP_BVC_CT bvc_ct) ru
|
||||||
sgsn_ct[port_idx] := bvc_ct;
|
sgsn_ct[port_idx] := bvc_ct;
|
||||||
}
|
}
|
||||||
|
|
||||||
private altstep as_Tguard() runs on BSSGP_ConnHdlr {
|
private altstep as_gTguard(timer Tguard) {
|
||||||
[] g_Tguard.timeout {
|
[] Tguard.timeout {
|
||||||
setverdict(fail, "Tguard timeout");
|
setverdict(fail, "Tguard timeout");
|
||||||
mtc.stop;
|
mtc.stop;
|
||||||
}
|
}
|
||||||
|
@ -601,7 +608,7 @@ runs on BSSGP_ConnHdlr {
|
||||||
}
|
}
|
||||||
|
|
||||||
g_Tguard.start(pars.t_guard);
|
g_Tguard.start(pars.t_guard);
|
||||||
activate(as_Tguard());
|
activate(as_gTguard(g_Tguard));
|
||||||
|
|
||||||
/* call the user-supplied test case function */
|
/* call the user-supplied test case function */
|
||||||
fn.apply(id);
|
fn.apply(id);
|
||||||
|
|
Loading…
Reference in New Issue