pespin has uploaded this change for review.
SIP_Emulation: Rename component id
Remove the dash character, since it makes it impossible to reference the
component name under TESTPORT_PARAMETERS in .default/.cfg files.
While at it, actually, allow the test to provide a full id instead of
always appending the suffix to it. This provides more freedom on the
testsuite to provide a fitting component name.
Change-Id: Iecefe7d98a5842872f1efc55e013f672186ef1a8
---
M asterisk/Asterisk_Tests.ttcn
M library/SIP_Emulation.ttcn
M sip/SIP_Tests.ttcn
3 files changed, 19 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/41/36641/1
diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn
index b164ee5..caa941c 100644
--- a/asterisk/Asterisk_Tests.ttcn
+++ b/asterisk/Asterisk_Tests.ttcn
@@ -66,7 +66,7 @@
function f_init() runs on test_CT {
f_init_ami();
- f_init_sip(vc_SIP, "Asterisk_Test");
+ f_init_sip(vc_SIP, "Asterisk_Test_SIP_EMU");
log("end of f_init");
}
diff --git a/library/SIP_Emulation.ttcn b/library/SIP_Emulation.ttcn
index 1b357b7..a5ebcfb 100644
--- a/library/SIP_Emulation.ttcn
+++ b/library/SIP_Emulation.ttcn
@@ -226,9 +226,7 @@
SipCreateCallback create_cb
};
-function f_init_sip(inout SIP_Emulation_CT ct, charstring id) {
- id := id & "-SIP";
-
+function f_init_sip(inout SIP_Emulation_CT ct, charstring id := "SIP_EMU") {
var SipOps ops := {
create_cb := refers(SIP_Emulation.ExpectedCreateCallback)
};
diff --git a/sip/SIP_Tests.ttcn b/sip/SIP_Tests.ttcn
index 95f09e8..5899311 100644
--- a/sip/SIP_Tests.ttcn
+++ b/sip/SIP_Tests.ttcn
@@ -131,7 +131,7 @@
//f_ipa_ctrl_start_client(mp_osmosip_host, mp_osmosip_port_ctrl);
f_init_mncc("SIP_Test");
log("end of f_init_mncc");
- f_init_sip(vc_SIP, "SIP_Test");
+ f_init_sip(vc_SIP, "SIP_Test_SIP_EMU");
log("end of f_init_sip");
map(self:SIPVTY, system:SIPVTY);
To view, visit change 36641. To unsubscribe, or for help writing mail filters, visit settings.