diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn index a98026ee079f2fe7680e9d860c504462ad5c5d91..c16c1a04687953d8c1e1f03b882804a4d4cba4ac 100644 --- a/LibOneM2M/OneM2M_Functions.ttcn +++ b/LibOneM2M/OneM2M_Functions.ttcn @@ -7,7 +7,7 @@ * * @author ETSI * @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $ - * $Id: OneM2M_Functions.ttcn 103 2016-08-30 09:39:32Z reinaortega $ + * $Id: OneM2M_Functions.ttcn 104 2016-08-30 15:13:47Z reinaortega $ * @desc Module containing functions for oneM2M * */ @@ -27,7 +27,7 @@ module OneM2M_Functions { /** @desc Ports mapping and default behaviour activation for Config 1 */ - function f_cf01Up() runs on M2M { + function f_cf01Up() runs on CseTester { // Variables @@ -35,6 +35,7 @@ module OneM2M_Functions { map(self:mcaPort, system:mcaPort); map(self:acPort, system:acPort); activate(a_default()); + activate(a_cse_cf01()); // Connect @@ -42,7 +43,7 @@ module OneM2M_Functions { } // end f_cf01Up - function f_cf02Up() runs on M2M { + function f_cf02Up() runs on CseTester { // Variables @@ -51,192 +52,385 @@ module OneM2M_Functions { map(self:mccPort, system:mccPort); map(self:acPort, system:acPort); activate(a_default()); + activate(a_cse_cf02()); // Connect //Initialze the IUT } // end f_cf02Up - - }//end group configFunctions - - group preambleFunctions { - - /** - * @desc Creation of auxiliar resources ACP and AE for correct execution of the test case - * @param p_allowedOperations Allowed operations for the auxiliar AE resource - * @return Internal AE resource index - * @verdict - */ - function f_preamble_registerAe(in template (value) AccessControlOperations p_allowedOperations := int63) runs on M2M return integer{//c_CRUDNDi - var RequestPrimitive v_request; - var M2MResponsePrimitive v_response; - var integer v_aeAuxIndex := -1; - var integer v_acpAuxIndex := -1; - - if(PX_ACP_SUPPORT){ - v_acpAuxIndex := f_createAccessControlPolicyAux(p_allowedOperations := p_allowedOperations); - vc_acpAuxIndex := v_acpAuxIndex; - } - - if(v_acpAuxIndex != -1) { - vc_resourcesIndexToBeDeleted := {v_acpAuxIndex}; - v_request := valueof(m_createAeAux(p_accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)})); - - //TODO Test, to be removed - v_request.to_ := f_addPrefix(f_getResourceAddress()); - - mcaPort.send(m_request(v_request)); - //mcaPort.send(m_request(m_createAeAux(p_name, {PX_URI_CSE & PX_CSE_NAME & "/" & PX_ACPAUX_NAME}))); - } else { - mcaPort.send(m_request(m_createAeAux())); - } - tc_ac.start; - alt { - [] mcaPort.receive(mw_responseOK) -> value v_response { - tc_ac.stop; - log("Preamble: Application registered successfuly"); - if(ischosen(v_response.responsePrimitive_.primitiveContent.any_1[0].AE_optional)) { - vc_aeAux := v_response.responsePrimitive_.primitiveContent.any_1[0].AE_optional; - - v_aeAuxIndex := f_setResource(v_response.responsePrimitive_.primitiveContent); - vc_resourcesIndexToBeDeleted := vc_resourcesIndexToBeDeleted & {v_aeAuxIndex}; - - if(ispresent(vc_aeAux.aE_ID)){ - f_sendAcPrimitive("AE-ID_changed", oct2char(unichar2oct(vc_aeAux.aE_ID))); - } else { - f_sendAcPrimitive("AE-ID_changed", "0"); - } - } - } - [] mcaPort.receive(mw_responseKO) { - tc_ac.stop; - setverdict(inconc, "Preamble: Error while registering application"); - stop; - } - [] mcaPort.receive { - tc_ac.stop; - setverdict(inconc, "Preamble: Unexpected message received"); - stop; - } - [] tc_ac.timeout { - setverdict(inconc, "Preamble: No answer while registering resource"); - stop; - } - } - - return v_aeAuxIndex; - - } - - //Added by @Naum - function f_preamble_prepareCSE(in template ListOfM2MID p_allowedAEs, in template (value) AccessControlOperations p_allowedOperations := int63) runs on M2M return integer{//c_CRUDNDi - - var M2MResponsePrimitive v_response; - var integer v_serviceSubscribedAppRuleIndex := -1; - var RequestPrimitive v_request; - - v_serviceSubscribedAppRuleIndex := f_createResource(int19, m_createServiceSubscribedAppRule({"None"}, {PX_APP_ID}, valueof(p_allowedAEs))); - - return v_serviceSubscribedAppRuleIndex; - - } - - }//end group preambleFunctions - - group postambleFunctions { - - /** - * @desc Deletion of all resources created during the test case execution. IUT gets clean and ready for next execution - * @verdict - */ - function f_postamble_deleteResources() runs on M2M { - var integer i; - var XSD.ID v_resourceAddress; - var M2MResponsePrimitive v_response; - var RequestPrimitive v_request; - - if (PX_RUN_POSTAMBLE) { - - for(i := 0; i < lengthof(vc_resourcesIndexToBeDeleted); i := i + 1) { - - v_resourceAddress := f_getResourceAddress(lengthof(vc_resourcesIndexToBeDeleted)-1 - i); - - v_request := valueof(m_deleteRequest(v_resourceAddress)); - - if(PX_FROM_IS_AE_ID){ - if(ischosen(vc_resourcesList[i].resource.any_1[0].AccessControlPolicy_optional)) { - v_request.from_ := PX_AE_ID_STEM; - } else { - v_request.from_ := vc_aeAux.aE_ID; - } - } - mcaPort.send(m_request(v_request)); - - tc_ac.start; - alt { - [] mcaPort.receive(mw_responseOK) { - tc_ac.stop; - log("Postamble: AE Resource deleted"); - } - [] mcaPort.receive(mw_responseKO) { - tc_ac.stop; - log("Postamble: Error while deleting resource"); - } - [] tc_ac.timeout { - log("Postamble: No answer while deleting resource"); - } - } - } - } - - f_postamble_default(); - } - /** * @desc Ports unmapping * @verdict */ - function f_postamble_default() runs on M2M { - + function f_cf01Down() runs on CseTester { + unmap(self:mcaPort, system:mcaPort); unmap(self:acPort, system:acPort); //stop; } - - function f_postamble_CF02() runs on M2M { - + + function f_cf02Down() runs on CseTester { + unmap(self:mcaPort, system:mcaPort); unmap(self:mccPort, system:mccPort); unmap(self:acPort, system:acPort); //stop; } - - }//end group postambleFunctions + + }//end group configFunctions - group altstepFunctions { - - /** - * @desc Default altstep - */ - altstep a_default() runs on M2M { - - [] mcaPort.receive { - log("a_default: WARNING: Unexpected message received"); - repeat; - } - [] tc_wait.timeout { - setverdict(inconc,"a_default: ERROR: Timeout while awaiting reaction of the IUT prior to Upper Tester action"); - } - [] tc_ac.timeout { - setverdict(inconc,"a_default: ERROR: Timeout while awaiting the reception of a message"); + group cseFunctions { + + group preambleFunctions { + + /** + * @desc Creation of auxiliar resources ACP and AE for correct execution of the test case + * @param p_allowedOperations Allowed operations for the auxiliar AE resource + * @return Internal AE resource index + * @verdict + */ + function f_cse_preamble_registerAe(in template (value) AccessControlOperations p_allowedOperations := int63) runs on CseTester return integer {//c_CRUDNDi + + var RequestPrimitive v_request; + var MsgIn v_response; + var integer v_aeAuxIndex := -1; + var integer v_acpAuxIndex := -1; + + if(PX_ACP_SUPPORT){ + v_acpAuxIndex := f_cse_createAccessControlPolicyAux(p_allowedOperations := p_allowedOperations); + vc_acpAuxIndex := v_acpAuxIndex; + } + + if(v_acpAuxIndex != -1) { + vc_resourcesIndexToBeDeleted := {v_acpAuxIndex}; + v_request := valueof(m_createAeAux(p_accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)})); + + //TODO Test, to be removed + v_request.to_ := f_addPrefix(f_getResourceAddress()); + + mcaPort.send(m_request(v_request)); + //mcaPort.send(m_request(m_createAeAux(p_name, {PX_URI_CSE & PX_CSE_NAME & "/" & PX_ACPAUX_NAME}))); + } else { + mcaPort.send(m_request(m_createAeAux())); + } + tc_ac.start; + alt { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { + tc_ac.stop; + log("Preamble: Application registered successfuly"); + if(ischosen(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AE_optional)) { + vc_aeAux := v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AE_optional; + + v_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent); + vc_resourcesIndexToBeDeleted := vc_resourcesIndexToBeDeleted & {v_aeAuxIndex}; + + if(ispresent(vc_aeAux.aE_ID)){ + f_sendAcPrimitive("AE-ID_changed", oct2char(unichar2oct(vc_aeAux.aE_ID))); + } else { + f_sendAcPrimitive("AE-ID_changed", "0"); + } + } + } + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { + tc_ac.stop; + setverdict(inconc, "Preamble: Error while registering application"); + stop; + } + [] mcaPort.receive { + tc_ac.stop; + setverdict(inconc, "Preamble: Unexpected message received"); + stop; + } + [] tc_ac.timeout { + setverdict(inconc, "Preamble: No answer while registering resource"); + stop; + } + } + + return v_aeAuxIndex; + + } + + //Added by @Naum + function f_cse_preamble_createServiceSubscribedAppRule(in template ListOfM2MID p_allowedAEs, in template (value) AccessControlOperations p_allowedOperations := int63) runs on CseTester return integer {//c_CRUDNDi + + var MsgIn v_response; + var integer v_serviceSubscribedAppRuleIndex := -1; + var RequestPrimitive v_request; + + v_serviceSubscribedAppRuleIndex := f_cse_createResource(int19, m_createServiceSubscribedAppRule({"None"}, {PX_APP_ID}, valueof(p_allowedAEs))); + + return v_serviceSubscribedAppRuleIndex; + + } + + }//end group preambleFunctions + + group postambleFunctions { + + /** + * @desc Deletion of all resources created during the test case execution. IUT gets clean and ready for next execution + * @verdict + */ + function f_cse_postamble_deleteResources() runs on CseTester { + var integer i; + var XSD.ID v_resourceAddress; + var MsgIn v_response; + var RequestPrimitive v_request; + + if (PX_RUN_POSTAMBLE) { + + for(i := 0; i < lengthof(vc_resourcesIndexToBeDeleted); i := i + 1) { + + v_resourceAddress := f_getResourceAddress(lengthof(vc_resourcesIndexToBeDeleted)-1 - i); + + v_request := valueof(m_deleteRequest(v_resourceAddress)); + + if(PX_FROM_IS_AE_ID){ + if(ischosen(vc_resourcesList[i].resource.any_1[0].AccessControlPolicy_optional)) { + v_request.from_ := PX_AE_ID_STEM; + } else { + v_request.from_ := vc_aeAux.aE_ID; + } + } + mcaPort.send(m_request(v_request)); + + tc_ac.start; + alt { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) { + tc_ac.stop; + log("Postamble: AE Resource deleted"); + } + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { + tc_ac.stop; + log("Postamble: Error while deleting resource"); + } + [] tc_ac.timeout { + log("Postamble: No answer while deleting resource"); + } + } + } + } + + f_cse_postamble_default(); + } + + /** + * @desc Default postamble + * @verdict + */ + function f_cse_postamble_default() runs on CseTester { } - } - }//end group altstepFunctions + + + }//end group postambleFunctions + + group helpingFunctions { + + /** + * @desc Creation of a resource + * @param p_resourceType Resource type of the resource to be created + * @param p_requestPrimitive Template request primitive + * @param p_parentIndex Internal resource index which indicates the parent of the resource to be created + * @return Internal resource index of the created resource + * @verdict + */ + function f_cse_createResource(in ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, integer p_parentIndex := -1) runs on CseTester return integer { + + var MsgIn v_response; + var RequestPrimitive v_request; + var XSD.ID v_resourceId; + var integer v_resourceIndex := -1; + + v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, p_parentIndex); + + mcaPort.send(m_request(v_request)); + tc_ac.start; + alt { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { + tc_ac.stop; + setverdict(pass, "f_createResource: Resource type " & int2str(enum2int(p_resourceType)) & " created successfuly"); + v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, p_parentIndex); + } + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { + tc_ac.stop; + setverdict(inconc, "f_createResource: Error while creating resource type " & int2str(enum2int(p_resourceType))); + } + [] mcaPort.receive { + tc_ac.stop; + setverdict(inconc, "f_createResource: Unexpected message received"); + } + [] tc_ac.timeout { + setverdict(inconc, "f_createResource: No answer while creating resource type " & int2str(enum2int(p_resourceType))); + } + } + + return v_resourceIndex; + + } + + /** + * @desc Creation of the auxiliar ACP resource + * @param p_acpName ACP name + * @param p_allowedOperations Allowed operations + * @return Internal resource index of the created auxiliar ACP resource + * @verdict + */ + function f_cse_createAccessControlPolicyAux(in template (value) XSD.String p_acpName := c_acpAuxName, in template (value) AccessControlOperations p_allowedOperations := int63) runs on CseTester return integer{ + var RequestPrimitive v_request; + var MsgIn v_response; + var integer v_acpAuxIndex := -1; + + v_request := valueof(m_createAcpAux(p_acpName := p_acpName, p_allowedOperations := p_allowedOperations)); + + v_request.to_ := f_addPrefix(f_getResourceAddress()); + + mcaPort.send(m_request(v_request)); + tc_ac.start; + alt { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { + tc_ac.stop; + setverdict(pass, "f_createAccessControlPolicy: Resource type " & int2str(1) & " created successfuly"); + v_acpAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent); + vc_acpAux := v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AccessControlPolicy_optional;//TODO To be removed + } + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { + tc_ac.stop; + setverdict(inconc, "f_createAccessControlPolicy: Error while creating resource type " & int2str(1)); + } + [] mcaPort.receive { + tc_ac.stop; + setverdict(inconc, "f_createAccessControlPolicy: Unexpected message received"); + } + [] tc_ac.timeout { + setverdict(inconc, "f_createAccessControlPolicy: No answer while creating resource type " & int2str(1)); + } + } + + return v_acpAuxIndex; + + } + + + /** + * @desc Creation of the auxiliar Container resource + * @param p_parentIndex Internal resource index which indicates the parent of the Container resource to be created + * @return Internal resource index of the created Container resource + * @verdict + */ + function f_cse_createContainerResourceAux (integer p_parentIndex := -1) runs on CseTester return integer { + + var MsgIn v_response; + var RequestPrimitive v_request; + var integer v_acpAuxIndex := -1; + var integer v_containerResourceIndex := -1; + + v_acpAuxIndex := f_cse_createAccessControlPolicyAux(p_acpName := c_acpAuxName);//"MyAcp_2" + + v_request := valueof(m_createContainerBase); + v_request.primitiveContent.any_1[0].Container_optional.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}; + v_request.primitiveContent.any_1[0].Container_optional.resourceName := "MyContainerAux"; + + v_containerResourceIndex := f_cse_createResource(int3, v_request, p_parentIndex); + + return v_containerResourceIndex; + + } + + /** + * @desc Update of the auxiliar ACP resource + * @param p_allowedOperations New allowed operations + * @verdict + */ + function f_cse_updateAcpAuxResource (in template (value) AccessControlOperations p_allowedOperations) runs on CseTester { + var RequestPrimitive v_request; + + v_request := valueof(m_updateAcpBase); + + v_request.to_ := f_addPrefix(f_getResourceAddress(vc_acpAuxIndex)); + v_request.primitiveContent.any_1[0].AccessControlPolicy_optional.privileges.accessControlRule_list := { + { + accessControlOriginators := PX_ACOR, //{"admin:admin"} + accessControlOperations := valueof(p_allowedOperations), + accessControlContexts_list := omit + } + }; + + mcaPort.send(m_request(v_request)); + tc_ac.start; + alt { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) { + tc_ac.stop; + setverdict(pass, "f_updateAcpAuxResource: " & v_request.to_ & " resource updated successfuly"); + } + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { + tc_ac.stop; + setverdict(fail, "f_updateAcpAuxResource: Error while updating " & v_request.to_ & " resource"); + } + [] tc_ac.timeout { + setverdict(inconc, "f_updateAcpAuxResource: No answer while updating " & v_request.to_ & " resource" ); + } + } + } + + }//end group helpingFunctions + + group altstepFunctions { + + /** + * @desc Cse altstep for config 01 + */ + altstep a_cse_cf01() runs on CseTester { + + [] mcaPort.receive { + log("a_default: WARNING: Unexpected message received"); + repeat; + } + } + + /** + * @desc Cse altstep for config 02 + */ + altstep a_cse_cf02() runs on CseTester { + + [] mcaPort.receive { + log("a_default: WARNING: Unexpected message received"); + repeat; + } + [] mccPort.receive { + log("a_default: WARNING: Unexpected message received"); + repeat; + } + } + + }//end group altstepFunctions + + }//end cseFunctions - group getSetFunctions { + group aeFunctions { + + group altstepFunctions { + + /** + * @desc Ae altstep + */ + altstep a_ae_default() runs on AeTester { + + [] mcaPort.receive { + log("a_default: WARNING: Unexpected message received"); + repeat; + } + } + + }//end group altstepFunctions + + }//end of aeFunctions + + group getSetFunctions { + /** * @desc Creation of a CREATE request primitive from a template request primitive * @param p_resourceType Type of resource to be created @@ -245,26 +439,26 @@ module OneM2M_Functions { * @return Created CREATE request primitive * @verdict */ - function f_getCreateRequestPrimitive(in ResourceType p_resourceType, template RequestPrimitive p_request, integer p_parentIndex) runs on M2M return RequestPrimitive { - + function f_getCreateRequestPrimitive(in ResourceType p_resourceType, template RequestPrimitive p_request, integer p_parentIndex) runs on CseTester return RequestPrimitive { + p_request.from_ := f_getOriginator(p_parentIndex); - + p_request.to_ := f_addPrefix(f_getResourceAddress(p_parentIndex)); - + if (p_resourceType == int1) {//AccessControlPolicy - + } if (p_resourceType == int9) {//group p_request.primitiveContent.any_1[0].Group_optional.memberIDs := {f_getResourceAddress(p_parentIndex)}; } - + if (p_resourceType == int15) {//pollingChannel p_request.from_ := vc_aeAux.aE_ID; } - + if (p_resourceType == int23) {//subscription p_request.primitiveContent.any_1[0].Subscription_optional.notificationURI := {f_getResourceAddress(p_parentIndex)}; - + /*if(PX_FROM_IS_AE_ID) { if(PX_UNSTRUCTURED){ p_request.primitiveContent.any_1[0].Subscription_optional.notificationURI := {vc_aeAux.aE_ID}; @@ -275,10 +469,10 @@ module OneM2M_Functions { p_request.primitiveContent.any_1[0].Subscription_optional.notificationURI := {"/" & PX_CSE_NAME & "/" & PX_AEAUX_NAME};//c_aeAuxName }*/ } - + return valueof(p_request); } - + /** * @desc Creation of an UPDATE request primitive from a template request primitive * @param p_resourceType Type of resource to be created @@ -287,38 +481,38 @@ module OneM2M_Functions { * @return Created UPDATE request primitive * @verdict */ - function f_getUpdateRequestPrimitive(in ResourceType p_resourceType, integer p_resourceIndex, template RequestPrimitive p_request) runs on M2M return RequestPrimitive { - + function f_getUpdateRequestPrimitive(in ResourceType p_resourceType, integer p_resourceIndex, template RequestPrimitive p_request) runs on CseTester return RequestPrimitive { + p_request.from_ := f_getOriginator(p_resourceIndex); - + p_request.to_ := f_addPrefix(f_getResourceAddress(p_resourceIndex)); - + if (p_resourceType == int3) {//Container - + //TODO } - + if (p_resourceType == int9) {//group //TODO - + } - + if (p_resourceType == int18) {//schedule //TODO - + } - + if (p_resourceType == int15) {//pollingChannel //TODO } - + if (p_resourceType == int23) {//subscription //TODO } - + return valueof(p_request); } - + /** * @desc Extraction from a primitiveContent field the resourceID attribute * @param p_contentResource primitiveContent field @@ -326,7 +520,7 @@ module OneM2M_Functions { * @verdict */ function f_getResourceId(PrimitiveContent p_contentResource) return XSD.ID { - + if(ischosen(p_contentResource.any_1[0].AccessControlPolicy_optional)) { return p_contentResource.any_1[0].AccessControlPolicy_optional.resourceID; } @@ -349,9 +543,9 @@ module OneM2M_Functions { return p_contentResource.any_1[0].AE_optional.resourceID; } return "1"; - + } - + /** * @desc Extraction from a primitiveContent field the resourceName attribute * @param p_contentResource primitiveContent field @@ -359,7 +553,7 @@ module OneM2M_Functions { * @verdict */ function f_getResourceName(PrimitiveContent p_contentResource) return XSD.ID { - + if(ischosen(p_contentResource.any_1[0].AccessControlPolicy_optional)) { return p_contentResource.any_1[0].AccessControlPolicy_optional.resourceName; } @@ -381,23 +575,23 @@ module OneM2M_Functions { if(ischosen(p_contentResource.any_1[0].AE_optional)) { return p_contentResource.any_1[0].AE_optional.resourceName; } - + return "1"; - + } - + /** * @desc Resolution of the originator field (from) for a given resource * @param p_targetResourceIndex Internal resource index of the given resource * @return Originator for a given resource * @verdict */ - function f_getOriginator(integer p_targetResourceIndex := -1) runs on M2M return XSD.AnyURI { - + function f_getOriginator(integer p_targetResourceIndex := -1) runs on CseTester return XSD.AnyURI { + if(p_targetResourceIndex == -1) { return PX_AE_ID_STEM; } - + if(PX_FROM_IS_AE_ID) { if(ischosen(vc_resourcesList[p_targetResourceIndex].resource.any_1[0].AE_optional)) { return vc_resourcesList[p_targetResourceIndex].resource.any_1[0].AE_optional.aE_ID; @@ -408,7 +602,7 @@ module OneM2M_Functions { return PX_AE_ID_STEM; } } - + /** * @desc Return of a index of a specific attribute from an attributeList by attributeName * @param p_attributeList Target attributeList @@ -419,28 +613,28 @@ module OneM2M_Functions { function f_getAttribute(in AttributeList p_attributeList, in XSD.NCName p_attributeName) return integer { var integer i; var Attribute v_attribute := {-, -}; - + for (i:=0; i < lengthof(p_attributeList); i := i + 1){ if(p_attributeList[i] == p_attributeName){ return i; } } - + return -1; - + } - + /** * @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_getResourceAddress(integer p_targetResourceIndex := -1) runs on M2M return XSD.ID { + function f_getResourceAddress(integer p_targetResourceIndex := -1) runs on CseTester return XSD.ID { var XSD.ID v_resourceAddress; - + if(PX_ADDRESSING_FORMAT == e_cseRelative) { - + if(PX_UNSTRUCTURED) { if(p_targetResourceIndex == -1) { return ""; @@ -455,7 +649,7 @@ module OneM2M_Functions { return v_resourceAddress; } } - + } else if (PX_ADDRESSING_FORMAT == e_spRelative) { if(PX_UNSTRUCTURED) { if(p_targetResourceIndex == -1) { @@ -489,7 +683,7 @@ module OneM2M_Functions { } else { return ""; } - + } /** * @desc Saving of a resource and its parent index in the internal resource list @@ -498,166 +692,20 @@ module OneM2M_Functions { * @return Internal resource index of the saved resource * @verdict */ - function f_setResource(PrimitiveContent p_resource, integer p_parentIndex := -1) runs on M2M return integer { - + function f_setResource(PrimitiveContent p_resource, integer p_parentIndex := -1) runs on CseTester return integer { + if(isbound(vc_resourcesList)) { vc_resourcesList[lengthof(vc_resourcesList)] := {p_parentIndex, p_resource}; } else { vc_resourcesList[0] := {p_parentIndex, p_resource}; } return lengthof(vc_resourcesList)-1; - + } - + }//end group getSetFunctions - group helpingFunctions { - - /** - * @desc Creation of a resource - * @param p_resourceType Resource type of the resource to be created - * @param p_requestPrimitive Template request primitive - * @param p_parentIndex Internal resource index which indicates the parent of the resource to be created - * @return Internal resource index of the created resource - * @verdict - */ - function f_createResource(in ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, integer p_parentIndex := -1) runs on M2M return integer { - - var M2MResponsePrimitive v_response; - var RequestPrimitive v_request; - var XSD.ID v_resourceId; - var integer v_resourceIndex := -1; - - v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, p_parentIndex); - - mcaPort.send(m_request(v_request)); - tc_ac.start; - alt { - [] mcaPort.receive(mw_responseOK) -> value v_response { - tc_ac.stop; - setverdict(pass, "f_createResource: Resource type " & int2str(enum2int(p_resourceType)) & " created successfuly"); - v_resourceIndex := f_setResource(v_response.responsePrimitive_.primitiveContent, p_parentIndex); - } - [] mcaPort.receive(mw_responseKO) { - tc_ac.stop; - setverdict(inconc, "f_createResource: Error while creating resource type " & int2str(enum2int(p_resourceType))); - } - [] mcaPort.receive { - tc_ac.stop; - setverdict(inconc, "f_createResource: Unexpected message received"); - } - [] tc_ac.timeout { - setverdict(inconc, "f_createResource: No answer while creating resource type " & int2str(enum2int(p_resourceType))); - } - } - - return v_resourceIndex; - - } - - /** - * @desc Creation of the auxiliar ACP resource - * @param p_acpName ACP name - * @param p_allowedOperations Allowed operations - * @return Internal resource index of the created auxiliar ACP resource - * @verdict - */ - function f_createAccessControlPolicyAux(in template (value) XSD.String p_acpName := c_acpAuxName, in template (value) AccessControlOperations p_allowedOperations := int63) runs on M2M return integer{ - var RequestPrimitive v_request; - var M2MResponsePrimitive v_response; - var integer v_acpAuxIndex := -1; - - v_request := valueof(m_createAcpAux(p_acpName := p_acpName, p_allowedOperations := p_allowedOperations)); - - v_request.to_ := f_addPrefix(f_getResourceAddress()); - - mcaPort.send(m_request(v_request)); - tc_ac.start; - alt { - [] mcaPort.receive(mw_responseOK) -> value v_response { - tc_ac.stop; - setverdict(pass, "f_createAccessControlPolicy: Resource type " & int2str(1) & " created successfuly"); - v_acpAuxIndex := f_setResource(v_response.responsePrimitive_.primitiveContent); - vc_acpAux := v_response.responsePrimitive_.primitiveContent.any_1[0].AccessControlPolicy_optional;//TODO To be removed - } - [] mcaPort.receive(mw_responseKO) { - tc_ac.stop; - setverdict(inconc, "f_createAccessControlPolicy: Error while creating resource type " & int2str(1)); - } - [] mcaPort.receive { - tc_ac.stop; - setverdict(inconc, "f_createAccessControlPolicy: Unexpected message received"); - } - [] tc_ac.timeout { - setverdict(inconc, "f_createAccessControlPolicy: No answer while creating resource type " & int2str(1)); - } - } - - return v_acpAuxIndex; - - } - - - /** - * @desc Creation of the auxiliar Container resource - * @param p_parentIndex Internal resource index which indicates the parent of the Container resource to be created - * @return Internal resource index of the created Container resource - * @verdict - */ - function f_createContainerResourceAux (integer p_parentIndex := -1) runs on M2M return integer { - - var M2MResponsePrimitive v_response; - var RequestPrimitive v_request; - var integer v_acpAuxIndex := -1; - var integer v_containerResourceIndex := -1; - - v_acpAuxIndex := f_createAccessControlPolicyAux(p_acpName := c_acpAuxName);//"MyAcp_2" - - v_request := valueof(m_createContainerBase); - v_request.primitiveContent.any_1[0].Container_optional.accessControlPolicyIDs := {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)}; - v_request.primitiveContent.any_1[0].Container_optional.resourceName := "MyContainerAux"; - - v_containerResourceIndex := f_createResource(int3, v_request, p_parentIndex); - - return v_containerResourceIndex; - - } - - /** - * @desc Update of the auxiliar ACP resource - * @param p_allowedOperations New allowed operations - * @verdict - */ - function f_updateAcpAuxResource (in template (value) AccessControlOperations p_allowedOperations) runs on M2M { - var RequestPrimitive v_request; - - v_request := valueof(m_updateAcpBase); - - v_request.to_ := f_addPrefix(f_getResourceAddress(vc_acpAuxIndex)); - v_request.primitiveContent.any_1[0].AccessControlPolicy_optional.privileges.accessControlRule_list := { - { - accessControlOriginators := PX_ACOR, //{"admin:admin"} - accessControlOperations := valueof(p_allowedOperations), - accessControlContexts_list := omit - } - }; - - mcaPort.send(m_request(v_request)); - tc_ac.start; - alt { - [] mcaPort.receive(mw_responseOK) { - tc_ac.stop; - setverdict(pass, "f_updateAcpAuxResource: " & v_request.to_ & " resource updated successfuly"); - } - [] mcaPort.receive(mw_responseKO) { - tc_ac.stop; - setverdict(fail, "f_updateAcpAuxResource: Error while updating " & v_request.to_ & " resource"); - } - [] tc_ac.timeout { - setverdict(inconc, "f_updateAcpAuxResource: No answer while updating " & v_request.to_ & " resource" ); - } - } - } + group commonFunctions { /** * @desc Sending of an Adapter Control primitive @@ -665,18 +713,31 @@ module OneM2M_Functions { * @param data Corresponding information for the correct execution of the given action * @verdict */ - function f_sendAcPrimitive(in charstring event, in charstring data) runs on M2M { + function f_sendAcPrimitive(in charstring event, in charstring data) runs on Tester { var charstring v_data := "" & data; // clear encoding rules (ttwb issue ?) acPort.send(AcRequestPrimitive:{event, {charstring := v_data}}); } + + group altstepFunctions { + + /** + * @desc Default altstep + */ + altstep a_default() runs on Tester { + + [] tc_wait.timeout { + setverdict(inconc,"a_default: ERROR: Timeout while awaiting reaction of the IUT prior to Upper Tester action"); + } + [] tc_ac.timeout { + setverdict(inconc,"a_default: ERROR: Timeout while awaiting the reception of a message"); + } + } - - }//end group helpingFunctions - - - + }//end group altstepFunctions + + }//end of commonFunctions diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn index 453c4f697ada39d05fdb1758a7c95c19790c49b4..a68ef3230a18617d3c9888e73a89f60bbeb726c3 100644 --- a/LibOneM2M/OneM2M_Templates.ttcn +++ b/LibOneM2M/OneM2M_Templates.ttcn @@ -7,7 +7,7 @@ * * @author ETSI * @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $ - * $Id: OneM2M_Templates.ttcn 103 2016-08-30 09:39:32Z reinaortega $ + * $Id: OneM2M_Templates.ttcn 105 2016-08-31 13:01:46Z reinaortega $ * @desc Module containing templates for oneM2M * */ @@ -19,7 +19,7 @@ module OneM2M_Templates { import from OneM2M_TypesAndValues all; //import from OneM2M_AdditionalTypes all; import from OneM2M_Pixits all; - import from OneM2M_Functions all; + //import from OneM2M_Functions all; /** @@ -36,27 +36,34 @@ module OneM2M_Templates { /* Templates */ - /** - * @desc Base template for request sending operations - * @param p_requestPrimitive - */ - template (value) M2MRequestPrimitive m_request(in template (value) RequestPrimitive p_requestPrimitive, in template (omit) AttributeList_1 p_nullFields := omit ) := { - requestPrimitive_ := p_requestPrimitive, - host := PX_HOST_ADDRESS, - xmlNamespace := PX_XML_NAMESPACE, - protocolBinding := PX_PROTOCOL_BINDING, - serialization := PX_SERIALIZATION, - nullFields := p_nullFields - }; - //Added by @Naum - template M2MRequestPrimitive mw_request(in template RequestPrimitive p_requestPrimitive, in template (omit) AttributeList_1 p_nullFields := omit ) := { - requestPrimitive_ := p_requestPrimitive, - host := omit, - xmlNamespace := omit, - protocolBinding := omit, - serialization := omit, - nullFields := omit - }; + + group primitives { + /** + * @desc Base template for request sending operations + * @param p_requestPrimitive + */ + template (value) MsgOut m_request(in template (value) RequestPrimitive p_requestPrimitive, in template (omit) AttributeList_1 p_nullFields := omit ) := { + primitive := { requestPrimitive := p_requestPrimitive}, + host := PX_HOST_ADDRESS, + xmlNamespace := PX_XML_NAMESPACE, + protocolBinding := PX_PROTOCOL_BINDING, + serialization := PX_SERIALIZATION, + nullFields := p_nullFields + }; + //Added by @Naum + template MsgIn mw_request(in template (present) RequestPrimitive p_requestPrimitive) := { + primitive := { requestPrimitive := p_requestPrimitive} + }; + + /** + * @desc Base template for response receiving operations + * @param p_responsePrimitive + */ + template MsgIn mw_response(in template (present) ResponsePrimitive p_responsePrimitive) := { + primitive := { responsePrimitive := p_responsePrimitive} + }; + + } group RequestPrimitives { @@ -2123,57 +2130,48 @@ module OneM2M_Templates { }//end group SpecialContents group ResponsePrimitives { - template M2MResponsePrimitive mw_response(ResponseStatusCode p_statusCode) := { - responsePrimitive_ := { - responseStatusCode := p_statusCode, - requestIdentifier := ?, - primitiveContent := *, - to_ := *, - from_ := *, - originatingTimestamp := *, - resultExpirationTimestamp := *, - eventCategory := * - } + template ResponsePrimitive mw_responsePrimitive(ResponseStatusCode p_statusCode) := { + responseStatusCode := p_statusCode, + requestIdentifier := ?, + primitiveContent := *, + to_ := *, + from_ := *, + originatingTimestamp := *, + resultExpirationTimestamp := *, + eventCategory := * }; - template M2MResponsePrimitive mw_responseInverse(ResponseStatusCode p_statusCode) := { - responsePrimitive_ := { - responseStatusCode := complement(p_statusCode), - requestIdentifier := ?, - primitiveContent := *, - to_ := *, - from_ := *, - originatingTimestamp := *, - resultExpirationTimestamp := *, - eventCategory := * - } + template ResponsePrimitive mw_responsePrimitiveInverse(ResponseStatusCode p_statusCode) := { + responseStatusCode := complement(p_statusCode), + requestIdentifier := ?, + primitiveContent := *, + to_ := *, + from_ := *, + originatingTimestamp := *, + resultExpirationTimestamp := *, + eventCategory := * }; - template M2MResponsePrimitive mw_responseOK(in template PrimitiveContent p_content := *) := { - responsePrimitive_ := { - responseStatusCode := (int2000, int2001, int2002, int2004), - requestIdentifier := ?, - primitiveContent := p_content, - to_ := *, - from_ := *, - originatingTimestamp := *, - resultExpirationTimestamp := *, - eventCategory := * - } + template ResponsePrimitive mw_responsePrimitiveOK(in template PrimitiveContent p_content := *) := { + responseStatusCode := (int2000, int2001, int2002, int2004), + requestIdentifier := ?, + primitiveContent := p_content, + to_ := *, + from_ := *, + originatingTimestamp := *, + resultExpirationTimestamp := *, + eventCategory := * }; - - template M2MResponsePrimitive mw_responseKO := { - responsePrimitive_ := { - responseStatusCode := complement(int2000, int2001, int2002, int2004), - requestIdentifier := ?, - primitiveContent := *, - to_ := *, - from_ := *, - originatingTimestamp := *, - resultExpirationTimestamp := *, - eventCategory := * - } + template ResponsePrimitive mw_responsePrimitiveKO := { + responseStatusCode := complement(int2000, int2001, int2002, int2004), + requestIdentifier := ?, + primitiveContent := *, + to_ := *, + from_ := *, + originatingTimestamp := *, + resultExpirationTimestamp := *, + eventCategory := * }; }//end group ResponsePrimitives diff --git a/LibOneM2M/OneM2M_TestSystem.ttcn b/LibOneM2M/OneM2M_TestSystem.ttcn index f296e6862d7cc367e4374c53e9169d9bce0fed57..7a49c824d08697e0a6cafe5b216ea6528c7d32ee 100644 --- a/LibOneM2M/OneM2M_TestSystem.ttcn +++ b/LibOneM2M/OneM2M_TestSystem.ttcn @@ -7,7 +7,7 @@ * * @author ETSI * @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_TestSystem.ttcn $ - * $Id: OneM2M_TestSystem.ttcn 103 2016-08-30 09:39:32Z reinaortega $ + * $Id: OneM2M_TestSystem.ttcn 105 2016-08-31 13:01:46Z reinaortega $ * @desc Test System module for oneM2M * */ @@ -24,9 +24,9 @@ module OneM2M_TestSystem { */ type port OneM2MPort message { in - M2MRequestPrimitive, M2MResponsePrimitive; + MsgIn; out - M2MRequestPrimitive, M2MResponsePrimitive; + MsgOut; } /** @@ -39,61 +39,78 @@ module OneM2M_TestSystem { AcRequestPrimitive; } - /* Components */ - type component M2M { - port OneM2MPort mcaPort; - port OneM2MPort mccPort; + /* Components */ + type component Tester { port AdapterControlPort acPort; //timers timer tc_ac := PX_TAC; timer tc_wait; + //global variables + var MyResourcesList vc_resourcesList; + var IntegerList vc_resourcesIndexToBeDeleted; + } + + type component CseTester extends Tester { + port OneM2MPort mcaPort; + port OneM2MPort mccPort; + //global variables var AE_optional vc_aeAux;//TODO To be removed var AccessControlPolicy_optional vc_acpAux; var integer vc_acpAuxIndex := -1; - var MyResourcesList vc_resourcesList; - var IntegerList vc_resourcesIndexToBeDeleted; + + } + + type component AeTester extends Tester { + port OneM2MPort mcaPort; + + //global variables } - type component M2MSystem { + type component CseSystem { port OneM2MPort mcaPort; port OneM2MPort mccPort; port AdapterControlPort acPort; - } + } + + type component AeSystem { + port OneM2MPort mcaPort; + port AdapterControlPort acPort; + } + + /* Primitives */ /** * @desc Type for the oneM2M primitives exchange - * @member requestPrimitive_ oneM2M primitive + * @member primitive oneM2M primitive * @member host IP Address of the destination * @member xmlNamespace XML Namespace to be used * @member protocolBinding Protocol binding to be used * @member serialization Serialization to be used * @member nullFields Fields that are to be included in the oneM2M primitive but empty, i.e. <labels></labels> */ - type record M2MRequestPrimitive { - RequestPrimitive requestPrimitive_, + type record MsgOut { + union { + RequestPrimitive requestPrimitive, + ResponsePrimitive responsePrimitive + } primitive, charstring host optional, charstring xmlNamespace optional, charstring protocolBinding optional, charstring serialization optional, AttributeList_1 nullFields optional } - - type record M2MResponsePrimitive { - ResponsePrimitive responsePrimitive_ - } - type record M2MPrimitive { + /** + * @desc Type for the oneM2M primitives exchange + * @member primitive oneM2M primitive + */ + type record MsgIn { union { - RequestPrimitive requestPrimitive_, - ResponsePrimitive responsePrimitive_ - } primitive, - charstring host optional, - charstring xmlNamespace optional, - charstring protocolBinding optional, - charstring serialization optional, - AttributeList_1 nullFields optional + RequestPrimitive requestPrimitive, + ResponsePrimitive responsePrimitive + } primitive } type record AcRequestPrimitive { diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn index 12967234fa35aa41e3a7a2d23983620da8f77830..006fb7cbc4a5d0207c13fc465df49cbb3ad5a3b2 100644 --- a/OneM2M_Testcases.ttcn +++ b/OneM2M_Testcases.ttcn @@ -7,7 +7,7 @@ * * @author ETSI * @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $ - * $Id: OneM2M_Testcases.ttcn 103 2016-08-30 09:39:32Z reinaortega $ + * $Id: OneM2M_Testcases.ttcn 105 2016-08-31 13:01:46Z reinaortega $ * @desc Module containing test cases for oneM2M * */ @@ -29,7 +29,7 @@ module OneM2M_Testcases { group helpingTestCases {//These are not part of the test suite, just for verification purposes - testcase TC_DELETE_AE() runs on M2M system M2MSystem { + testcase TC_DELETE_AE() runs on CseTester system CseSystem { timer t_ac := 5.0; map(self:mcaPort, system:mcaPort); @@ -37,12 +37,12 @@ module OneM2M_Testcases { mcaPort.send(m_request(m_deleteRequest(PX_URI_CSE & PX_CSE_NAME & "/" & PX_RESOURCE_TO_BE_DELETED))); t_ac.start; alt { - [] mcaPort.receive(mw_responseOK) { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) { t_ac.stop; log("Postamble: Resource deleted"); setverdict(pass); } - [] mcaPort.receive(mw_responseKO) { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { t_ac.stop; log("Postamble: Error while deleting resource"); setverdict(fail); @@ -62,7 +62,7 @@ module OneM2M_Testcases { stop; } - testcase TC_DELETE_RESOURCES() runs on M2M system M2MSystem { + testcase TC_DELETE_RESOURCES() runs on CseTester system CseSystem { timer t_ac := 5.0; var integer i; @@ -72,12 +72,12 @@ module OneM2M_Testcases { mcaPort.send(m_request(m_delete(PX_URI_CSE & "/" & PX_CSE_NAME & "/" & PX_RESOURCES_TO_BE_DELETED[i]))); t_ac.start; alt { - [] mcaPort.receive(mw_responseOK) { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) { t_ac.stop; log("Postamble: Resource deleted"); setverdict(pass); } - [] mcaPort.receive(mw_responseKO) { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { t_ac.stop; log("Postamble: Error while deleting resource"); setverdict(fail); @@ -108,9 +108,9 @@ module OneM2M_Testcases { group Registration { - testcase TC_CSE_REG_BV_001() runs on M2M system M2MSystem { + testcase TC_CSE_REG_BV_001() runs on CseTester system CseSystem { - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_cseBaseIndex := -1; var integer v_resourceIndex := -1; @@ -120,7 +120,7 @@ module OneM2M_Testcases { f_cf01Up(); //Preambule - v_cseBaseIndex := f_preamble_prepareCSE({"C-AE-ID-STEM"});//c_CRUDNDi); + v_cseBaseIndex := f_cse_preamble_createServiceSubscribedAppRule({"C-AE-ID-STEM"});//c_CRUDNDi); //Test Body v_request := valueof(m_createAe(PX_APP_ID, omit, omit)); @@ -131,13 +131,13 @@ module OneM2M_Testcases { tc_ac.start; alt { - [] mcaPort.receive(mw_response(int2001)) { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) { tc_ac.stop; setverdict(pass, testcasename() & ": AE successfuly created."); } - [] mcaPort.receive(mw_responseInverse(int2001)) -> value v_response{ + [] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int2001))) -> value v_response{ tc_ac.stop; - setverdict(fail, testcasename() & ": Error while creating AE with status code " & int2str(enum2int(v_response.responsePrimitive_.responseStatusCode))); + setverdict(fail, testcasename() & ": Error while creating AE with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))); } [] tc_ac.timeout { setverdict(inconc, testcasename() & ": No answer while creating AE"); @@ -145,13 +145,16 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); } - testcase TC_CSE_REG_BV_002() runs on M2M system M2MSystem { + testcase TC_CSE_REG_BV_002() runs on CseTester system CseSystem { - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_cseBaseIndex := -1; var ResourceType v_resourceType := int2; @@ -160,37 +163,40 @@ module OneM2M_Testcases { f_cf01Up(); //Preambule - v_cseBaseIndex := f_preamble_prepareCSE({"C-AE-ID-STEM"});//c_CRUDNDi); + v_cseBaseIndex := f_cse_preamble_createServiceSubscribedAppRule({"C-AE-ID-STEM"});//c_CRUDNDi); //Test Body v_request := valueof(m_createAe(PX_APP_ID, omit, "C-AE-ID-STEM")); v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, v_cseBaseIndex); - mcaPort.send(m_request(v_request)); - tc_ac.start; - alt { - [] mcaPort.receive(mw_response(int2001)) { - tc_ac.stop; - setverdict(pass, testcasename() & ": AE successfuly created."); - } - [] mcaPort.receive(mw_responseInverse(int2001)) -> value v_response{ - tc_ac.stop; - setverdict(fail, testcasename() & ": Error while creating AE with status code " & int2str(enum2int(v_response.responsePrimitive_.responseStatusCode))); - } - [] tc_ac.timeout { - setverdict(inconc, testcasename() & ": No answer while creating AE"); - } - } - - // Postamble - f_postamble_deleteResources(); + mcaPort.send(m_request(v_request)); + tc_ac.start; + alt { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) { + tc_ac.stop; + setverdict(pass, testcasename() & ": AE successfuly created."); + } + [] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int2001))) -> value v_response{ + tc_ac.stop; + setverdict(fail, testcasename() & ": Error while creating AE with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))); + } + [] tc_ac.timeout { + setverdict(inconc, testcasename() & ": No answer while creating AE"); + } + } + + // Postamble + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); } - testcase TC_CSE_REG_BV_003() runs on M2M system M2MSystem { + testcase TC_CSE_REG_BV_003() runs on CseTester system CseSystem { - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_cseBaseIndex := -1; var ResourceType v_resourceType := int2; @@ -199,37 +205,40 @@ module OneM2M_Testcases { f_cf01Up(); //Preambule - v_cseBaseIndex := f_preamble_prepareCSE(omit);//c_CRUDNDi); + v_cseBaseIndex := f_cse_preamble_createServiceSubscribedAppRule(omit);//c_CRUDNDi); // Test Body v_request := valueof(m_createAe(PX_APP_ID, omit, omit)); v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, v_cseBaseIndex); - mcaPort.send(m_request(v_request)); - tc_ac.start; - alt { - [] mcaPort.receive(mw_response(int4005)) { - tc_ac.stop; - setverdict(pass, testcasename() & ": AE creation rejected."); - } - [] mcaPort.receive(mw_responseInverse(int4005)) -> value v_response{ - tc_ac.stop; - setverdict(fail, testcasename() & ": Error while creating AE with status code " & int2str(enum2int(v_response.responsePrimitive_.responseStatusCode))); - } - [] tc_ac.timeout { - setverdict(inconc, testcasename() & ": No answer while creating AE"); - } - } - - // Postamble - f_postamble_deleteResources(); + mcaPort.send(m_request(v_request)); + tc_ac.start; + alt { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) { + tc_ac.stop; + setverdict(pass, testcasename() & ": AE creation rejected."); + } + [] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int4005))) -> value v_response{ + tc_ac.stop; + setverdict(fail, testcasename() & ": Error while creating AE with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))); + } + [] tc_ac.timeout { + setverdict(inconc, testcasename() & ": No answer while creating AE"); + } + } + + // Postamble + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); } - testcase TC_CSE_REG_BV_004() runs on M2M system M2MSystem { + testcase TC_CSE_REG_BV_004() runs on CseTester system CseSystem { - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_cseBaseIndex := -1; var ResourceType v_resourceType := int2; @@ -238,37 +247,40 @@ module OneM2M_Testcases { f_cf01Up(); //Preambule - v_cseBaseIndex := f_preamble_prepareCSE(omit);//c_CRUDNDi); + v_cseBaseIndex := f_cse_preamble_createServiceSubscribedAppRule(omit);//c_CRUDNDi); //Test Body v_request := valueof(m_createAe(PX_APP_ID, omit, "C-AE-ID-STEM")); v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, v_cseBaseIndex); - mcaPort.send(m_request(v_request)); - tc_ac.start; - alt { - [] mcaPort.receive(mw_response(int4005)) { - tc_ac.stop; - setverdict(pass, testcasename() & ": AE creation rejected."); - } - [] mcaPort.receive(mw_responseInverse(int4005)) -> value v_response{ - tc_ac.stop; - setverdict(fail, testcasename() & ": Error while creating AE with status code " & int2str(enum2int(v_response.responsePrimitive_.responseStatusCode))); - } - [] tc_ac.timeout { - setverdict(inconc, testcasename() & ": No answer while creating AE"); - } - } - - // Postamble - f_postamble_deleteResources(); + mcaPort.send(m_request(v_request)); + tc_ac.start; + alt { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) { + tc_ac.stop; + setverdict(pass, testcasename() & ": AE creation rejected."); + } + [] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int4005))) -> value v_response{ + tc_ac.stop; + setverdict(fail, testcasename() & ": Error while creating AE with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))); + } + [] tc_ac.timeout { + setverdict(inconc, testcasename() & ": No answer while creating AE"); + } + } + + // Postamble + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); } - testcase TC_CSE_REG_BV_005() runs on M2M system M2MSystem { + testcase TC_CSE_REG_BV_005() runs on CseTester system CseSystem { - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_cseBaseIndex := -1; var ResourceType v_resourceType := int2; @@ -277,32 +289,35 @@ module OneM2M_Testcases { f_cf02Up(); //Preambule - v_cseBaseIndex := f_preamble_prepareCSE({"S"});//c_CRUDNDi); + v_cseBaseIndex := f_cse_preamble_createServiceSubscribedAppRule({"S"});//c_CRUDNDi); //Test Body v_request := valueof(m_createAe(PX_APP_ID, omit, "C-AE-ID-STEM")); v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, v_cseBaseIndex); - mcaPort.send(m_request(v_request)); - tc_ac.start; + mcaPort.send(m_request(v_request)); + tc_ac.start; - alt { - [] mccPort.receive(mw_request(mw_createAEannc(omit, omit, "APP_ID"))) { - tc_ac.stop; - setverdict(pass, testcasename() & ": AE creation redirected."); - } - [] mccPort.receive { - tc_ac.stop; - setverdict(fail, testcasename() & ": Error while creating AE"); - } - [] tc_ac.timeout { - setverdict(inconc, testcasename() & ": No answer while creating AE"); - } - } - - // Postamble - f_postamble_deleteResources(); + alt { + [] mccPort.receive(mw_request(mw_createAEannc(omit, omit, "APP_ID"))) { + tc_ac.stop; + setverdict(pass, testcasename() & ": AE creation redirected."); + } + [] mccPort.receive { + tc_ac.stop; + setverdict(fail, testcasename() & ": Error while creating AE"); + } + [] tc_ac.timeout { + setverdict(inconc, testcasename() & ": No answer while creating AE"); + } + } + + // Postamble + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); } @@ -312,46 +327,46 @@ module OneM2M_Testcases { group g_CSE_DMR_BV_001 { - testcase TC_CSE_DMR_BV_001_01() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_001_01() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_BV_001(int3, m_createContainerBase);//Container } - testcase TC_CSE_DMR_BV_001_02() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_001_02() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_BV_001(int9, m_createGroupBase);//Group } - testcase TC_CSE_DMR_BV_001_03() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_001_03() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_BV_001(int1, m_createAcpBase);//AccessControlPolicy } - testcase TC_CSE_DMR_BV_001_04() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_001_04() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_BV_001(int18, m_createScheduleBase);//Schedule } - testcase TC_CSE_DMR_BV_001_05() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_001_05() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_BV_001(int15, m_createPollingChannelBase);//PollingChannel } - testcase TC_CSE_DMR_BV_001_06() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_001_06() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_BV_001(int23, m_createSubscriptionBase);//Subscription } - function f_CSE_DMR_BV_001(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on M2M { + function f_CSE_DMR_BV_001(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on CseTester { // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; var integer v_resourceIndex := -1; @@ -364,9 +379,9 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe();//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); - v_resourceIndex := f_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); + v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); // Test Body v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex))); @@ -374,15 +389,15 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_responseOK) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; - if(ispresent(v_response.responsePrimitive_.primitiveContent)){ + if(ispresent(v_response.primitive.responsePrimitive.primitiveContent)){ setverdict(fail, testcasename() & ": Providing content when RC set to 0"); } else { setverdict(pass, testcasename() & ": No content provided with RC set to 0"); } } - [] mcaPort.receive(mw_responseKO) { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { tc_ac.stop; setverdict(fail, testcasename() & ": Error while retrieving resource"); } @@ -392,7 +407,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); }//end f_CSE_DMR_BV_001 @@ -400,7 +418,7 @@ module OneM2M_Testcases { group g_CSE_DMR_BV_002 { - testcase TC_CSE_DMR_BV_002_01() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_002_01() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -409,7 +427,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_002(int3, m_createContainerBase, v_contentResponse);//Container } - testcase TC_CSE_DMR_BV_002_02() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_002_02() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -418,7 +436,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_002(int9, m_createGroupBase, v_contentResponse);//Group } - testcase TC_CSE_DMR_BV_002_03() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_002_03() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -427,7 +445,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_002(int1, m_createAcpBase,v_contentResponse);//AccessControlPolicy } - testcase TC_CSE_DMR_BV_002_04() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_002_04() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -436,7 +454,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_002(int18, m_createScheduleBase, v_contentResponse);//Schedule } - testcase TC_CSE_DMR_BV_002_05() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_002_05() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -445,7 +463,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_002(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel } - testcase TC_CSE_DMR_BV_002_06() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_002_06() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -454,10 +472,10 @@ module OneM2M_Testcases { f_CSE_DMR_BV_002(int23, m_createSubscriptionBase, v_contentResponse);//Subscription } - function f_CSE_DMR_BV_002(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on M2M { + function f_CSE_DMR_BV_002(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester { // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; @@ -471,9 +489,9 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe();//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); - v_resourceIndex := f_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); + v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); // Test Body v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex))); @@ -481,15 +499,15 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_responseOK(p_contentResponse)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": No child resources provided with RC set to 1"); } - [] mcaPort.receive(mw_responseOK()) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Child resources provided with RC set to 1"); } - [] mcaPort.receive(mw_responseKO) { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { tc_ac.stop; setverdict(fail, testcasename() & ": Error while retrieving resource"); } @@ -499,7 +517,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); }//end f_CSE_DMR_BV_002 @@ -507,7 +528,7 @@ module OneM2M_Testcases { group g_CSE_DMR_BV_003 { - testcase TC_CSE_DMR_BV_003_01() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_003_01() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -516,7 +537,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_003(int3, m_createContainerBase, v_contentResponse);//Container } - testcase TC_CSE_DMR_BV_003_02() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_003_02() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -525,7 +546,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_003(int9, m_createGroupBase, v_contentResponse);//Group } - testcase TC_CSE_DMR_BV_003_03() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_003_03() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -534,7 +555,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_003(int1, m_createAcpBase,v_contentResponse);//AccessControlPolicy } - testcase TC_CSE_DMR_BV_003_04() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_003_04() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -543,7 +564,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_003(int18, m_createScheduleBase, v_contentResponse);//Schedule } - testcase TC_CSE_DMR_BV_003_05() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_003_05() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -552,7 +573,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_003(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel } - testcase TC_CSE_DMR_BV_003_06() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_003_06() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -561,10 +582,10 @@ module OneM2M_Testcases { f_CSE_DMR_BV_003(int23, m_createSubscriptionBase, v_contentResponse);//Subscription } - function f_CSE_DMR_BV_003(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on M2M { + function f_CSE_DMR_BV_003(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester { // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; @@ -578,9 +599,9 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe();//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); - v_resourceIndex := f_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); + v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); // Test Body v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex))); @@ -588,15 +609,15 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_responseOK(p_contentResponse)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Only hierarchical address provided with RC set to 2"); } - [] mcaPort.receive(mw_responseOK()) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Not only hierarchical address provided with RC set to 2"); } - [] mcaPort.receive(mw_responseKO) { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { tc_ac.stop; setverdict(fail, testcasename() & ": Error while retrieving resource"); } @@ -606,7 +627,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); }//end f_CSE_DMR_BV_003 @@ -614,7 +638,7 @@ module OneM2M_Testcases { group g_CSE_DMR_BV_004 { - testcase TC_CSE_DMR_BV_004_01() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_004_01() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -623,7 +647,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_004(int3, m_createContainerBase, v_contentResponse);//Container } - testcase TC_CSE_DMR_BV_004_02() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_004_02() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -632,7 +656,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_004(int9, m_createGroupBase, v_contentResponse);//Group } - testcase TC_CSE_DMR_BV_004_03() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_004_03() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -641,7 +665,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_004(int1, m_createAcpBase,v_contentResponse);//AccessControlPolicy } - testcase TC_CSE_DMR_BV_004_04() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_004_04() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -650,7 +674,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_004(int18, m_createScheduleBase, v_contentResponse);//Schedule } - testcase TC_CSE_DMR_BV_004_05() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_004_05() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -659,7 +683,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_004(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel } - testcase TC_CSE_DMR_BV_004_06() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_004_06() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -668,10 +692,10 @@ module OneM2M_Testcases { f_CSE_DMR_BV_004(int23, m_createSubscriptionBase, v_contentResponse);//Subscription } - function f_CSE_DMR_BV_004(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on M2M { + function f_CSE_DMR_BV_004(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester { // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; @@ -685,9 +709,9 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe();//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); - v_resourceIndex := f_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); + v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); // Test Body v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex))); @@ -695,15 +719,15 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_responseOK(p_contentResponse)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": No child resources provided with RC set to 1"); } - [] mcaPort.receive(mw_responseOK()) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Child resources provided with RC set to 1"); } - [] mcaPort.receive(mw_responseKO) { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { tc_ac.stop; setverdict(fail, testcasename() & ": Error while retrieving resource"); } @@ -713,7 +737,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); }//end f_CSE_DMR_BV_004 @@ -721,7 +748,7 @@ module OneM2M_Testcases { group g_CSE_DMR_BV_005 { - testcase TC_CSE_DMR_BV_005_01() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_005_01() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -730,7 +757,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_005(int3, m_createContainerBase, v_contentResponse);//Container } - testcase TC_CSE_DMR_BV_005_02() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_005_02() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -739,7 +766,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_005(int9, m_createGroupBase, v_contentResponse);//Group } - testcase TC_CSE_DMR_BV_005_03() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_005_03() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -748,7 +775,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_005(int1, m_createAcpBase,v_contentResponse);//AccessControlPolicy } - testcase TC_CSE_DMR_BV_005_04() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_005_04() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -757,7 +784,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_005(int18, m_createScheduleBase, v_contentResponse);//Schedule } - testcase TC_CSE_DMR_BV_005_05() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_005_05() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -766,7 +793,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_005(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel } - testcase TC_CSE_DMR_BV_005_06() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_005_06() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -775,10 +802,10 @@ module OneM2M_Testcases { f_CSE_DMR_BV_005(int23, m_createSubscriptionBase, v_contentResponse);//Subscription } - function f_CSE_DMR_BV_005(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on M2M { + function f_CSE_DMR_BV_005(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester { // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; @@ -792,9 +819,9 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe();//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); - v_resourceIndex := f_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); + v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); // Test Body v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex))); @@ -802,15 +829,15 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_responseOK(p_contentResponse)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": No child resources provided with RC set to 1"); } - [] mcaPort.receive(mw_responseOK()) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Child resources provided with RC set to 1"); } - [] mcaPort.receive(mw_responseKO) { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { tc_ac.stop; setverdict(fail, testcasename() & ": Error while retrieving resource"); } @@ -820,7 +847,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); }//end f_CSE_DMR_BV_005 @@ -828,7 +858,7 @@ module OneM2M_Testcases { group g_CSE_DMR_BV_006 { - testcase TC_CSE_DMR_BV_006_01() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_006_01() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -837,7 +867,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_006(int3, m_createContainerBase, v_contentResponse);//Container } - testcase TC_CSE_DMR_BV_006_02() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_006_02() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -846,7 +876,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_006(int9, m_createGroupBase, v_contentResponse);//Group } - testcase TC_CSE_DMR_BV_006_03() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_006_03() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -855,7 +885,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_006(int1, m_createAcpBase,v_contentResponse);//AccessControlPolicy } - testcase TC_CSE_DMR_BV_006_04() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_006_04() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -864,7 +894,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_006(int18, m_createScheduleBase, v_contentResponse);//Schedule } - testcase TC_CSE_DMR_BV_006_05() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_006_05() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -873,7 +903,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_006(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel } - testcase TC_CSE_DMR_BV_006_06() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_006_06() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -882,10 +912,10 @@ module OneM2M_Testcases { f_CSE_DMR_BV_006(int23, m_createSubscriptionBase, v_contentResponse);//Subscription } - function f_CSE_DMR_BV_006(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on M2M { + function f_CSE_DMR_BV_006(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester { // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; @@ -899,9 +929,9 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe();//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); - v_resourceIndex := f_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); + v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); // Test Body v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex))); @@ -909,15 +939,15 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_responseOK(p_contentResponse)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": No child resources provided with RC set to 1"); } - [] mcaPort.receive(mw_responseOK()) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Child resources provided with RC set to 1"); } - [] mcaPort.receive(mw_responseKO) { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { tc_ac.stop; setverdict(fail, testcasename() & ": Error while retrieving resource"); } @@ -927,7 +957,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); }//end f_CSE_DMR_BV_006 @@ -935,7 +968,7 @@ module OneM2M_Testcases { group g_CSE_DMR_BV_007 { - testcase TC_CSE_DMR_BV_007_01() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_007_01() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -944,7 +977,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_007(int3, m_createContainerBase, v_contentResponse);//Container } - testcase TC_CSE_DMR_BV_007_02() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_007_02() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -953,7 +986,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_007(int9, m_createGroupBase, v_contentResponse);//Group } - testcase TC_CSE_DMR_BV_007_03() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_007_03() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -962,7 +995,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_007(int1, m_createAcpBase,v_contentResponse);//AccessControlPolicy } - testcase TC_CSE_DMR_BV_007_04() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_007_04() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -971,7 +1004,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_007(int18, m_createScheduleBase, v_contentResponse);//Schedule } - testcase TC_CSE_DMR_BV_007_05() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_007_05() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -980,7 +1013,7 @@ module OneM2M_Testcases { f_CSE_DMR_BV_007(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel } - testcase TC_CSE_DMR_BV_007_06() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_BV_007_06() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -989,10 +1022,10 @@ module OneM2M_Testcases { f_CSE_DMR_BV_007(int23, m_createSubscriptionBase, v_contentResponse);//Subscription } - function f_CSE_DMR_BV_007(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on M2M { + function f_CSE_DMR_BV_007(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester { // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; @@ -1006,9 +1039,9 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe();//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); - v_resourceIndex := f_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); + v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); // Test Body v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex))); @@ -1016,15 +1049,15 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_responseOK(p_contentResponse)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": No child resources provided with RC set to 1"); } - [] mcaPort.receive(mw_responseOK()) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Child resources provided with RC set to 1"); } - [] mcaPort.receive(mw_responseKO) { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { tc_ac.stop; setverdict(fail, testcasename() & ": Error while retrieving resource"); } @@ -1034,7 +1067,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); }//end f_CSE_DMR_BV_007 @@ -1044,7 +1080,7 @@ module OneM2M_Testcases { group g_CSE_DMR_CRE_BV_001 { - testcase TC_CSE_DMR_CRE_BV_001_01() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_CRE_BV_001_01() runs on CseTester system CseSystem { // Local variables var template RequestPrimitive v_createRequest := m_createContainerBase; var ResponsePrimitive v_responsePrimitive; @@ -1062,7 +1098,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_CRE_BV_001_02() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_CRE_BV_001_02() runs on CseTester system CseSystem { // Local variables var template RequestPrimitive v_createRequest := m_createGroupBase; var ResponsePrimitive v_responsePrimitive; @@ -1078,7 +1114,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_CRE_BV_001_03() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_CRE_BV_001_03() runs on CseTester system CseSystem { // Local variables var template RequestPrimitive v_createRequest := m_createAcpBase; var ResponsePrimitive v_responsePrimitive; @@ -1094,7 +1130,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_CRE_BV_001_04() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_CRE_BV_001_04() runs on CseTester system CseSystem { // Local variables var template RequestPrimitive v_createRequest := m_createScheduleBase; var ResponsePrimitive v_responsePrimitive; @@ -1110,7 +1146,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_CRE_BV_001_05() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_CRE_BV_001_05() runs on CseTester system CseSystem { // Local variables var template RequestPrimitive v_createRequest := m_createPollingChannelBase; var ResponsePrimitive v_responsePrimitive; @@ -1126,7 +1162,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_CRE_BV_001_06() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_CRE_BV_001_06() runs on CseTester system CseSystem { // Local variables var template RequestPrimitive v_createRequest := m_createSubscriptionBase; var ResponsePrimitive v_responsePrimitive; @@ -1142,10 +1178,10 @@ module OneM2M_Testcases { } } - function f_CSE_DMR_CRE_BV_001(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on M2M return ResponsePrimitive { + function f_CSE_DMR_CRE_BV_001(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on CseTester return ResponsePrimitive { // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; @@ -1158,7 +1194,7 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe();//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); // Test Body @@ -1167,11 +1203,11 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_responseOK) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Resource type " & int2str(enum2int(p_resourceType)) & " created successfuly"); } - [] mcaPort.receive(mw_responseKO) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error while creating resource type " & int2str(enum2int(p_resourceType))); } @@ -1181,9 +1217,12 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); - return v_response.responsePrimitive_; + return v_response.primitive.responsePrimitive; }//end f_CSE_DMR_CRE_BV_001 @@ -1192,7 +1231,7 @@ module OneM2M_Testcases { group g_CSE_DMR_CRE_BV_002 { - testcase TC_CSE_DMR_CRE_BV_002_01() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_CRE_BV_002_01() runs on CseTester system CseSystem { // Local variables var ResponsePrimitive v_responsePrimitive; @@ -1209,7 +1248,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_CRE_BV_002_02() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_CRE_BV_002_02() runs on CseTester system CseSystem { // Local variables var ResponsePrimitive v_responsePrimitive; @@ -1226,7 +1265,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_CRE_BV_002_03() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_CRE_BV_002_03() runs on CseTester system CseSystem { // Local variables var ResponsePrimitive v_responsePrimitive; @@ -1243,7 +1282,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_CRE_BV_002_04() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_CRE_BV_002_04() runs on CseTester system CseSystem { // Local variables var ResponsePrimitive v_responsePrimitive; @@ -1259,7 +1298,7 @@ module OneM2M_Testcases { } } } - testcase TC_CSE_DMR_CRE_BV_002_05() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_CRE_BV_002_05() runs on CseTester system CseSystem { // Local variables var ResponsePrimitive v_responsePrimitive; @@ -1276,7 +1315,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_CRE_BV_002_06() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_CRE_BV_002_06() runs on CseTester system CseSystem { // Local variables var ResponsePrimitive v_responsePrimitive; @@ -1293,10 +1332,10 @@ module OneM2M_Testcases { } } - function f_CSE_DMR_CRE_BV_002(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on M2M return ResponsePrimitive{//system M2MSystem { MRO system keyword not supported on functions in Titan + function f_CSE_DMR_CRE_BV_002(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on CseTester return ResponsePrimitive{//system CseSystem { MRO system keyword not supported on functions in Titan // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; @@ -1309,7 +1348,7 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe();//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); // Test Body v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex); @@ -1317,11 +1356,11 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_responseOK) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Container created successfuly"); } - [] mcaPort.receive(mw_responseKO) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error while creating container"); } @@ -1331,9 +1370,12 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); - return v_response.responsePrimitive_; + // Tear down + f_cf01Down(); + + return v_response.primitive.responsePrimitive; }//end f_CSE_DMR_CRE_BV_002 @@ -1342,46 +1384,46 @@ module OneM2M_Testcases { group g_CSE_DMR_CRE_BV_003 { - testcase TC_CSE_DMR_CRE_BV_003_01() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_CRE_BV_003_01() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_CRE_BV_003(int3, m_createContainerBase);//container } - testcase TC_CSE_DMR_CRE_BV_003_02() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_CRE_BV_003_02() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_CRE_BV_003(int9, m_createGroupBase);//group } - testcase TC_CSE_DMR_CRE_BV_003_03() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_CRE_BV_003_03() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_CRE_BV_003(int1, m_createAcpBase);//accessControlPolicy } - testcase TC_CSE_DMR_CRE_BV_003_04() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_CRE_BV_003_04() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_CRE_BV_003(int18, m_createScheduleBase);//Schedule } - testcase TC_CSE_DMR_CRE_BV_003_05() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_CRE_BV_003_05() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_CRE_BV_003(int15, m_createPollingChannelBase);//Pollingchannel } - testcase TC_CSE_DMR_CRE_BV_003_06() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_CRE_BV_003_06() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_CRE_BV_003(int23, m_createSubscriptionBase);//Subscription } - function f_CSE_DMR_CRE_BV_003(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on M2M {//system M2MSystem { MRO system keyword not supported on functions in Titan + function f_CSE_DMR_CRE_BV_003(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on CseTester {//system CseSystem { MRO system keyword not supported on functions in Titan // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; @@ -1395,9 +1437,9 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe();//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); - v_resourceIndex := f_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); + v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex); @@ -1407,15 +1449,15 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_response(int4105)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int4105))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Resource already exists"); } - [] mcaPort.receive(mw_responseKO) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error while creating an already existing resource"); } - [] mcaPort.receive(mw_responseOK) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Creating a resource that already exists"); } @@ -1425,7 +1467,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); }//end f_CSE_DMR_CRE_BV_003 @@ -1433,46 +1478,46 @@ module OneM2M_Testcases { group g_CSE_DMR_CRE_BV_004 { - testcase TC_CSE_DMR_CRE_BV_004_01() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_CRE_BV_004_01() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_CRE_BV_004(int3, m_createContainerBase);//container } - testcase TC_CSE_DMR_CRE_BV_004_02() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_CRE_BV_004_02() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_CRE_BV_004(int9, m_createGroupBase);//group } - testcase TC_CSE_DMR_CRE_BV_004_03() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_CRE_BV_004_03() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_CRE_BV_004(int1, m_createAcpBase);//accessControlPolicy } - testcase TC_CSE_DMR_CRE_BV_004_04() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_CRE_BV_004_04() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_CRE_BV_004(int18, m_createScheduleBase);//Schedule } - testcase TC_CSE_DMR_CRE_BV_004_05() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_CRE_BV_004_05() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_CRE_BV_004(int15, m_createPollingChannelBase);//Pollingchannel } - testcase TC_CSE_DMR_CRE_BV_004_06() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_CRE_BV_004_06() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_CRE_BV_004(int23, m_createSubscriptionBase);//Subscription } - function f_CSE_DMR_CRE_BV_004(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on M2M {//system M2MSystem { MRO system keyword not supported on functions in Titan + function f_CSE_DMR_CRE_BV_004(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on CseTester {//system CseSystem { MRO system keyword not supported on functions in Titan // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; @@ -1486,9 +1531,9 @@ module OneM2M_Testcases { // Preamble if (p_resourceType != int23) { - v_aeIndex := f_preamble_registerAe(int62);//c_RUDNDi); + v_aeIndex := f_cse_preamble_registerAe(int62);//c_RUDNDi); } else { - v_aeIndex := f_preamble_registerAe(int60);//c_UDNDi); + v_aeIndex := f_cse_preamble_registerAe(int60);//c_UDNDi); } // Test Body @@ -1501,15 +1546,15 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_response(int4103)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Access denied to create a resource"); } - [] mcaPort.receive(mw_responseKO) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error while creating a resource without privileges"); } - [] mcaPort.receive(mw_responseOK) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Resource created without creation privileges"); } @@ -1519,7 +1564,7 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); }//end f_CSE_DMR_CRE_BV_004 @@ -1532,7 +1577,7 @@ module OneM2M_Testcases { group g_CSE_DMR_RET_BV_001 { - testcase TC_CSE_DMR_RET_BV_001_01() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BV_001_01() runs on CseTester system CseSystem { // Local variables var ResponsePrimitive v_responsePrimitive; var template PrimitiveContent v_contentResponse; @@ -1543,7 +1588,7 @@ module OneM2M_Testcases { } - testcase TC_CSE_DMR_RET_BV_001_02() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BV_001_02() runs on CseTester system CseSystem { // Local variables var ResponsePrimitive v_responsePrimitive; var template PrimitiveContent v_contentResponse; @@ -1554,7 +1599,7 @@ module OneM2M_Testcases { } - testcase TC_CSE_DMR_RET_BV_001_03() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BV_001_03() runs on CseTester system CseSystem { // Local variables var ResponsePrimitive v_responsePrimitive; var template PrimitiveContent v_contentResponse; @@ -1565,7 +1610,7 @@ module OneM2M_Testcases { } - testcase TC_CSE_DMR_RET_BV_001_04() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BV_001_04() runs on CseTester system CseSystem { // Local variables var ResponsePrimitive v_responsePrimitive; var template PrimitiveContent v_contentResponse; @@ -1576,7 +1621,7 @@ module OneM2M_Testcases { } - testcase TC_CSE_DMR_RET_BV_001_05() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BV_001_05() runs on CseTester system CseSystem { // Local variables var ResponsePrimitive v_responsePrimitive; var template PrimitiveContent v_contentResponse; @@ -1587,7 +1632,7 @@ module OneM2M_Testcases { } - testcase TC_CSE_DMR_RET_BV_001_06() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BV_001_06() runs on CseTester system CseSystem { // Local variables var ResponsePrimitive v_responsePrimitive; var template PrimitiveContent v_contentResponse; @@ -1598,10 +1643,10 @@ module OneM2M_Testcases { } - function f_CSE_DMR_RET_BV_001(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on M2M return ResponsePrimitive { + function f_CSE_DMR_RET_BV_001(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester return ResponsePrimitive { // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; @@ -1615,24 +1660,24 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe();//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); - v_resourceIndex := f_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); + v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); // Test Body mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_resourceIndex)))); tc_ac.start; alt { - [] mcaPort.receive(mw_responseOK(p_contentResponse)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Response OK for retrieving"); } - [] mcaPort.receive(mw_responseOK) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error, resource elements provided not matching expected resource elements"); } - [] mcaPort.receive(mw_responseKO) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error while retrieving resource"); } @@ -1642,9 +1687,12 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); - return v_response.responsePrimitive_; + // Tear down + f_cf01Down(); + + return v_response.primitive.responsePrimitive; }//end f_CSE_DMR_RET_BV_001 @@ -1652,10 +1700,10 @@ module OneM2M_Testcases { group g_CSE_DMR_RET_BO_002 { - testcase TC_CSE_DMR_RET_BO_002() runs on M2M system M2MSystem{ + testcase TC_CSE_DMR_RET_BO_002() runs on CseTester system CseSystem{ // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; @@ -1669,7 +1717,7 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe();//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); // Test Body if(PX_UNSTRUCTURED) { @@ -1680,15 +1728,15 @@ module OneM2M_Testcases { tc_ac.start; alt { - [] mcaPort.receive(mw_response(int4004)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Resource not found"); } - [] mcaPort.receive(mw_responseKO) { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { tc_ac.stop; setverdict(fail, testcasename() & ": Error while retrieving resource"); } - [] mcaPort.receive(mw_responseOK) { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) { tc_ac.stop; setverdict(fail, testcasename() & ": Error while retrieving resource"); } @@ -1698,7 +1746,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); }//end f_CSE_DMR_RET_BO_002 @@ -1706,19 +1757,19 @@ module OneM2M_Testcases { group g_CSE_DMR_RET_BO_003 { - testcase TC_CSE_DMR_RET_BO_003_01() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BO_003_01() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_RET_BO_003(int3, m_createContainerBase);//Container } - testcase TC_CSE_DMR_RET_BO_003_02() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BO_003_02() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_RET_BO_003(int9, m_createGroupBase);//Group } - testcase TC_CSE_DMR_RET_BO_003_03() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BO_003_03() runs on CseTester system CseSystem { // Local variables var template RequestPrimitive v_requestPrimitive := m_createAcpBase; @@ -1727,28 +1778,28 @@ module OneM2M_Testcases { f_CSE_DMR_RET_BO_003(int1, v_requestPrimitive);//AccessControlPolicy } - testcase TC_CSE_DMR_RET_BO_003_04() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BO_003_04() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_RET_BO_003(int18, m_createScheduleBase);//Schedule } - testcase TC_CSE_DMR_RET_BO_003_05() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BO_003_05() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_RET_BO_003(int15, m_createPollingChannelBase);//PollingChannel } - testcase TC_CSE_DMR_RET_BO_003_06() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BO_003_06() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_RET_BO_003(int23, m_createSubscriptionBase);//Subscription } - function f_CSE_DMR_RET_BO_003(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on M2M { + function f_CSE_DMR_RET_BO_003(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on CseTester { // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var XSD.ID v_acpId; @@ -1767,26 +1818,26 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe();//c_CRUDNDi; + v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi; - v_resourceIndex := f_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); + v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); - f_updateAcpAuxResource(int61); //c_CUDNDi + f_cse_updateAcpAuxResource(int61); //c_CUDNDi // Test Body mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(v_resourceIndex)))); tc_ac.start; alt { - [] mcaPort.receive(mw_response(int4103)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Access denied to retrieve attributes from resource type " & int2str(enum2int(p_resourceType))); } - [] mcaPort.receive(mw_responseKO) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error while retrieving attributes from resource without having privileges"); } - [] mcaPort.receive(mw_responseOK) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Retrieving attributes from resource without having privileges"); } @@ -1796,7 +1847,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); }//end f_CSE_DMR_RET_BO_003 @@ -1805,7 +1859,7 @@ module OneM2M_Testcases { group g_CSE_DMR_RET_BV_004 { - testcase TC_CSE_DMR_RET_BV_004_01() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BV_004_01() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -1815,7 +1869,7 @@ module OneM2M_Testcases { f_CSE_DMR_RET_BV_004(int3, m_createContainerBase, v_contentResponse);//Container } - testcase TC_CSE_DMR_RET_BV_004_02() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BV_004_02() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -1825,7 +1879,7 @@ module OneM2M_Testcases { f_CSE_DMR_RET_BV_004(int9, m_createGroupBase, v_contentResponse);//Group } - testcase TC_CSE_DMR_RET_BV_004_03() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BV_004_03() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -1835,7 +1889,7 @@ module OneM2M_Testcases { f_CSE_DMR_RET_BV_004(int1, m_createAcpBase, v_contentResponse);//AccessControlPolicy } - testcase TC_CSE_DMR_RET_BV_004_04() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BV_004_04() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -1845,7 +1899,7 @@ module OneM2M_Testcases { f_CSE_DMR_RET_BV_004(int18, m_createScheduleBase,v_contentResponse);//Schedule } - testcase TC_CSE_DMR_RET_BV_004_05() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BV_004_05() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -1855,7 +1909,7 @@ module OneM2M_Testcases { f_CSE_DMR_RET_BV_004(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel } - testcase TC_CSE_DMR_RET_BV_004_06() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BV_004_06() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -1865,10 +1919,10 @@ module OneM2M_Testcases { f_CSE_DMR_RET_BV_004(int23, m_createSubscriptionBase, v_contentResponse);//Subscription } - function f_CSE_DMR_RET_BV_004(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on M2M { + function f_CSE_DMR_RET_BV_004(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester { // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var XSD.String v_attribute := "#pi";//Attribute parentId to be retrieved @@ -1883,24 +1937,24 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe();//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); - v_resourceIndex := f_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); + v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); // Test Body mcaPort.send(m_request(m_retrieveResourceAttributeToOption(f_getResourceAddress(v_resourceIndex) & v_attribute))); tc_ac.start; alt { - [] mcaPort.receive(mw_responseOK(p_contentResponse)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Requested attribute retrieved successfuly"); } - [] mcaPort.receive(mw_responseOK) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error, not only requested attribute retrieved"); } - [] mcaPort.receive(mw_responseKO) { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { tc_ac.stop; setverdict(fail, testcasename() & ": Error while retrieving resource attribute"); } @@ -1910,7 +1964,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); }//end f_CSE_DMR_RET_BV_004 @@ -1919,7 +1976,7 @@ module OneM2M_Testcases { group g_CSE_DMR_RET_BV_005 { - testcase TC_CSE_DMR_RET_BV_005_01() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BV_005_01() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -1929,7 +1986,7 @@ module OneM2M_Testcases { f_CSE_DMR_RET_BV_005(int3, m_createContainerBase, v_contentResponse);//Container } - testcase TC_CSE_DMR_RET_BV_005_02() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BV_005_02() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -1939,7 +1996,7 @@ module OneM2M_Testcases { f_CSE_DMR_RET_BV_005(int9, m_createGroupBase, v_contentResponse);//Group } - testcase TC_CSE_DMR_RET_BV_005_03() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BV_005_03() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -1949,7 +2006,7 @@ module OneM2M_Testcases { f_CSE_DMR_RET_BV_005(int1, m_createAcpBase, v_contentResponse);//AccessControlPolicy } - testcase TC_CSE_DMR_RET_BV_005_04() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BV_005_04() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -1959,7 +2016,7 @@ module OneM2M_Testcases { f_CSE_DMR_RET_BV_005(int18, m_createScheduleBase, v_contentResponse);//Schedule } - testcase TC_CSE_DMR_RET_BV_005_05() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BV_005_05() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -1969,7 +2026,7 @@ module OneM2M_Testcases { f_CSE_DMR_RET_BV_005(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel } - testcase TC_CSE_DMR_RET_BV_005_06() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BV_005_06() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -1980,10 +2037,10 @@ module OneM2M_Testcases { } - function f_CSE_DMR_RET_BV_005(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on M2M { + function f_CSE_DMR_RET_BV_005(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester { // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var XSD.String v_attribute := "#pi";//Attribute parentId to be retrieved @@ -1998,24 +2055,24 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe();//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); - v_resourceIndex := f_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); + v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); // Test Body mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(f_getResourceAddress(v_resourceIndex) , {"pi"}))); tc_ac.start; alt { - [] mcaPort.receive(mw_responseOK(p_contentResponse)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Requested attribute retrieved successfuly"); } - [] mcaPort.receive(mw_responseOK) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error, not only requested attribute retrieved"); } - [] mcaPort.receive(mw_responseKO) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error while retrieving resource attribute"); } @@ -2025,7 +2082,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); }//end f_CSE_DMR_RET_BV_005 @@ -2034,7 +2094,7 @@ module OneM2M_Testcases { group g_CSE_DMR_RET_BV_006 { - testcase TC_CSE_DMR_RET_BV_006_01() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BV_006_01() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -2045,7 +2105,7 @@ module OneM2M_Testcases { f_CSE_DMR_RET_BV_006(int3, m_createContainerBase, v_contentResponse);//Container } - testcase TC_CSE_DMR_RET_BV_006_02() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BV_006_02() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -2056,7 +2116,7 @@ module OneM2M_Testcases { f_CSE_DMR_RET_BV_006(int9, m_createGroupBase, v_contentResponse);//Group } - testcase TC_CSE_DMR_RET_BV_006_03() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BV_006_03() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -2067,7 +2127,7 @@ module OneM2M_Testcases { f_CSE_DMR_RET_BV_006(int1, m_createAcpBase, v_contentResponse);//AccessControlPolicy } - testcase TC_CSE_DMR_RET_BV_006_04() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BV_006_04() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -2078,7 +2138,7 @@ module OneM2M_Testcases { f_CSE_DMR_RET_BV_006(int18, m_createScheduleBase, v_contentResponse);//Schedule } - testcase TC_CSE_DMR_RET_BV_006_05() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BV_006_05() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -2089,7 +2149,7 @@ module OneM2M_Testcases { f_CSE_DMR_RET_BV_006(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel } - testcase TC_CSE_DMR_RET_BV_006_06() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BV_006_06() runs on CseTester system CseSystem { // Local variables var template PrimitiveContent v_contentResponse; @@ -2101,10 +2161,10 @@ module OneM2M_Testcases { } - function f_CSE_DMR_RET_BV_006(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on M2M { + function f_CSE_DMR_RET_BV_006(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester { // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; @@ -2118,9 +2178,9 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe();//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); - v_resourceIndex := f_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); + v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); // Test Body mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(f_getResourceAddress(v_resourceIndex) , @@ -2128,15 +2188,15 @@ module OneM2M_Testcases { tc_ac.start; alt { - [] mcaPort.receive(mw_responseOK(p_contentResponse)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK(p_contentResponse))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Requested attributes retrieved successfuly"); } - [] mcaPort.receive(mw_responseOK) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error, not only requested attributes retrieved"); } - [] mcaPort.receive(mw_responseKO) { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { tc_ac.stop; setverdict(fail, testcasename() & ": Error while retrieving resource attributes"); } @@ -2146,7 +2206,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); }//end f_CSE_DMR_RET_BV_006 @@ -2155,47 +2218,47 @@ module OneM2M_Testcases { group g_CSE_DMR_RET_BO_007 { - testcase TC_CSE_DMR_RET_BO_007_01() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BO_007_01() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_RET_BO_007(int3, m_createContainerBase);//Container } - testcase TC_CSE_DMR_RET_BO_007_02() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BO_007_02() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_RET_BO_007(int9, m_createGroupBase);//Group } - testcase TC_CSE_DMR_RET_BO_007_03() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BO_007_03() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_RET_BO_007(int1, m_createAcpBase);//AccessControlPolicy } - testcase TC_CSE_DMR_RET_BO_007_04() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BO_007_04() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_RET_BO_007(int18, m_createScheduleBase);//Schedule } - testcase TC_CSE_DMR_RET_BO_007_05() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BO_007_05() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_RET_BO_007(int15, m_createPollingChannelBase);//PollingChannel } - testcase TC_CSE_DMR_RET_BO_007_06() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BO_007_06() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_RET_BO_007(int23, m_createSubscriptionBase);//Subscription } - function f_CSE_DMR_RET_BO_007(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on M2M { + function f_CSE_DMR_RET_BO_007(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on CseTester { // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; @@ -2209,9 +2272,9 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe();//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); - v_resourceIndex := f_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); + v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); // Test Body mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(f_getResourceAddress(v_resourceIndex), @@ -2219,14 +2282,14 @@ module OneM2M_Testcases { tc_ac.start; alt { - [] mcaPort.receive(mw_response(int4004)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response { tc_ac.stop; } - [] mcaPort.receive(mw_responseKO) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error while retrieving non existing resource attribute"); } - [] mcaPort.receive(mw_responseOK) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error while retrieving non existing resource attribute"); } @@ -2236,7 +2299,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); }//end f_CSE_DMR_RET_BO_007 @@ -2245,47 +2311,47 @@ module OneM2M_Testcases { group g_CSE_DMR_RET_BO_008 { - testcase TC_CSE_DMR_RET_BO_008_01() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BO_008_01() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_RET_BO_008(int3, m_createContainerBase);//Container } - testcase TC_CSE_DMR_RET_BO_008_02() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BO_008_02() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_RET_BO_008(int9, m_createGroupBase);//Group } - testcase TC_CSE_DMR_RET_BO_008_03() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BO_008_03() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_RET_BO_008(int1, m_createAcpBase);//AccessControlPolicy } - testcase TC_CSE_DMR_RET_BO_008_04() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BO_008_04() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_RET_BO_008(int18, m_createScheduleBase);//Schedule } - testcase TC_CSE_DMR_RET_BO_008_05() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BO_008_05() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_RET_BO_008(int15, m_createPollingChannelBase);//PollingChannel } - testcase TC_CSE_DMR_RET_BO_008_06() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_RET_BO_008_06() runs on CseTester system CseSystem { // Local variables f_CSE_DMR_RET_BO_008(int23, m_createSubscriptionBase);//Subscription } - function f_CSE_DMR_RET_BO_008(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on M2M { + function f_CSE_DMR_RET_BO_008(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on CseTester { // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; @@ -2299,9 +2365,9 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe();//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); - v_resourceIndex := f_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); + v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex); // Test Body mcaPort.send(m_request(m_retrieveResourceAttributeContentOption(f_getResourceAddress(v_resourceIndex), @@ -2309,14 +2375,14 @@ module OneM2M_Testcases { tc_ac.start; alt { - [] mcaPort.receive(mw_response(int4004)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) -> value v_response { tc_ac.stop; } - [] mcaPort.receive(mw_responseKO) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error while retrieving non existing resource attributes"); } - [] mcaPort.receive(mw_responseOK) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error while retrieving non existing resource attributes"); } @@ -2326,7 +2392,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); }//end f_CSE_DMR_RET_BO_008 @@ -2337,7 +2406,7 @@ module OneM2M_Testcases { group Update { group g_CSE_DMR_UPD_BV_001 { - testcase TC_CSE_DMR_UPD_BV_001_01() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BV_001_01() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var Labels v_labels_2:= {"VALUE_2"}; @@ -2364,7 +2433,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_UPD_BV_001_02() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BV_001_02() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var Labels v_labels_2 := {"VALUE_2"}; @@ -2389,7 +2458,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_UPD_BV_001_03() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BV_001_03() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var Labels v_labels_2 := {"VALUE_2"}; @@ -2415,7 +2484,7 @@ module OneM2M_Testcases { } - testcase TC_CSE_DMR_UPD_BV_001_04() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BV_001_04() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var Labels v_labels_2 := {"VALUE_2"}; @@ -2441,7 +2510,7 @@ module OneM2M_Testcases { } - testcase TC_CSE_DMR_UPD_BV_001_05() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BV_001_05() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var Labels v_labels_2 := {"VALUE_2"}; @@ -2466,7 +2535,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_UPD_BV_001_06() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BV_001_06() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var Labels v_labels_2 := {"VALUE_2"}; @@ -2492,10 +2561,10 @@ module OneM2M_Testcases { } - function f_CSE_DMR_UPD_BV_001(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on M2M return ResponsePrimitive{ + function f_CSE_DMR_UPD_BV_001(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on CseTester return ResponsePrimitive{ // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; @@ -2509,9 +2578,9 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe();//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); - v_resourceIndex := f_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex); + v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex); // Test Body v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive); @@ -2519,11 +2588,11 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_responseOK) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfuly"); } - [] mcaPort.receive(mw_responseKO) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error while updating resource type " & int2str(enum2int(p_resourceType))); } @@ -2533,9 +2602,12 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); - return v_response.responsePrimitive_; + return v_response.primitive.responsePrimitive; }//end f_CSE_DMR_UPD_BV_001 @@ -2543,7 +2615,7 @@ module OneM2M_Testcases { group g_CSE_DMR_UPD_BV_002 { - testcase TC_CSE_DMR_UPD_BV_002_01() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BV_002_01() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var template RequestPrimitive v_updateRequest := m_updateContainerBase; @@ -2565,7 +2637,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_UPD_BV_002_02() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BV_002_02() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var template RequestPrimitive v_updateRequest := m_updateGroupBase; @@ -2587,7 +2659,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_UPD_BV_002_03() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BV_002_03() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var template RequestPrimitive v_updateRequest := m_updateAcpBase; @@ -2609,7 +2681,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_UPD_BV_002_04() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BV_002_04() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var template RequestPrimitive v_updateRequest := m_updateScheduleBase; @@ -2631,7 +2703,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_UPD_BV_002_05() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BV_002_05() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase; @@ -2653,7 +2725,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_UPD_BV_002_06() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BV_002_06() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; @@ -2675,10 +2747,10 @@ module OneM2M_Testcases { } } - function f_CSE_DMR_UPD_BV_002(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on M2M return ResponsePrimitive { + function f_CSE_DMR_UPD_BV_002(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on CseTester return ResponsePrimitive { // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; var integer v_resourceIndex := -1; @@ -2691,9 +2763,9 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe();//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); - v_resourceIndex := f_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex); + v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex); // Test Body v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive); @@ -2701,11 +2773,11 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_responseOK) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfuly"); } - [] mcaPort.receive(mw_responseKO) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error while updating resource type " & int2str(enum2int(p_resourceType))); } @@ -2715,9 +2787,12 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); - return v_response.responsePrimitive_; + // Tear down + f_cf01Down(); + + return v_response.primitive.responsePrimitive; }//end f_CSE_DMR_UPD_BV_002 @@ -2725,7 +2800,7 @@ module OneM2M_Testcases { group g_CSE_DMR_UPD_BV_003 { - testcase TC_CSE_DMR_UPD_BV_003_01() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BV_003_01() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var Labels v_labels_2 := {"To be deleted"}; @@ -2755,7 +2830,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_UPD_BV_003_02() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BV_003_02() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var Labels v_labels_2 := {"To be deleted"}; @@ -2783,7 +2858,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_UPD_BV_003_03() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BV_003_03() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var Labels v_labels_2 := {"To be deleted"}; @@ -2811,7 +2886,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_UPD_BV_003_04() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BV_003_04() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var Labels v_labels_2 := {"To be deleted"}; @@ -2839,7 +2914,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_UPD_BV_003_05() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BV_003_05() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var Labels v_labels_2 := {"To be deleted"}; @@ -2867,7 +2942,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_UPD_BV_003_06() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BV_003_06() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var Labels v_labels_2 := {"To be deleted"}; @@ -2895,10 +2970,10 @@ module OneM2M_Testcases { } } - function f_CSE_DMR_UPD_BV_003(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, template (omit) AttributeList_1 p_nullFields := omit) runs on M2M return ResponsePrimitive { + function f_CSE_DMR_UPD_BV_003(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, template (omit) AttributeList_1 p_nullFields := omit) runs on CseTester return ResponsePrimitive { // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; var integer v_resourceIndex := -1; @@ -2911,9 +2986,9 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe();//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); - v_resourceIndex := f_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex); + v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex); // Test Body v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive); @@ -2921,11 +2996,11 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request, p_nullFields)); tc_ac.start; alt { - [] mcaPort.receive(mw_responseOK) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfuly"); } - [] mcaPort.receive(mw_responseKO) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error while updating resource type " & int2str(enum2int(p_resourceType))); } @@ -2935,9 +3010,12 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); - return v_response.responsePrimitive_; + return v_response.primitive.responsePrimitive; }//end f_CSE_DMR_UPD_BV_003 @@ -2945,7 +3023,7 @@ module OneM2M_Testcases { group g_CSE_DMR_UPD_BV_004 { - testcase TC_CSE_DMR_UPD_BV_004_01() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BV_004_01() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var Labels v_labels_2 := {"To be deleted"}; @@ -2983,7 +3061,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_UPD_BV_004_02() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BV_004_02() runs on CseTester system CseSystem { // Local variables var XSD.String v_groupName_1 := "VALUE_1";//Attribute 1 var XSD.String v_groupName_2 := "VALUE_2"; @@ -3026,7 +3104,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_UPD_BV_004_03() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BV_004_03() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var Labels v_labels_2 := {"To be deleted"}; @@ -3082,7 +3160,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_UPD_BV_004_04() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BV_004_04() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var Labels v_labels_2 := {"To be deleted"}; @@ -3120,7 +3198,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_UPD_BV_004_05() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BV_004_05() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var Labels v_labels_2 := {"To be deleted"}; @@ -3157,7 +3235,7 @@ module OneM2M_Testcases { } } - testcase TC_CSE_DMR_UPD_BV_004_06() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BV_004_06() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var Labels v_labels_2 := {"VALUE_2"}; @@ -3197,10 +3275,10 @@ module OneM2M_Testcases { } } - function f_CSE_DMR_UPD_BV_004(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, template (omit) AttributeList_1 p_nullFields := omit) runs on M2M return ResponsePrimitive { + function f_CSE_DMR_UPD_BV_004(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, template (omit) AttributeList_1 p_nullFields := omit) runs on CseTester return ResponsePrimitive { // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; var integer v_resourceIndex := -1; @@ -3213,9 +3291,9 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe();//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); - v_resourceIndex := f_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex); + v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex); // Test Body v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive); @@ -3223,11 +3301,11 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request, p_nullFields)); tc_ac.start; alt { - [] mcaPort.receive(mw_responseOK) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Attribute of resource type " & int2str(enum2int(p_resourceType)) & " updated successfuly"); } - [] mcaPort.receive(mw_responseKO) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error while updating resource type " & int2str(enum2int(p_resourceType))); } @@ -3237,9 +3315,12 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); - return v_response.responsePrimitive_; + return v_response.primitive.responsePrimitive; }//end f_CSE_DMR_UPD_BV_004 @@ -3247,7 +3328,7 @@ module OneM2M_Testcases { group g_CSE_DMR_UPD_BO_005{ - testcase TC_CSE_DMR_UPD_BO_005_01() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BO_005_01() runs on CseTester system CseSystem { // Local variables var XSD.PositiveInteger v_expirationCounter := 1; var template RequestPrimitive v_updateRequest := m_updateContainerBase; @@ -3259,7 +3340,7 @@ module OneM2M_Testcases { f_CSE_DMR_UPD_BO_005(int3, m_createContainerBase, v_updateRequest);//Container } - testcase TC_CSE_DMR_UPD_BO_005_02() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BO_005_02() runs on CseTester system CseSystem { // Local variables var XSD.PositiveInteger v_expirationCounter := 1; var template RequestPrimitive v_updateRequest := m_updateGroupBase; @@ -3271,7 +3352,7 @@ module OneM2M_Testcases { f_CSE_DMR_UPD_BO_005(int9, m_createGroupBase, v_updateRequest);//Group } - testcase TC_CSE_DMR_UPD_BO_005_03() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BO_005_03() runs on CseTester system CseSystem { // Local variables var XSD.PositiveInteger v_expirationCounter := 1; var template RequestPrimitive v_updateRequest := m_updateAcpBase; @@ -3283,7 +3364,7 @@ module OneM2M_Testcases { f_CSE_DMR_UPD_BO_005(int1, m_createAcpBase, v_updateRequest);//AccessControlPolicy } - testcase TC_CSE_DMR_UPD_BO_005_04() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BO_005_04() runs on CseTester system CseSystem { // Local variables var XSD.PositiveInteger v_expirationCounter := 1; var template RequestPrimitive v_updateRequest := m_updateScheduleBase; @@ -3295,7 +3376,7 @@ module OneM2M_Testcases { f_CSE_DMR_UPD_BO_005(int18, m_createScheduleBase, v_updateRequest);//Schedule } - testcase TC_CSE_DMR_UPD_BO_005_05() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BO_005_05() runs on CseTester system CseSystem { // Local variables var XSD.PositiveInteger v_expirationCounter := 1; var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase; @@ -3307,7 +3388,7 @@ module OneM2M_Testcases { f_CSE_DMR_UPD_BO_005(int15, m_createPollingChannelBase, v_updateRequest);//PollingChannel } - testcase TC_CSE_DMR_UPD_BO_005_06() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BO_005_06() runs on CseTester system CseSystem { // Local variables var XSD.NonNegativeInteger v_maxNrOfInstances := 5; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; @@ -3319,10 +3400,10 @@ module OneM2M_Testcases { f_CSE_DMR_UPD_BO_005(int23, m_createSubscriptionBase, v_updateRequest);//Subscription } - function f_CSE_DMR_UPD_BO_005(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on M2M { + function f_CSE_DMR_UPD_BO_005(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on CseTester { // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; @@ -3334,7 +3415,7 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe();//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); // Test Body v_request := f_getUpdateRequestPrimitive(p_resourceType, v_aeIndex, p_updateRequestPrimitive); @@ -3344,15 +3425,15 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_response(int4005)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Resource " & c_defaultResourceName & " of type " & int2str(enum2int(p_resourceType)) & " not found"); } - [] mcaPort.receive(mw_responseKO) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error while updating an unexisting resource type " & int2str(enum2int(p_resourceType))); } - [] mcaPort.receive(mw_responseOK) { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) { tc_ac.stop; setverdict(fail, testcasename() & ": Error while updating an unexisting resource type " & int2str(enum2int(p_resourceType))); } @@ -3362,7 +3443,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); }//end f_CSE_DMR_UPD_BO_005 @@ -3370,7 +3454,7 @@ module OneM2M_Testcases { group g_CSE_DMR_UPD_BO_006{ - testcase TC_CSE_DMR_UPD_BO_006_01() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BO_006_01() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var template RequestPrimitive v_updateRequest := m_updateContainerBase; @@ -3380,7 +3464,7 @@ module OneM2M_Testcases { f_CSE_DMR_UPD_BO_006(int3, m_createContainerBase, v_updateRequest);//Container } - testcase TC_CSE_DMR_UPD_BO_006_02() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BO_006_02() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var template RequestPrimitive v_updateRequest := m_updateGroupBase; @@ -3390,7 +3474,7 @@ module OneM2M_Testcases { f_CSE_DMR_UPD_BO_006(int9, m_createGroupBase, v_updateRequest);//Group } - testcase TC_CSE_DMR_UPD_BO_006_03() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BO_006_03() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var template RequestPrimitive v_updateRequest := m_updateAcpBase; @@ -3403,7 +3487,7 @@ module OneM2M_Testcases { f_CSE_DMR_UPD_BO_006(int1, v_requestPrimitive, v_updateRequest);//AccessControlPolicy } - testcase TC_CSE_DMR_UPD_BO_006_04() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BO_006_04() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var template RequestPrimitive v_updateRequest := m_updateScheduleBase; @@ -3413,7 +3497,7 @@ module OneM2M_Testcases { f_CSE_DMR_UPD_BO_006(int18, m_createScheduleBase, v_updateRequest);//Schedule } - testcase TC_CSE_DMR_UPD_BO_006_05() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BO_006_05() runs on CseTester system CseSystem { // Local variable var Labels v_labels_1 := {"VALUE_1"}; var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase; @@ -3423,7 +3507,7 @@ module OneM2M_Testcases { f_CSE_DMR_UPD_BO_006(int15, m_createPollingChannelBase, v_updateRequest);//PollingChannel } - testcase TC_CSE_DMR_UPD_BO_006_06() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BO_006_06() runs on CseTester system CseSystem { // Local variables var Labels v_labels_1 := {"VALUE_1"}; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; @@ -3433,10 +3517,10 @@ module OneM2M_Testcases { f_CSE_DMR_UPD_BO_006(int23, m_createSubscriptionBase, v_updateRequest);//Subscription } - function f_CSE_DMR_UPD_BO_006(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on M2M { + function f_CSE_DMR_UPD_BO_006(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on CseTester { // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; var integer v_resourceIndex := -1; @@ -3449,10 +3533,10 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe(int59);//c_CRDNDi); + v_aeIndex := f_cse_preamble_registerAe(int59);//c_CRDNDi); - v_resourceIndex := f_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex); + v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex); // Test Body v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive); @@ -3460,15 +3544,15 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_response(int4103)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Access denied to update attributes from resource type " & int2str(enum2int(p_resourceType))); } - [] mcaPort.receive(mw_responseKO) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error while updating attributes from resource without having privileges"); } - [] mcaPort.receive(mw_responseOK) { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) { tc_ac.stop; setverdict(fail, testcasename() & ": Updating attributes from resource without having privileges"); } @@ -3478,7 +3562,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); }//end f_CSE_DMR_UPD_BO_006 @@ -3487,7 +3574,7 @@ module OneM2M_Testcases { group g_CSE_DMR_UPD_BO_007{ - testcase TC_CSE_DMR_UPD_BO_007_01() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BO_007_01() runs on CseTester system CseSystem { // Local variables var Timestamp v_creationTime := "20001231T012345"; var template RequestPrimitive v_updateRequest := m_updateContainerBase; @@ -3498,7 +3585,7 @@ module OneM2M_Testcases { f_CSE_DMR_UPD_BO_007(int3, m_createContainerBase, v_updateRequest);//Container } - testcase TC_CSE_DMR_UPD_BO_007_02() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BO_007_02() runs on CseTester system CseSystem { // Local variables var Timestamp v_creationTime := "20001231T012345"; var template RequestPrimitive v_updateRequest := m_updateGroupBase; @@ -3509,7 +3596,7 @@ module OneM2M_Testcases { f_CSE_DMR_UPD_BO_007(int9, m_createGroupBase, v_updateRequest);//Group } - testcase TC_CSE_DMR_UPD_BO_007_03() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BO_007_03() runs on CseTester system CseSystem { // Local variables var Timestamp v_creationTime := "20001231T012345"; var template RequestPrimitive v_updateRequest := m_updateAcpBase; @@ -3520,7 +3607,7 @@ module OneM2M_Testcases { f_CSE_DMR_UPD_BO_007(int1, m_createAcpBase, v_updateRequest);//AccessControlPolicy } - testcase TC_CSE_DMR_UPD_BO_007_04() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BO_007_04() runs on CseTester system CseSystem { // Local variables var Timestamp v_creationTime := "20001231T012345"; var template RequestPrimitive v_updateRequest := m_updateScheduleBase; @@ -3531,7 +3618,7 @@ module OneM2M_Testcases { f_CSE_DMR_UPD_BO_007(int18, m_createScheduleBase, v_updateRequest);//Schedule } - testcase TC_CSE_DMR_UPD_BO_007_05() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BO_007_05() runs on CseTester system CseSystem { // Local variables var Timestamp v_creationTime := "20001231T012345"; var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase; @@ -3542,7 +3629,7 @@ module OneM2M_Testcases { f_CSE_DMR_UPD_BO_007(int15, m_createPollingChannelBase, v_updateRequest);//PollingChannel } - testcase TC_CSE_DMR_UPD_BO_007_06() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BO_007_06() runs on CseTester system CseSystem { // Local variables var Timestamp v_creationTime := "20001231T012345"; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; @@ -3553,10 +3640,10 @@ module OneM2M_Testcases { f_CSE_DMR_UPD_BO_007(int23, m_createSubscriptionBase, v_updateRequest);//Subscription } - function f_CSE_DMR_UPD_BO_007(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on M2M { + function f_CSE_DMR_UPD_BO_007(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on CseTester { // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; var integer v_resourceIndex := -1; @@ -3569,9 +3656,9 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe();//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); - v_resourceIndex := f_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex); + v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex); // Test Body v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive); @@ -3579,15 +3666,15 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_response(int4005)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Operation not allowed. RO attribute from resource type " & int2str(enum2int(p_resourceType)) ); } - [] mcaPort.receive(mw_responseKO) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error while updating RO attribute"); } - [] mcaPort.receive(mw_responseOK) { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) { tc_ac.stop; setverdict(fail, testcasename() & ": Updating RO attribute from resource"); } @@ -3597,7 +3684,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); }//end f_CSE_DMR_UPD_BO_007 @@ -3605,7 +3695,7 @@ module OneM2M_Testcases { group g_CSE_DMR_UPD_BO_008{ - testcase TC_CSE_DMR_UPD_BO_008_01() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BO_008_01() runs on CseTester system CseSystem { // Local variables var Timestamp v_expirationTime := "20001231T012345"; var template RequestPrimitive v_updateRequest := m_updateContainerBase; @@ -3618,7 +3708,7 @@ module OneM2M_Testcases { f_CSE_DMR_UPD_BO_008(int3, m_createContainerBase, v_updateRequest, v_nullFields);//Container } - testcase TC_CSE_DMR_UPD_BO_008_02() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BO_008_02() runs on CseTester system CseSystem { // Local variables var Timestamp v_expirationTime := "20001231T012345"; var template RequestPrimitive v_updateRequest := m_updateGroupBase; @@ -3631,7 +3721,7 @@ module OneM2M_Testcases { f_CSE_DMR_UPD_BO_008(int9, m_createGroupBase, v_updateRequest, v_nullFields);//Group } - testcase TC_CSE_DMR_UPD_BO_008_03() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BO_008_03() runs on CseTester system CseSystem { // Local variables var Timestamp v_expirationTime := "20001231T012345"; var template RequestPrimitive v_updateRequest := m_updateAcpBase; @@ -3644,7 +3734,7 @@ module OneM2M_Testcases { f_CSE_DMR_UPD_BO_008(int1, m_createAcpBase, v_updateRequest, v_nullFields);//AccessControlPolicy } - testcase TC_CSE_DMR_UPD_BO_008_04() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BO_008_04() runs on CseTester system CseSystem { // Local variables var Timestamp v_expirationTime := "20001231T012345"; var template RequestPrimitive v_updateRequest := m_updateScheduleBase; @@ -3657,7 +3747,7 @@ module OneM2M_Testcases { f_CSE_DMR_UPD_BO_008(int18, m_createScheduleBase, v_updateRequest, v_nullFields);//Schedule } - testcase TC_CSE_DMR_UPD_BO_008_05() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BO_008_05() runs on CseTester system CseSystem { // Local variables var Timestamp v_expirationTime := "20001231T012345"; var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase; @@ -3670,7 +3760,7 @@ module OneM2M_Testcases { f_CSE_DMR_UPD_BO_008(int15, m_createPollingChannelBase, v_updateRequest, v_nullFields);//PollingChannel } - testcase TC_CSE_DMR_UPD_BO_008_06() runs on M2M system M2MSystem { + testcase TC_CSE_DMR_UPD_BO_008_06() runs on CseTester system CseSystem { // Local variables var Timestamp v_expirationTime := "20001231T012345"; var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase; @@ -3683,10 +3773,10 @@ module OneM2M_Testcases { f_CSE_DMR_UPD_BO_008(int23, m_createSubscriptionBase, v_updateRequest, v_nullFields);//Subscription } - function f_CSE_DMR_UPD_BO_008(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, template (omit) AttributeList_1 p_nullFields := omit) runs on M2M { + function f_CSE_DMR_UPD_BO_008(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, template (omit) AttributeList_1 p_nullFields := omit) runs on CseTester { // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; var integer v_resourceIndex := -1; @@ -3699,9 +3789,9 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe();//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); - v_resourceIndex := f_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex); + v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex); // Test Body v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive); @@ -3709,15 +3799,15 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request,p_nullFields)); tc_ac.start; alt { - [] mcaPort.receive(mw_response(int4005)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Operation not allowed. Mandatory RW attribute from resource type " & int2str(enum2int(p_resourceType)) ); } - [] mcaPort.receive(mw_responseKO) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error while deleting mandatory RW attribute"); } - [] mcaPort.receive(mw_responseOK) { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) { tc_ac.stop; setverdict(fail, testcasename() & ": Deleting a mandatory RW attribute from resource"); } @@ -3727,7 +3817,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); }//end f_CSE_DMR_UPD_BO_008 @@ -3742,18 +3835,18 @@ module OneM2M_Testcases { group g_CSE_LOC_BV_001{ - testcase TC_CSE_LOC_BV_001() runs on M2M system M2MSystem { + testcase TC_CSE_LOC_BV_001() runs on CseTester system CseSystem { var integer v_aeAuxIndex := -1; var XSD.ID p_aeResourceAddress := PX_URI_CSE & PX_CSE_NAME & "/" & c_aeAuxName; var RequestPrimitive v_request; - var M2MResponsePrimitive v_response; + var MsgIn v_response; //Test component configuration f_cf01Up(); //Preamble - v_aeAuxIndex := f_preamble_registerAe(); + v_aeAuxIndex := f_cse_preamble_registerAe(); //Set requestPrimitive v_request := f_getCreateRequestPrimitive(int10, m_createLocationPolicy(p_aeResourceAddress, omit, omit, omit, omit), v_aeAuxIndex); @@ -3762,17 +3855,17 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt{ - [] mcaPort.receive(mw_response(int4000)) -> value v_response { //BAD REQUEST + [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response { //BAD REQUEST tc_ac.stop; setverdict(pass, testcasename() & "Resource <locationPolicy> create request is rejected due to invalid request body message!!"); } - [] mcaPort.receive(mw_responseKO) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response { tc_ac.stop; - setverdict(fail, testcasename() & ": Error while handling an invalid locationPolicy resource create request with response status code:" & int2str(enum2int(v_response.responsePrimitive_.responseStatusCode))); + setverdict(fail, testcasename() & ": Error while handling an invalid locationPolicy resource create request with response status code:" & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))); } - [] mcaPort.receive(mw_responseOK) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; - setverdict(fail, testcasename() & ": Created a locationPolicy resource for an invalid create request with response status code:" & int2str(enum2int(v_response.responsePrimitive_.responseStatusCode))); + setverdict(fail, testcasename() & ": Created a locationPolicy resource for an invalid create request with response status code:" & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))); } [] tc_ac.timeout { setverdict(inconc, testcasename() & ": Timeout due to no response received from requested server!"); @@ -3780,14 +3873,17 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); - }// end testcase TC_CSE_LOC_BV_001_01 + }// end testcase TC_CSE_LOC_BV_001 }//end group g_CSE_LOC_BV_001 group g_CSE_LOC_BV_002{ - testcase TC_CSE_LOC_BV_002() runs on M2M system M2MSystem { + testcase TC_CSE_LOC_BV_002() runs on CseTester system CseSystem { var integer v_aeAuxIndex := -1; var XSD.ID p_aeResourceAddress := PX_URI_CSE & PX_CSE_NAME & "/" & c_aeAuxName; @@ -3795,13 +3891,13 @@ module OneM2M_Testcases { var XSD.Token locationTargetID := PX_LOCATION_TARGET_ID; var XSD.AnyURI locationServerAddress := PX_LOCATION_SERVER_ADDRESS; var RequestPrimitive v_request; - var M2MResponsePrimitive v_response; + var MsgIn v_response; //Test component configuration f_cf01Up(); //Preamble - v_aeAuxIndex := f_preamble_registerAe(); + v_aeAuxIndex := f_cse_preamble_registerAe(); //Set requestPrimitive v_request := f_getCreateRequestPrimitive(int10, m_createLocationPolicy(p_aeResourceAddress, omit, locationUpdatePeriod, locationTargetID, locationServerAddress), v_aeAuxIndex); @@ -3810,13 +3906,13 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_responseOK) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; - setverdict(pass, testcasename() & ": Resource locationPolicy is created successfuly with response status code: " & int2str(enum2int(v_response.responsePrimitive_.responseStatusCode))&"!"); + setverdict(pass, testcasename() & ": Resource locationPolicy is created successfuly with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))&"!"); } - [] mcaPort.receive(mw_responseKO) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response { tc_ac.stop; - setverdict(fail, testcasename() & ": Error occurrs with response status code: " & int2str(enum2int(v_response.responsePrimitive_.responseStatusCode)) & "while handling a valid locationPolicy resource create request!"); + setverdict(fail, testcasename() & ": Error occurrs with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "while handling a valid locationPolicy resource create request!"); } [] tc_ac.timeout { setverdict(inconc, testcasename() & ": Timeout due to no response from requested server!"); @@ -3824,16 +3920,19 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); - }// end testcase TC_CSE_LOC_BV_001_02 + }// end testcase TC_CSE_LOC_BV_002 }//end group g_CSE_LOC_BV_002 group g_CSE_LOC_BO_001{ - testcase TC_CSE_LOC_BO_001() runs on M2M system M2MSystem {//no AE_ID presented in the from_ is assigned privilege to do locationPolicy resource create operation!! + testcase TC_CSE_LOC_BO_001() runs on CseTester system CseSystem {//no AE_ID presented in the from_ is assigned privilege to do locationPolicy resource create operation!! var integer v_aeAuxIndex := -1; var XSD.ID p_aeResourceAddress := PX_URI_CSE & PX_CSE_NAME & "/" & c_aeAuxName; @@ -3841,13 +3940,13 @@ module OneM2M_Testcases { var XSD.Token locationTargetID := PX_LOCATION_TARGET_ID; var XSD.AnyURI locationServerAddress := PX_LOCATION_SERVER_ADDRESS; var RequestPrimitive v_request; - var M2MResponsePrimitive v_response; + var MsgIn v_response; //Test component configuration f_cf01Up(); //Preamble - v_aeAuxIndex := f_preamble_registerAe(int62);//c_RUDNDi //No resource creation privilege + v_aeAuxIndex := f_cse_preamble_registerAe(int62);//c_RUDNDi //No resource creation privilege //Request target resource address p_aeResourceAddress := f_addPrefix(f_getResourceAddress(v_aeAuxIndex)); @@ -3859,13 +3958,13 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_response(int4103)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Access denied to create a resource including locationPolicy!"); } - [] mcaPort.receive(mw_responseOK) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; - setverdict(fail, testcasename() & ": Error occurrs with response status code: " & int2str(enum2int(v_response.responsePrimitive_.responseStatusCode)) & "due to IUT failed to check the access privilege of originator!"); + setverdict(fail, testcasename() & ": Error occurrs with response status code: " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "due to IUT failed to check the access privilege of originator!"); } [] tc_ac.timeout { setverdict(inconc, testcasename() & ": Timeout due to no response from requested server!"); @@ -3873,15 +3972,18 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); - } // end testcase TC_CSE_LOC_BO_001_01 + } // end testcase TC_CSE_LOC_BO_001 }//end group g_CSE_LOC_BO_001 - group g_CSE_LOC_BV_002{ - testcase TC_CSE_LOC_BO_002() runs on M2M system M2MSystem { + group g_CSE_LOC_BO_002{ + testcase TC_CSE_LOC_BO_002() runs on CseTester system CseSystem { var integer v_aeAuxIndex := -1; var XSD.ID p_targetResourceAddress := PX_URI_CSE & PX_CSE_NAME & "/" & c_aeAuxName & "/" & c_defaultResourceName; @@ -3889,13 +3991,13 @@ module OneM2M_Testcases { var XSD.Token locationTargetID := PX_LOCATION_TARGET_ID; var XSD.AnyURI locationServerAddress := PX_LOCATION_SERVER_ADDRESS; var RequestPrimitive v_request; - var M2MResponsePrimitive v_response; + var MsgIn v_response; //Test component configuration f_cf01Up(); //Preamble - v_aeAuxIndex := f_preamble_registerAe(); + v_aeAuxIndex := f_cse_preamble_registerAe(); //Set requestPrimitive v_request := f_getCreateRequestPrimitive(int10, m_createLocationPolicy(p_targetResourceAddress, omit, locationUpdatePeriod, locationTargetID, locationServerAddress), v_aeAuxIndex); @@ -3904,13 +4006,13 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_response(int4000)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": The targeted resource is not found!!"); } - [] mcaPort.receive(mw_responseOK) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; - setverdict(fail, testcasename() & ": Error occurrs with response status code: "& int2str(enum2int(v_response.responsePrimitive_.responseStatusCode)) & "due to IUT created a locationPolicy resource under a non-existed parent resource!"); + setverdict(fail, testcasename() & ": Error occurrs with response status code: "& int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "due to IUT created a locationPolicy resource under a non-existed parent resource!"); } [] tc_ac.timeout { setverdict(inconc, testcasename() & ": Timeout due to no response from requested server!"); @@ -3918,15 +4020,19 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); - }// end testcase TC_CSE_LOC_BO_001_02 + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); + + }// end testcase TC_CSE_LOC_BO_002 - }//end group g_CSE_LOC_BO_001 + }//end group g_CSE_LOC_BO_002 group g_CSE_LOC_BI_001{ - testcase TC_CSE_LOC_BI_001() runs on M2M system M2MSystem {//reject a invalid update request with invalid attribtue locationUpdatePeriod + testcase TC_CSE_LOC_BI_001() runs on CseTester system CseSystem {//reject a invalid update request with invalid attribtue locationUpdatePeriod var integer v_aeAuxIndex := -1; var integer v_locPolicyResourceIndex := -1; @@ -3935,16 +4041,16 @@ module OneM2M_Testcases { var XSD.Duration locationUpdatePeriod_invalid := PX_LOCATION_UPDATE_PERIOD_INVALID; var RequestPrimitive v_request; var RequestPrimitive v_request_preamble; - var M2MResponsePrimitive v_response; + var MsgIn v_response; //Test component configuration f_cf01Up(); //Preamble - register AE - v_aeAuxIndex := f_preamble_registerAe(); + v_aeAuxIndex := f_cse_preamble_registerAe(); //Preamble - create a valid locationPolicy resource for later update use v_request_preamble := valueof(m_createLocationPolicy(p_aeResourceAddress, omit, PX_LOCATION_UPDATE_PERIOD, PX_LOCATION_TARGET_ID, PX_LOCATION_SERVER_ADDRESS)); - v_locPolicyResourceIndex := f_createResource(int10, v_request_preamble, v_aeAuxIndex); + v_locPolicyResourceIndex := f_cse_createResource(int10, v_request_preamble, v_aeAuxIndex); //Set requestPrimitive v_request := f_getUpdateRequestPrimitive(int10, v_locPolicyResourceIndex, m_updateLocationPolicy(p_defaultResourceAddress, omit, locationUpdatePeriod_invalid)); @@ -3953,13 +4059,13 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_response(int4000)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Update locationPolicy resource is rejected!!"); } - [] mcaPort.receive(mw_responseOK) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response { tc_ac.stop; - setverdict(fail, testcasename() & ": Error occurrs with response status code: "& int2str(enum2int(v_response.responsePrimitive_.responseStatusCode)) & "due to IUT failed to handle an invalid locationPolicy update request"); + setverdict(fail, testcasename() & ": Error occurrs with response status code: "& int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode)) & "due to IUT failed to handle an invalid locationPolicy update request"); } [] tc_ac.timeout { setverdict(inconc, testcasename() & ": Timeout due to no response from requested server!"); @@ -3967,9 +4073,12 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); - }//end testcase TC_CSE_LOC_BI_001_01 + }//end testcase TC_CSE_LOC_BI_001 }//end group g_CSE_LOC_BI_001 @@ -3984,10 +4093,10 @@ module OneM2M_Testcases { // of members. group g_CSE_GMG_BV_001 { - testcase TC_CSE_GMG_BV_001() runs on M2M system M2MSystem { + testcase TC_CSE_GMG_BV_001() runs on CseTester system CseSystem { // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; var integer v_resourceIndex := -1; @@ -4008,7 +4117,7 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe();//c_CRUDNDi); + v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); // Test Body v_request := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex); @@ -4017,11 +4126,11 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_response(int6010)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int6010))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Creation failed because member ID exceed max number of member"); } - [] mcaPort.receive(mw_responseKO) { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { tc_ac.stop; setverdict(fail, testcasename() & ": Error while retrieving resource"); } @@ -4031,7 +4140,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); } @@ -4045,7 +4157,7 @@ module OneM2M_Testcases { // be retrieved due to lack of privilege. group g_CSE_GMG_BV_002 { - testcase TC_CSE_GMG_BV_002() runs on M2M system M2MSystem + testcase TC_CSE_GMG_BV_002() runs on CseTester system CseSystem { //TODO } @@ -4059,7 +4171,7 @@ module OneM2M_Testcases { // memberType cannot be retrieved due to lack of privilege. group g_CSE_GMG_BV_003 { - testcase TC_CSE_GMG_BV_003() runs on M2M system M2MSystem + testcase TC_CSE_GMG_BV_003() runs on CseTester system CseSystem { //TODO } @@ -4071,10 +4183,10 @@ module OneM2M_Testcases { // resource when member ID exceed max number of members. group g_CSE_GMG_BV_004 { - testcase TC_CSE_GMG_BV_004() runs on M2M system M2MSystem + testcase TC_CSE_GMG_BV_004() runs on CseTester system CseSystem { - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; var integer v_resourceIndex := -1; @@ -4095,8 +4207,8 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe(); //c_CRUDNDi - v_resourceIndex := f_createResource(int9, v_createRequest, v_aeIndex); + v_aeIndex := f_cse_preamble_registerAe(); //c_CRUDNDi + v_resourceIndex := f_cse_createResource(int9, v_createRequest, v_aeIndex); // Test Body v_request := f_getUpdateRequestPrimitive(int9, v_resourceIndex, v_updateRequest); @@ -4105,11 +4217,11 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_response(int4005)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Update failed because member ID exceed max number of member"); } - [] mcaPort.receive(mw_responseKO) { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { tc_ac.stop; setverdict(fail, testcasename() & ": Error while retrieving resource"); } @@ -4119,7 +4231,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); } @@ -4130,7 +4245,7 @@ module OneM2M_Testcases { // fanOutPoint in group resource. group g_CSE_GMG_BV_005 { - testcase TC_CSE_GMG_BV_005() runs on M2M system M2MSystem + testcase TC_CSE_GMG_BV_005() runs on CseTester system CseSystem { // TODO: use right values for c_fanoutPointAddress and c_RessourceType1 @@ -4138,7 +4253,7 @@ module OneM2M_Testcases { var ResourceType c_RessourceType1 := int1; // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; var integer v_resourceIndex := -1; @@ -4159,22 +4274,22 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe(); //c_CRUDNDi - v_resourceIndex := f_createResource(int9, v_createRequest, v_aeIndex); + v_aeIndex := f_cse_preamble_registerAe(); //c_CRUDNDi + v_resourceIndex := f_cse_createResource(int9, v_createRequest, v_aeIndex); // Test Body mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_response(int2001)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": creation successfull by using fanOutPoint in group resource"); // TODO: check for aggregatedResponse representation } - [] mcaPort.receive(mw_responseKO) { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { tc_ac.stop; setverdict(fail, testcasename() & ": Error while retrieving resource"); } @@ -4184,8 +4299,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + // Tear down + f_cf01Down(); } @@ -4196,7 +4313,7 @@ module OneM2M_Testcases { // fanOutPoint in group resource. group g_CSE_GMG_BV_006 { - testcase TC_CSE_GMG_BV_006() runs on M2M system M2MSystem + testcase TC_CSE_GMG_BV_006() runs on CseTester system CseSystem { @@ -4208,7 +4325,7 @@ module OneM2M_Testcases { // Local variables var XSD.ID v_resourceId := "NonExisting"; var RequestPrimitive v_request; - var M2MResponsePrimitive v_response; + var MsgIn v_response; var integer v_aeIndex := -1; var integer v_resourceIndex := -1; @@ -4225,21 +4342,21 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe(); //c_CRUDNDi - v_resourceIndex := f_createResource(int9, v_request, v_aeIndex); + v_aeIndex := f_cse_preamble_registerAe(); //c_CRUDNDi + v_resourceIndex := f_cse_createResource(int9, v_request, v_aeIndex); // Test Body mcaPort.send(m_request(valueof(v_request))); tc_ac.start; alt { - [] mcaPort.receive(mw_response(int2000)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": retrieve attributes successfull by using fanOutPoint in group resource"); // TODO: check for aggregatedResponse representation } - [] mcaPort.receive(mw_responseKO) { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { tc_ac.stop; setverdict(fail, testcasename() & ": Error while retrieving resource"); } @@ -4249,7 +4366,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); } @@ -4260,14 +4380,14 @@ module OneM2M_Testcases { // fanOutPoint in group resource. group g_CSE_GMG_BV_007 { - testcase TC_CSE_GMG_BV_007() runs on M2M system M2MSystem + testcase TC_CSE_GMG_BV_007() runs on CseTester system CseSystem { // TODO: use right values for c_fanoutPointAddress and c_RessourceType1 var XSD.AnyURI c_fanoutPointAddress := "FANOUTPOINT_ADDRESS"; // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; var integer v_resourceIndex := -1; @@ -4286,8 +4406,8 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe(); //c_CRUDNDi - v_resourceIndex := f_createResource(int9, v_createRequest, v_aeIndex); + v_aeIndex := f_cse_preamble_registerAe(); //c_CRUDNDi + v_resourceIndex := f_cse_createResource(int9, v_createRequest, v_aeIndex); // Test Body v_request := f_getUpdateRequestPrimitive(int9, v_resourceIndex, v_updateRequest); @@ -4296,14 +4416,14 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_response(int2004)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int2004))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": update successfull by using fanOutPoint in group resource"); // TODO: check for aggregatedResponse representation } - [] mcaPort.receive(mw_responseKO) { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { tc_ac.stop; setverdict(fail, testcasename() & ": Error while retrieving resource"); } @@ -4313,7 +4433,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); } @@ -4324,7 +4447,7 @@ module OneM2M_Testcases { // fanOutPoint in group resource. group g_CSE_GMG_BV_008_1 { - testcase TC_CSE_GMG_BV_008_1() runs on M2M system M2MSystem + testcase TC_CSE_GMG_BV_008_1() runs on CseTester system CseSystem { // TODO: use right values for c_fanoutPointAddress and c_deleteAddress var XSD.AnyURI c_fanoutPointAddress := "FANOUTPOINT_ADDRESS"; @@ -4334,7 +4457,7 @@ module OneM2M_Testcases { var RequestPrimitive v_request; var integer v_aeIndex := -1; var integer v_resourceIndex := -1; - var M2MResponsePrimitive v_response; + var MsgIn v_response; var template RequestPrimitive v_createRequest := m_createGroupBase; @@ -4352,8 +4475,8 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe(); //c_CRUDNDi - v_resourceIndex := f_createResource(int9, v_createRequest, v_aeIndex); + v_aeIndex := f_cse_preamble_registerAe(); //c_CRUDNDi + v_resourceIndex := f_cse_createResource(int9, v_createRequest, v_aeIndex); // Test Body v_request := f_getUpdateRequestPrimitive(int9, v_resourceIndex, v_deleteRequest); @@ -4362,11 +4485,11 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_response(int2002)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": delete successfull by using fanOutPoint in group resource"); } - [] mcaPort.receive(mw_responseKO) { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { tc_ac.stop; setverdict(fail, testcasename() & ": Error while retrieving resource"); } @@ -4376,8 +4499,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + // Tear down + f_cf01Down(); } @@ -4388,14 +4513,14 @@ module OneM2M_Testcases { // group resource and removes the duplicate member IDs prior to creation of the group resource. group g_CSE_GMG_BV_008_2 { - testcase TC_CSE_GMG_BV_008_2() runs on M2M system M2MSystem + testcase TC_CSE_GMG_BV_008_2() runs on CseTester system CseSystem { // TODO: use right values for c_memberRessourceAddress var XSD.AnyURI c_memberRessourceAddress := "MEMBER_RESSOURCE_ADDRESS"; // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var integer v_aeIndex := -1; var integer v_resourceIndex := -1; var template RequestPrimitive v_createRequest := m_createGroupBase; @@ -4408,7 +4533,7 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe(); //c_CRUDNDi + v_aeIndex := f_cse_preamble_registerAe(); //c_CRUDNDi v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex); @@ -4417,21 +4542,21 @@ module OneM2M_Testcases { mcaPort.send(m_request(valueof(v_createRequest))); tc_ac.start; alt { - [] mcaPort.receive(mw_response(int2001)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Resource created successfuly"); - if(not ispresent(v_response.responsePrimitive_.primitiveContent.any_1[0].Group_optional.memberIDs)){ + if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberIDs)){ setverdict(fail, testcasename(), ": Error, memberID attribute not provided"); } else { - if(v_response.responsePrimitive_.primitiveContent.any_1[0].Group_optional.memberIDs[0] != c_memberRessourceAddress){ + if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberIDs[0] != c_memberRessourceAddress){ setverdict(fail, testcasename(), ": Error, memberIDs attribute not correct"); } } } - [] mcaPort.receive(mw_responseKO) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error while creating resource"); } @@ -4441,7 +4566,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); } @@ -4452,10 +4580,10 @@ module OneM2M_Testcases { // group resource when memberType attribute is not ‘mixed’. group g_CSE_GMG_BV_009 { - testcase TC_CSE_GMG_BV_009() runs on M2M system M2MSystem + testcase TC_CSE_GMG_BV_009() runs on CseTester system CseSystem { // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; var integer v_resourceIndex := -1; @@ -4478,7 +4606,7 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe(); //c_CRUDNDi + v_aeIndex := f_cse_preamble_registerAe(); //c_CRUDNDi v_request := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex); @@ -4490,20 +4618,20 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_response(int2001)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Resource created successfuly"); - if(not ispresent(v_response.responsePrimitive_.primitiveContent.any_1[0].Group_optional.memberTypeValidated)){ + if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberTypeValidated)){ setverdict(fail, testcasename(), ": Error, memberTypeValidated attribute not provided"); } else { - if(v_response.responsePrimitive_.primitiveContent.any_1[0].Group_optional.memberTypeValidated == false){ + if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberTypeValidated == false){ setverdict(fail, testcasename(), ": Error, memberTypeValidated attribute not correct"); } } } - [] mcaPort.receive(mw_responseKO) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error while creating resource"); } @@ -4513,7 +4641,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); } } // end group g_CSE_GMG_BV_009 @@ -4524,7 +4655,7 @@ module OneM2M_Testcases { // group resource when memberType attribute is not ‘mixed’ and the consistencyStrategy attribute is SET_MIXED. group g_CSE_GMG_BV_010 { - testcase TC_CSE_GMG_BV_010() runs on M2M system M2MSystem + testcase TC_CSE_GMG_BV_010() runs on CseTester system CseSystem { // TODO: use right values for c_RessourceType1 and c_RessourceType2 @@ -4533,7 +4664,7 @@ module OneM2M_Testcases { // Local variables var ResponsePrimitive.primitiveContent v_responsePrimitive; - var M2MResponsePrimitive v_response; + var MsgIn v_response; var integer v_aeIndex := -1; var integer v_resourceIndex := -1; var RequestPrimitive v_request; @@ -4548,7 +4679,7 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe(); //c_CRUDNDi + v_aeIndex := f_cse_preamble_registerAe(); //c_CRUDNDi @@ -4561,30 +4692,30 @@ module OneM2M_Testcases { mcaPort.send(m_request(v_request)); tc_ac.start; alt { - [] mcaPort.receive(mw_response(int2001)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Resource created successfuly"); // check for memberTypeValidated - if(not ispresent(v_response.responsePrimitive_.primitiveContent.any_1[0].Group_optional.memberTypeValidated)){ + if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberTypeValidated)){ setverdict(fail, testcasename(), ": Error, memberTypeValidated attribute not provided"); } else { - if(v_response.responsePrimitive_.primitiveContent.any_1[0].Group_optional.memberTypeValidated == false){ + if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberTypeValidated == false){ setverdict(fail, testcasename(), ": Error, memberTypeValidated attribute not correct"); } } // check for memberType (MIXED) - if(not ispresent(v_response.responsePrimitive_.primitiveContent.any_1[0].Group_optional.memberType)){ + if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberType)){ setverdict(fail, testcasename(), ": Error, memberType attribute not provided"); } else { - if(v_response.responsePrimitive_.primitiveContent.any_1[0].Group_optional.memberType != int3){ + if(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].Group_optional.memberType != int3){ setverdict(fail, testcasename(), ": Error, memberType attribute not correct"); } } } - [] mcaPort.receive(mw_responseKO) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error while creating resource"); } @@ -4594,8 +4725,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + // Tear down + f_cf01Down(); } } // end group g_CSE_GMG_BV_010 @@ -4606,7 +4739,7 @@ module OneM2M_Testcases { // ABANDON_MEMBER,. group g_CSE_GMG_BV_011 { - testcase TC_CSE_GMG_BV_011() runs on M2M system M2MSystem + testcase TC_CSE_GMG_BV_011() runs on CseTester system CseSystem { // TODO: use right values for c_RessourceType1 and c_RessourceType2 and c_memberRessourceAddress1 and c_memberRessourceAddress2 @@ -4616,7 +4749,7 @@ module OneM2M_Testcases { var XSD.AnyURI c_memberRessourceAddress2 := "MEMBER_RESSOURCE_ADDRESS_2"; // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var integer v_aeIndex := -1; var integer v_resourceIndex := -1; var template RequestPrimitive v_createRequest := m_createGroupBase; @@ -4630,7 +4763,7 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe(); //c_CRUDNDi + v_aeIndex := f_cse_preamble_registerAe(); //c_CRUDNDi v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex); v_createRequest.primitiveContent.any_1[0].Group_optional.memberType := c_RessourceType1; @@ -4639,7 +4772,7 @@ module OneM2M_Testcases { mcaPort.send(m_request(valueof(v_createRequest))); tc_ac.start; alt { - [] mcaPort.receive(mw_response(int2001)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": Resource created successfuly"); @@ -4660,7 +4793,7 @@ module OneM2M_Testcases { } } } - [] mcaPort.receive(mw_responseKO) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response { tc_ac.stop; setverdict(fail, testcasename() & ": Error while creating resource"); } @@ -4670,8 +4803,10 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + // Tear down + f_cf01Down(); } @@ -4683,7 +4818,7 @@ module OneM2M_Testcases { // ABANDON_GROUP. group g_CSE_GMG_BV_012 { - testcase TC_CSE_GMG_BV_012() runs on M2M system M2MSystem + testcase TC_CSE_GMG_BV_012() runs on CseTester system CseSystem { @@ -4694,7 +4829,7 @@ module OneM2M_Testcases { var XSD.AnyURI c_memberRessourceAddress2 := "MEMBER_RESSOURCE_ADDRESS_2"; // Local variables - var M2MResponsePrimitive v_response; + var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; var integer v_resourceIndex := -1; @@ -4710,7 +4845,7 @@ module OneM2M_Testcases { // Test adapter configuration // Preamble - v_aeIndex := f_preamble_registerAe(); //c_CRUDNDi + v_aeIndex := f_cse_preamble_registerAe(); //c_CRUDNDi v_createRequest := f_getCreateRequestPrimitive(int9, v_createRequest, v_aeIndex); v_createRequest.primitiveContent.any_1[0].Group_optional := m_contentCreateGroup (1, {c_memberRessourceAddress1, c_memberRessourceAddress2}, omit); @@ -4720,11 +4855,11 @@ module OneM2M_Testcases { mcaPort.send(m_request(valueof(v_createRequest))); tc_ac.start; alt { - [] mcaPort.receive(mw_response(int6011)) -> value v_response { + [] mcaPort.receive(mw_response(mw_responsePrimitive(int6011))) -> value v_response { tc_ac.stop; setverdict(pass, testcasename() & ": unsuccessful validation of the resource type during the creation of the group"); } - [] mcaPort.receive(mw_responseKO) { + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { tc_ac.stop; setverdict(fail, testcasename() & ": Error while retrieving resource"); } @@ -4734,10 +4869,13 @@ module OneM2M_Testcases { } // Postamble - f_postamble_deleteResources(); + f_cse_postamble_deleteResources(); + + // Tear down + f_cf01Down(); + } - } // end group g_CSE_GMG_BV_012 } // end group Group_Managment