Change in osmo-ttcn3-hacks[master]: sgsn: Fix TC_attach_second_attempt

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/10008


Change subject: sgsn: Fix TC_attach_second_attempt
......................................................................

sgsn: Fix TC_attach_second_attempt

Use a different IMSI first time in order to get a AUTH Req and LU from
osmo-sgsn, like other tests do.
During second attach, don't expect to receie an AUTH + LU since
osmo-sgsn remembers us.

Change-Id: I0989bf8d258c5def3c7f325de2053f62288b9897
---
M sgsn/SGSN_Tests.ttcn
M sgsn/expected-results.xml
2 files changed, 12 insertions(+), 12 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/08/10008/1

diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn
index 214239e..c9e407f 100644
--- a/sgsn/SGSN_Tests.ttcn
+++ b/sgsn/SGSN_Tests.ttcn
@@ -456,7 +456,7 @@
 	GSUP.send(ts_GSUP_UL_RES(g_pars.imsi));
 }
 
-private function f_gmm_attach(boolean umts_aka_challenge, boolean force_gsm_sres) runs on BSSGP_ConnHdlr {
+private function f_gmm_attach(boolean umts_aka_challenge, boolean force_gsm_sres, boolean already_attached := false) runs on BSSGP_ConnHdlr {
 	var BssgpDecoded bd;
 	var RoutingAreaIdentificationV old_ra := f_random_RAI();
 	var template PDU_L3_MS_SGSN attach_req := ts_GMM_ATTACH_REQ(f_mi_get_lv(), old_ra, false, false, omit, omit);
@@ -469,9 +469,11 @@
 	attach_req.msgs.gprs_mm.attachRequest.msNetworkCapability.msNetworkCapabilityV.solSACapability := '0'B;
 
 	BSSGP.send(attach_req);
-	f_gmm_auth(umts_aka_challenge, force_gsm_sres);
-	/* Expect SGSN to perform LU with HLR */
-	f_gmm_gsup_lu_isd();
+	if (not already_attached) {
+		f_gmm_auth(umts_aka_challenge, force_gsm_sres);
+		/* Expect SGSN to perform LU with HLR */
+		f_gmm_gsup_lu_isd();
+	}
 
 	BSSGP.receive(tr_BD_L3_MT(tr_GMM_ATTACH_ACCEPT('001'B, ?, ?))) -> value bd {
 		f_process_attach_accept(bd.l3_mt.msgs.gprs_mm.attachAccept);
@@ -481,7 +483,7 @@
 }
 
 private function f_TC_attach(charstring id) runs on BSSGP_ConnHdlr {
-	f_gmm_attach(false, false);
+	f_gmm_attach(false, false, false);
 	setverdict(pass);
 }
 
@@ -1251,15 +1253,15 @@
 	/* first perform regular attach */
 	f_TC_attach(id);
 
-	/* second to perform regular attach */
-	f_TC_attach(id);
+	/* second to perform regular attach, don't expect AUTH or LU */
+	f_gmm_attach(false, false, true);
 }
 
 
 testcase TC_attach_second_attempt() runs on test_CT {
 	var BSSGP_ConnHdlr vc_conn;
 	f_init();
-	vc_conn := f_start_handler(refers(f_TC_attach_forget_tlli_attach), testcasename(), g_gb[0], 22);
+	vc_conn := f_start_handler(refers(f_TC_attach_forget_tlli_attach), testcasename(), g_gb[0], 24);
 	vc_conn.done;
 }
 
diff --git a/sgsn/expected-results.xml b/sgsn/expected-results.xml
index 2d7063b..bc00aac 100644
--- a/sgsn/expected-results.xml
+++ b/sgsn/expected-results.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<testsuite name='Titan' tests='27' failures='4' errors='3' skipped='0' inconc='0' time='MASKED'>
+<testsuite name='Titan' tests='27' failures='4' errors='2' skipped='0' inconc='0' time='MASKED'>
   <testcase classname='SGSN_Tests' name='TC_attach' time='MASKED'/>
   <testcase classname='SGSN_Tests' name='TC_attach_mnc3' time='MASKED'/>
   <testcase classname='SGSN_Tests' name='TC_attach_umts_aka_umts_res' time='MASKED'/>
@@ -57,8 +57,6 @@
   <testcase classname='SGSN_Tests' name='TC_attach_pdp_act_ggsn_reject' time='MASKED'/>
   <testcase classname='SGSN_Tests' name='TC_attach_pdp_act_user_deact_mo' time='MASKED'/>
   <testcase classname='SGSN_Tests' name='TC_attach_pdp_act_user_deact_mt' time='MASKED'/>
-  <testcase classname='SGSN_Tests' name='TC_attach_second_attempt' time='MASKED'>
-    <error type='DTE'></error>
-  </testcase>
+  <testcase classname='SGSN_Tests' name='TC_attach_second_attempt' time='MASKED'/>
   <testcase classname='SGSN_Tests' name='TC_attach_restart_ctr_dettach' time='MASKED'/>
 </testsuite>

-- 
To view, visit https://gerrit.osmocom.org/10008
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0989bf8d258c5def3c7f325de2053f62288b9897
Gerrit-Change-Number: 10008
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180716/cdcd8358/attachment.htm>