From d9844b24efef08b3a1f4805aace5e0db795acb22 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Wed, 14 Mar 2018 20:20:08 +0100
Subject: [PATCH] Completing the deactivation and reactivation of defaults
during UT trigger actions
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Functions.ttcn | 29 +++++++++++++++++++++--------
LibOneM2M/OneM2M_TestSystem.ttcn | 3 ++-
2 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 8c56a99..575401f 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -39,7 +39,7 @@ module OneM2M_Functions {
map(self:acPort, system:acPort);
activate(a_default());
- activate(a_cse_cf01());
+ vc_a_cse := activate(a_cse_cf01());
// Initialize AE2
if(p_auxiliaryAe2Required) {
@@ -88,7 +88,7 @@ module OneM2M_Functions {
map(self:utPort, system:utPort);
}
activate(a_default());
- activate(a_cse_cf02_ae1());
+ vc_a_cse := activate(a_cse_cf02_ae1());
vc_cse1.start(f_cf02UpCse1());
vc_cse1.done;
@@ -140,7 +140,7 @@ module OneM2M_Functions {
map(self:mccPortIn, system:mccPortIn);
map(self:acPort, system:acPort);
activate(a_default());
- activate(a_cse_cf02_cse1());
+ vc_a_cse := activate(a_cse_cf02_cse1());
vc_ae1.start(f_cf02UpAe1());
vc_ae1.done;
@@ -189,7 +189,7 @@ module OneM2M_Functions {
map(self:utPort, system:utPort);
}
activate(a_default());
- vc_a_ae_cf03 := activate(a_ae_cf03());
+ vc_a_ae := activate(a_ae_cf03());
// Connect
@@ -216,7 +216,7 @@ module OneM2M_Functions {
map(self:mccPortIn, system:mccPortIn);
map(self:acPort, system:acPort);
activate(a_default());
- activate(a_cse_cf04());
+ vc_a_cse := activate(a_cse_cf04());
// Connect
@@ -3532,7 +3532,7 @@ module OneM2M_Functions {
p_utRequest.from_ := "UNINITIALIZED";
p_utRequest.requestIdentifier := "m_uttriggerPrimitive" & f_rnd(1, 1000000);
- deactivate(vc_a_ae_cf03);
+ deactivate;
utPort.send(valueof(p_utRequest));
tc_wait.start;
@@ -3549,8 +3549,21 @@ module OneM2M_Functions {
setverdict(inconc, __SCOPE__, " : Timeout due to no response received from requested SUT!");
}
}
- vc_a_ae_cf03 := activate(a_ae_cf03());
-
+
+ activate(a_default());
+ if(vc_config == e_cf01) {
+ vc_a_cse := activate(a_cse_cf01());
+ } else if ((vc_config == e_cf02) or (vc_config == e_cf02CseSimuMaster)) {
+ if(vc_testSystemRole == e_ae) {
+ vc_a_cse := activate(a_cse_cf02_ae1());
+ } else if (vc_testSystemRole == e_cse) {
+ vc_a_cse := activate(a_cse_cf02_cse1());
+ }
+ } else if (vc_config == e_cf03) {
+ vc_a_ae := activate(a_ae_cf03());
+ } else if (vc_config == e_cf04) {
+ vc_a_cse := activate(a_cse_cf04());
+ }
}else{
action(p_action);
diff --git a/LibOneM2M/OneM2M_TestSystem.ttcn b/LibOneM2M/OneM2M_TestSystem.ttcn
index 99c08aa..b61834b 100644
--- a/LibOneM2M/OneM2M_TestSystem.ttcn
+++ b/LibOneM2M/OneM2M_TestSystem.ttcn
@@ -39,7 +39,8 @@ module OneM2M_TestSystem {
var AccessControlPolicy_optional vc_acpAux;
var MsgIn vc_request;
var MsgIn vc_response;
- var default vc_a_ae_cf03;
+ var default vc_a_ae := null;
+ var default vc_a_cse := null;
};
type component AeSimu extends Tester {
--
GitLab