laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20128 )
Change subject: NS_Emulation: pass around string idenifier for components
created
......................................................................
NS_Emulation: pass around string idenifier for components created
We want to see useful identification for components in the log, and
hence must be giving every component a name at create() time.
Change-Id: I0fe650243953e4d85161684865acd0354b2e465f
---
M library/NS_Emulation.ttcnpp
M library/NS_Provider_FR.ttcn
M library/NS_Provider_IPL4.ttcn
3 files changed, 11 insertions(+), 10 deletions(-)
Approvals:
fixeria: Looks good to me, approved
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
lynxis lazus: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp
index ee25d3e..5fb2aa6 100644
--- a/library/NS_Emulation.ttcnpp
+++ b/library/NS_Emulation.ttcnpp
@@ -85,25 +85,25 @@
out NsUnitdataRequest;
} with { extension "internal" };
- function NSStart(NSConfiguration init_config) runs on NS_CT {
+ function NSStart(NSConfiguration init_config, charstring id :=
testcasename()) runs on NS_CT {
config := init_config;
- f_init();
+ f_init(id & "-NSemu");
f_ScanEvents();
}
- private function f_init() runs on NS_CT {
+ private function f_init(charstring id) runs on NS_CT {
var Result res;
if (ischosen(config.provider.ip)) {
/* Connect the UDP socket */
- vc_NSP_IP := NS_Provider_IPL4_CT.create;
+ vc_NSP_IP := NS_Provider_IPL4_CT.create(id & "-provIP");
connect(self:NSCP, vc_NSP_IP:NSE);
- vc_NSP_IP.start(NS_Provider_IPL4.main(config));
+ vc_NSP_IP.start(NS_Provider_IPL4.main(config, id));
#ifdef NS_EMULATION_FR
} else if (ischosen(config.provider.fr)) {
- vc_NSP_FR := NS_Provider_FR_CT.create;
+ vc_NSP_FR := NS_Provider_FR_CT.create(id & "-provFR");
connect(self:NSCP, vc_NSP_FR:NSE);
- vc_NSP_FR.start(NS_Provider_FR.main(config));
+ vc_NSP_FR.start(NS_Provider_FR.main(config, id));
#endif
}
diff --git a/library/NS_Provider_FR.ttcn b/library/NS_Provider_FR.ttcn
index afa27d9..5387b0f 100644
--- a/library/NS_Provider_FR.ttcn
+++ b/library/NS_Provider_FR.ttcn
@@ -27,11 +27,12 @@
var boolean pvc_active := false;
};
-function main(NSConfiguration config) runs on NS_Provider_FR_CT system
af_packet {
+function main(NSConfiguration config, charstring id) runs on NS_Provider_FR_CT
system af_packet {
/* start Frame Relay Emulation */
- vc_FREMU := FR_Emulation_CT.create();
+ vc_FREMU := FR_Emulation_CT.create(id & "-FRemu");
var Q933em_Config q933_cfg := valueof(ts_Q933em_Config(ats_is_user :=
not config.role_sgsn, bidirectional := false));
+ q933_cfg.T391 := 1.0;
map(vc_FREMU:FR, system:AF_PACKET) param (config.provider.fr.netdev);
vc_FREMU.start(FrameRelay_Emulation.main(q933_cfg));
diff --git a/library/NS_Provider_IPL4.ttcn b/library/NS_Provider_IPL4.ttcn
index f1fda6c..3b9fcaf 100644
--- a/library/NS_Provider_IPL4.ttcn
+++ b/library/NS_Provider_IPL4.ttcn
@@ -23,7 +23,7 @@
var integer g_conn_id := -1;
};
-function main(NSConfiguration config) runs on NS_Provider_IPL4_CT {
+function main(NSConfiguration config, charstring id) runs on
NS_Provider_IPL4_CT {
/* connect socket */
map(self:IPL4, system:IPL4);
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20128
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I0fe650243953e4d85161684865acd0354b2e465f
Gerrit-Change-Number: 20128
Gerrit-PatchSet: 7
Gerrit-Owner: laforge <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: lynxis lazus <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-CC: daniel <[email protected]>
Gerrit-MessageType: merged
