From c4c8ab2b3e5cf858916f6b7668d4c3fdfc46f016 Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Fri, 8 Dec 2017 02:57:57 +0100
Subject: [PATCH] Creation of local resource to be used in the
UtTriggerPrimitive
Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
---
OneM2M_Testcases_AE.ttcn | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/OneM2M_Testcases_AE.ttcn b/OneM2M_Testcases_AE.ttcn
index 83ad33d..de87f75 100644
--- a/OneM2M_Testcases_AE.ttcn
+++ b/OneM2M_Testcases_AE.ttcn
@@ -178,7 +178,7 @@ module OneM2M_Testcases_AE {
tc_ac.start;
alt {
- [] mcaPortIn.receive(mw_request(mw_createContainer(omit,v_utRequest.to_))) {
+ [] mcaPortIn.receive(mw_request(mw_createContainer(-,v_utRequest.to_))) {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container creation request received successfuly");
@@ -251,6 +251,7 @@ module OneM2M_Testcases_AE {
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
+ var PrimitiveContent v_localResource;
var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
@@ -262,8 +263,9 @@ module OneM2M_Testcases_AE {
f_cf03Up();
//Send Trigger Message
- v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
- v_utRequest.to_ := f_getResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope);
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -1, int3);
+ v_auxInteger := f_setLocalResource(v_localResource, int3);
+ v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope);
v_utRequest.from_ := "UNINITIALIZED";
f_sendUtPrimitive(v_utRequest,v_action);
@@ -337,6 +339,7 @@ module OneM2M_Testcases_AE {
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
+ var PrimitiveContent v_localResource;
var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
@@ -347,8 +350,8 @@ module OneM2M_Testcases_AE {
f_cf03Up();
//Send Trigger Message
- v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
- v_utRequest.to_ := f_getResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope);
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -1, int3);
+ v_auxInteger := f_setLocalResource(v_localResource, int3);
v_utRequest.from_ := "UNINITIALIZED";
f_sendUtPrimitive(v_utRequest,v_action);
@@ -428,6 +431,7 @@ module OneM2M_Testcases_AE {
var UtTriggerPrimitive v_utRequest;
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
+ var PrimitiveContent v_localResource;
var charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
@@ -438,7 +442,8 @@ module OneM2M_Testcases_AE {
f_cf03Up();
//Send Trigger Message
- v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -1, int3);
+ v_auxInteger := f_setLocalResource(v_localResource, int3);
v_utRequestTemplate := m_utRetrieveResource(f_getResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope),"UNINITIALIZED");
f_sendUtPrimitive(v_utRequestTemplate,v_action);
v_utRequest := valueof(v_utRequestTemplate);
@@ -514,6 +519,7 @@ module OneM2M_Testcases_AE {
var UtTriggerPrimitive v_utRequest;
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
+ var PrimitiveContent v_localResource;
var charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
@@ -524,7 +530,8 @@ module OneM2M_Testcases_AE {
f_cf03Up();
//Send Trigger Message
- v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -1, int3);
+ v_auxInteger := f_setLocalResource(v_localResource, int3);
v_utRequestTemplate := m_utRetrieveResource(f_getResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope),"UNINITIALIZED");
v_utRequest := valueof(v_utRequestTemplate);
f_sendUtPrimitive(v_utRequest,v_action);
@@ -604,6 +611,7 @@ module OneM2M_Testcases_AE {
var template UtTriggerPrimitive v_utRequest := m_utDeleteRequest;
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
+ var PrimitiveContent v_localResource;
var charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope);
if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
@@ -614,7 +622,8 @@ module OneM2M_Testcases_AE {
f_cf03Up();
//Send Trigger Message
- v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -1, int3);
+ v_auxInteger := f_setLocalResource(v_localResource, int3);
v_utRequest.to_ := f_getResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope);
v_utRequest.from_ := "UNINITIALIZED";
f_sendUtPrimitive(v_utRequest,v_action);
@@ -689,6 +698,7 @@ module OneM2M_Testcases_AE {
var template UtTriggerPrimitive v_utRequest := m_utDeleteRequest;
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
+ var PrimitiveContent v_localResource;
var charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope);
if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
@@ -699,7 +709,8 @@ module OneM2M_Testcases_AE {
f_cf03Up();
//Send Trigger Message
- v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -1, int3);
+ v_auxInteger := f_setLocalResource(v_localResource, int3);
v_utRequest.to_ := f_getResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope);
v_utRequest.from_ := "UNINITIALIZED";
f_sendUtPrimitive(v_utRequest,v_action);
--
GitLab