<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/15262">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_pdp46_act_deact_apn4<br><br>Related osmo-ggsn.git libgtp fix: I6c6215a4ce478afabc78ffaf5ffb0cf829e41226<br><br>Related: OS#4154<br>Change-Id: Ia1893e0c181307ac1ceb07ee5f496507f7a603c8<br>---<br>M ggsn_tests/GGSN_Tests.ttcn<br>M ggsn_tests/expected-results.xml<br>2 files changed, 26 insertions(+), 2 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 31c1056..ae92626 100644</span><br><span>--- a/ggsn_tests/GGSN_Tests.ttcn</span><br><span>+++ b/ggsn_tests/GGSN_Tests.ttcn</span><br><span>@@ -247,7 +247,7 @@</span><br><span> }</span><br><span> </span><br><span> /* send a PDP context activation */</span><br><span style="color: hsl(0, 100%, 40%);">- function f_pdp_ctx_act(inout PdpContext ctx) runs on GT_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ 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> var default d;</span><br><span> </span><br><span>@@ -260,7 +260,7 @@</span><br><span> alt {</span><br><span> [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, createPDPContextResponse, ctx.teic)) -> value ud {</span><br><span> var CreatePDPContextResponse cpr := ud.gtpc.gtpc_pdu.createPDPContextResponse;</span><br><span style="color: hsl(0, 100%, 40%);">- if (cpr.cause.causevalue == '80'O) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (exp_cause == '80'O and exp_cause == cpr.cause.causevalue) {</span><br><span> /* Check if EUA type corresponds to requested type */</span><br><span> if (match(ctx.eua, t_EuaIPv4(?)) and</span><br><span> not match(cpr.endUserAddress, tr_EuaIPv4(?))){</span><br><span>@@ -292,6 +292,12 @@</span><br><span> ctx.eua := cpr.endUserAddress;</span><br><span> ctx.pco_neg := cpr.protConfigOptions;</span><br><span> 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> } else {</span><br><span> setverdict(fail);</span><br><span> }</span><br><span>@@ -1287,6 +1293,22 @@</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%);">+ /* Test IPv4v6 context activation for dynamic IPv4v6 EUA on a v4-only APN */</span><br><span style="color: hsl(120, 100%, 40%);">+ testcase TC_pdp46_act_deact_apn4() runs on GT_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ /* A typical MS first attempts v4v6, and if rejected, then tries v4 and v6 separetly */</span><br><span style="color: hsl(120, 100%, 40%);">+ var PdpContext ctx46 := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dynv6Dyn)));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_pdp_ctx_act(ctx46, 'DC'O); /* Cause: Unknown PDP address or PDP type */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ var PdpContext ctx4 := 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(ctx4, '80'O); /* Normal accept cause */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ var PdpContext ctx6 := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv6Dyn)));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_pdp_ctx_act(ctx6, 'DC'O); /* Cause: Unknown PDP address or PDP type */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_pdp_ctx_del(ctx4, '1'B);</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>@@ -1332,6 +1354,7 @@</span><br><span> execute(TC_pdp46_act_deact_pcodns6());</span><br><span> execute(TC_pdp46_act_deact_gtpu_access());</span><br><span> execute(TC_pdp46_clients_interact());</span><br><span style="color: hsl(120, 100%, 40%);">+ execute(TC_pdp46_act_deact_apn4());</span><br><span> </span><br><span> execute(TC_echo_req_resp());</span><br><span> execute(TC_act_deact_retrans_duplicate());</span><br><span>diff --git a/ggsn_tests/expected-results.xml b/ggsn_tests/expected-results.xml</span><br><span>index e57a7df..374cde0 100644</span><br><span>--- a/ggsn_tests/expected-results.xml</span><br><span>+++ b/ggsn_tests/expected-results.xml</span><br><span>@@ -21,6 +21,7 @@</span><br><span> <testcase classname='GGSN_Tests' name='TC_pdp46_act_deact_pcodns6' time='MASKED'/></span><br><span> <testcase classname='GGSN_Tests' name='TC_pdp46_act_deact_gtpu_access' time='MASKED'/></span><br><span> <testcase classname='GGSN_Tests' name='TC_pdp46_clients_interact' time='MASKED'/></span><br><span style="color: hsl(120, 100%, 40%);">+ <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> <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/c/osmo-ttcn3-hacks/+/15262">change 15262</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/+/15262"/><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: Ia1893e0c181307ac1ceb07ee5f496507f7a603c8 </div>
<div style="display:none"> Gerrit-Change-Number: 15262 </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-MessageType: merged </div>