msc: Add SMPP tests for MO + MT SMS

Change-Id: I5349559c7c3096533fb07fcf53f0a44ff7f6567f

1 files changed, 8 insertions, 1 deletions

diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn
index 8c9b7239..b7a4f50e 100644
--- a/msc/BSC_ConnectionHandler.ttcn
+++ b/msc/BSC_ConnectionHandler.ttcn
@@ -29,8 +29,10 @@ import from MobileL3_SMS_Types all;
 import from L3_Templates all;
 import from L3_Common all;
 
+import from SMPP_Emulation all;
+
 /* this component represents a single subscriber connection */
-type component BSC_ConnHdlr extends BSSAP_ConnHdlr, MNCC_ConnHdlr, GSUP_ConnHdlr, MGCP_ConnHdlr {
+type component BSC_ConnHdlr extends BSSAP_ConnHdlr, MNCC_ConnHdlr, GSUP_ConnHdlr, MGCP_ConnHdlr, SMPP_ConnHdlr {
 	var BSC_ConnHdlrPars g_pars;
 	timer g_Tguard := 60.0;
 }
@@ -118,6 +120,8 @@ function f_init_handler(BSC_ConnHdlrPars pars, float t_guard := 60.0) runs on BS
 	/* Start guard timer and activate it as default */
 	g_Tguard.start(t_guard);
 	activate(as_Tguard());
+	/* Route all SMPP messages for our MSISDN to us */
+	f_create_smpp_expect(hex2str(pars.msisdn));
 }
 
 
@@ -817,6 +821,9 @@ runs on BSC_ConnHdlr {
 
 	var default d := activate(as_other_sms());
 
+	/* just in case this is routed to SMPP.. */
+	f_create_smpp_expect(hex2str(spars.tp.da.tP_DA_NoPad.tP_DAValue));
+
 	tp_mo := ts_SMS_SUBMIT(spars.tp.msg_ref, spars.tp.da, spars.tp.pid, spars.tp.dcs,
 				 spars.tp.udl, spars.tp.ud);
 	rp_mo := ts_RP_DATA_MO(spars.rp.msg_ref, spars.rp.orig, spars.rp.dest, tp_mo);