From f7223230a2875bd40430afaa64f27b7f0144640f Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Tue, 10 Jul 2018 21:13:06 +0200
Subject: [PATCH] Review of f_CSE_ANNC_CRE_009_CseSimu
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
OneM2M_PermutationFunctions.ttcn | 30 ++++++-----------------------
OneM2M_Testcases_CSE_Release_2.ttcn | 7 ++++---
2 files changed, 10 insertions(+), 27 deletions(-)
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 8788fbb..c5c1028 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -7565,7 +7565,7 @@ module OneM2M_PermutationFunctions {
var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_create.primitiveContent.container.announceTo := {PX_CSE1_ID};
+ v_create.primitiveContent.aE.announceTo := {PX_CSE1_ID};
// Test control
@@ -7574,34 +7574,16 @@ module OneM2M_PermutationFunctions {
//Test adapter configuration
// Register the CSE
- f_cse_registerRemoteCse(mw_createRemoteCSE);
+ f_cse_registerRemoteCse(m_createRemoteCSEBase);
v_ae1.start(f_cse_createResource(int2,v_create));
- f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -));
+ v_aeIndex := f_getLatestResourceIndex(v_ae1);
+ v_aEAnncIndex := f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -));
v_ae1.done;
// Test Body
- v_ae1.start(f_cse_sendCreateRequestPrimitive(p_resourceType,p_requestCreatePrimitive, v_parentIndex));
-
- tc_ac.start;
- alt {
- [] mccPortIn.receive(mw_request(p_createRequestAnnc)) -> value v_request {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ":INFO: CREATE REQUEST received");
-
- if(match(v_request.primitive.requestPrimitive.to_, f_getLocalResourceAddress(v_aEAnncIndex, e_hierarchical, e_spRelative)) or
- match(v_request.primitive.requestPrimitive.to_, f_getLocalResourceAddress(v_aEAnncIndex, e_nonHierarchical, e_spRelative))) {
- setverdict(pass, __SCOPE__ & ":matching ANNC_PARENT_RESOURCE_ADDRESS");
- } else {
- setverdict(fail, __SCOPE__ & ":mis-matching ANNC_PARENT_RESOURCE_ADDRESS");
- }
-
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ":ERROR: No CREATE REQUEST received");
- }
- }
-
+ v_ae1.start(f_cse_createResource(p_resourceType,p_requestCreatePrimitive, v_aeIndex));
+ f_cse_announcementProcedure_createHandler(p_createRequestAnnc, -, v_aEAnncIndex);
v_ae1.done;
// Postamble
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index dee81de..744c452 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -10859,11 +10859,12 @@ module OneM2M_Testcases_CSE_Release_2 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template RequestPrimitive v_createRequest := m_createContainerBase;
var template RequestPrimitive v_createRequestAnnc := mw_createContainerAnncBase;
-
- v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
- v_cse1.done;
+ v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
+ v_cse1.done;
+
v_createRequest.primitiveContent.container.announceTo := {PX_CSE1_ID};
v_createRequest.primitiveContent.container.labels := {"MyLabel"};
+ v_createRequestAnnc.primitiveContent.container.labels := ?;
v_cse1.start(f_CSE_ANNC_CRE_009_CseSimu(int3, v_createRequestAnnc, v_createRequest));//Container
v_cse1.done;
--
GitLab