<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10008">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sgsn: Fix TC_attach_second_attempt<br><br>Use a different IMSI first time in order to get a AUTH Req and LU from<br>osmo-sgsn, like other tests do.<br>During second attach, don't expect to receie an AUTH + LU since<br>osmo-sgsn remembers us.<br><br>Change-Id: I0989bf8d258c5def3c7f325de2053f62288b9897<br>---<br>M sgsn/SGSN_Tests.ttcn<br>M sgsn/expected-results.xml<br>2 files changed, 12 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/08/10008/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn</span><br><span>index 214239e..c9e407f 100644</span><br><span>--- a/sgsn/SGSN_Tests.ttcn</span><br><span>+++ b/sgsn/SGSN_Tests.ttcn</span><br><span>@@ -456,7 +456,7 @@</span><br><span>  GSUP.send(ts_GSUP_UL_RES(g_pars.imsi));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private function f_gmm_attach(boolean umts_aka_challenge, boolean force_gsm_sres) runs on BSSGP_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_gmm_attach(boolean umts_aka_challenge, boolean force_gsm_sres, boolean already_attached := false) runs on BSSGP_ConnHdlr {</span><br><span>    var BssgpDecoded bd;</span><br><span>         var RoutingAreaIdentificationV old_ra := f_random_RAI();</span><br><span>     var template PDU_L3_MS_SGSN attach_req := ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit);</span><br><span>@@ -469,9 +469,11 @@</span><br><span>         attach_req.msgs.gprs_mm.attachRequest.msNetworkCapability.msNetworkCapabilityV.solSACapability := '0'B;</span><br><span> </span><br><span>  BSSGP.send(attach_req);</span><br><span style="color: hsl(0, 100%, 40%);">- f_gmm_auth(umts_aka_challenge, force_gsm_sres);</span><br><span style="color: hsl(0, 100%, 40%);">- /* Expect SGSN to perform LU with HLR */</span><br><span style="color: hsl(0, 100%, 40%);">-        f_gmm_gsup_lu_isd();</span><br><span style="color: hsl(120, 100%, 40%);">+  if (not already_attached) {</span><br><span style="color: hsl(120, 100%, 40%);">+           f_gmm_auth(umts_aka_challenge, force_gsm_sres);</span><br><span style="color: hsl(120, 100%, 40%);">+               /* Expect SGSN to perform LU with HLR */</span><br><span style="color: hsl(120, 100%, 40%);">+              f_gmm_gsup_lu_isd();</span><br><span style="color: hsl(120, 100%, 40%);">+  }</span><br><span> </span><br><span>        BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd {</span><br><span>              f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept);</span><br><span>@@ -481,7 +483,7 @@</span><br><span> }</span><br><span> </span><br><span> private function f_TC_attach(charstring id) runs on BSSGP_ConnHdlr {</span><br><span style="color: hsl(0, 100%, 40%);">-     f_gmm_attach(false, false);</span><br><span style="color: hsl(120, 100%, 40%);">+   f_gmm_attach(false, false, false);</span><br><span>   setverdict(pass);</span><br><span> }</span><br><span> </span><br><span>@@ -1251,15 +1253,15 @@</span><br><span>         /* first perform regular attach */</span><br><span>   f_TC_attach(id);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    /* second to perform regular attach */</span><br><span style="color: hsl(0, 100%, 40%);">-  f_TC_attach(id);</span><br><span style="color: hsl(120, 100%, 40%);">+      /* second to perform regular attach, don't expect AUTH or LU */</span><br><span style="color: hsl(120, 100%, 40%);">+   f_gmm_attach(false, false, true);</span><br><span> }</span><br><span> </span><br><span> </span><br><span> testcase TC_attach_second_attempt() runs on test_CT {</span><br><span>      var BSSGP_ConnHdlr vc_conn;</span><br><span>  f_init();</span><br><span style="color: hsl(0, 100%, 40%);">-       vc_conn := f_start_handler(refers(f_TC_attach_forget_tlli_attach), testcasename(), g_gb[0], 22);</span><br><span style="color: hsl(120, 100%, 40%);">+      vc_conn := f_start_handler(refers(f_TC_attach_forget_tlli_attach), testcasename(), g_gb[0], 24);</span><br><span>     vc_conn.done;</span><br><span> }</span><br><span> </span><br><span>diff --git a/sgsn/expected-results.xml b/sgsn/expected-results.xml</span><br><span>index 2d7063b..bc00aac 100644</span><br><span>--- a/sgsn/expected-results.xml</span><br><span>+++ b/sgsn/expected-results.xml</span><br><span>@@ -1,5 +1,5 @@</span><br><span> <?xml version="1.0"?></span><br><span style="color: hsl(0, 100%, 40%);">-<testsuite name='Titan' tests='27' failures='4' errors='3' skipped='0' inconc='0' time='MASKED'></span><br><span style="color: hsl(120, 100%, 40%);">+<testsuite name='Titan' tests='27' failures='4' errors='2' skipped='0' inconc='0' time='MASKED'></span><br><span>   <testcase classname='SGSN_Tests' name='TC_attach' time='MASKED'/></span><br><span>   <testcase classname='SGSN_Tests' name='TC_attach_mnc3' time='MASKED'/></span><br><span>   <testcase classname='SGSN_Tests' name='TC_attach_umts_aka_umts_res' time='MASKED'/></span><br><span>@@ -57,8 +57,6 @@</span><br><span>   <testcase classname='SGSN_Tests' name='TC_attach_pdp_act_ggsn_reject' time='MASKED'/></span><br><span>   <testcase classname='SGSN_Tests' name='TC_attach_pdp_act_user_deact_mo' time='MASKED'/></span><br><span>   <testcase classname='SGSN_Tests' name='TC_attach_pdp_act_user_deact_mt' time='MASKED'/></span><br><span style="color: hsl(0, 100%, 40%);">-  <testcase classname='SGSN_Tests' name='TC_attach_second_attempt' time='MASKED'></span><br><span style="color: hsl(0, 100%, 40%);">-    <error type='DTE'></error></span><br><span style="color: hsl(0, 100%, 40%);">-  </testcase></span><br><span style="color: hsl(120, 100%, 40%);">+  <testcase classname='SGSN_Tests' name='TC_attach_second_attempt' time='MASKED'/></span><br><span>   <testcase classname='SGSN_Tests' name='TC_attach_restart_ctr_dettach' time='MASKED'/></span><br><span> </testsuite></span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10008">change 10008</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/10008"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I0989bf8d258c5def3c7f325de2053f62288b9897 </div>
<div style="display:none"> Gerrit-Change-Number: 10008 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>