From 677f4bbcd539d034dee773d04f808a1fc5ab6cdd Mon Sep 17 00:00:00 2001 From: Bogdan Stanca-Kaposta <bogdan.stanca-kaposta@spirent.com> Date: Sat, 9 Dec 2017 00:14:43 +0900 Subject: [PATCH] AE testcases should use getLocalResourceAddress and setLocalResource --- OneM2M_Testcases_AE.ttcn | 130 +++++++++++++++++++-------------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/OneM2M_Testcases_AE.ttcn b/OneM2M_Testcases_AE.ttcn index c2529e1..7cda4d2 100644 --- a/OneM2M_Testcases_AE.ttcn +++ b/OneM2M_Testcases_AE.ttcn @@ -77,7 +77,7 @@ module OneM2M_Testcases_AE { var integer v_resourceIndex := -1; var MsgIn v_request; var PrimitiveContent v_modifiedResource; - var charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope); + var charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_nonHierarchical, p_primitiveScope); if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) { setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case"); @@ -159,7 +159,7 @@ module OneM2M_Testcases_AE { var ResponsePrimitive v_responsePrimitive; var template UtTriggerPrimitive v_utRequest := m_utCreateContainer; var UtTriggerAckPrimitive v_trigger_response; - var charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope); + var charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_hierarchical, p_primitiveScope); //Test Control @@ -171,14 +171,14 @@ module OneM2M_Testcases_AE { f_cf03Up(); //Send Trigger Message - v_utRequest.to_ := f_getResourceAddress(-1, e_hierarchical, p_primitiveScope); + v_utRequest.to_ := f_getLocalResourceAddress(-1, e_hierarchical, p_primitiveScope); v_utRequest.from_ := "UNINITIALIZED"; f_sendUtPrimitive(v_utRequest,v_action); 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,7 +251,7 @@ module OneM2M_Testcases_AE { var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer; var UtTriggerAckPrimitive v_trigger_response; var integer v_auxInteger; - var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope); + var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_nonHierarchical, p_primitiveScope); if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) { @@ -263,13 +263,13 @@ module OneM2M_Testcases_AE { //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_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope); v_utRequest.from_ := "UNINITIALIZED"; f_sendUtPrimitive(v_utRequest,v_action); tc_ac.start; alt { - [] mcaPortIn.receive(mw_request(mw_updateContainer(omit,v_utRequest.to_))) { + [] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.to_))) { tc_ac.stop; setverdict(pass, __SCOPE__, " : Container update request received successfuly"); @@ -337,7 +337,7 @@ module OneM2M_Testcases_AE { var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer; var UtTriggerAckPrimitive v_trigger_response; var integer v_auxInteger; - var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope); + var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_hierarchical, p_primitiveScope); if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) { setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case"); @@ -348,13 +348,13 @@ module OneM2M_Testcases_AE { //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_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope); v_utRequest.from_ := "UNINITIALIZED"; f_sendUtPrimitive(v_utRequest,v_action); tc_ac.start; alt { - [] mcaPortIn.receive(mw_request(mw_updateContainer(omit,v_utRequest.to_))) { + [] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.to_))) { tc_ac.stop; setverdict(pass, __SCOPE__, " : Container update request received successfuly"); @@ -428,7 +428,7 @@ module OneM2M_Testcases_AE { var UtTriggerPrimitive v_utRequest; var UtTriggerAckPrimitive v_trigger_response; var integer v_auxInteger; - var charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope); + var charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_nonHierarchical, p_primitiveScope); if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) { setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case"); @@ -439,7 +439,7 @@ module OneM2M_Testcases_AE { //Send Trigger Message v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3); - v_utRequestTemplate := m_utRetrieveResource(f_getResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope),"UNINITIALIZED"); + v_utRequestTemplate := m_utRetrieveResource(f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope),"UNINITIALIZED"); f_sendUtPrimitive(v_utRequestTemplate,v_action); v_utRequest := valueof(v_utRequestTemplate); @@ -514,7 +514,7 @@ module OneM2M_Testcases_AE { var UtTriggerPrimitive v_utRequest; var UtTriggerAckPrimitive v_trigger_response; var integer v_auxInteger; - var charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope); + var charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_hierarchical, p_primitiveScope); if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) { setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case"); @@ -525,7 +525,7 @@ module OneM2M_Testcases_AE { //Send Trigger Message v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3); - v_utRequestTemplate := m_utRetrieveResource(f_getResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope),"UNINITIALIZED"); + v_utRequestTemplate := m_utRetrieveResource(f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope),"UNINITIALIZED"); v_utRequest := valueof(v_utRequestTemplate); f_sendUtPrimitive(v_utRequest,v_action); @@ -604,7 +604,7 @@ module OneM2M_Testcases_AE { var template UtTriggerPrimitive v_utRequest := m_utDeleteRequest; var UtTriggerAckPrimitive v_trigger_response; var integer v_auxInteger; - var charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope); + var charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_nonHierarchical, p_primitiveScope); if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) { setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case"); @@ -615,7 +615,7 @@ module OneM2M_Testcases_AE { //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_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope); v_utRequest.from_ := "UNINITIALIZED"; f_sendUtPrimitive(v_utRequest,v_action); @@ -689,7 +689,7 @@ module OneM2M_Testcases_AE { var template UtTriggerPrimitive v_utRequest := m_utDeleteRequest; var UtTriggerAckPrimitive v_trigger_response; var integer v_auxInteger; - var charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope); + var charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getLocalResourceAddress(-1, e_hierarchical, p_primitiveScope); if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) { setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case"); @@ -700,7 +700,7 @@ module OneM2M_Testcases_AE { //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_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope); v_utRequest.from_ := "UNINITIALIZED"; f_sendUtPrimitive(v_utRequest,v_action); @@ -1483,7 +1483,7 @@ module OneM2M_Testcases_AE { var template RequestPrimitive v_request := mw_updateContainer; var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer; var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute expirationTime"; - v_utRequest.to_ := f_getResourceAddress(v_auxInteger); + v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger); v_utRequest.primitiveContent.container.expirationTime := "20301231T012345"; v_request.primitiveContent.container.expirationTime := ?; f_AE_DMR_UPD_002(v_utRequest,v_request,v_action); @@ -1495,7 +1495,7 @@ module OneM2M_Testcases_AE { var template RequestPrimitive v_request := mw_updateContainer; var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer; var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute labels"; - v_utRequest.to_ := f_getResourceAddress(v_auxInteger); + v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger); v_utRequest.primitiveContent.container.labels := {"UNINITIALIZED"}; v_request.primitiveContent.container.labels := ?; f_AE_DMR_UPD_002(v_utRequest,v_request,v_action); @@ -1507,7 +1507,7 @@ module OneM2M_Testcases_AE { var template RequestPrimitive v_request := mw_updateContainer; var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer; var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxNrOfInstances"; - v_utRequest.to_ := f_getResourceAddress(v_auxInteger); + v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger); v_utRequest.primitiveContent.container.maxNrOfInstances := 1; v_request.primitiveContent.container.maxNrOfInstances := ?; f_AE_DMR_UPD_002(v_utRequest,v_request,v_action); @@ -1519,7 +1519,7 @@ module OneM2M_Testcases_AE { var template RequestPrimitive v_request := mw_updateContainer; var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer; var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxByteSize"; - v_utRequest.to_ := f_getResourceAddress(v_auxInteger); + v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger); v_utRequest.primitiveContent.container.maxByteSize := 1; v_request.primitiveContent.container.maxByteSize := ?; f_AE_DMR_UPD_002(v_utRequest,v_request,v_action); @@ -1531,7 +1531,7 @@ module OneM2M_Testcases_AE { var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer; var charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxInstanceAge"; - v_utRequest.to_ := f_getResourceAddress(v_auxInteger); + v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger); v_utRequest.primitiveContent.container.maxInstanceAge := 1; v_request.primitiveContent.container.maxInstanceAge := ?; f_AE_DMR_UPD_002(v_utRequest,v_request,v_action); @@ -1590,21 +1590,21 @@ module OneM2M_Testcases_AE { */ testcase TC_AE_DMR_RET_001_CB() runs on CseSimu system AeSystem { - var integer v_auxInteger := f_setResource(valueof(m_primitiveContentCSEBase(m_contentCreateCSEBase)), int5); + var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentCSEBase(m_contentCreateCSEBase)), int5); var charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for CSEBase"; - f_AE_DMR_RET_001(int5, f_getResourceAddress(v_auxInteger),v_action); + f_AE_DMR_RET_001(int5, f_getLocalResourceAddress(v_auxInteger),v_action); } testcase TC_AE_DMR_RET_001_AE() runs on CseSimu system AeSystem { - var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2); + var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2); var charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for AE"; - f_AE_DMR_RET_001(int2, f_getResourceAddress(v_auxInteger),v_action); + f_AE_DMR_RET_001(int2, f_getLocalResourceAddress(v_auxInteger),v_action); } testcase TC_AE_DMR_RET_001_CNT() runs on CseSimu system AeSystem { - var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer())), int3); + var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer())), int3); var charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for Container"; - f_AE_DMR_RET_001(int3, f_getResourceAddress(v_auxInteger),v_action); + f_AE_DMR_RET_001(int3, f_getLocalResourceAddress(v_auxInteger),v_action); } function f_AE_DMR_RET_001(ResourceType p_resourceType, XSD.AnyURI p_address, in charstring p_action) runs on CseSimu { @@ -1656,8 +1656,8 @@ module OneM2M_Testcases_AE { testcase TC_AE_DMR_RET_002() runs on CseSimu system AeSystem { - var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3); - var XSD.AnyURI v_address := f_getResourceAddress(v_auxInteger); + var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3); + var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger); //variables var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address & "/" & c_resourceShortNameOldest, "UNINITIALIZED"); @@ -1704,8 +1704,8 @@ module OneM2M_Testcases_AE { testcase TC_AE_DMR_RET_003() runs on CseSimu system AeSystem { - var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3); - var XSD.AnyURI v_address := f_getResourceAddress(v_auxInteger); + var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3); + var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger); //variables var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address & "/" & c_resourceShortNameLatest, "UNINITIALIZED"); @@ -1752,8 +1752,8 @@ module OneM2M_Testcases_AE { testcase TC_AE_DMR_RET_004() runs on CseSimu system AeSystem { - var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3); - var XSD.AnyURI v_address := f_getResourceAddress(v_auxInteger); + var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3); + var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger); //variables var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address, "UNINITIALIZED"); @@ -1801,8 +1801,8 @@ module OneM2M_Testcases_AE { testcase TC_AE_DMR_RET_005 () runs on CseSimu system AeSystem { - var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), int4); - var XSD.AnyURI v_address := f_getResourceAddress(v_auxInteger); + var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), int4); + var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger); //variables var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address, "UNINITIALIZED"); @@ -1854,8 +1854,8 @@ module OneM2M_Testcases_AE { testcase TC_AE_DMR_DEL_001() runs on CseSimu system AeSystem { - var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3); - var XSD.AnyURI v_address := f_getResourceAddress(v_auxInteger); + var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3); + var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger); //variables var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address & "/" & c_resourceShortNameOldest, "UNINITIALIZED"); @@ -1902,8 +1902,8 @@ module OneM2M_Testcases_AE { testcase TC_AE_DMR_DEL_002() runs on CseSimu system AeSystem { - var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3); - var XSD.AnyURI v_address := f_getResourceAddress(v_auxInteger); + var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3); + var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger); //variables var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address & "/" & c_resourceShortNameLatest, "UNINITIALIZED"); @@ -1950,8 +1950,8 @@ module OneM2M_Testcases_AE { testcase TC_AE_DMR_DEL_003() runs on CseSimu system AeSystem { - var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3); - var XSD.AnyURI v_address := f_getResourceAddress(v_auxInteger); + var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3); + var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger); //variables var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address, "UNINITIALIZED"); @@ -1999,8 +1999,8 @@ module OneM2M_Testcases_AE { testcase TC_AE_DMR_DEL_004 () runs on CseSimu system AeSystem { - var integer v_auxInteger := f_setResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)),int4); - var XSD.AnyURI v_address := f_getResourceAddress(v_auxInteger); + var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)),int4); + var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger); //variables var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address, "UNINITIALIZED"); @@ -2063,8 +2063,8 @@ module OneM2M_Testcases_AE { var ResponsePrimitive v_responsePrimitive; var charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request"; - var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2); - v_utRequest.to_ := f_getResourceAddress(v_auxInteger); + var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2); + v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger); f_cf03Up(); @@ -2109,11 +2109,11 @@ module OneM2M_Testcases_AE { var charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute accessControlPolicyIDs"; var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2); - v_utRequest.to_ := f_getResourceAddress(v_auxInteger); + v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger); v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"}; v_utRequest.primitiveContent.subscription.accessControlPolicyIDs := {"UNINITIALIZED"}; - v_requestT.to_ := f_getResourceAddress(v_auxInteger); + v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger); v_requestT.primitiveContent.subscription.notificationURI := ?; v_requestT.primitiveContent.subscription.accessControlPolicyIDs := ?; @@ -2125,12 +2125,12 @@ module OneM2M_Testcases_AE { var template RequestPrimitive v_requestT := mw_createSubscription; var charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute createdBefore"; var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2); - v_utRequest.to_ := f_getResourceAddress(v_auxInteger); + v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger); v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"}; v_utRequest.primitiveContent.subscription.eventNotificationCriteria.createdBefore := "20301231T012345"; - v_requestT.to_ := f_getResourceAddress(v_auxInteger); + v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger); v_requestT.primitiveContent.subscription.notificationURI := ?; v_requestT.primitiveContent.subscription.eventNotificationCriteria.createdBefore := ?; @@ -2143,11 +2143,11 @@ module OneM2M_Testcases_AE { var charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute expirationCounter"; var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2); - v_utRequest.to_ := f_getResourceAddress(v_auxInteger); + v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger); v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"}; v_utRequest.primitiveContent.subscription.expirationCounter := 1; - v_requestT.to_ := f_getResourceAddress(v_auxInteger); + v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger); v_requestT.primitiveContent.subscription.notificationURI := ?; v_requestT.primitiveContent.subscription.expirationCounter := ?; @@ -2160,11 +2160,11 @@ module OneM2M_Testcases_AE { var charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationForwardingURI"; var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2); - v_utRequest.to_ := f_getResourceAddress(v_auxInteger); + v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger); v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"}; v_utRequest.primitiveContent.subscription.notificationForwardingURI := "UNINITIALIZED"; - v_requestT.to_ := f_getResourceAddress(v_auxInteger); + v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger); v_requestT.primitiveContent.subscription.notificationURI := ?; v_requestT.primitiveContent.subscription.notificationForwardingURI := ?; @@ -2177,11 +2177,11 @@ module OneM2M_Testcases_AE { var charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationContentType"; var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2); - v_utRequest.to_ := f_getResourceAddress(v_auxInteger); + v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger); v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"}; v_utRequest.primitiveContent.subscription.notificationContentType := int1; - v_requestT.to_ := f_getResourceAddress(v_auxInteger); + v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger); v_requestT.primitiveContent.subscription.notificationURI := ?; v_requestT.primitiveContent.subscription.notificationContentType := ?; @@ -2194,11 +2194,11 @@ module OneM2M_Testcases_AE { var charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute notificationEventCat"; var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2); - v_utRequest.to_ := f_getResourceAddress(v_auxInteger); + v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger); v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"}; v_utRequest.primitiveContent.subscription.notificationEventCat.alt_1 := 100; - v_requestT.to_ := f_getResourceAddress(v_auxInteger); + v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger); v_requestT.primitiveContent.subscription.notificationURI := ?; v_requestT.primitiveContent.subscription.notificationEventCat.alt_ := ?; @@ -2211,11 +2211,11 @@ module OneM2M_Testcases_AE { var charstring v_action := __SCOPE__ & ": Please, send a valid subscription creation request with optional attribute subscriberURI"; var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2); - v_utRequest.to_ := f_getResourceAddress(v_auxInteger); + v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger); v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"}; v_utRequest.primitiveContent.subscription.subscriberURI := "UNINITIALIZED"; - v_requestT.to_ := f_getResourceAddress(v_auxInteger); + v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger); v_requestT.primitiveContent.subscription.notificationURI := ?; v_requestT.primitiveContent.subscription.subscriberURI := ?; @@ -2278,7 +2278,7 @@ module OneM2M_Testcases_AE { var charstring v_action := __SCOPE__ & ": Please, send a valid AE Registration CREATE Request"; var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2); - v_utRequest.to_ := f_getResourceAddress(v_auxInteger); + v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger); f_cf03Up(); @@ -2308,7 +2308,7 @@ module OneM2M_Testcases_AE { //create Subscription v_utRequest := m_utCreateSubscription; - v_utRequest.to_ := f_getResourceAddress(-1); + v_utRequest.to_ := f_getLocalResourceAddress(-1); v_action := "Please, send a valid CREATE request for Subscription"; f_sendUtPrimitive(v_utRequest,v_action); @@ -2369,7 +2369,7 @@ module OneM2M_Testcases_AE { var charstring v_action := __SCOPE__ & ": Please, send a valid AE Registration CREATE Request"; var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2); - v_utRequest.to_ := f_getResourceAddress(v_auxInteger); + v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger); f_cf03Up(); @@ -2399,7 +2399,7 @@ module OneM2M_Testcases_AE { //create Subscription v_utRequest := m_utCreateSubscription; - v_utRequest.to_ := f_getResourceAddress(-1); + v_utRequest.to_ := f_getLocalResourceAddress(-1); v_action := "Please, send a valid CREATE request for Subscription"; f_sendUtPrimitive(v_utRequest,v_action); -- GitLab