daniel has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35228?usp=email )
Change subject: gbproy/ns: Make components alive
......................................................................
gbproy/ns: Make components alive
Might help with random test failures on shutdown, see OS#6273 for
details.
Change-Id: I59578934c6406bea5eb8d55d3641737e555a2d85
Related: OS#6273
---
M gbproxy/GBProxy_Tests.ttcn
M library/NS_Emulation.ttcnpp
M library/NS_Provider_FR.ttcn
M library/RAW_NS.ttcnpp
4 files changed, 20 insertions(+), 7 deletions(-)
Approvals:
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
daniel: Looks good to me, approved; Verified
pespin: Looks good to me, but someone else must approve
diff --git a/gbproxy/GBProxy_Tests.ttcn b/gbproxy/GBProxy_Tests.ttcn
index e5bec7d..7a6572a 100644
--- a/gbproxy/GBProxy_Tests.ttcn
+++ b/gbproxy/GBProxy_Tests.ttcn
@@ -702,7 +702,7 @@
pars.p_tmsi := omit;
}
- vc_conn := BSSGP_ConnHdlr.create(id);
+ vc_conn := BSSGP_ConnHdlr.create(id) alive;
log("Starting ", id, " for SGSN[", sgsn_idx, "], NRI=", nri, ",
P-TMSI=", pars.p_tmsi,
", TLLI=", pars.tlli, ", IMSI=", pars.imsi, " on component=",
vc_conn);
diff --git a/library/NS_Emulation.ttcnpp b/library/NS_Emulation.ttcnpp
index b5fc807..d1700f8 100644
--- a/library/NS_Emulation.ttcnpp
+++ b/library/NS_Emulation.ttcnpp
@@ -319,7 +319,7 @@
/* Create ipep and add it to the list */
log("Creating NSIP provider for ", ipep.local_ip, ":",
ipep.local_udp_port);
- ipep.provider_ct := NS_Provider_IPL4_CT.create(nsvc_id
& "-provIP");
+ ipep.provider_ct := NS_Provider_IPL4_CT.create(nsvc_id
& "-provIP") alive;
connect(self:NSPIP_PROC, ipep.provider_ct:PROC);
ipep.provider_ct.start(NS_Provider_IPL4.main(nsvc_cfg,
g_config, nsvc_id));
g_ip_endpoints := g_ip_endpoints & { ipep };
@@ -343,7 +343,7 @@
/* Start the actual NSVC component */
te.cfg := nsvc_cfg;
- te.vc_conn := NSVC_CT.create(nsvc_id);
+ te.vc_conn := NSVC_CT.create(nsvc_id) alive;
te.state := NSVC_S_DEAD_BLOCKED;
connect(self:NSVC, te.vc_conn:NS_SP);
@@ -721,7 +721,7 @@
vc_NSP_IP := nsp_ip
#ifdef NS_EMULATION_FR
} else if (ischosen(g_nsvc_config.provider.fr)) {
- vc_NSP_FR := NS_Provider_FR_CT.create(id & "-provFR");
+ vc_NSP_FR := NS_Provider_FR_CT.create(id & "-provFR")
alive;
connect(self:NSCP, vc_NSP_FR:NSE);
vc_NSP_FR.start(NS_Provider_FR.main(g_nsvc_config,
g_config, id));
#endif
diff --git a/library/NS_Provider_FR.ttcn b/library/NS_Provider_FR.ttcn
index eb2fb24..b664b5e 100644
--- a/library/NS_Provider_FR.ttcn
+++ b/library/NS_Provider_FR.ttcn
@@ -30,7 +30,7 @@
function main(NSVCConfiguration config, NSConfiguration nsconfig, charstring
id) runs on NS_Provider_FR_CT system af_packet {
/* start Frame Relay Emulation */
- vc_FREMU := FR_Emulation_CT.create(id & "-FRemu");
+ vc_FREMU := FR_Emulation_CT.create(id & "-FRemu") alive;
var Q933em_Config q933_cfg := valueof(ts_Q933em_Config(ats_is_user :=
not nsconfig.role_sgsn, bidirectional := false));
q933_cfg.T391 := 1.0;
map(vc_FREMU:FR, system:AF_PACKET) param (config.provider.fr.netdev);
diff --git a/library/RAW_NS.ttcnpp b/library/RAW_NS.ttcnpp
index 6930a72..da1a0cc 100644
--- a/library/RAW_NS.ttcnpp
+++ b/library/RAW_NS.ttcnpp
@@ -103,7 +103,7 @@
}
ip_prov[prov_idx].local_ip :=
ns_config.nsvc[idx].provider.ip.local_ip;
ip_prov[prov_idx].local_udp_port :=
ns_config.nsvc[idx].provider.ip.local_udp_port;
- ip_prov[prov_idx].vc_NSP_IP :=
NS_Provider_IPL4_CT.create(id & "-provIP" & int2str(prov_idx));
+ ip_prov[prov_idx].vc_NSP_IP :=
NS_Provider_IPL4_CT.create(id & "-provIP" & int2str(prov_idx)) alive;
connect(self:NSPIP_PROC,
ip_prov[prov_idx].vc_NSP_IP:PROC);
ip_prov[prov_idx].vc_NSP_IP.start(NS_Provider_IPL4.main(ns_config.nsvc[idx],
ns_config, id));
}
@@ -112,7 +112,7 @@
/* the NS_PROV_LINK_STATUS_UP is not sent by the
NS_Provider_IPL4 because we connect the port manual */
#ifdef NS_EMULATION_FR
} else if (ischosen(ns_config.nsvc[idx].provider.fr)) {
- vc_NSP_FR[idx] := NS_Provider_FR_CT.create(id & "-provFR");
+ vc_NSP_FR[idx] := NS_Provider_FR_CT.create(id & "-provFR")
alive;
connect(self:NSCP[idx], vc_NSP_FR[idx]:NSE);
vc_NSP_FR[idx].start(NS_Provider_FR.main(ns_config.nsvc[idx],
ns_config, id));
NSCP[idx].receive(NS_Provider_Evt:{link_status:=NS_PROV_LINK_STATUS_UP});
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35228?usp=email
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: I59578934c6406bea5eb8d55d3641737e555a2d85
Gerrit-Change-Number: 35228
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillm...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillm...@sysmocom.de>
Gerrit-Reviewer: fixeria <axilira...@gmail.com>
Gerrit-Reviewer: osmith <osm...@sysmocom.de>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged
