Commit 312a5548 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega

Merge branch 'Release1'

Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parents 4a9f4142 5f2b1110
This diff is collapsed.
......@@ -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
......
......@@ -252,6 +252,17 @@ module OneM2M_Templates {
}
};
/**
* @desc RETRIEVE request primtive containing the Filter Criteria in the filterCriteria field
* @param p_targetResourceAddress Target resource address
* @param p_filterCriteria FilterCriteria
* @param p_originator Originator (from)
*/
template (value) RequestPrimitive m_retrieveFilterCriteria(XSD.ID p_targetResourceAddress, in XSD.ID p_originator, in template (value) FilterCriteria p_filterCriteria) modifies m_retrieve := {
requestIdentifier := "m_retrieveResourceFilterUsageOption" & f_rnd(1, 1000000),
filterCriteria := p_filterCriteria
};
/**
* @desc RETRIEVE request primtive containing the Filter Criteria in the filterCriteria field
* @param p_targetResourceAddress Target resource address
......@@ -355,6 +366,37 @@ module OneM2M_Templates {
}
};
/**
* @desc FilterCriteria empty template
*/
template (value) FilterCriteria m_filterCriteria := {
createdBefore := omit,
createdAfter := omit,
modifiedSince := omit,
unmodifiedSince := omit,
stateTagSmaller := omit,
stateTagBigger := omit,
expireBefore := omit,
expireAfter := omit,
labels := omit,
resourceType := omit,
sizeAbove := omit,
sizeBelow := omit,
contentType_list := {},
attribute_list := {},
filterUsage := omit,
limit := omit,
semanticsFilter_list := {},
filterOperation := omit,
contentFilterSyntax := omit,
contentFilterQuery := omit,
level := omit,
offset := omit
}
}//end group Retrieve
group Update {
......@@ -419,7 +461,7 @@ module OneM2M_Templates {
requestIdentifier := "m_updateAe",
primitiveContent:= {aE := m_contentUpdateAe}
};
/**
* @desc Reception template for update Ae resource
*/
......@@ -522,15 +564,10 @@ module OneM2M_Templates {
primitiveContent := {remoteCSE := m_contentUpdateRemoteCSE}
}
template (value) RequestPrimitive m_updateAE modifies m_update := {
requestIdentifier := "m_updateAE",
primitiveContent := {aE := m_contentUpdateAe}
}
template (value) RequestPrimitive m_updateAEAnnc(template (omit) AcpType p_accessControlPolicyIds := omit, template (omit) XSD.ID p_to := omit, template (omit) XSD.ID p_from := omit, XSD.ID p_appId, XSD.ID p_stemId := "") modifies m_update:= {
template (value) RequestPrimitive m_updateAEAnncBase modifies m_update:= {
requestIdentifier := testcasename() & "-m_updateAEAnnc",
resourceType := int10002,
primitiveContent := {aEAnnc := m_contentUpdateAEAnnc(p_appId,p_stemId)}
primitiveContent := {aEAnnc := m_contentUpdateAEAnnc}
};
}//end group Update
......@@ -612,7 +649,7 @@ module OneM2M_Templates {
/**
* @desc Reception template for CREATE AEAnnc
*/
template RequestPrimitive mw_createAEAnnc(template (omit) XSD.ID p_from := omit, template (omit) XSD.ID p_to := omit, template (omit) AcpType p_accessControlPolicyIds := omit) modifies mw_create := {
template RequestPrimitive mw_createAEAnnc(template (omit) XSD.ID p_from := omit, template (omit) XSD.ID p_to := omit, template (omit) AcpType p_accessControlPolicyIds := omit, template XSD.AnyURI p_link := ?) modifies mw_create := {
resourceType := int10002,
primitiveContent := {aEAnnc := mw_contentCreateAEAnnc({"Credential-ID:None"}, p_accessControlPolicyIds)}
};
......@@ -1320,7 +1357,7 @@ module OneM2M_Templates {
lastModifiedTime := omit,//NP
labels := p_labels,//O
accessControlPolicyIDs := p_accessControlPolicyIds,//O
expirationTime := omit,//O
expirationTime := "20301231T012345",//O
link := omit,//M TODO Put the right value
dynamicAuthorizationConsultationIDs := omit, //TODO Check whether it is optional or mandatory for create operation
appName := omit,//O
......@@ -1342,7 +1379,7 @@ module OneM2M_Templates {
* @param p_appId App ID
* @param p_nodeLink Node link
*/
template AEAnnc_optional mw_contentCreateAEAnnc (in template Labels p_labels := ?, in template AcpType p_accessControlPolicyIds := ?) := {
template AEAnnc_optional mw_contentCreateAEAnnc (in template Labels p_labels := ?, in template AcpType p_accessControlPolicyIds := ?, template XSD.AnyURI p_link := ?) := {
resourceName := omit,//NA M
resourceType := omit,//NA M
resourceID := omit,//NA M
......@@ -1352,7 +1389,7 @@ module OneM2M_Templates {
labels := p_labels,//MA
accessControlPolicyIDs := p_accessControlPolicyIds,//MA
expirationTime := ?,//MA M
link := ?,//M
link := p_link,//M
dynamicAuthorizationConsultationIDs := omit, //OA
appName := omit,//OA
app_ID := omit,//OA
......@@ -1418,7 +1455,7 @@ module OneM2M_Templates {
accessControlRule_list := {valueof(m_createAcr(p_acor, p_allowedOperations))}
},//M
selfPrivileges := {
accessControlRule_list := {valueof(m_createAcr({"*"}, int63))}
accessControlRule_list := {valueof(m_createAcr(p_acor, int63))}
},//M
choice := omit //NP
};
......@@ -2533,7 +2570,7 @@ module OneM2M_Templates {
choice := omit
}
template (value) AEAnnc_optional m_contentUpdateAEAnnc (template (omit) XSD.ID p_appId := omit, template (omit) XSD.ID p_stemId := omit) := {
template (value) AEAnnc_optional m_contentUpdateAEAnnc := {
resourceName := omit,
resourceType := omit,
resourceID := omit,
......@@ -2546,7 +2583,7 @@ module OneM2M_Templates {
link := omit,
dynamicAuthorizationConsultationIDs := omit,
appName := omit,
app_ID := p_appId,
app_ID := omit,
aE_ID := omit,
pointOfAccess := omit,
ontologyRef := omit,
......@@ -3023,6 +3060,16 @@ module OneM2M_Templates {
choice := omit//O
};
template RemoteCSE_optional m_contentMyRemoteCSEResource modifies m_contentRemoteCSE_allOmit := {
resourceName := PX_CSE1_NAME,//M
resourceType := int16,//M
resourceID := PX_CSE1_RESOURCE_ID,//M
pointOfAccess := {PX_CSE1_ADDRESS},//O
cSEBase := PX_CSE1_NAME,//M
cSE_ID := PX_CSE1_ID,//M
requestReachability := true//M
};
template RemoteCSE_optional mw_contentRemoteCSEBase := {
resourceName := ?,//M
resourceType := ?,//M
......
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());}
//AE/DMR/00001
if(true) {execute (TC_AE_DMR_CRE_001());}
if(true) {execute (TC_AE_DMR_CRE_004_RN());}
if(true) {execute (TC_AE_DMR_CRE_004_ET());}
if(true) {execute (TC_AE_DMR_CRE_004_LBL());}
if(true) {execute (TC_AE_DMR_CRE_004_CR());}
if(true) {execute (TC_AE_DMR_CRE_004_MNI());}
if(true) {execute (TC_AE_DMR_CRE_004_MBS());}
if(true) {execute (TC_AE_DMR_CRE_004_MIA());}
if(PICS_CNT_RN) {execute (TC_AE_DMR_CRE_004_RN());}
if(PICS_CNT_ET) {execute (TC_AE_DMR_CRE_004_ET());}
if(PICS_CNT_LBL) {execute (TC_AE_DMR_CRE_004_LBL());}
if(PICS_CNT_CR) {execute (TC_AE_DMR_CRE_004_CR());}
if(PICS_CNT_MNI) {execute (TC_AE_DMR_CRE_004_MNI());}
if(PICS_CNT_MBS) {execute (TC_AE_DMR_CRE_004_MBS());}
if(PICS_CNT_MIA) {execute (TC_AE_DMR_CRE_004_MIA());}
if(true) {execute (TC_AE_DMR_UPD_002_ET());}
if(true) {execute (TC_AE_DMR_UPD_002_LBL());}
if(true) {execute (TC_AE_DMR_UPD_002_MNI());}
......@@ -88,11 +89,11 @@ module OneM2M_TestControl_ADN_profile_4 {
if(true) {execute (TC_AE_DMR_RET_004());}
//AE/DMR/00002
if(true) {execute (TC_AE_DMR_CRE_002());}
if(true) {execute (TC_AE_DMR_CRE_003_RN());}
if(true) {execute (TC_AE_DMR_CRE_003_ET());}
if(true) {execute (TC_AE_DMR_CRE_003_LBL());}
if(true) {execute (TC_AE_DMR_CRE_003_CR());}
if(true) {execute (TC_AE_DMR_CRE_003_CNF());}
if(PICS_CIN_RN) {execute (TC_AE_DMR_CRE_003_RN());}
if(PICS_CIN_ET) {execute (TC_AE_DMR_CRE_003_ET());}
if(PICS_CIN_LBL) {execute (TC_AE_DMR_CRE_003_LBL());}
if(PICS_CIN_CR) {execute (TC_AE_DMR_CRE_003_CR());}
if(PICS_CIN_CNF) {execute (TC_AE_DMR_CRE_003_CNF());}
if(true) {execute (TC_AE_DMR_RET_005());}
if(true) {execute (TC_AE_DMR_RET_002());}
if(true) {execute (TC_AE_DMR_RET_003());}
......@@ -106,18 +107,18 @@ module OneM2M_TestControl_ADN_profile_4 {
if(true) {execute (TC_AE_REG_CRE_002_OR());}
if(true) {execute (TC_AE_DMR_UPD_001_OR());}
// AE/DMR/00001
if(true) {execute (TC_AE_DMR_CRE_004_ACPI());}
if(true) {execute (TC_AE_DMR_CRE_004_OR());}
if(PICS_CNT_ACPI) {execute (TC_AE_DMR_CRE_004_ACPI());}
if(PICS_CNT_OR) {execute (TC_AE_DMR_CRE_004_OR());}
//if(true) {execute (TC_AE_DMR_CRE_004_LI());}//TODO To be implemented
//AE/SUB/00001
//if(true) {execute (TC_AE_SUB_CRE_002_LBL());}//TODO To be implemented. TP As well
if(true) {execute (TC_AE_SUB_CRE_002_SU());}
if(true) {execute (TC_AE_SUB_CRE_002_ACPI());}
if(true) {execute (TC_AE_SUB_CRE_002_ENC());}
if(true) {execute (TC_AE_SUB_CRE_002_EXC());}
if(true) {execute (TC_AE_SUB_CRE_002_NFU());}
if(true) {execute (TC_AE_SUB_CRE_002_NCT());}
if(true) {execute (TC_AE_SUB_CRE_002_NEC());}
if(PICS_SUB_SU) {execute (TC_AE_SUB_CRE_002_SU());}
if(PICS_SUB_ACPI) {execute (TC_AE_SUB_CRE_002_ACPI());}
if(PICS_SUB_ENC) {execute (TC_AE_SUB_CRE_002_ENC());}
if(PICS_SUB_EXC) {execute (TC_AE_SUB_CRE_002_EXC());}
if(PICS_SUB_NFU) {execute (TC_AE_SUB_CRE_002_NFU());}
if(PICS_SUB_NCT) {execute (TC_AE_SUB_CRE_002_NCT());}
if(PICS_SUB_NEC) {execute (TC_AE_SUB_CRE_002_NEC());}
if(true) {execute (TC_AE_SUB_NTF_001());}
if(true) {execute (TC_AE_SUB_NTF_002());}
......
......@@ -14,48 +14,21 @@
module OneM2M_TestControl_ASN_profile {
import from OneM2M_Testcases_CSE_Release_1 all;
import from OneM2M_Testcases_CSE_Release_1 all;
import from OneM2M_Pics all;
control {
//CE_GEN_00001
if(true) {execute (TC_CSE_GEN_CRE_001_CSR());}
if(true) {execute (TC_CSE_GEN_CRE_001_SPR());}
if(true) {execute (TC_CSE_GEN_CRE_001_ABS());}
if(true) {execute (TC_CSE_GEN_RET_001_CSR());}
if(true) {execute (TC_CSE_GEN_RET_001_SPR());}
if(true) {execute (TC_CSE_GEN_RET_001_ABS());}
if(true) {execute (TC_CSE_GEN_UPD_001_CSR());}
if(true) {execute (TC_CSE_GEN_UPD_001_SPR());}
if(true) {execute (TC_CSE_GEN_UPD_001_ABS());}
if(true) {execute (TC_CSE_GEN_DEL_001_CSR());}
if(true) {execute (TC_CSE_GEN_DEL_001_SPR());}
if(true) {execute (TC_CSE_GEN_DEL_001_ABS());}
if(true) {execute (TC_CSE_GEN_CRE_002_CSR());}
if(true) {execute (TC_CSE_GEN_CRE_002_SPR());}
if(true) {execute (TC_CSE_GEN_CRE_002_ABS());}
if(true) {execute (TC_CSE_GEN_RET_002_CSR());}
if(true) {execute (TC_CSE_GEN_RET_002_SPR());}
if(true) {execute (TC_CSE_GEN_RET_002_ABS());}
if(true) {execute (TC_CSE_GEN_UPD_002_CSR());}
if(true) {execute (TC_CSE_GEN_UPD_002_SPR());}
if(true) {execute (TC_CSE_GEN_UPD_002_ABS());}
if(true) {execute (TC_CSE_GEN_DEL_002_CSR());}
if(true) {execute (TC_CSE_GEN_DEL_002_SPR());}
if(true) {execute (TC_CSE_GEN_DEL_002_ABS());}
//CE_GEN_00002
//CE_REG_00005
if(true) {execute (TC_CSE_REG_CRE_024());}
if(true) {execute (TC_CSE_DMR_RET_013_CSR());}
if(true) {execute (TC_CSE_REG_CRE_026_POA());}
if(PICS_ASN_CSE) {execute (TC_CSE_REG_CRE_024());}
if(PICS_CSR_POA) {execute (TC_CSE_REG_CRE_026_POA());}
//CE_DMR_00002
if(true) {execute (TC_CSE_DMR_CRE_001_CIN_CNT());}
if(true) {execute (TC_CSE_DMR_RET_001_CIN());}
if(true) {execute (TC_CSE_DMR_UPD_011());}
if(true) {execute (TC_CSE_DMR_DEL_001_CIN());}
}
......
......@@ -15,34 +15,35 @@ module OneM2M_TestControl_Constrained_actuator_as_ADN {
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,34 +15,35 @@ module OneM2M_TestControl_Constrained_sensor_as_ADN {
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());}
......@@ -61,19 +62,19 @@ module OneM2M_TestControl_Constrained_sensor_as_ADN {
if(true) {execute (TC_AE_REG_CRE_002_APN());}
//AE/DMR/00001
if(true) {execute (TC_AE_DMR_CRE_001());}
if(true) {execute (TC_AE_DMR_CRE_004_RN());}
if(true) {execute (TC_AE_DMR_CRE_004_ET());}
if(true) {execute (TC_AE_DMR_CRE_004_LBL());}
if(true) {execute (TC_AE_DMR_CRE_004_CR());}
if(true) {execute (TC_AE_DMR_CRE_004_MNI());}
if(true) {execute (TC_AE_DMR_CRE_004_MBS());}
if(true) {execute (TC_AE_DMR_CRE_004_MIA());}
if(PICS_CNT_RN) {execute (TC_AE_DMR_CRE_004_RN());}
if(PICS_CNT_ET) {execute (TC_AE_DMR_CRE_004_ET());}
if(PICS_CNT_LBL) {execute (TC_AE_DMR_CRE_004_LBL());}
if(PICS_CNT_CR) {execute (TC_AE_DMR_CRE_004_CR());}
if(PICS_CNT_MNI) {execute (TC_AE_DMR_CRE_004_MNI());}
if(PICS_CNT_MBS) {execute (TC_AE_DMR_CRE_004_MBS());}
if(PICS_CNT_MIA) {execute (TC_AE_DMR_CRE_004_MIA());}
//AE/DMR/00002
if(true) {execute (TC_AE_DMR_CRE_003_RN());}
if(true) {execute (TC_AE_DMR_CRE_003_ET());}
if(true) {execute (TC_AE_DMR_CRE_003_LBL());}
if(true) {execute (TC_AE_DMR_CRE_003_CR());}
if(true) {execute (TC_AE_DMR_CRE_003_CNF());}
if(PICS_CIN_RN) {execute (TC_AE_DMR_CRE_003_RN());}
if(PICS_CIN_ET) {execute (TC_AE_DMR_CRE_003_ET());}
if(PICS_CIN_LBL) {execute (TC_AE_DMR_CRE_003_LBL());}
if(PICS_CIN_CR) {execute (TC_AE_DMR_CRE_003_CR());}
if(PICS_CIN_CNF) {execute (TC_AE_DMR_CRE_003_CNF());}
}
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment