pespin submitted this change.
Use newer M3UA & MTP3 deps generating MTP-STATUS,PAUSE,RESUME.ind
* titan.TestPorts.MTP3asp pointer is changed to osmocom fork containing
extra patch adding missing fields to MTP-STATUS,PAUSE,RESUME records.
It also adds templates for them.
* titan.ProtocolEmulations.M3UA pointer is changed to osmocom fork
containing extra patch improving M3UA_Emulation component to build
MTP-STATUS,PAUSE,RESUME.ind primiives when receiving DAVA/DUNA/DUPU/SCON
from M3UA link.
The upper layers building on top of MTP3asp_PT (ie. port MTP3asp_SCCP_PT
from SCCP_MApping.ttcnp) are fine because they explicitly discard
ASP_MTP3_PAUSE,RESUME,STATUS messages in the port defintion.
Hence, supporting those in SCCP layer is left as a subsequent task.
Related: OS#6907
Change-Id: I67cc2bcf3395a81fa8acee861af01e752984ebb3
---
M deps/Makefile
M sccp/SCCP_Tests_RAW.ttcn
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/deps/Makefile b/deps/Makefile
index 61d5fee..e8575cc 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -8,7 +8,6 @@
OSMOGITEA:=https://gitea.osmocom.org/ttcn3
ECLIPSEGITLAB_REPOS= titan.Libraries.TCCUsefulFunctions \
- titan.ProtocolEmulations.M3UA \
titan.ProtocolEmulations.SCCP \
titan.ProtocolModules.BSSAPP_v7.3.0 \
titan.ProtocolModules.DIAMETER_ProtocolModule_Generator \
@@ -44,7 +43,6 @@
titan.TestPorts.HTTPmsg \
titan.TestPorts.IPL4asp \
titan.TestPorts.LANL2asp \
- titan.TestPorts.MTP3asp \
titan.TestPorts.PCAPasp \
titan.TestPorts.PIPEasp \
titan.TestPorts.SIPmsg \
@@ -54,6 +52,8 @@
titan.TestPorts.UNIX_DOMAIN_SOCKETasp
OSMOGITHUB_REPOS= titan.TestPorts.SCTPasp \
+ titan.TestPorts.MTP3asp \
+ titan.ProtocolEmulations.M3UA \
titan.ProtocolModules.BSSGP_v13.0.0
OSMOGERRIT_REPOS= osmo-uecups
@@ -74,7 +74,7 @@
# exact commits of deps when doing regression testing.
nas_commit= 60a69a44cc6bbb32d96aecc4e355128ac5f95a5e
titan.Libraries.TCCUsefulFunctions_commit= R.35.B-6-gb3687da
-titan.ProtocolEmulations.M3UA_commit= b58f92046e48a7b1ed531e243a2319ebca53bf4c
+titan.ProtocolEmulations.M3UA_commit= a70095b9113b23d2ea2405a5775befec18dd0fe0
titan.ProtocolEmulations.SCCP_commit= 750a3e836831e58eae59d4757ef5d0c759f9ca5d
titan.ProtocolModules.BSSAPP_v7.3.0_commit= R.2.A-4-g20cfaf8
titan.ProtocolModules.BSSGP_v13.0.0_commit= e97d92a8b66bec399babea52f593771b76cb175a
@@ -114,7 +114,7 @@
titan.TestPorts.HTTPmsg_commit= R.9.B-4-g9a0dfde
titan.TestPorts.IPL4asp_commit= R.30.E-7-g029bccb
titan.TestPorts.LANL2asp_commit= R.8.C-3-gb07c265
-titan.TestPorts.MTP3asp_commit= 88224e93e9fffba082061b9642251551209ee567
+titan.TestPorts.MTP3asp_commit= 3e92ca9b24615f582741812350b0c2023f0a426c
titan.TestPorts.PCAPasp_commit= R.8.A-3-g9ad320f
titan.TestPorts.PIPEasp_commit= R.7.D-3-g8b01154
titan.TestPorts.SCTPasp_commit= R.11.A-8-g2e911c3
diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn
index 9b53a1c..3366111 100644
--- a/sccp/SCCP_Tests_RAW.ttcn
+++ b/sccp/SCCP_Tests_RAW.ttcn
@@ -554,11 +554,8 @@
};
MTP3.send(tx);
- /* TODO: Here we should wait to receive a MTP-STATUS.ind in MTP3 port generated by
- * received DUPU (see https://datatracker.ietf.org/doc/html/rfc4666#section-5.5.2.3.4),
- * but forwarding non-data M3UA messages up the stack is not yet implemented
- * in M3UA_Emulation.ttcn, see OS#6907. */
- f_sleep(1.0);
+ /* DUPU gets translated to MTP-STATUS.ind: */
+ MTP3.receive(tr_ASP_MTP3_STATUS(g_param.dpc, cause := ?, user := bit2int(unavail_sio.si)));
setverdict(pass);
}
To view, visit change 41959. To unsubscribe, or for help writing mail filters, visit settings.