From 8beda19d748f1a082d95f061d659e2772e213865 Mon Sep 17 00:00:00 2001 From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org> Date: Fri, 20 Oct 2017 16:52:10 +0200 Subject: [PATCH] - Creation of f_getLocalResourceAddress function (CseSimu) - New Pixits for CSE1 parameters (name, resourceId, spId) - Minor corrections to CSE/REG test cases - Alignment of CSE/DMR/UPD test cases ids to the TS-0018 v1.0.0 Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org> --- LibOneM2M/OneM2M_Functions.ttcn | 65 +++++++++ LibOneM2M/OneM2M_Pixits.ttcn | 18 ++- OneM2M_Testcases_CSE.ttcn | 230 ++++++++++++++++---------------- 3 files changed, 197 insertions(+), 116 deletions(-) diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn index 20f6f49..5ca7f81 100644 --- a/LibOneM2M/OneM2M_Functions.ttcn +++ b/LibOneM2M/OneM2M_Functions.ttcn @@ -2353,6 +2353,71 @@ module OneM2M_Functions { } } + + /** + * @desc Resolution of the resource address field (to) for a given resource depending on addressing and hierarchical format + * @param p_targetResourceIndex Internal resource index of the given resource + * @return Resource address for the given resource + * @verdict + */ + function f_getLocalResourceAddress(integer p_targetResourceIndex := -1, AddressingMethod p_addressingMethod := PX_ADDRESSING_METHOD, PrimitiveScope p_primitiveScope := PX_PRIMITIVE_SCOPE) runs on CseSimu return XSD.ID { + var XSD.ID v_resourceAddress; + + if(p_primitiveScope == e_cseRelative) { + + if(p_addressingMethod == e_nonHierarchical) { + if(p_targetResourceIndex == -1) { + return PX_CSE1_RESOURCE_ID; + } else { + return f_getResourceId(vc_localResourcesList[p_targetResourceIndex].resource); + } + } else { + if(p_targetResourceIndex == -1) { + return PX_CSE1_NAME; + } else { + v_resourceAddress := f_getResourceAddress(vc_localResourcesList[p_targetResourceIndex].parentIndex, p_addressingMethod, p_primitiveScope) & "/" & f_getResourceName(vc_localResourcesList[p_targetResourceIndex].resource); + return v_resourceAddress; + } + } + + } else if (p_primitiveScope == e_spRelative) { + if(p_addressingMethod == e_nonHierarchical) { + if(p_targetResourceIndex == -1) { + return PX_CSE1_ID & "/" & PX_CSE1_RESOURCE_ID; + } else { + v_resourceAddress := PX_CSE_ID & "/" & f_getResourceId(vc_localResourcesList[p_targetResourceIndex].resource); + return v_resourceAddress; + } + } else { + if(p_targetResourceIndex == -1) { + return PX_CSE1_ID & "/" & PX_CSE1_NAME; + } else { + v_resourceAddress := f_getResourceAddress(vc_localResourcesList[p_targetResourceIndex].parentIndex, p_addressingMethod, p_primitiveScope) & "/" & f_getResourceName(vc_localResourcesList[p_targetResourceIndex].resource); + return v_resourceAddress; + } + } + } else if (p_primitiveScope == e_absolute) { + if(p_addressingMethod == e_nonHierarchical) { + if(p_targetResourceIndex == -1) { + return PX_SP1_ID & PX_CSE1_ID; + } else { + v_resourceAddress := f_getResourceAddress(-, p_addressingMethod, p_primitiveScope) & "/" & f_getResourceId(vc_localResourcesList[p_targetResourceIndex].resource); + return v_resourceAddress; + } + } else { + if(p_targetResourceIndex == -1) { + return PX_SP1_ID & PX_CSE1_ID & "/" & PX_CSE1_NAME; + } else { + v_resourceAddress := f_getResourceAddress(vc_localResourcesList[p_targetResourceIndex].parentIndex, p_addressingMethod, p_primitiveScope) & "/" & f_getResourceName(vc_localResourcesList[p_targetResourceIndex].resource); + return v_resourceAddress; + } + } + } else { + return ""; + } + + } + /** * @desc Saving of a resource and its parent index in the internal resource list * @param p_resource Resource to be saved diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn index 60d9181..08646ae 100644 --- a/LibOneM2M/OneM2M_Pixits.ttcn +++ b/LibOneM2M/OneM2M_Pixits.ttcn @@ -78,10 +78,26 @@ module OneM2M_Pixits { modulepar charstring PX_CSE1_ADDRESS := "127.0.0.1:3141"; + + /** + * @desc Test System CSE1 Name + */ + modulepar XSD.ID PX_CSE1_NAME := "CSE1_NAME"; + /** * @desc Test System CSE1-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1 */ - modulepar XSD.ID PX_CSE1_ID := "/MyCSEId"; + modulepar XSD.ID PX_CSE1_ID := "/CSE1_ID"; + + /** + * @desc Test System CSE1 resource ID with Unstructured-CSE-relative-Resource-ID (relative) format according to TS-0001-7.2-1 + */ + modulepar XSD.ID PX_CSE1_RESOURCE_ID := "CSE1_RESOURCE_ID"; + + /** + * @desc Test System M2M-SP1-ID with M2M-SP-ID format (absolute) according to TS-0001-7.2-1 Unstructured-CSE-relative -Resource-ID + */ + modulepar XSD.ID PX_SP1_ID := "//onem2m.org"; /** * @desc Test System AE1-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1 diff --git a/OneM2M_Testcases_CSE.ttcn b/OneM2M_Testcases_CSE.ttcn index 58b0d1b..6633cad 100644 --- a/OneM2M_Testcases_CSE.ttcn +++ b/OneM2M_Testcases_CSE.ttcn @@ -2751,7 +2751,7 @@ module OneM2M_Testcases_CSE { var RequestPrimitive v_request; var ResourceType v_resourceType := int16; //remoteCSE var template PrimitiveContent v_contentResponse; - var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE; + var template UtTriggerPrimitive v_utRequest; // Test control if(not(PICS_MN_CSE)) { @@ -2768,17 +2768,17 @@ module OneM2M_Testcases_CSE { vc_remoteCseIndex := f_cse_registrationRemoteCse(m_createRemoteCSEBase); //Send Trigger Message - v_utRequest.to_ := f_getResourceAddress(); - v_utRequest.from_ := "UNINITIALIZED"; + v_utRequest := m_utRetrieveResource(f_getLocalResourceAddress(vc_remoteCseIndex), PX_CSE_ID); + v_utRequest.from_ := "UNINITIALIZED"; f_sendUtPrimitive(v_utRequest); tc_ac.start; alt { - [] mccPort.receive(mw_request(m_retrieveResource(f_getResourceAddress(), f_getOriginator(vc_remoteCseIndex)))) -> value v_response { + [] mccPortIn.receive(mw_request(mw_retrieveResource(f_getResourceAddress()))) -> value v_response { tc_ac.stop; setverdict(pass, __SCOPE__ & ": Retrieve Request received successfully"); } - [] mccPort.receive { + [] mccPortIn.receive { tc_ac.stop; setverdict(fail, __SCOPE__ & ": Error Retrieve request was not received"); } @@ -3341,11 +3341,11 @@ module OneM2M_Testcases_CSE { // Test Body tc_ac.start; alt { - [] mccPort.receive(mw_request(mw_deleteRequest( f_getResourceAddress(vc_remoteCseIndex), PX_CSE_ID))) { + [] mccPortIn.receive(mw_request(mw_deleteRequest( f_getResourceAddress(vc_remoteCseIndex), PX_CSE_ID))) { tc_ac.stop; setverdict(pass, __SCOPE__ & ": <remoteCSE> delete request has been received"); } - [] mccPort.receive { + [] mccPortIn.receive { tc_ac.stop; setverdict(fail, __SCOPE__ & ": Error while receiving <remoteCSE> delete request"); } @@ -12911,12 +12911,12 @@ module OneM2M_Testcases_CSE { } // end g_CSE_DMR_UPD_014 - group g_CSE_DMR_UPD_017{ + group g_CSE_DMR_UPD_015{ /** * @desc Check that the IUT updates successfully the value of the optional attribute OPTIONAL_ATTRIBUTE of the RESOURCE_TYPE resource under CSEBase */ - testcase TC_CSE_DMR_UPD_017_CSR_LBL() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_CSR_LBL() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var Labels v_labels := {"MyLabel"}; var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase; @@ -12925,7 +12925,7 @@ module OneM2M_Testcases_CSE { v_updateRequest.primitiveContent.remoteCSE.labels := v_labels; - v_ae1.start(f_CSE_DMR_UPD_017(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE + v_ae1.start(f_CSE_DMR_UPD_015(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE v_ae1.done; @@ -12950,7 +12950,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_CSR_POA() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_CSR_POA() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var PoaList v_poaList := {"http://" & PX_AE2_ADDRESS & "/"}; var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase; @@ -12959,7 +12959,7 @@ module OneM2M_Testcases_CSE { v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := v_poaList; - v_ae1.start(f_CSE_DMR_UPD_017(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE + v_ae1.start(f_CSE_DMR_UPD_015(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE v_ae1.done; @@ -12984,7 +12984,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_CSR_NL() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_CSR_NL() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var XSD.AnyURI v_nodeLink := "MyNodeId"; var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase; @@ -12993,7 +12993,7 @@ module OneM2M_Testcases_CSE { v_updateRequest.primitiveContent.remoteCSE.nodeLink := v_nodeLink; - v_ae1.start(f_CSE_DMR_UPD_017(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE + v_ae1.start(f_CSE_DMR_UPD_015(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE v_ae1.done; @@ -13018,7 +13018,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_NOD_LBL() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_NOD_LBL() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var Labels v_labels := {"MyLabel"}; var template RequestPrimitive v_updateRequest := m_updateNodeBase; @@ -13027,7 +13027,7 @@ module OneM2M_Testcases_CSE { v_updateRequest.primitiveContent.node.labels := v_labels; - v_ae1.start(f_CSE_DMR_UPD_017(int9, m_createNodeBase, v_updateRequest));//Node + v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createNodeBase, v_updateRequest));//Node v_ae1.done; @@ -13052,7 +13052,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_NOD_ACPI() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_NOD_ACPI() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_updateRequest := m_updateNodeBase; var RequestPrimitive v_updateRequestPrimitive; @@ -13060,7 +13060,7 @@ module OneM2M_Testcases_CSE { var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_CSE_DMR_UPD_017(int9, m_createNodeBase, v_updateRequest, true));//Node + v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createNodeBase, v_updateRequest, true));//Node v_ae1.done; @@ -13088,12 +13088,12 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_NOD_HCL() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_NOD_HCL() runs on Tester system CseSystem { /* TO BE DONE */ } - testcase TC_CSE_DMR_UPD_017_AE_LBL() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_AE_LBL() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var Labels v_labels := {"MyLabel"}; var template RequestPrimitive v_updateRequest := m_updateAE; @@ -13102,7 +13102,7 @@ module OneM2M_Testcases_CSE { v_updateRequest.primitiveContent.aE.labels := v_labels; - v_ae1.start(f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE + v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE v_ae1.done; @@ -13127,14 +13127,14 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_AE_ACPI() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_AE_ACPI() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_updateRequest := m_updateAE; var RequestPrimitive v_updateRequestPrimitive; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest, true));//AE + v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID), v_updateRequest, true));//AE v_ae1.done; @@ -13161,7 +13161,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_AE_APN() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_AE_APN() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var XSD.String v_appName := "MyAppName"; var template RequestPrimitive v_updateRequest := m_updateAE; @@ -13169,7 +13169,7 @@ module OneM2M_Testcases_CSE { var PrimitiveContent v_primitiveContentRetrieveResource; v_updateRequest.primitiveContent.aE.appName := v_appName; - v_ae1.start(f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE + v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE v_ae1.done; @@ -13194,7 +13194,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_AE_POA() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_AE_POA() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var PoaList v_poaList := {"http://" & PX_AE2_ADDRESS & "/"}; var template RequestPrimitive v_updateRequest := m_updateAE; @@ -13202,7 +13202,7 @@ module OneM2M_Testcases_CSE { var PrimitiveContent v_primitiveContentRetrieveResource; v_updateRequest.primitiveContent.aE.pointOfAccess := v_poaList; - v_ae1.start(f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE + v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE v_ae1.done; @@ -13227,7 +13227,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_AE_OR() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_AE_OR() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var XSD.AnyURI v_ontoLogyRef := "MyOntologyRef"; var template RequestPrimitive v_updateRequest := m_updateAE; @@ -13235,7 +13235,7 @@ module OneM2M_Testcases_CSE { var PrimitiveContent v_primitiveContentRetrieveResource; v_updateRequest.primitiveContent.aE.ontologyRef := v_ontoLogyRef; - v_ae1.start(f_CSE_DMR_UPD_017(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE + v_ae1.start(f_CSE_DMR_UPD_015(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE v_ae1.done; @@ -13260,7 +13260,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_CNT_LBL() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_CNT_LBL() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var Labels v_labels := {"MyLabel"}; var template RequestPrimitive v_updateRequest := m_updateContainerBase; @@ -13269,7 +13269,7 @@ module OneM2M_Testcases_CSE { v_updateRequest.primitiveContent.container.labels := v_labels; - v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest));//Container + v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container v_ae1.done; @@ -13294,14 +13294,14 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_CNT_ACPI() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_CNT_ACPI() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_updateRequest := m_updateContainerBase; var RequestPrimitive v_updateRequestPrimitive; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest, true));//Container + v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest, true));//Container v_ae1.done; @@ -13328,7 +13328,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_CNT_MNI() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_CNT_MNI() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var XSD.NonNegativeInteger v_maxNrOfInstances := 5; var template RequestPrimitive v_updateRequest := m_updateContainerBase; @@ -13337,7 +13337,7 @@ module OneM2M_Testcases_CSE { v_updateRequest.primitiveContent.container.maxNrOfInstances := v_maxNrOfInstances; - v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest));//Container + v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container v_ae1.done; @@ -13362,7 +13362,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_CNT_MBS() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_CNT_MBS() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var XSD.NonNegativeInteger v_maxByteSize := 512; var template RequestPrimitive v_updateRequest := m_updateContainerBase; @@ -13371,7 +13371,7 @@ module OneM2M_Testcases_CSE { v_updateRequest.primitiveContent.container.maxByteSize := v_maxByteSize; - v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest));//Container + v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container v_ae1.done; @@ -13396,7 +13396,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_CNT_MIA() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_CNT_MIA() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var XSD.NonNegativeInteger v_maxInstanceAge := 1; var template RequestPrimitive v_updateRequest := m_updateContainerBase; @@ -13405,7 +13405,7 @@ module OneM2M_Testcases_CSE { v_updateRequest.primitiveContent.container.maxInstanceAge := v_maxInstanceAge; - v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest));//Container + v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container v_ae1.done; @@ -13430,7 +13430,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_CNT_OR() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_CNT_OR() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var XSD.AnyURI v_ontoLogyRef := "MyOntologyRef"; var template RequestPrimitive v_updateRequest := m_updateContainerBase; @@ -13439,7 +13439,7 @@ module OneM2M_Testcases_CSE { v_updateRequest.primitiveContent.container.ontologyRef := v_ontoLogyRef; - v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest));//Container + v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container v_ae1.done; @@ -13464,7 +13464,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_CNT_LI() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_CNT_LI() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var XSD.AnyURI v_locationID := "MyLocationID"; var template RequestPrimitive v_updateRequest := m_updateContainerBase; @@ -13473,7 +13473,7 @@ module OneM2M_Testcases_CSE { v_updateRequest.primitiveContent.container.locationID := v_locationID; - v_ae1.start(f_CSE_DMR_UPD_017(int3, m_createContainerBase, v_updateRequest));//Container + v_ae1.start(f_CSE_DMR_UPD_015(int3, m_createContainerBase, v_updateRequest));//Container v_ae1.done; @@ -13498,7 +13498,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_ACP_LBL() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_ACP_LBL() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var Labels v_labels := {"MyLabel"}; var template RequestPrimitive v_updateRequest := m_updateAcpBase; @@ -13507,7 +13507,7 @@ module OneM2M_Testcases_CSE { v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels; - v_ae1.start(f_CSE_DMR_UPD_017(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy + v_ae1.start(f_CSE_DMR_UPD_015(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy v_ae1.done; @@ -13532,14 +13532,14 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_SUB_ACPI() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_SUB_ACPI() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; var RequestPrimitive v_updateRequestPrimitive; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest, true));//Subscription + v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest, true));//Subscription v_ae1.done; @@ -13566,7 +13566,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_SUB_LBL() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_SUB_LBL() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var Labels v_labels := {"MyLabel"}; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; @@ -13574,7 +13574,7 @@ module OneM2M_Testcases_CSE { var PrimitiveContent v_primitiveContentRetrieveResource; v_updateRequest.primitiveContent.subscription.labels := v_labels; - v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription + v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription v_ae1.done; @@ -13599,7 +13599,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_SUB_ENC() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_SUB_ENC() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var EventNotificationCriteria v_eventNotificationCriteria:= valueof(m_eventNotificationCriteria({int3}, -)); var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; @@ -13607,7 +13607,7 @@ module OneM2M_Testcases_CSE { var PrimitiveContent v_primitiveContentRetrieveResource; v_updateRequest.primitiveContent.subscription.eventNotificationCriteria:=v_eventNotificationCriteria ; - v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription + v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription v_ae1.done; @@ -13632,7 +13632,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_SUB_EXC() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_SUB_EXC() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var XSD.PositiveInteger v_expirationCounter:=10; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; @@ -13640,7 +13640,7 @@ module OneM2M_Testcases_CSE { var PrimitiveContent v_primitiveContentRetrieveResource; v_updateRequest.primitiveContent.subscription.expirationCounter:=v_expirationCounter; - v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription + v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription v_ae1.done; @@ -13665,7 +13665,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_SUB_GPI() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_SUB_GPI() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var XSD.AnyURI v_groupID := "MyGroupID"; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; @@ -13673,7 +13673,7 @@ module OneM2M_Testcases_CSE { var PrimitiveContent v_primitiveContentRetrieveResource; v_updateRequest.primitiveContent.subscription.groupID:=v_groupID; - v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription + v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription v_ae1.done; @@ -13698,7 +13698,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_SUB_NFU() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_SUB_NFU() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var XSD.AnyURI v_notificationForwardingURI:= "MyNotificationForwardingURI"; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; @@ -13706,7 +13706,7 @@ module OneM2M_Testcases_CSE { var PrimitiveContent v_primitiveContentRetrieveResource; v_updateRequest.primitiveContent.subscription.notificationForwardingURI:=v_notificationForwardingURI; - v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription + v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription v_ae1.done; @@ -13731,7 +13731,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_SUB_BN() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_SUB_BN() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var BatchNotify v_batchNotify:= {1, "PT1S"}; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; @@ -13739,7 +13739,7 @@ module OneM2M_Testcases_CSE { var PrimitiveContent v_primitiveContentRetrieveResource; v_updateRequest.primitiveContent.subscription.batchNotify:=v_batchNotify; - v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription + v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription v_ae1.done; @@ -13764,7 +13764,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_SUB_RL() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_SUB_RL() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var RateLimit v_rateLimit:= {2, "PT1S"}; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; @@ -13772,7 +13772,7 @@ module OneM2M_Testcases_CSE { var PrimitiveContent v_primitiveContentRetrieveResource; v_updateRequest.primitiveContent.subscription.rateLimit:=v_rateLimit; - v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription + v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription v_ae1.done; @@ -13797,7 +13797,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_SUB_PN() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_SUB_PN() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var PendingNotification v_pendingNotification:=int2; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; @@ -13805,7 +13805,7 @@ module OneM2M_Testcases_CSE { var PrimitiveContent v_primitiveContentRetrieveResource; v_updateRequest.primitiveContent.subscription.pendingNotification:=v_pendingNotification; - v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription + v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription v_ae1.done; @@ -13830,7 +13830,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_SUB_NSP() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_SUB_NSP() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var XSD.PositiveInteger v_notificationStoragePriority:=10; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; @@ -13838,7 +13838,7 @@ module OneM2M_Testcases_CSE { var PrimitiveContent v_primitiveContentRetrieveResource; v_updateRequest.primitiveContent.subscription.notificationStoragePriority:=v_notificationStoragePriority; - v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription + v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription v_ae1.done; @@ -13863,7 +13863,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_SUB_LN() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_SUB_LN() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var XSD.Boolean v_latestNotify:=true; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; @@ -13871,7 +13871,7 @@ module OneM2M_Testcases_CSE { var PrimitiveContent v_primitiveContentRetrieveResource; v_updateRequest.primitiveContent.subscription.latestNotify:=v_latestNotify; - v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription + v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription v_ae1.done; @@ -13896,7 +13896,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_SUB_NEC() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_SUB_NEC() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var EventCat v_eventCat:= {alt_1:= 300}; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; @@ -13904,7 +13904,7 @@ module OneM2M_Testcases_CSE { var PrimitiveContent v_primitiveContentRetrieveResource; v_updateRequest.primitiveContent.subscription.notificationEventCat:=v_eventCat; - v_ae1.start(f_CSE_DMR_UPD_017(int23, m_createSubscriptionBase, v_updateRequest));//Subscription + v_ae1.start(f_CSE_DMR_UPD_015(int23, m_createSubscriptionBase, v_updateRequest));//Subscription v_ae1.done; @@ -13929,7 +13929,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_GRP_LBL() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_GRP_LBL() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var Labels v_labels := {"MyLabel"}; var template RequestPrimitive v_updateRequest := m_updateGroupBase; @@ -13937,7 +13937,7 @@ module OneM2M_Testcases_CSE { var PrimitiveContent v_primitiveContentRetrieveResource; v_updateRequest.primitiveContent.group_.labels := v_labels; - v_ae1.start(f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest));//Group + v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest));//Group v_ae1.done; @@ -13962,14 +13962,14 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_GRP_ACPI() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_GRP_ACPI() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_updateRequest := m_updateGroupBase; var RequestPrimitive v_updateRequestPrimitive; var ResponsePrimitive v_responsePrimitive; var PrimitiveContent v_primitiveContentRetrieveResource; - v_ae1.start(f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest, true));//Group + v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest, true));//Group v_ae1.done; @@ -13996,7 +13996,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_GRP_MACP() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_GRP_MACP() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var ListOfURIs v_membersAccessControlPolicyIDs := {"NotInitialized"}; var template RequestPrimitive v_updateRequest := m_updateGroupBase; @@ -14004,7 +14004,7 @@ module OneM2M_Testcases_CSE { var PrimitiveContent v_primitiveContentRetrieveResource; v_updateRequest.primitiveContent.group_.membersAccessControlPolicyIDs := v_membersAccessControlPolicyIDs; - v_ae1.start(f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest));//Group + v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest));//Group v_ae1.done; @@ -14029,7 +14029,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_017_GRP_GN() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_015_GRP_GN() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var XSD.String v_groupName:="MyGroupName"; var template RequestPrimitive v_updateRequest := m_updateGroupBase; @@ -14037,7 +14037,7 @@ module OneM2M_Testcases_CSE { var PrimitiveContent v_primitiveContentRetrieveResource; v_updateRequest.primitiveContent.group_.groupName := v_groupName; - v_ae1.start(f_CSE_DMR_UPD_017(int9, m_createGroupBase, v_updateRequest));//Group + v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest));//Group v_ae1.done; @@ -14062,7 +14062,7 @@ module OneM2M_Testcases_CSE { } } - function f_CSE_DMR_UPD_017(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, boolean p_secondAcp := false) runs on AeSimu { + function f_CSE_DMR_UPD_015(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, boolean p_secondAcp := false) runs on AeSimu { //Local variables var MsgIn v_response; var AcpType v_acpi; @@ -14145,16 +14145,16 @@ module OneM2M_Testcases_CSE { // Tear down f_cf02Down(); - } // end function f_CSE_DMR_UPD_017 + } // end function f_CSE_DMR_UPD_015 } // end group g_CSE_DMR_UPD_017 - group g_CSE_DMR_UPD_018 { + group g_CSE_DMR_UPD_016 { /** * @desc Check that the IUT updates successfully the value of the attribute MANDATORY_ATTRIBUTE of the RESOURCE_TYPE resource under CSEBase */ - testcase TC_CSE_DMR_UPD_018_CSR_ET() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_016_CSR_ET() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var Timestamp v_expirationTime := "20001231T012345"; var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase; @@ -14163,7 +14163,7 @@ module OneM2M_Testcases_CSE { v_updateRequest.primitiveContent.remoteCSE.expirationTime := v_expirationTime; - v_ae1.start(f_CSE_DMR_UPD_018(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE + v_ae1.start(f_CSE_DMR_UPD_016(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE v_ae1.done; @@ -14188,7 +14188,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_018_CSR_RR() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_016_CSR_RR() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var XSD.Boolean v_requestReachability := true; var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase; @@ -14200,7 +14200,7 @@ module OneM2M_Testcases_CSE { - v_ae1.start(f_CSE_DMR_UPD_018(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE + v_ae1.start(f_CSE_DMR_UPD_016(int16, m_createRemoteCSEBase, v_updateRequest));//Remote CSE if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1); //Check attribute 1 if(ispresent(v_responsePrimitive.primitiveContent)) { @@ -14221,7 +14221,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_018_NOD_ET() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_016_NOD_ET() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var Timestamp v_expirationTime := "20001231T012345"; var template RequestPrimitive v_updateRequest := m_updateNodeBase; @@ -14230,7 +14230,7 @@ module OneM2M_Testcases_CSE { v_updateRequest.primitiveContent.node.expirationTime := v_expirationTime; - v_ae1.start(f_CSE_DMR_UPD_018(int9, m_createNodeBase, v_updateRequest));//Node + v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createNodeBase, v_updateRequest));//Node v_ae1.done; @@ -14255,7 +14255,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_018_NOD_NI() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_016_NOD_NI() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var template RequestPrimitive v_updateRequest := m_updateNodeBase; var XSD.Token v_targetId := "TARGET-ID"; @@ -14264,7 +14264,7 @@ module OneM2M_Testcases_CSE { v_updateRequest.primitiveContent.node.nodeID := v_targetId; - v_ae1.start(f_CSE_DMR_UPD_018(int9, m_createNodeBase, v_updateRequest));//Node + v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createNodeBase, v_updateRequest));//Node v_ae1.done; @@ -14289,7 +14289,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_018_AE_ET() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_016_AE_ET() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var Timestamp v_expirationTime := "20001231T012345"; var template RequestPrimitive v_updateRequest := m_updateAE; @@ -14298,7 +14298,7 @@ module OneM2M_Testcases_CSE { v_updateRequest.primitiveContent.aE.expirationTime := v_expirationTime; - v_ae1.start(f_CSE_DMR_UPD_018(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE + v_ae1.start(f_CSE_DMR_UPD_016(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE v_ae1.done; @@ -14323,7 +14323,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_018_AE_RR() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_016_AE_RR() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var XSD.Boolean v_requestReachability := true; var template RequestPrimitive v_updateRequest := m_updateAE; @@ -14332,7 +14332,7 @@ module OneM2M_Testcases_CSE { v_updateRequest.primitiveContent.aE.requestReachability := v_requestReachability; - v_ae1.start(f_CSE_DMR_UPD_018(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE + v_ae1.start(f_CSE_DMR_UPD_016(int2, m_createAe(PX_APP_ID), v_updateRequest));//AE v_ae1.done; @@ -14357,7 +14357,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_018_CNT_ET() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_016_CNT_ET() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var Timestamp v_expirationTime := "20001231T012345"; var template RequestPrimitive v_updateRequest := m_updateContainerBase; @@ -14366,7 +14366,7 @@ module OneM2M_Testcases_CSE { v_updateRequest.primitiveContent.container.expirationTime := v_expirationTime; - v_ae1.start(f_CSE_DMR_UPD_018(int3, m_createContainerBase, v_updateRequest));//Container + v_ae1.start(f_CSE_DMR_UPD_016(int3, m_createContainerBase, v_updateRequest));//Container v_ae1.done; @@ -14391,7 +14391,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_018_ACP_ET() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_016_ACP_ET() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var Timestamp v_expirationTime := "20001231T012345"; var template RequestPrimitive v_updateRequest := m_updateAcpBase; @@ -14400,7 +14400,7 @@ module OneM2M_Testcases_CSE { v_updateRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime; - v_ae1.start(f_CSE_DMR_UPD_018(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy + v_ae1.start(f_CSE_DMR_UPD_016(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy v_ae1.done; @@ -14425,7 +14425,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_018_ACP_PV() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_016_ACP_PV() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var SetOfAcrs v_privileges_1 := {{valueof(m_createAcr({PX_SUPER_AE_ID}, int61))}}; var template RequestPrimitive v_updateRequest := m_updateAcpBase; @@ -14433,7 +14433,7 @@ module OneM2M_Testcases_CSE { var PrimitiveContent v_primitiveContentRetrieveResource; v_updateRequest.primitiveContent.accessControlPolicy.privileges := v_privileges_1; - v_ae1.start(f_CSE_DMR_UPD_018(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy + v_ae1.start(f_CSE_DMR_UPD_016(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy v_ae1.done; @@ -14458,7 +14458,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_018_ACP_PVS() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_016_ACP_PVS() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var SetOfAcrs v_privileges_1 := {{valueof(m_createAcr({PX_SUPER_AE_ID}, int61))}}; var template RequestPrimitive v_updateRequest := m_updateAcpBase; @@ -14466,7 +14466,7 @@ module OneM2M_Testcases_CSE { var PrimitiveContent v_primitiveContentRetrieveResource; v_updateRequest.primitiveContent.accessControlPolicy.selfPrivileges := v_privileges_1; - v_ae1.start(f_CSE_DMR_UPD_018(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy + v_ae1.start(f_CSE_DMR_UPD_016(int1, m_createAcpBase, v_updateRequest));//AccessControlPolicy v_ae1.done; @@ -14491,7 +14491,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_018_SUB_ET() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_016_SUB_ET() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var Timestamp v_expirationTime := "20001231T012345"; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; @@ -14500,7 +14500,7 @@ module OneM2M_Testcases_CSE { v_updateRequest.primitiveContent.subscription.expirationTime := v_expirationTime; - v_ae1.start(f_CSE_DMR_UPD_018(int23, m_createSubscriptionBase, v_updateRequest));//Subscription + v_ae1.start(f_CSE_DMR_UPD_016(int23, m_createSubscriptionBase, v_updateRequest));//Subscription v_ae1.done; @@ -14526,7 +14526,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_018_SUB_NU() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_016_SUB_NU() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var ListOfURIs v_notificationURI := {"NotReachableNotificationURI"}; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; @@ -14535,7 +14535,7 @@ module OneM2M_Testcases_CSE { v_updateRequest.primitiveContent.subscription.notificationURI := v_notificationURI; - v_ae1.start(f_CSE_DMR_UPD_018(int23, m_createSubscriptionBase, v_updateRequest));//Subscription + v_ae1.start(f_CSE_DMR_UPD_016(int23, m_createSubscriptionBase, v_updateRequest));//Subscription v_ae1.done; @@ -14560,7 +14560,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_018_SUB_NCT() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_016_SUB_NCT() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var NotificationContentType v_notificationContentType := int2; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; @@ -14569,7 +14569,7 @@ module OneM2M_Testcases_CSE { v_updateRequest.primitiveContent.subscription.notificationContentType := v_notificationContentType; - v_ae1.start(f_CSE_DMR_UPD_018(int23, m_createSubscriptionBase, v_updateRequest));//Subscription + v_ae1.start(f_CSE_DMR_UPD_016(int23, m_createSubscriptionBase, v_updateRequest));//Subscription v_ae1.done; @@ -14594,7 +14594,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_018_GRP_ET() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_016_GRP_ET() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var Timestamp v_expirationTime := "20001231T012345"; var template RequestPrimitive v_updateRequest := m_updateGroupBase; @@ -14603,7 +14603,7 @@ module OneM2M_Testcases_CSE { v_updateRequest.primitiveContent.group_.expirationTime := v_expirationTime; - v_ae1.start(f_CSE_DMR_UPD_018(int9, m_createGroupBase, v_updateRequest));//Group + v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createGroupBase, v_updateRequest));//Group v_ae1.done; @@ -14628,7 +14628,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_018_GRP_MNM() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_016_GRP_MNM() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var XSD.PositiveInteger v_maxNrOfMembers := 10; var template RequestPrimitive v_updateRequest := m_updateGroupBase; @@ -14637,7 +14637,7 @@ module OneM2M_Testcases_CSE { v_updateRequest.primitiveContent.group_.maxNrOfMembers := v_maxNrOfMembers; - v_ae1.start(f_CSE_DMR_UPD_018(int9, m_createGroupBase, v_updateRequest));//Group + v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createGroupBase, v_updateRequest));//Group v_ae1.done; @@ -14662,7 +14662,7 @@ module OneM2M_Testcases_CSE { } } - testcase TC_CSE_DMR_UPD_018_GRP_MID() runs on Tester system CseSystem { + testcase TC_CSE_DMR_UPD_016_GRP_MID() runs on Tester system CseSystem { var AeSimu v_ae1 := AeSimu.create("AE1") alive; var ListOfURIs v_memberIDs := {"NotInitialized"}; var template RequestPrimitive v_updateRequest := m_updateGroupBase; @@ -14671,7 +14671,7 @@ module OneM2M_Testcases_CSE { v_updateRequest.primitiveContent.group_.memberIDs := v_memberIDs; - v_ae1.start(f_CSE_DMR_UPD_018(int9, m_createGroupBase, v_updateRequest));//Group + v_ae1.start(f_CSE_DMR_UPD_016(int9, m_createGroupBase, v_updateRequest));//Group v_ae1.done; @@ -14696,7 +14696,7 @@ module OneM2M_Testcases_CSE { } } - function f_CSE_DMR_UPD_018(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu { + function f_CSE_DMR_UPD_016(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu { //Local variables var MsgIn v_response; var RequestPrimitive v_request; @@ -14769,9 +14769,9 @@ module OneM2M_Testcases_CSE { // Tear down f_cf02Down(); - } //end function f_CSE_DMR_UPD_018 + } //end function f_CSE_DMR_UPD_016 - } // end group g_CSE_DMR_UPD_018 + } // end group g_CSE_DMR_UPD_016 }//end group Update -- GitLab