pespin has uploaded this change for review.

View Change

hnbgw: Merge TC_ps_rab_assignment_* testcases

Change-Id: Ibfc3a7d74494bd78d8cfb4efa535ab4cd1b07cae
---
M hnbgw/HNBGW_Tests.ttcn
M hnbgw/expected-results.xml
2 files changed, 17 insertions(+), 43 deletions(-)

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

diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn
index e89a07f..c422ba2 100644
--- a/hnbgw/HNBGW_Tests.ttcn
+++ b/hnbgw/HNBGW_Tests.ttcn
@@ -1383,15 +1383,17 @@
 	f_shutdown_helper();
 }
 
-friend function f_tc_ps_rab_assignment_with_pfcp(charstring id) runs on ConnHdlr {
+friend function f_tc_ps_rab_assignment(charstring id) runs on ConnHdlr {
 	var RANAP_PDU tx;
-	var PDU_PFCP m;
-	f_pfcp_wait_assoc_setup_req();
+
+	if (g_pars.pfcp_pars.pfcp_enabled) {
+		f_pfcp_wait_assoc_setup_req();
+	}
 
 	tx := f_build_initial_ue(g_pars);
 	f_iuh2iu_connect(tx);
 
-	f_create_rab_ps_with_pfcp();
+	f_create_rab_ps();
 	f_sleep(2.0);
 
 	tx := valueof(ts_RANAP_IuReleaseCommand(g_pars.rab_rel_cause));
@@ -1399,46 +1401,23 @@
 	tx := valueof(ts_RANAP_IuReleaseComplete());
 	f_iuh2iu(tx);
 
-	m := f_pfcp_expect(tr_PFCP_Session_Del_Req(g_pars.pfcp_pars.up_f_seid.seid));
-	PFCP.send(ts_PFCP_Session_Del_Resp(m.sequence_number, g_pars.pfcp_pars.hnbgw_f_seid.seid));
-	/* ask PFCPEM to *not* route PDUs with this specific SEID to us */
-	f_PFCPEM_unsubscribe_seid(c_SEID1);
+	if (g_pars.pfcp_pars.pfcp_enabled) {
+		var PDU_PFCP m;
+		m := f_pfcp_expect(tr_PFCP_Session_Del_Req(g_pars.pfcp_pars.up_f_seid.seid));
+		PFCP.send(ts_PFCP_Session_Del_Resp(m.sequence_number, g_pars.pfcp_pars.hnbgw_f_seid.seid));
+		/* ask PFCPEM to *not* route PDUs with this specific SEID to us */
+		f_PFCPEM_unsubscribe_seid(c_SEID1);
+	}
 }
 
-testcase TC_ps_rab_assignment_with_pfcp() runs on test_CT {
+testcase TC_ps_rab_assignment() runs on test_CT {
 	var ConnHdlr vc_conn;
 	g_num_hnbs := 1;
 	f_init();
 	f_init_pfcp(testcasename());
 	f_sleep(1.0);
 
-	vc_conn := f_start_handler_with_pars(refers(f_tc_ps_rab_assignment_with_pfcp), f_TestHdlrParams(7, ps_domain := true));
-	vc_conn.done;
-
-	f_shutdown_helper();
-}
-
-friend function f_tc_ps_rab_assignment_without_pfcp(charstring id) runs on ConnHdlr {
-	var RANAP_PDU tx;
-	tx := f_build_initial_ue(g_pars);
-	f_iuh2iu_connect(tx);
-
-	f_create_rab_ps_without_pfcp();
-	f_sleep(2.0);
-
-	tx := valueof(ts_RANAP_IuReleaseCommand(g_pars.rab_rel_cause));
-	f_iu2iuh(tx);
-	tx := valueof(ts_RANAP_IuReleaseComplete());
-	f_iuh2iu(tx);
-}
-
-testcase TC_ps_rab_assignment_without_pfcp() runs on test_CT {
-	var ConnHdlr vc_conn;
-	f_init();
-	f_init_pfcp(testcasename());
-	f_sleep(1.0);
-
-	vc_conn := f_start_handler_with_pars(refers(f_tc_ps_rab_assignment_without_pfcp), f_TestHdlrParams(7, ps_domain := true));
+	vc_conn := f_start_handler_with_pars(refers(f_tc_ps_rab_assignment), f_TestHdlrParams(7, ps_domain := true));
 	vc_conn.done;
 
 	f_shutdown_helper();
@@ -2344,12 +2323,7 @@
 	execute(TC_ranap_cs_creq_cref());
 	execute(TC_ranap_ps_creq_cref());
 	execute(TC_cs_iu_release_req_rua_disconnect());
-
-	if (mp_enable_pfcp_tests) {
-		execute(TC_ps_rab_assignment_with_pfcp());
-	} else {
-		execute(TC_ps_rab_assignment_without_pfcp());
-	}
+	execute(TC_ps_rab_assignment());
 
 	execute( TC_mscpool_L3Compl_on_1_cnlink() );
 	execute( TC_mscpool_L3Complete_by_imsi_round_robin() );
diff --git a/hnbgw/expected-results.xml b/hnbgw/expected-results.xml
index a7f5021..7bbcdec 100644
--- a/hnbgw/expected-results.xml
+++ b/hnbgw/expected-results.xml
@@ -25,7 +25,7 @@
   <testcase classname='HNBGW_Tests' name='TC_ranap_cs_creq_cref' time='MASKED'/>
   <testcase classname='HNBGW_Tests' name='TC_ranap_ps_creq_cref' time='MASKED'/>
   <testcase classname='HNBGW_Tests' name='TC_cs_iu_release_req_rua_disconnect' time='MASKED'/>
-  <testcase classname='HNBGW_Tests' name='TC_ps_rab_assignment_without_pfcp' time='MASKED'/>
+  <testcase classname='HNBGW_Tests' name='TC_ps_rab_assignment' time='MASKED'/>
   <testcase classname='HNBGW_Tests' name='TC_mscpool_L3Compl_on_1_cnlink' time='MASKED'/>
   <testcase classname='HNBGW_Tests' name='TC_mscpool_L3Complete_by_imsi_round_robin' time='MASKED'/>
   <testcase classname='HNBGW_Tests' name='TC_mscpool_LU_by_tmsi_null_nri_0_round_robin' time='MASKED'/>

To view, visit change 38595. To unsubscribe, or for help writing mail filters, visit settings.