<p>pespin <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15283">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ggsn: Introduce test TC_pdp_act2_recovery<br><br>Some code is moved out of f_pdp_ctx_act() into f_handle_create_req() in<br>order to re-use it in the test.<br><br>Related: OS#4165<br>Change-Id: I48c1bc9287ce8b820e5ea672dffbc5a8503f16d7<br>---<br>M ggsn_tests/GGSN_Tests.ttcn<br>M ggsn_tests/expected-results.xml<br>2 files changed, 111 insertions(+), 42 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 e294fb7..4a53fa1 100644</span><br><span>--- a/ggsn_tests/GGSN_Tests.ttcn</span><br><span>+++ b/ggsn_tests/GGSN_Tests.ttcn</span><br><span>@@ -267,6 +267,51 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ function f_handle_create_req(inout PdpContext ctx, in Gtp1cUnitdata ud, in OCT1 exp_cause := '80'O) runs on GT_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var CreatePDPContextResponse cpr := ud.gtpc.gtpc_pdu.createPDPContextResponse;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (exp_cause == '80'O and exp_cause == cpr.cause.causevalue) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Check if EUA type corresponds to requested type */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (match(ctx.eua, t_EuaIPv4(?)) and</span><br><span style="color: hsl(120, 100%, 40%);">+ not match(cpr.endUserAddress, tr_EuaIPv4(?))){</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (match(ctx.eua, t_EuaIPv6(?)) and</span><br><span style="color: hsl(120, 100%, 40%);">+ not match(cpr.endUserAddress, tr_EuaIPv6(?))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (match(ctx.eua, t_EuaIPv4v6(?, ?)) and</span><br><span style="color: hsl(120, 100%, 40%);">+ not match(cpr.endUserAddress, tr_EuaIPv4v6(?, ?))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Check if PCO response corresponds to request */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ispresent(ctx.pco_req)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (match(ctx.pco_req, ts_PCO_IPv4_DNS_CONT) and</span><br><span style="color: hsl(120, 100%, 40%);">+ not match(cpr.protConfigOptions, tr_PCO_IPv4_DNS_CONT_resp(?))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ log("IPv4 DNS Container requested, but missing");</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (match(ctx.pco_req, ts_PCO_IPv6_DNS) and</span><br><span style="color: hsl(120, 100%, 40%);">+ not match(cpr.protConfigOptions, tr_PCO_IPv6_DNS_resp(?))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ log("IPv6 DNS Container requested, but missing");</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ ctx.teid_remote := cpr.teidDataI.teidDataI;</span><br><span style="color: hsl(120, 100%, 40%);">+ ctx.teic_remote := cpr.teidControlPlane.teidControlPlane;</span><br><span style="color: hsl(120, 100%, 40%);">+ ctx.eua := cpr.endUserAddress;</span><br><span style="color: hsl(120, 100%, 40%);">+ ctx.pco_neg := cpr.protConfigOptions;</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (exp_cause != '80'O and exp_cause == cpr.cause.causevalue) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ispresent(cpr.endUserAddress)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ log("EUA received on createPDPContextResponse cause=" & oct2str(cpr.cause.causevalue));</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* send a PDP context activation */</span><br><span> function f_pdp_ctx_act(inout PdpContext ctx, OCT1 exp_cause := '80'O) runs on GT_CT {</span><br><span> var Gtp1cUnitdata ud;</span><br><span>@@ -280,48 +325,7 @@</span><br><span> d := activate(pingpong());</span><br><span> alt {</span><br><span> [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, createPDPContextResponse, ctx.teic)) -> value ud {</span><br><span style="color: hsl(0, 100%, 40%);">- var CreatePDPContextResponse cpr := ud.gtpc.gtpc_pdu.createPDPContextResponse;</span><br><span style="color: hsl(0, 100%, 40%);">- if (exp_cause == '80'O and exp_cause == cpr.cause.causevalue) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Check if EUA type corresponds to requested type */</span><br><span style="color: hsl(0, 100%, 40%);">- if (match(ctx.eua, t_EuaIPv4(?)) and</span><br><span style="color: hsl(0, 100%, 40%);">- not match(cpr.endUserAddress, tr_EuaIPv4(?))){</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (match(ctx.eua, t_EuaIPv6(?)) and</span><br><span style="color: hsl(0, 100%, 40%);">- not match(cpr.endUserAddress, tr_EuaIPv6(?))) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (match(ctx.eua, t_EuaIPv4v6(?, ?)) and</span><br><span style="color: hsl(0, 100%, 40%);">- not match(cpr.endUserAddress, tr_EuaIPv4v6(?, ?))) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- /* Check if PCO response corresponds to request */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ispresent(ctx.pco_req)) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (match(ctx.pco_req, ts_PCO_IPv4_DNS_CONT) and</span><br><span style="color: hsl(0, 100%, 40%);">- not match(cpr.protConfigOptions, tr_PCO_IPv4_DNS_CONT_resp(?))) {</span><br><span style="color: hsl(0, 100%, 40%);">- log("IPv4 DNS Container requested, but missing");</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (match(ctx.pco_req, ts_PCO_IPv6_DNS) and</span><br><span style="color: hsl(0, 100%, 40%);">- not match(cpr.protConfigOptions, tr_PCO_IPv6_DNS_resp(?))) {</span><br><span style="color: hsl(0, 100%, 40%);">- log("IPv6 DNS Container requested, but missing");</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- ctx.teid_remote := cpr.teidDataI.teidDataI;</span><br><span style="color: hsl(0, 100%, 40%);">- ctx.teic_remote := cpr.teidControlPlane.teidControlPlane;</span><br><span style="color: hsl(0, 100%, 40%);">- ctx.eua := cpr.endUserAddress;</span><br><span style="color: hsl(0, 100%, 40%);">- ctx.pco_neg := cpr.protConfigOptions;</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(pass);</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (exp_cause != '80'O and exp_cause == cpr.cause.causevalue) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (ispresent(cpr.endUserAddress)) {</span><br><span style="color: hsl(0, 100%, 40%);">- log("EUA received on createPDPContextResponse cause=" & oct2str(cpr.cause.causevalue));</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(pass);</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ f_handle_create_req(ctx, ud, exp_cause);</span><br><span> }</span><br><span> }</span><br><span> deactivate(d);</span><br><span>@@ -1359,6 +1363,69 @@</span><br><span> f_pdp_ctx_del(ctx4, '1'B);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Validate if 2nd CtxCreateReq with increased Recovery IE causes ggsn to drop 1st one (while keeping 2nd one). */</span><br><span style="color: hsl(120, 100%, 40%);">+ testcase TC_pdp_act2_recovery() runs on GT_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var Gtp1cUnitdata ud;</span><br><span style="color: hsl(120, 100%, 40%);">+ var default d;</span><br><span style="color: hsl(120, 100%, 40%);">+ var boolean ctxA_deleted := false;</span><br><span style="color: hsl(120, 100%, 40%);">+ var boolean ctxB_created := false;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ var PdpContext ctxA := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn)));</span><br><span style="color: hsl(120, 100%, 40%);">+ var PdpContext ctxB := 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(ctxA);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ g_restart_ctr := int2oct(oct2int(g_restart_ctr) + 1, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ log("sending 2nd CreatePDP (recovery increased)");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_gtpc(ts_GTPC_CreatePDP(g_peer_c, g_c_seq_nr, ctxB.imsi, g_restart_ctr,</span><br><span style="color: hsl(120, 100%, 40%);">+ ctxB.teid, ctxB.teic, ctxB.nsapi, ctxB.eua, ctxB.apn,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_sgsn_ip_c, g_sgsn_ip_u, ctxB.msisdn, ctxB.pco_req));</span><br><span style="color: hsl(120, 100%, 40%);">+ T_default.start;</span><br><span style="color: hsl(120, 100%, 40%);">+ d := activate(pingpong());</span><br><span style="color: hsl(120, 100%, 40%);">+ alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, createPDPContextResponse, ctxB.teic)) -> value ud {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_handle_create_req(ctxB, ud);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not ctxB_created) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ctxB_created := true;</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Repeated createPDPContextResponse(ctxB)");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not ctxA_deleted) {</span><br><span style="color: hsl(120, 100%, 40%);">+ repeat;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, deletePDPContextRequest, ctxA.teic)) -> value ud {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ispresent(ud.gtpc.gtpc_pdu.deletePDPContextRequest.tearDownIndicator)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not ctxA_deleted) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ctxA_deleted := true;</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Repeated deletePDPContextRequest(ctxA)");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not ctxB_created) {</span><br><span style="color: hsl(120, 100%, 40%);">+ repeat;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, deletePDPContextRequest, ctxB.teic)) -> value ud {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "GGSN dropping still valid pdp ctx");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ deactivate(d);</span><br><span style="color: hsl(120, 100%, 40%);">+ T_default.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_pdp_ctx_del(ctxB, '1'B);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Send a duplicate echo req. osmo-ggsn maintains a queue for sent</span><br><span> responses (60 seconds): If same delete req is sent and duplicate is</span><br><span> detected, saved duplicate response should be sent back. */</span><br><span>@@ -1433,6 +1500,7 @@</span><br><span> execute(TC_pdp46_act_deact_apn4());</span><br><span> </span><br><span> execute(TC_echo_req_resp());</span><br><span style="color: hsl(120, 100%, 40%);">+ execute(TC_pdp_act2_recovery());</span><br><span> execute(TC_act_deact_retrans_duplicate());</span><br><span> </span><br><span> if (m_ggsn_supports_echo_interval) {</span><br><span>diff --git a/ggsn_tests/expected-results.xml b/ggsn_tests/expected-results.xml</span><br><span>index c31c14a..baa5b1f 100644</span><br><span>--- a/ggsn_tests/expected-results.xml</span><br><span>+++ b/ggsn_tests/expected-results.xml</span><br><span>@@ -23,6 +23,7 @@</span><br><span> <testcase classname='GGSN_Tests' name='TC_pdp46_clients_interact' time='MASKED'/></span><br><span> <testcase classname='GGSN_Tests' name='TC_pdp46_act_deact_apn4' 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_pdp_act2_recovery' time='MASKED'/></span><br><span> <testcase classname='GGSN_Tests' name='TC_act_deact_retrans_duplicate' time='MASKED'/></span><br><span> <testcase classname='GGSN_Tests' name='TC_pdp_act_restart_ctr_echo' time='MASKED'/></span><br><span> </testsuite></span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15283">change 15283</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/c/osmo-ttcn3-hacks/+/15283"/><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-Change-Id: I48c1bc9287ce8b820e5ea672dffbc5a8503f16d7 </div>
<div style="display:none"> Gerrit-Change-Number: 15283 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>