pespin submitted this change.
Expect and discard N-PCSTATE.ind with newer SCCP_Emulation
Newer titan.ProtocolEmulations.SCCP will generate N-PCSTATE.ind when
needed. Since our tests written so far don't expect those (yet), discard
them at the port level so the indications don't interfere with it.
Work to enable them will be done in follow-up patches.
Related: OS#6907
Change-Id: I532b9f839ab2c08e707fbd63a1e1058253f79b6c
---
M deps/Makefile
M library/BSSAP_CodecPort.ttcn
M library/BSSAP_LE_CodecPort.ttcn
M library/ranap/RANAP_CodecPort.ttcn
M library/tcap/TCAP_CodecPort.ttcn
5 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/deps/Makefile b/deps/Makefile
index e8575cc..3fed0d3 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -8,7 +8,6 @@
OSMOGITEA:=https://gitea.osmocom.org/ttcn3
ECLIPSEGITLAB_REPOS= titan.Libraries.TCCUsefulFunctions \
- titan.ProtocolEmulations.SCCP \
titan.ProtocolModules.BSSAPP_v7.3.0 \
titan.ProtocolModules.DIAMETER_ProtocolModule_Generator \
titan.ProtocolModules.DNS \
@@ -54,6 +53,7 @@
OSMOGITHUB_REPOS= titan.TestPorts.SCTPasp \
titan.TestPorts.MTP3asp \
titan.ProtocolEmulations.M3UA \
+ titan.ProtocolEmulations.SCCP \
titan.ProtocolModules.BSSGP_v13.0.0
OSMOGERRIT_REPOS= osmo-uecups
@@ -75,7 +75,7 @@
nas_commit= 60a69a44cc6bbb32d96aecc4e355128ac5f95a5e
titan.Libraries.TCCUsefulFunctions_commit= R.35.B-6-gb3687da
titan.ProtocolEmulations.M3UA_commit= a70095b9113b23d2ea2405a5775befec18dd0fe0
-titan.ProtocolEmulations.SCCP_commit= 750a3e836831e58eae59d4757ef5d0c759f9ca5d
+titan.ProtocolEmulations.SCCP_commit= 744f3eeb58d7b5bc372c9fd01db737a20bae069a
titan.ProtocolModules.BSSAPP_v7.3.0_commit= R.2.A-4-g20cfaf8
titan.ProtocolModules.BSSGP_v13.0.0_commit= e97d92a8b66bec399babea52f593771b76cb175a
titan.ProtocolModules.BSSMAP_commit= 4acb6ab5f058477f0b90c2da182d52054e3614b0
diff --git a/library/BSSAP_CodecPort.ttcn b/library/BSSAP_CodecPort.ttcn
index 5339b32..2bb6ab6 100644
--- a/library/BSSAP_CodecPort.ttcn
+++ b/library/BSSAP_CodecPort.ttcn
@@ -388,7 +388,8 @@
BSSAP_N_NOTICE_ind,
ASP_SCCP_N_RESET_ind,
ASP_SCCP_N_RESET_cfm,
- ASP_SCCP_N_STATE_ind;
+ ASP_SCCP_N_STATE_ind,
+ ASP_SCCP_N_PCSTATE_ind;
} with { extension "internal user SCCPasp_PT
out(BSSAP_N_CONNECT_req -> ASP_SCCP_N_CONNECT_req: function(f_enc_ConnectReq);
BSSAP_N_CONNECT_res -> ASP_SCCP_N_CONNECT_res: function(f_enc_ConnectRes);
@@ -404,7 +405,8 @@
ASP_SCCP_N_NOTICE_ind -> BSSAP_N_NOTICE_ind: function(f_dec_NoticeInd);
ASP_SCCP_N_RESET_ind -> ASP_SCCP_N_RESET_ind: simple;
ASP_SCCP_N_RESET_cfm -> ASP_SCCP_N_RESET_cfm: simple;
- ASP_SCCP_N_STATE_ind -> ASP_SCCP_N_STATE_ind: simple)"
+ ASP_SCCP_N_STATE_ind -> ASP_SCCP_N_STATE_ind: simple;
+ ASP_SCCP_N_PCSTATE_ind -> -: discard)"
}
diff --git a/library/BSSAP_LE_CodecPort.ttcn b/library/BSSAP_LE_CodecPort.ttcn
index f1d930f..418e55a 100644
--- a/library/BSSAP_LE_CodecPort.ttcn
+++ b/library/BSSAP_LE_CodecPort.ttcn
@@ -357,7 +357,8 @@
BSSAP_LE_N_NOTICE_ind,
ASP_SCCP_N_RESET_ind,
ASP_SCCP_N_RESET_cfm,
- ASP_SCCP_N_STATE_ind;
+ ASP_SCCP_N_STATE_ind,
+ ASP_SCCP_N_PCSTATE_ind;
} with { extension "internal user SCCPasp_PT
out(BSSAP_LE_N_CONNECT_req -> ASP_SCCP_N_CONNECT_req: function(f_enc_ConnectReq);
BSSAP_LE_N_CONNECT_res -> ASP_SCCP_N_CONNECT_res: function(f_enc_ConnectRes);
@@ -373,7 +374,8 @@
ASP_SCCP_N_NOTICE_ind -> BSSAP_LE_N_NOTICE_ind: function(f_dec_NoticeInd);
ASP_SCCP_N_RESET_ind -> ASP_SCCP_N_RESET_ind: simple;
ASP_SCCP_N_RESET_cfm -> ASP_SCCP_N_RESET_cfm: simple;
- ASP_SCCP_N_STATE_ind -> ASP_SCCP_N_STATE_ind: simple)"
+ ASP_SCCP_N_STATE_ind -> ASP_SCCP_N_STATE_ind: simple;
+ ASP_SCCP_N_PCSTATE_ind -> -: discard)"
}
diff --git a/library/ranap/RANAP_CodecPort.ttcn b/library/ranap/RANAP_CodecPort.ttcn
index af2090c..084d1cf 100644
--- a/library/ranap/RANAP_CodecPort.ttcn
+++ b/library/ranap/RANAP_CodecPort.ttcn
@@ -387,7 +387,8 @@
RANAP_N_NOTICE_ind,
ASP_SCCP_N_RESET_ind,
ASP_SCCP_N_RESET_cfm,
- ASP_SCCP_N_STATE_ind;
+ ASP_SCCP_N_STATE_ind,
+ ASP_SCCP_N_PCSTATE_ind;
} with { extension "internal user SCCPasp_PT
out(RANAP_N_CONNECT_req -> ASP_SCCP_N_CONNECT_req: function(f_enc_ConnectReq);
RANAP_N_CONNECT_res -> ASP_SCCP_N_CONNECT_res: function(f_enc_ConnectRes);
@@ -403,7 +404,8 @@
ASP_SCCP_N_NOTICE_ind -> RANAP_N_NOTICE_ind: function(f_dec_NoticeInd);
ASP_SCCP_N_RESET_ind -> ASP_SCCP_N_RESET_ind: simple;
ASP_SCCP_N_RESET_cfm -> ASP_SCCP_N_RESET_cfm: simple;
- ASP_SCCP_N_STATE_ind -> ASP_SCCP_N_STATE_ind: simple)"
+ ASP_SCCP_N_STATE_ind -> ASP_SCCP_N_STATE_ind: simple;
+ ASP_SCCP_N_PCSTATE_ind -> -: discard)"
}
diff --git a/library/tcap/TCAP_CodecPort.ttcn b/library/tcap/TCAP_CodecPort.ttcn
index cb52814..5f17bc1 100644
--- a/library/tcap/TCAP_CodecPort.ttcn
+++ b/library/tcap/TCAP_CodecPort.ttcn
@@ -385,7 +385,8 @@
TCAP_N_NOTICE_ind,
ASP_SCCP_N_RESET_ind,
ASP_SCCP_N_RESET_cfm,
- ASP_SCCP_N_STATE_ind;
+ ASP_SCCP_N_STATE_ind,
+ ASP_SCCP_N_PCSTATE_ind;
} with { extension "internal user SCCPasp_PT
out(TCAP_N_CONNECT_req -> ASP_SCCP_N_CONNECT_req: function(f_enc_ConnectReq);
TCAP_N_CONNECT_res -> ASP_SCCP_N_CONNECT_res: function(f_enc_ConnectRes);
@@ -401,7 +402,8 @@
ASP_SCCP_N_NOTICE_ind -> TCAP_N_NOTICE_ind: function(f_dec_NoticeInd);
ASP_SCCP_N_RESET_ind -> ASP_SCCP_N_RESET_ind: simple;
ASP_SCCP_N_RESET_cfm -> ASP_SCCP_N_RESET_cfm: simple;
- ASP_SCCP_N_STATE_ind -> ASP_SCCP_N_STATE_ind: simple)"
+ ASP_SCCP_N_STATE_ind -> ASP_SCCP_N_STATE_ind: simple;
+ ASP_SCCP_N_PCSTATE_ind -> -: discard)"
}
To view, visit change 41961. To unsubscribe, or for help writing mail filters, visit settings.