From c7a65bf32e8c6974b6ebbd2ec2667a775b8a0479 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Thu, 23 Jan 2020 15:48:22 +0100
Subject: [PATCH] Fix #90
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
OneM2M_PermutationFunctions.ttcn | 44 ++++++++++++--------------------
1 file changed, 17 insertions(+), 27 deletions(-)
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 2b4a2c1..9f5061c 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -4035,14 +4035,11 @@ module OneM2M_PermutationFunctions {
function f_CSE_DMR_CRE_023(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template (present) RequestPrimitive p_requestAnnc) runs on AeSimu system CseSystem{
// Local variables
- var MsgIn v_anncRequest;
- var RequestPrimitive v_request;
+ var integer v_aeIndex := -1;
var integer v_parentIndex := -1;
- var integer v_containerIndex := -1;
- var integer v_remoteCseIndex;
- var integer v_aeAnncIndex;
- var integer v_resourceIndex;
-
+ var template RequestPrimitive v_create := m_createAe(PX_TS_AE1.appId, omit, omit);
+ v_create.primitiveContent.aE.announceTo := {PX_TS_CSE1.cseId};
+
// Test control
// Test component configuration
@@ -4052,31 +4049,24 @@ module OneM2M_PermutationFunctions {
// Preamble
- if (PX_MN_CSE) {
- vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSE));
- }else if (PX_IN_CSE) {
- vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
- }
- vc_cse1.done;
+ vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, {f_getCompletePoA()})));
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
- vc_cse1.start(f_cse_announcementProcedure_createHandler());
- v_resourceIndex := f_cse_createResource(int2, m_createAe(PX_TS_AE1.appId, omit, omit));
- vc_cse1.done;
-
+ vc_cse1.start(f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -)));
+ v_aeIndex := f_cse_createResource(int2,v_create);
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
+
if(p_resourceType == int4) {
- v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_parentIndex);
- v_parentIndex := v_containerIndex;
+ v_parentIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
+ } else {
+ v_parentIndex := v_aeIndex;
}
// Test Body
- v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_parentIndex);
-
- vc_cse1.start(f_cse_receiveCreateRequest_cseSimu(p_requestAnnc));
- f_send(e_mcaPort, m_request(v_request));
- vc_cse1.done;
-
- vc_request.primitive.requestPrimitive := f_getRequestPrimitive(vc_cse1);
-
+ vc_cse1.start(f_cse_announcementProcedure_createHandler(p_requestAnnc));
+ f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
+
// Postamble
f_cse_postamble_deleteResources();
--
GitLab