daniel has uploaded this change for review.
ggsn: Accept deletePDPContextRequest for dangling contexts from ggsn
This seems to happen if the previous tests (*_clients_interact) fail and
some PDP contexts from that test carry over to the next. Since the
restart counter indicates that the SGSN has restarted osmo-ggsn sends
the deletePDPContextRequest for the old PDP contexts and this blocks the
port in the altstep.
Change-Id: I1116c8e7a9640003458f837fe8f948cfe55fd6c9
---
M ggsn_tests/GGSN_Tests.ttcn
1 file changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/22/44022/1
diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn
index e5b0581..c8e94df 100644
--- a/ggsn_tests/GGSN_Tests.ttcn
+++ b/ggsn_tests/GGSN_Tests.ttcn
@@ -775,6 +775,9 @@
f_handle_create_req(ctx, ud, exp_cause);
cpr := ud.gtpc.gtpc_pdu.createPDPContextResponse;
}
+ [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, deletePDPContextRequest, ?)) {
+ repeat;
+ }
}
deactivate(d);
T_default.stop;
@@ -836,6 +839,9 @@
as_DIA_Gy_CCR(ctx, TERMINATION_REQUEST);
}
alt {
+ [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, deletePDPContextRequest, ?)) {
+ repeat;
+ }
[] GTPC.receive(tr_GTPC_MsgType(g_peer_c, deletePDPContextResponse, expect_teid)) -> value ud {
if (ud.gtpc.gtpc_pdu.deletePDPContextResponse.cause.causevalue == expect_causevalue) {
setverdict(pass);
@@ -2051,6 +2057,9 @@
/* Wait to receive echo request and send initial Restart counter */
T_echo.start(int2float(g_use_echo_intval) + 1.0);
alt {
+ [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, deletePDPContextRequest, ?)) {
+ repeat;
+ }
[] GTPC.receive(tr_GTPC_PING(?)) -> value ud {
var uint16_t seq := oct2int(ud.gtpc.opt_part.sequenceNumber);
GTPC.send(ts_GTPC_PONG(ud.peer, seq, g_restart_ctr));
@@ -2068,6 +2077,9 @@
g_restart_ctr := int2oct((oct2int(g_restart_ctr) + 1) mod 256, 1);
T_echo.start(int2float(g_use_echo_intval) + 1.0);
alt {
+ [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, deletePDPContextRequest, ?)) {
+ repeat;
+ }
[] GTPC.receive(tr_GTPC_PING(?)) -> value ud {
var uint16_t seq := oct2int(ud.gtpc.opt_part.sequenceNumber);
GTPC.send(ts_GTPC_PONG(ud.peer, seq, g_restart_ctr));
To view, visit change 44022. To unsubscribe, or for help writing mail filters, visit settings.