From 05c857842939435dde2026ba54338a5d6726a39a Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Wed, 1 Aug 2018 11:44:22 +0200
Subject: [PATCH] Fix for f_AE_REG_CRE_001, f_AE_REG_CRE_002 and
f_AE_DMR_DEL_004
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
OneM2M_PermutationFunctions.ttcn | 9 +++------
OneM2M_Testcases_AE_Release_1.ttcn | 13 +++++--------
2 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 0b475b9..8284a1f 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -418,13 +418,10 @@ module OneM2M_PermutationFunctions {
[] mcaPortIn.receive(mw_request(p_request)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__ & " : AE registration request is accepted!!");
- v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
- v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
- v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);
- v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
-
+ v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);
+
//send back responsePrimitive
- mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
}
[] mcaPortIn.receive(mw_request(mw_createAe())) -> value v_request {
tc_ac.stop;
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index 6c456ad..c33a066 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -536,13 +536,10 @@ module OneM2M_Testcases_AE_Release_1 {
[] mcaPortIn.receive(mw_request(v_requestPrimitive)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__ & " : AE registration request is accepted!!");
- v_parentIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
- v_resource := f_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, v_parentIndex, v_request.primitive.requestPrimitive.resourceType);
- v_resourceIndex := f_setLocalResource(v_resource, v_request.primitive.requestPrimitive.resourceType, v_parentIndex);
- v_responsePrimitive := valueof(m_responsePrimitive(int2001, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
+ v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);
//send back responsePrimitive
- mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
+ mcaPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
}
[] mcaPortIn.receive(mw_request(mw_createAe())) -> value v_request {
tc_ac.stop;
@@ -1873,9 +1870,9 @@ module OneM2M_Testcases_AE_Release_1 {
f_cf03Up();
//send triggering primitive to SUT
- v_localResource := f_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), vc_cSEBaseIndex, int4);
- v_containerResourceIndex := f_setLocalResource(v_localResource, int4, vc_cSEBaseIndex);
- v_localResource := f_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), v_resourceIndex, int4);
+ v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+ v_containerResourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
+ v_localResource := f_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), v_containerResourceIndex, int4);
v_resourceIndex := f_setLocalResource(v_localResource, int4, v_containerResourceIndex);
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex);
f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex));
--
GitLab