<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14240">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ggsn: Add test to verify retransmit queue_resp<br><br>Related: OS#3997<br>Change-Id: I8d937d0af9af8462418b174a54022655f9d77a5f<br>---<br>M ggsn_tests/GGSN_Tests.ttcn<br>M ggsn_tests/expected-results.xml<br>2 files changed, 35 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn</span><br><span>index 9577a60..dc9d07c 100644</span><br><span>--- a/ggsn_tests/GGSN_Tests.ttcn</span><br><span>+++ b/ggsn_tests/GGSN_Tests.ttcn</span><br><span>@@ -300,16 +300,25 @@</span><br><span> T_default.stop;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- function f_pdp_ctx_del(PdpContext ctx, template BIT1 teardown_ind) runs on GT_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ function f_pdp_ctx_del(PdpContext ctx, template BIT1 teardown_ind, OCT1 expect_causevalue := '80'O) runs on GT_CT {</span><br><span> var Gtp1cUnitdata ud;</span><br><span> var default d;</span><br><span style="color: hsl(120, 100%, 40%);">+ var OCT4 expect_teid;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 3GPP TS 29.060 sec 7.3.6 specifies TEID used in response</span><br><span style="color: hsl(120, 100%, 40%);">+ message with cause value "Non existent" shall be zero. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (expect_causevalue == 'C0'O) {</span><br><span style="color: hsl(120, 100%, 40%);">+ expect_teid := '00000000'O;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ expect_teid := ctx.teic;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> f_send_gtpc(ts_GTPC_DeletePDP(g_peer_c, g_c_seq_nr, ctx.teic_remote, ctx.nsapi, teardown_ind));</span><br><span> T_default.start;</span><br><span> d := activate(pingpong());</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, deletePDPContextResponse, ctx.teic)) -> value ud {</span><br><span style="color: hsl(0, 100%, 40%);">- if (ud.gtpc.gtpc_pdu.deletePDPContextResponse.cause.causevalue == '80'O) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, deletePDPContextResponse, expect_teid)) -> value ud {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ud.gtpc.gtpc_pdu.deletePDPContextResponse.cause.causevalue == expect_causevalue) {</span><br><span> setverdict(pass);</span><br><span> } else {</span><br><span> setverdict(fail);</span><br><span>@@ -1244,6 +1253,27 @@</span><br><span> f_pdp_ctx_del(ctxA, '1'B);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Send a duplicate echo req. osmo-ggsn maintains a queue for sent</span><br><span style="color: hsl(120, 100%, 40%);">+ responses (60 seconds): If same delete req is sent and duplicate is</span><br><span style="color: hsl(120, 100%, 40%);">+ detected, saved duplicate response should be sent back. */</span><br><span style="color: hsl(120, 100%, 40%);">+ testcase TC_act_deact_retrans_duplicate() runs on GT_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn)));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_pdp_ctx_act(ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_pdp_ctx_del(ctx, '1'B);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* leave some time in between to make sure retransmit response queue keeps packets for a while */</span><br><span style="color: hsl(120, 100%, 40%);">+ f_sleep(1.0);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* g_c_seq_nr was increased during f_pdp_ctx_del(), we want a</span><br><span style="color: hsl(120, 100%, 40%);">+ duplicate. If it was not a duplicate, osmo-ggsn would answer</span><br><span style="color: hsl(120, 100%, 40%);">+ with a failure since that PDP ctx was already deleted. */</span><br><span style="color: hsl(120, 100%, 40%);">+ g_c_seq_nr := g_c_seq_nr - 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_pdp_ctx_del(ctx, '1'B);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Now send a new pdp ctx del (increased seqnum). It should fail with cause "non-existent": */</span><br><span style="color: hsl(120, 100%, 40%);">+ var OCT1 cause_nonexistent := 'C0'O;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_pdp_ctx_del(ctx, '1'B, cause_nonexistent);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> control {</span><br><span> execute(TC_pdp4_act_deact());</span><br><span> execute(TC_pdp4_act_deact_ipcp());</span><br><span>@@ -1269,5 +1299,6 @@</span><br><span> execute(TC_pdp46_clients_interact());</span><br><span> </span><br><span> execute(TC_echo_req_resp());</span><br><span style="color: hsl(120, 100%, 40%);">+ execute(TC_act_deact_retrans_duplicate());</span><br><span> }</span><br><span> }</span><br><span>diff --git a/ggsn_tests/expected-results.xml b/ggsn_tests/expected-results.xml</span><br><span>index 081325e..c2defea 100644</span><br><span>--- a/ggsn_tests/expected-results.xml</span><br><span>+++ b/ggsn_tests/expected-results.xml</span><br><span>@@ -19,4 +19,5 @@</span><br><span> <testcase classname='GGSN_Tests' name='TC_pdp6_act_deact_gtpu_access' time='MASKED'/></span><br><span> <testcase classname='GGSN_Tests' name='TC_pdp6_clients_interact' time='MASKED'/></span><br><span> <testcase classname='GGSN_Tests' name='TC_echo_req_resp' time='MASKED'/></span><br><span style="color: hsl(120, 100%, 40%);">+ <testcase classname='GGSN_Tests' name='TC_act_deact_retrans_duplicate' time='MASKED'/></span><br><span> </testsuite></span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14240">change 14240</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/14240"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I8d937d0af9af8462418b174a54022655f9d77a5f </div>
<div style="display:none"> Gerrit-Change-Number: 14240 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>