summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Maier <pmaier@sysmocom.de>2018-11-08 17:40:53 +0100
committerPhilipp Maier <pmaier@sysmocom.de>2018-12-18 17:14:19 +0100
commitaeb29a8a4fc5781a6692966019bd07bd54d64ded (patch)
tree1a36c10116606ac2686f9167ac5a6970c16c77ca
parent1f581b4c49787aadb8d83cbf9e3cfc82ef94517b (diff)
BSC_ConnectionHandler: introduce ctrl interface
There are some upcomming tests which require to access the control interface of the MSC while the actual test is running. Future test cases (e.g. Paging, see also Change Id: a6a1a6bd6da1bf46d6d703be495795d3610ca431) will use this. Change-Id: Ie3caf7a449311e7687670cadfa27818635d25aa4 Related: OS#3615 Related: OS#3187
-rw-r--r--msc/BSC_ConnectionHandler.ttcn16
-rw-r--r--msc/MSC_Tests.ttcn5
2 files changed, 18 insertions, 3 deletions
diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn
index f005e02..e97b97d 100644
--- a/msc/BSC_ConnectionHandler.ttcn
+++ b/msc/BSC_ConnectionHandler.ttcn
@@ -31,8 +31,13 @@ import from L3_Common all;
import from SMPP_Emulation all;
+import from IPA_Emulation all;
+import from Osmocom_CTRL_Functions all;
+import from Osmocom_CTRL_Types all;
+import from Osmocom_CTRL_Adapter all;
+
/* this component represents a single subscriber connection */
-type component BSC_ConnHdlr extends BSSAP_ConnHdlr, MNCC_ConnHdlr, GSUP_ConnHdlr, MGCP_ConnHdlr, SMPP_ConnHdlr {
+type component BSC_ConnHdlr extends BSSAP_ConnHdlr, MNCC_ConnHdlr, GSUP_ConnHdlr, MGCP_ConnHdlr, SMPP_ConnHdlr, CTRL_Adapter_CT {
var BSC_ConnHdlrPars g_pars;
timer g_Tguard := 60.0;
}
@@ -57,7 +62,10 @@ type record BSC_ConnHdlrPars {
BSSMAP_IE_ClassmarkInformationType3 cm3 optional,
AuthVector vec optional,
BSC_ConnHdlrNetworkPars net,
- boolean send_early_cm
+ boolean send_early_cm,
+ charstring ipa_ctrl_ip,
+ integer ipa_ctrl_port,
+ boolean ipa_ctrl_enable
};
/* get a one-octet bitmaks of supported algorithms based on Classmark information */
@@ -122,6 +130,10 @@ function f_init_handler(BSC_ConnHdlrPars pars, float t_guard := 60.0) runs on BS
activate(as_Tguard());
/* Route all SMPP messages for our MSISDN to us */
f_create_smpp_expect(hex2str(pars.msisdn));
+
+ if (g_pars.ipa_ctrl_enable == true) {
+ f_ipa_ctrl_start(g_pars.ipa_ctrl_ip, g_pars.ipa_ctrl_port);
+ }
}
diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn
index adaeea3..1b37329 100644
--- a/msc/MSC_Tests.ttcn
+++ b/msc/MSC_Tests.ttcn
@@ -454,7 +454,10 @@ function f_init_pars(integer imsi_suffix) runs on MTC_CT return BSC_ConnHdlrPars
cm3 := omit,
vec := omit,
net := net_pars,
- send_early_cm := true
+ send_early_cm := true,
+ ipa_ctrl_ip := mp_msc_ip,
+ ipa_ctrl_port := mp_msc_ctrl_port,
+ ipa_ctrl_enable := true
};
return pars;
}