Commit de0d8b84 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Merge branch 'Release1' of https://git.onem2m.org/TST/ATS into Release1

parents 1633ac83 5f2b1110
......@@ -14,6 +14,7 @@
module OneM2M_Functions {
import from XSD all;
import from LibCommon_Time all;
import from OneM2M_Templates all;
import from OneM2M_Types all;
import from OneM2M_TypesAndValues all;
......@@ -752,7 +753,20 @@ module OneM2M_Functions {
if(p_ae.running) {
p_ae.stop;
}
p_ae.start(f_cse_postamble_deleteResources());
p_ae.start(f_cse_postamble_deleteResources());
p_ae.done;
}
/**
* @desc Calls to postamble for AeSimu component (i.e. AE1) on CseSimu
* @verdict
*/
function f_cse_postamble_ae1() runs on CseSimu {
if(vc_ae1.running) {
vc_ae1.stop;
}
vc_ae1.start(f_cse_postamble_deleteResources());
vc_ae1.done;
}
/**
......@@ -765,14 +779,16 @@ module OneM2M_Functions {
var RequestPrimitive v_request;
if (PX_RUN_POSTAMBLE) {
if(vc_config == e_cf02CseSimuMaster) {
f_cse_postamble_ae1();
};
for(i := lengthof(vc_resourcesIndexToBeDeleted) -1; i >=0; i := i - 1) {
v_resourceAddress := f_getResourceAddress(vc_resourcesIndexToBeDeleted[i]);
v_request := valueof(m_delete(v_resourceAddress, f_getOriginator(vc_resourcesIndexToBeDeleted[i],false)));
v_request.from_ := PX_SUPER_CSE_ID;
mccPort.send(m_request(v_request));
......@@ -845,6 +861,37 @@ module OneM2M_Functions {
return v_resourceIndex;
}
/**
* @desc Message exchange for the update of an announced resource
* @param p_requestPrimitive UPDATE request primitive to be used
* @verdict
*/
function f_cse_updateAnnouncedResource(in RequestPrimitive p_requestPrimitive) runs on CseSimu {
mccPort.send(m_request(p_requestPrimitive));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value vc_response {
tc_ac.stop;
setverdict(pass, __SCOPE__&":INFO: Attribute of announced resource updated successfuly");
}
[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value vc_response {
tc_ac.stop;
setverdict(inconc, __SCOPE__&":INFO: Error while updating announced resource");
}
[] mccPort.receive{
tc_ac.stop;
setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
}
[] tc_ac.timeout {
setverdict(inconc, __SCOPE__&":INFO: No answer while updating announced resource");
}
}
f_checkCseSimuStatus();
}// end f_cse_updateAnnouncedResource
/**
* @desc Creation of the auxiliar ACP resource
......@@ -1008,6 +1055,11 @@ module OneM2M_Functions {
setverdict(pass, testcasename() & ": Resource present: " & f_getResourceAddress(p_resourceIndex));
return true;
}
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) {
tc_ac.stop;
setverdict(pass, testcasename() & ": Resource: " & f_getResourceAddress(p_resourceIndex) & " not found");
return false;
}
[] mcaPort.receive(mw_response(mw_responsePrimitive(?, -))) {
tc_ac.stop;
setverdict(inconc, testcasename() & ": Wrong response status code in the response");
......@@ -1177,7 +1229,7 @@ module OneM2M_Functions {
tc_ac.stop;
setverdict(pass, __SCOPE__&":INFO: Resource type " & int2str(enum2int(p_resourceType)) & " created successfuly");
f_checkAttributesToBeSaved(p_resourceType, v_request, vc_response.primitive.responsePrimitive);
v_resourceIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, p_resourceType, vc_remoteCseIndex);
v_resourceIndex := f_setResource(vc_response.primitive.responsePrimitive.primitiveContent, f_getAnnouncedResourceType(p_resourceType), vc_remoteCseIndex);
}
[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
......@@ -1576,15 +1628,13 @@ module OneM2M_Functions {
/**
* @desc Handling message exchange for the AE Annc update
* @param p_responseStatusCode Response Status Code to be used for the response to the AE Annc request
* @verdict
*/
//TODO TO BE FINALIZED
function f_cse_notifyProcedure_updateHandler() runs on CseSimu {
// Local variables
var ResponsePrimitive v_responsePrimitive;
var template Notification v_notificationRequest := mw_contentNotification_any;
var template Notification v_notificationRequest := mw_contentNotification_any;
//Preparation of Notification response to be sent
v_responsePrimitive := valueof(m_responseNotification(int2004, omit));
......@@ -1634,6 +1684,11 @@ module OneM2M_Functions {
setverdict(pass, testcasename() & ": Resource present: " & f_getResourceAddress(p_resourceIndex));
return true;
}
[] mccPort.receive(mw_response(mw_responsePrimitive(int4004))) {
tc_ac.stop;
setverdict(pass, testcasename() & ": Resource: " & f_getResourceAddress(p_resourceIndex) & " not found");
return false;
}
[] mccPort.receive(mw_response(mw_responsePrimitive(?, -))) {
tc_ac.stop;
setverdict(inconc, testcasename() & ": Wrong response status code in the response");
......@@ -1646,6 +1701,38 @@ module OneM2M_Functions {
}
return false;
}
/**
* @desc Check that a resource is not present in the IUT (resourceId is NOT known)
* @param p_parentIndex Index of the parent resource of the resource to be checked
* @param p_resourceName Resource name (Hierarchical method is used) of the resource to be checked
* @return boolean
*/
function f_cse_isResourceNotPresent (integer p_parentIndex, XSD.String p_resourceName) runs on CseSimu return boolean {
log(testcasename() & ":INFO: Hierarchical addressing method is required to check the non presence of the resource");
//Check to see if the resource has NOT been created
mccPort.send(m_request(m_retrieve(f_getResourceAddress(p_parentIndex, e_hierarchical) & "/" & p_resourceName, f_getOriginator(p_parentIndex))));
tc_ac.start;
alt {
[] mccPort.receive(mw_response(mw_responsePrimitive(int4004))) {
tc_ac.stop;
setverdict(pass, testcasename() & ": Resource not present");
return true;
}
[] mccPort.receive(mw_response(mw_responsePrimitive(?))) {
tc_ac.stop;
setverdict(inconc, testcasename() & ": Wrong response status code in the response");
return false;
}
[] tc_ac.timeout {
setverdict(inconc, testcasename() & ": No answer while retrieving resource");
return false;
}
}
return false;
}
/**
* @desc Registration of Test System (simulating a CSE) to the CSE IUT (creation of remoteCSE)
......@@ -1713,7 +1800,7 @@ module OneM2M_Functions {
//send triggering primitive to SUT
f_sendUtPrimitive(v_utRequest,v_action);
f_sendUtPrimitive(v_utRequest,v_action);
tc_ac.start;
alt {
......@@ -1729,19 +1816,22 @@ module OneM2M_Functions {
v_response.primitiveContent.remoteCSE := vc_localResourcesList[vc_localRemoteCseIndex].resource.remoteCSE;
mccPortIn.send(m_response(v_response));
v_resourceIndex := f_setResource(v_request.primitive.requestPrimitive.primitiveContent, int16, -1);
v_resourceIndex := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentMyRemoteCSEResource)), int16, -1);
v_remoteCSERegistered:=true;
tc_ac.start;
repeat;
}
[] tc_ac.timeout {
if(not (v_remoteCSERegistered)){
setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type remoteCSE");
}
setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type remoteCSE");
}
}
}
f_checkCseSimuStatus();
//In order for the IUT to perform some actions
f_sleep(10.0);
return v_resourceIndex;
......@@ -1845,7 +1935,7 @@ module OneM2M_Functions {
v_myResource.aEAnnc.expirationTime := p_resource.aEAnnc.expirationTime;
v_myResource.aEAnnc.accessControlPolicyIDs := p_resource.aEAnnc.accessControlPolicyIDs;
v_myResource.aEAnnc.labels := p_resource.aEAnnc.labels;
}
}
} else if (p_resourceType == int10001 and ispresent (p_resource)) { //Acp Annc
if(ischosen(p_resource.accessControlPolicyAnnc)) {
v_myResource.accessControlPolicyAnnc.expirationTime := p_resource.accessControlPolicyAnnc.expirationTime;
......@@ -1953,7 +2043,7 @@ module OneM2M_Functions {
* @desc Cse altstep for config 02 on CSE1 (AE1 as master)
*/
altstep a_cse_cf02_cse1() runs on CseSimu {
var PrimitiveContent v_localResource;
var integer vc_localResourceIndex := -1;
var MsgIn v_request;
......@@ -2109,7 +2199,7 @@ module OneM2M_Functions {
}//end function f_ae_preamble_register
/**
/**
* @desc Waits for Container create request and process it
* @param p_utRequest UpperTester request primitive to be sent to the IUT
* @return Internal resource index of Container or -1 in case of failure
......@@ -2157,7 +2247,7 @@ module OneM2M_Functions {
f_checkCseSimuStatus();
return v_resourceIndex;
} //end function f_ae_preamble_createContainer
} //end function f_ae_preamble_createContainer
} // end preambleFunctions
......@@ -2295,7 +2385,7 @@ module OneM2M_Functions {
p_request.requestIdentifier := valueof(p_request.requestIdentifier) & f_rnd(1, 1000000);
if(p_resourceType != int2) {
if((p_resourceType != int2) and (p_resourceType != int10002)) {
if(p_resourceType == int16) {
p_request.from_ := PX_CSE1_ID;
} else {
......@@ -2306,6 +2396,7 @@ module OneM2M_Functions {
}
}
}
p_request.to_ := f_getResourceAddress(p_parentIndex);
if (p_resourceType == int1) {//AccessControlPolicy
......@@ -2430,9 +2521,15 @@ module OneM2M_Functions {
p_request.requestIdentifier := valueof(p_request.requestIdentifier) & f_rnd(1, 1000000);
p_request.from_ := f_getOriginator(p_resourceIndex);
p_request.to_ := f_getResourceAddress(p_resourceIndex);
if(p_resourceType != int10002) {
p_request.from_ := f_getOriginator(p_resourceIndex);
p_request.to_ := f_getResourceAddress(p_resourceIndex);
} else {
p_request.from_ := PX_CSE1_ID & "/" & f_getResourceId(vc_resourcesList[p_resourceIndex].resource);
p_request.to_ := f_getResourceAddress(p_resourceIndex, -, e_spRelative);
}
if (p_resourceType == int3) {//Container
......@@ -2492,6 +2589,9 @@ module OneM2M_Functions {
if(ischosen(p_contentResource.aE)) {
return f_resourceIdCleaner(p_contentResource.aE.resourceID);
}
if(ischosen(p_contentResource.aEAnnc)) {
return f_resourceIdCleaner(p_contentResource.aEAnnc.resourceID);
}
if(ischosen(p_contentResource.serviceSubscribedAppRule)) {
return f_resourceIdCleaner(p_contentResource.serviceSubscribedAppRule.resourceID);
}
......@@ -2552,6 +2652,9 @@ module OneM2M_Functions {
if(ischosen(p_contentResource.aE)) {
return p_contentResource.aE.resourceName;
}
if(ischosen(p_contentResource.aEAnnc)) {
return p_contentResource.aEAnnc.resourceName;
}
if(ischosen(p_contentResource.serviceSubscribedAppRule)) {
return p_contentResource.serviceSubscribedAppRule.resourceName;
}
......@@ -2690,9 +2793,9 @@ module OneM2M_Functions {
if(match(f_getResourceName(vc_localResourcesList[i].resource), v_resourceName)){
v_resourceIndex := i;
break;
}
}
}
} else {
v_resourceID := f_resourceIdCleaner(p_receivedURI);
......@@ -3081,11 +3184,11 @@ module OneM2M_Functions {
f_cse_postamble_deleteResources();
// Tear down
if(vc_config == e_cf01) {
f_cf01Down();
f_cf01Down();
} else if (vc_config ==e_cf02) {
vc_cse1.start(f_cse_postamble_deleteResourcesCSE());
vc_cse1.done;
f_cf02Down();
vc_cse1.start(f_cse_postamble_deleteResourcesCSE());
vc_cse1.done;
f_cf02Down();
}
stop;
}
......@@ -3136,10 +3239,13 @@ module OneM2M_Functions {
if(vc_config == e_cf03) {
f_cf03Down();
stop;
} else if (vc_config ==e_cf04) {
} else if (vc_config ==e_cf04) {
f_cf04Down();
stop;
}
} else if (vc_config == e_cf02CseSimuMaster) {
f_cf02DownCseSimuMaster();
stop;
}
}
}
......
......@@ -19,7 +19,8 @@ module OneM2M_Pics {
*/
modulepar boolean PICS_ACP_SUPPORT := true;
modulepar boolean PICS_IN_CSE := true;
modulepar boolean PICS_MN_CSE := true;
modulepar boolean PICS_MN_CSE := true;
modulepar boolean PICS_ASN_CSE := true;
modulepar boolean PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT := true;
modulepar boolean PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT := true;
......@@ -27,5 +28,83 @@ module OneM2M_Pics {
modulepar boolean PICS_PRIMITIVE_SCOPE_SP_RELATIVE := true;
modulepar boolean PICS_PRIMITIVE_SCOPE_ABSOLUTE := true;
//AccessControlPolicy optional attributes
modulepar boolean PICS_ACP_LBL := true;
modulepar boolean PICS_ACP_AT := true;
//AE optional attributes
modulepar boolean PICS_AE_LBL := true;
modulepar boolean PICS_AE_APN := true;
modulepar boolean PICS_AE_POA := true;
modulepar boolean PICS_AE_NL := true;
modulepar boolean PICS_AE_CSZ := true;
modulepar boolean PICS_AE_OR := true;
modulepar boolean PICS_AE_ACPI := true;
//Container optional attributes
modulepar boolean PICS_CNT_ACPI := true;
modulepar boolean PICS_CNT_MNI := true;
modulepar boolean PICS_CNT_MBS := true;
modulepar boolean PICS_CNT_MIA := true;
modulepar boolean PICS_CNT_OR := true;
modulepar boolean PICS_CNT_LI := true;
modulepar boolean PICS_CNT_RN := true;
modulepar boolean PICS_CNT_ET := true;
modulepar boolean PICS_CNT_LBL := true;
modulepar boolean PICS_CNT_CR := true;
//ContentInstance optional attributes
modulepar boolean PICS_CIN_CNF := true;
modulepar boolean PICS_CIN_RN := true;
modulepar boolean PICS_CIN_ET := true;
modulepar boolean PICS_CIN_LBL := true;
modulepar boolean PICS_CIN_CR := true;
modulepar boolean PICS_CIN_OR := true;
//CSEBase optional attributes
modulepar boolean PICS_CB_CST := true;
modulepar boolean PICS_CB_NL := true;
//Group optional attributes
modulepar boolean PICS_GRP_LBL := true;
modulepar boolean PICS_GRP_GN := true;
modulepar boolean PICS_GRP_ACPI := true;
modulepar boolean PICS_GRP_MACP := true;
//RemoteCSE optional attributes
modulepar boolean PICS_CSR_LBL := true;
modulepar boolean PICS_CSR_CST := true;
modulepar boolean PICS_CSR_POA := true;
modulepar boolean PICS_CSR_NL := true;
modulepar boolean PICS_CSR_RN := true;
modulepar boolean PICS_CSR_ET := true;
modulepar boolean PICS_CSR_RR := true;
//Subscription optional attributes
modulepar boolean PICS_SUB_ACPI := true;
modulepar boolean PICS_SUB_ENC := true;
modulepar boolean PICS_SUB_EXC := true;
modulepar boolean PICS_SUB_NFU := true;
modulepar boolean PICS_SUB_NCT := true;
modulepar boolean PICS_SUB_NEC := true;
modulepar boolean PICS_SUB_SU := true;
modulepar boolean PICS_SUB_LBL := true;
modulepar boolean PICS_SUB_GPI := true;
modulepar boolean PICS_SUB_BN := true;
modulepar boolean PICS_SUB_RL := true;
modulepar boolean PICS_SUB_PN := true;
modulepar boolean PICS_SUB_NSP := true;
modulepar boolean PICS_SUB_LN := true;
modulepar boolean PICS_SUB_PSN := true;
modulepar boolean PICS_SUB_CR := true;
} // end of module
......@@ -59,13 +59,13 @@ module OneM2M_Pixits {
*/
modulepar XSD.ID PX_SUPER_CSE_ID := "/admin:admin";
modulepar XSD.IDREFS PX_ALLOWED_C_AE_IDS := {"C"};
modulepar XSD.IDREFS PX_ALLOWED_C_AE_IDS := {"C-AllowedAeId"};
modulepar XSD.IDREFS PX_NOT_ALLOWED_C_AE_IDS := {"MyAe"};
modulepar XSD.IDREFS PX_NOT_ALLOWED_C_AE_IDS := {"C-NotAllowedAeId"};
modulepar XSD.IDREFS PX_ALLOWED_S_AE_IDS := {"S"};
modulepar XSD.IDREFS PX_ALLOWED_S_AE_IDS := {"S-AllowedAeId"};
modulepar XSD.IDREFS PX_NOT_ALLOWED_S_AE_IDS := {"MyAe"};
modulepar XSD.IDREFS PX_NOT_ALLOWED_S_AE_IDS := {"S-NotAllowedAeId"};
modulepar AddressingMethod PX_ADDRESSING_METHOD := e_hierarchical;
......@@ -134,24 +134,11 @@ module OneM2M_Pixits {
group ExecutionParameters {
modulepar boolean PX_DELETE_CREATED_RESOURCES := true;
modulepar XSD.AnyURI PX_RESOURCE_TO_BE_DELETED := "/ae_test";
modulepar XSD.IDREFS PX_RESOURCES_TO_BE_DELETED := {"MyAe"};
modulepar boolean PX_RUN_POSTAMBLE := true;
}
modulepar boolean PX_USE_RESOURCE_ID_AS_ORIGINATOR := true;
//for checking whether the locationPolicy creation request is originated from a ASN-AE
//NOTE: Apply to Device-based location request, and this requires Test System (TS) to activate ASN-AE mode to test IUT
......
This diff is collapsed.
This diff is collapsed.
......@@ -15,34 +15,35 @@ module OneM2M_TestControl_ADN_profile_3 {
import from OneM2M_Testcases_AE_Release_1 all;
import from OneM2M_Pics all;
control {
//AE_GEN_00001
if(true) {execute (TC_AE_GEN_CRE_001_CSR());}
if(true) {execute (TC_AE_GEN_CRE_001_SPR());}
if(true) {execute (TC_AE_GEN_CRE_001_ABS());}
if(true) {execute (TC_AE_GEN_CRE_002_CSR());}
if(true) {execute (TC_AE_GEN_CRE_002_SPR());}
if(true) {execute (TC_AE_GEN_CRE_002_ABS());}
if(true) {execute (TC_AE_GEN_UPD_001_CSR());}
if(true) {execute (TC_AE_GEN_UPD_001_SPR());}
if(true) {execute (TC_AE_GEN_UPD_001_ABS());}
if(true) {execute (TC_AE_GEN_UPD_002_CSR());}
if(true) {execute (TC_AE_GEN_UPD_002_SPR());}
if(true) {execute (TC_AE_GEN_UPD_002_ABS());}
if(true) {execute (TC_AE_GEN_RET_001_CSR());}
if(true) {execute (TC_AE_GEN_RET_001_SPR());}
if(true) {execute (TC_AE_GEN_RET_001_ABS());}
if(true) {execute (TC_AE_GEN_RET_002_CSR());}
if(true) {execute (TC_AE_GEN_RET_002_SPR());}
if(true) {execute (TC_AE_GEN_RET_002_ABS());}
if(true) {execute (TC_AE_GEN_DEL_001_CSR());}
if(true) {execute (TC_AE_GEN_DEL_001_SPR());}
if(true) {execute (TC_AE_GEN_DEL_001_ABS());}
if(true) {execute (TC_AE_GEN_DEL_002_CSR());}
if(true) {execute (TC_AE_GEN_DEL_002_SPR());}
if(true) {execute (TC_AE_GEN_DEL_002_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_ABS());}
//AE_GEN_00002
if(true) {execute (TC_AE_DMR_CRE_001());}
//AE_REG_00002
......
......@@ -15,33 +15,34 @@ module OneM2M_TestControl_ADN_profile_4 {
import from OneM2M_Testcases_AE_Release_1 all;
import from OneM2M_Pics all;
control {
//AE_GEN_00001
if(true) {execute (TC_AE_GEN_CRE_001_CSR());}
if(true) {execute (TC_AE_GEN_CRE_001_SPR());}
if(true) {execute (TC_AE_GEN_CRE_001_ABS());}
if(true) {execute (TC_AE_GEN_CRE_002_CSR());}
if(true) {execute (TC_AE_GEN_CRE_002_SPR());}
if(true) {execute (TC_AE_GEN_CRE_002_ABS());}
if(true) {execute (TC_AE_GEN_UPD_001_CSR());}
if(true) {execute (TC_AE_GEN_UPD_001_SPR());}
if(true) {execute (TC_AE_GEN_UPD_001_ABS());}
if(true) {execute (TC_AE_GEN_UPD_002_CSR());}
if(true) {execute (TC_AE_GEN_UPD_002_SPR());}
if(true) {execute (TC_AE_GEN_UPD_002_ABS());}
if(true) {execute (TC_AE_GEN_RET_001_CSR());}
if(true) {execute (TC_AE_GEN_RET_001_SPR());}
if(true) {execute (TC_AE_GEN_RET_001_ABS());}
if(true) {execute (TC_AE_GEN_RET_002_CSR());}
if(true) {execute (TC_AE_GEN_RET_002_SPR());}
if(true) {execute (TC_AE_GEN_RET_002_ABS());}
if(true) {execute (TC_AE_GEN_DEL_001_CSR());}
if(true) {execute (TC_AE_GEN_DEL_001_SPR());}
if(true) {execute (TC_AE_GEN_DEL_001_ABS());}
if(true) {execute (TC_AE_GEN_DEL_002_CSR());}
if(true) {execute (TC_AE_GEN_DEL_002_SPR());}
if(true) {execute (TC_AE_GEN_DEL_002_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_ABS());}
if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_CSR());}
if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_SPR());}
if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_ABS());}
//AE_GEN_00002
if(true) {execute (TC_AE_DMR_CRE_001());}
if(true) {execute (TC_AE_DMR_RET_001_CB());}
......@@ -72,13 +73,13 @@ module OneM2M_TestControl_ADN_profile_4 {
if(true) {execute (TC_AE_DMR_RET_001_AE());}