pespin submitted this change.

View Change

Approvals: fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified
RAN_Adapter: Create components alive

HNBGW_Tests.TC_hnb_disconnected_timeout needs modification since it
expects the component to drop the underlaying conn towards the IUT when
the component is stopped. This is not longer the case when the component
is created as "alive". In order to make sure its resources are
destroyed, one needs to kill it.

Change-Id: Ice4d93b42552f1c5d621582b1fc3a38b4e1ae837
---
M hnbgw/HNBGW_Tests.ttcn
M library/RAN_Adapter.ttcnpp
2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn
index 939a608..1665431 100644
--- a/hnbgw/HNBGW_Tests.ttcn
+++ b/hnbgw/HNBGW_Tests.ttcn
@@ -424,8 +424,8 @@
function f_drop_hnodeb(integer hnb_idx) runs on test_CT
{

- vc_Iuh[hnb_idx].stop;
- vc_RUA[hnb_idx].stop;
+ vc_Iuh[hnb_idx].kill;
+ vc_RUA[hnb_idx].kill;
disconnect(self:HNBAP[hnb_idx], vc_Iuh[hnb_idx]:HNBAP);
disconnect(vc_RUA[hnb_idx]:RUA, vc_Iuh[hnb_idx]:RUA);
}
diff --git a/library/RAN_Adapter.ttcnpp b/library/RAN_Adapter.ttcnpp
index c90ffce..04a9bf0 100644
--- a/library/RAN_Adapter.ttcnpp
+++ b/library/RAN_Adapter.ttcnpp
@@ -92,9 +92,9 @@
ops.sccp_addr_peer := ba.sccp_addr_peer;

/* create components */
- ba.vc_SCCP := SCCP_CT.create(id & "-SCCP");
+ ba.vc_SCCP := SCCP_CT.create(id & "-SCCP") alive;
if (isvalue(ops)) {
- ba.vc_RAN := RAN_Emulation_CT.create(id & "-RAN");
+ ba.vc_RAN := RAN_Emulation_CT.create(id & "-RAN") alive;
} else {
ba.vc_RAN := null;
}
@@ -106,7 +106,7 @@
} else {
rctx := cfg.rctx;
}
- ba.vc_M3UA := M3UA_CT.create(id & "-M3UA");
+ ba.vc_M3UA := M3UA_CT.create(id & "-M3UA") alive;
map(ba.vc_M3UA:SCTP_PORT, system:sctp);
/* connect MTP3 service provider (M3UA) to lower side of SCCP */
connect(ba.vc_M3UA:MTP3_SP_PORT, ba.vc_SCCP:MTP3_SCCP_PORT);
@@ -114,12 +114,12 @@
}
#ifdef IPA_EMULATION_SCCP
case (BSSAP_TRANSPORT_SCCPlite_SERVER) {
- ba.vc_IPA := IPA_Emulation_CT.create(id & "-IPA");
+ ba.vc_IPA := IPA_Emulation_CT.create(id & "-IPA") alive;
map(ba.vc_IPA:IPA_PORT, system:IPA_CODEC_PT);
/* connect MTP3 service provider (IPA) to lower side of SCCP */
connect(ba.vc_IPA:MTP3_SP_PORT, ba.vc_SCCP:MTP3_SCCP_PORT);
/* connect waiter to general IPA port (for ASP_IPA_Event) */
- ba.vc_WAIT := IPA_EventWaiter_CT.create(id & "-IPA-WAIT");
+ ba.vc_WAIT := IPA_EventWaiter_CT.create(id & "-IPA-WAIT") alive;
connect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT);
ba.vc_WAIT.start(IPA_Emulation.waiter_main());
ba.vc_IPA.start(IPA_Emulation.main_server(cfg.sctp_addr.local_ip_addr,
@@ -130,12 +130,12 @@
disconnect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT);
}
case (BSSAP_TRANSPORT_SCCPlite_CLIENT) {
- ba.vc_IPA := IPA_Emulation_CT.create(id & "-IPA");
+ ba.vc_IPA := IPA_Emulation_CT.create(id & "-IPA") alive;
map(ba.vc_IPA:IPA_PORT, system:IPA_CODEC_PT);
/* connect MTP3 service provider (IPA) to lower side of SCCP */
connect(ba.vc_IPA:MTP3_SP_PORT, ba.vc_SCCP:MTP3_SCCP_PORT);
/* connect waiter to general IPA port (for ASP_IPA_Event) */
- ba.vc_WAIT := IPA_EventWaiter_CT.create(id & "-IPA-WAIT");
+ ba.vc_WAIT := IPA_EventWaiter_CT.create(id & "-IPA-WAIT") alive;
connect(ba.vc_IPA:IPA_SP_PORT, ba.vc_WAIT:IPA_SP_PORT);
ba.vc_WAIT.start(IPA_Emulation.waiter_main());
ba.vc_IPA.start(IPA_Emulation.main_client(cfg.sctp_addr.remote_ip_addr,

To view, visit change 39486. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ice4d93b42552f1c5d621582b1fc3a38b4e1ae837
Gerrit-Change-Number: 39486
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-CC: laforge <laforge@osmocom.org>