fixeria has uploaded this change for review.
s1gw: add TC_uemux_e_rab_{setup,release_cmd,release_ind}
Change-Id: Ia4583f82a768ca3d185aad596ce8ec9bbd37ad32
---
M s1gw/S1GW_Tests.ttcn
M s1gw/S1GW_UEMux.ttcn
M s1gw/expected-results.xml
3 files changed, 132 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/82/39882/1
diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn
index be10799..6e2dbf4 100644
--- a/s1gw/S1GW_Tests.ttcn
+++ b/s1gw/S1GW_Tests.ttcn
@@ -717,6 +717,82 @@
f_UEMuxUEList_all_done(vc_ues);
}
+function f_TC_uemux_e_rab_setup_release(in ERabList erabs,
+ boolean release_cmd := false,
+ boolean release_ind := false)
+runs on UEMuxUE {
+ f_UEMuxUE_subscribe_for_mme_ue_id(g_mme_ue_id);
+ f_UEMuxUE_subscribe_for_enb_ue_id(g_enb_ue_id);
+
+ f_rnd_sleep(0.5);
+ f_UEMux_erab_setup(erabs);
+
+ if (release_cmd) {
+ f_rnd_sleep(0.5);
+ f_UEMux_erab_release_cmd(erabs);
+ }
+ if (release_ind) {
+ f_rnd_sleep(0.5);
+ f_UEMux_erab_release_ind(erabs);
+ }
+
+ f_UEMuxUE_unsubscribe();
+}
+testcase TC_uemux_e_rab_setup() runs on test_CT {
+ var ConnHdlrPars pars := valueof(t_ConnHdlrPars(num_erabs := mp_multi_ue_num));
+ var UEMuxUEList vc_ues;
+ var UEMux_CT vc_uemux;
+
+ f_init();
+
+ vc_uemux := f_UEMux_spawn(refers(f_TC_UEMux_main), pars);
+
+ for (var integer i := 0; i < mp_multi_ue_num; i := i + 1) {
+ var ERabList erabs := { pars.erabs[i] };
+
+ vc_ues[i] := f_UEMuxUE_create(vc_uemux, pars, i, i);
+ vc_ues[i].start(f_TC_uemux_e_rab_setup_release(erabs));
+ }
+
+ f_UEMuxUEList_all_done(vc_ues);
+}
+testcase TC_uemux_e_rab_release_cmd() runs on test_CT {
+ var ConnHdlrPars pars := valueof(t_ConnHdlrPars(num_erabs := mp_multi_ue_num));
+ var UEMuxUEList vc_ues;
+ var UEMux_CT vc_uemux;
+
+ f_init();
+
+ vc_uemux := f_UEMux_spawn(refers(f_TC_UEMux_main), pars);
+
+ for (var integer i := 0; i < mp_multi_ue_num; i := i + 1) {
+ var ERabList erabs := { pars.erabs[i] };
+
+ vc_ues[i] := f_UEMuxUE_create(vc_uemux, pars, i, i);
+ vc_ues[i].start(f_TC_uemux_e_rab_setup_release(erabs, release_cmd := true));
+ }
+
+ f_UEMuxUEList_all_done(vc_ues);
+}
+testcase TC_uemux_e_rab_release_ind() runs on test_CT {
+ var ConnHdlrPars pars := valueof(t_ConnHdlrPars(num_erabs := mp_multi_ue_num));
+ var UEMuxUEList vc_ues;
+ var UEMux_CT vc_uemux;
+
+ f_init();
+
+ vc_uemux := f_UEMux_spawn(refers(f_TC_UEMux_main), pars);
+
+ for (var integer i := 0; i < mp_multi_ue_num; i := i + 1) {
+ var ERabList erabs := { pars.erabs[i] };
+
+ vc_ues[i] := f_UEMuxUE_create(vc_uemux, pars, i, i);
+ vc_ues[i].start(f_TC_uemux_e_rab_setup_release(erabs, release_ind := false));
+ }
+
+ f_UEMuxUEList_all_done(vc_ues);
+}
+
function f_TC_pfcp_heartbeat(charstring id) runs on ConnHdlr {
var integer rts := f_PFCPEM_get_recovery_timestamp();
var PDU_PFCP pfcp_pdu;
@@ -759,6 +835,9 @@
execute( TC_ue_ctx_release_cmd_compl() );
execute( TC_ue_ctx_release_cmd_compl3() );
execute( TC_uemux_uldl_nas_release() );
+ execute( TC_uemux_e_rab_setup() );
+ execute( TC_uemux_e_rab_release_cmd() );
+ execute( TC_uemux_e_rab_release_ind() );
execute( TC_pfcp_heartbeat() );
}
diff --git a/s1gw/S1GW_UEMux.ttcn b/s1gw/S1GW_UEMux.ttcn
index 1d2e5c6..68be645 100644
--- a/s1gw/S1GW_UEMux.ttcn
+++ b/s1gw/S1GW_UEMux.ttcn
@@ -253,10 +253,18 @@
signature UEMux_subscribe_for_enb_ue_id(in ENB_UE_S1AP_ID enb_ue_id);
signature UEMux_unsubscribe();
+signature UEMux_erab_setup(inout ERabList erabs);
+signature UEMux_erab_release_cmd(inout ERabList erabs);
+signature UEMux_erab_release_ind(inout ERabList erabs);
+
type port UEMUX_PROC_PT procedure {
inout UEMux_subscribe_for_mme_ue_id;
inout UEMux_subscribe_for_enb_ue_id;
inout UEMux_unsubscribe;
+
+ inout UEMux_erab_setup;
+ inout UEMux_erab_release_cmd;
+ inout UEMux_erab_release_ind;
} with { extension "internal" };
/***********************************************************************************
@@ -284,6 +292,27 @@
}
}
+function f_UEMux_erab_setup(inout ERabList erabs)
+runs on UEMuxUE {
+ UEMUX_PROC.call(UEMux_erab_setup:{erabs}) {
+ [] UEMUX_PROC.getreply(UEMux_erab_setup:{?}) -> param(erabs);
+ }
+}
+
+function f_UEMux_erab_release_cmd(inout ERabList erabs)
+runs on UEMuxUE {
+ UEMUX_PROC.call(UEMux_erab_release_cmd:{erabs}) {
+ [] UEMUX_PROC.getreply(UEMux_erab_release_cmd:{?}) -> param(erabs);
+ }
+}
+
+function f_UEMux_erab_release_ind(inout ERabList erabs)
+runs on UEMuxUE {
+ UEMUX_PROC.call(UEMux_erab_release_ind:{erabs}) {
+ [] UEMUX_PROC.getreply(UEMux_erab_release_ind:{?}) -> param(erabs);
+ }
+}
+
function f_UEMuxUE_tx_s1ap_from_mme(template (value) S1AP_PDU pdu)
runs on UEMuxUE {
var S1AP_dPDU dpdu := { S1AP_PDU_DIR_FROM_MME, valueof(pdu) };
@@ -339,6 +368,7 @@
var MME_UE_S1AP_ID mme_ue_id;
var ENB_UE_S1AP_ID enb_ue_id;
var UEMuxUE vc_conn;
+ var ERabList erabs;
var S1AP_PDU pdu;
alt {
@@ -373,6 +403,25 @@
f_UEMux_unsubscribe(vc_conn);
UEMUX_PROC.reply(UEMux_unsubscribe:{}) to vc_conn;
}
+
+ /* E-RAB and context related procedures */
+ [] UEMUX_PROC.getcall(UEMux_erab_setup:{?}) -> param(erabs) sender vc_conn {
+ var integer idx := f_UEMux_find_ue_by_vc_conn(vc_conn);
+ f_ConnHdlr_erab_setup_req(erabs, g_uemux_list[idx].mme_ue_id, g_uemux_list[idx].enb_ue_id);
+ f_ConnHdlr_erab_setup_rsp(erabs, g_uemux_list[idx].mme_ue_id, g_uemux_list[idx].enb_ue_id);
+ UEMUX_PROC.reply(UEMux_erab_setup:{erabs}) to vc_conn;
+ }
+ [] UEMUX_PROC.getcall(UEMux_erab_release_cmd:{?}) -> param(erabs) sender vc_conn {
+ var integer idx := f_UEMux_find_ue_by_vc_conn(vc_conn);
+ f_ConnHdlr_erab_release_cmd(erabs, g_uemux_list[idx].mme_ue_id, g_uemux_list[idx].enb_ue_id);
+ f_ConnHdlr_erab_release_rsp(erabs, g_uemux_list[idx].mme_ue_id, g_uemux_list[idx].enb_ue_id);
+ UEMUX_PROC.reply(UEMux_erab_release_cmd:{erabs}) to vc_conn;
+ }
+ [] UEMUX_PROC.getcall(UEMux_erab_release_ind:{?}) -> param(erabs) sender vc_conn {
+ var integer idx := f_UEMux_find_ue_by_vc_conn(vc_conn);
+ f_ConnHdlr_erab_release_ind(erabs, g_uemux_list[idx].mme_ue_id, g_uemux_list[idx].enb_ue_id);
+ UEMUX_PROC.reply(UEMux_erab_release_ind:{erabs}) to vc_conn;
+ }
}
}
}
diff --git a/s1gw/expected-results.xml b/s1gw/expected-results.xml
index 343ba48..27698e9 100644
--- a/s1gw/expected-results.xml
+++ b/s1gw/expected-results.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<testsuite name='S1GW_Tests' tests='25' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'>
+<testsuite name='S1GW_Tests' tests='28' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'>
<testcase classname='S1GW_Tests' name='TC_setup' time='MASKED'/>
<testcase classname='S1GW_Tests' name='TC_setup_multi' time='MASKED'/>
<testcase classname='S1GW_Tests' name='TC_conn_term_by_mme' time='MASKED'/>
@@ -24,5 +24,8 @@
<testcase classname='S1GW_Tests' name='TC_ue_ctx_release_cmd_compl' time='MASKED'/>
<testcase classname='S1GW_Tests' name='TC_ue_ctx_release_cmd_compl3' time='MASKED'/>
<testcase classname='S1GW_Tests' name='TC_uemux_uldl_nas_release' time='MASKED'/>
+ <testcase classname='S1GW_Tests' name='TC_uemux_e_rab_setup' time='MASKED'/>
+ <testcase classname='S1GW_Tests' name='TC_uemux_e_rab_release_cmd' time='MASKED'/>
+ <testcase classname='S1GW_Tests' name='TC_uemux_e_rab_release_ind' time='MASKED'/>
<testcase classname='S1GW_Tests' name='TC_pfcp_heartbeat' time='MASKED'/>
</testsuite>
To view, visit change 39882. To unsubscribe, or for help writing mail filters, visit settings.