Skip to content
Snippets Groups Projects
Commit a5f96610 authored by acverdugo's avatar acverdugo
Browse files

- Updated default values in some PIXIT

- Updated profiles TestContol with PICS
- New PICS

Signed-off-by: default avataracverdugo <acverdugo@at4wireless.com>
parent 7af1b2f0
No related branches found
No related tags found
No related merge requests found
...@@ -28,5 +28,85 @@ module OneM2M_Pics { ...@@ -28,5 +28,85 @@ module OneM2M_Pics {
modulepar boolean PICS_PRIMITIVE_SCOPE_SP_RELATIVE := true; modulepar boolean PICS_PRIMITIVE_SCOPE_SP_RELATIVE := true;
modulepar boolean PICS_PRIMITIVE_SCOPE_ABSOLUTE := true; modulepar boolean PICS_PRIMITIVE_SCOPE_ABSOLUTE := true;
//AccessControlPolicy optional attributes
modulepar boolean PICS_ACP_LBL := true;
modulepar boolean PICS_ACP_AT := true;
modulepar boolean PICS_ACP_ET := 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_ET := 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 } // end of module
...@@ -59,13 +59,13 @@ module OneM2M_Pixits { ...@@ -59,13 +59,13 @@ module OneM2M_Pixits {
*/ */
modulepar XSD.ID PX_SUPER_CSE_ID := "/admin:admin"; 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; modulepar AddressingMethod PX_ADDRESSING_METHOD := e_hierarchical;
......
...@@ -15,34 +15,35 @@ module OneM2M_TestControl_ADN_profile_3 { ...@@ -15,34 +15,35 @@ module OneM2M_TestControl_ADN_profile_3 {
import from OneM2M_Testcases_AE_Release_1 all; import from OneM2M_Testcases_AE_Release_1 all;
import from OneM2M_Pics all;
control { control {
//AE_GEN_00001 //AE_GEN_00001
if(true) {execute (TC_AE_GEN_CRE_001_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_CSR());}
if(true) {execute (TC_AE_GEN_CRE_001_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_SPR());}
if(true) {execute (TC_AE_GEN_CRE_001_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_ABS());}
if(true) {execute (TC_AE_GEN_CRE_002_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_CSR());}
if(true) {execute (TC_AE_GEN_CRE_002_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_SPR());}
if(true) {execute (TC_AE_GEN_CRE_002_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_ABS());}
if(true) {execute (TC_AE_GEN_UPD_001_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_CSR());}
if(true) {execute (TC_AE_GEN_UPD_001_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_SPR());}
if(true) {execute (TC_AE_GEN_UPD_001_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_ABS());}
if(true) {execute (TC_AE_GEN_UPD_002_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_CSR());}
if(true) {execute (TC_AE_GEN_UPD_002_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_SPR());}
if(true) {execute (TC_AE_GEN_UPD_002_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_ABS());}
if(true) {execute (TC_AE_GEN_RET_001_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_CSR());}
if(true) {execute (TC_AE_GEN_RET_001_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_SPR());}
if(true) {execute (TC_AE_GEN_RET_001_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_ABS());}
if(true) {execute (TC_AE_GEN_RET_002_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_CSR());}
if(true) {execute (TC_AE_GEN_RET_002_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_SPR());}
if(true) {execute (TC_AE_GEN_RET_002_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_ABS());}
if(true) {execute (TC_AE_GEN_DEL_001_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_CSR());}
if(true) {execute (TC_AE_GEN_DEL_001_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_SPR());}
if(true) {execute (TC_AE_GEN_DEL_001_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_ABS());}
if(true) {execute (TC_AE_GEN_DEL_002_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_CSR());}
if(true) {execute (TC_AE_GEN_DEL_002_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_SPR());}
if(true) {execute (TC_AE_GEN_DEL_002_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_ABS());}
//AE_GEN_00002 //AE_GEN_00002
if(true) {execute (TC_AE_DMR_CRE_001());} if(true) {execute (TC_AE_DMR_CRE_001());}
//AE_REG_00002 //AE_REG_00002
......
...@@ -15,33 +15,34 @@ module OneM2M_TestControl_ADN_profile_4 { ...@@ -15,33 +15,34 @@ module OneM2M_TestControl_ADN_profile_4 {
import from OneM2M_Testcases_AE_Release_1 all; import from OneM2M_Testcases_AE_Release_1 all;
import from OneM2M_Pics all;
control { control {
//AE_GEN_00001 //AE_GEN_00001
if(true) {execute (TC_AE_GEN_CRE_001_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_CSR());}
if(true) {execute (TC_AE_GEN_CRE_001_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_SPR());}
if(true) {execute (TC_AE_GEN_CRE_001_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_ABS());}
if(true) {execute (TC_AE_GEN_CRE_002_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_CSR());}
if(true) {execute (TC_AE_GEN_CRE_002_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_SPR());}
if(true) {execute (TC_AE_GEN_CRE_002_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_ABS());}
if(true) {execute (TC_AE_GEN_UPD_001_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_CSR());}
if(true) {execute (TC_AE_GEN_UPD_001_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_SPR());}
if(true) {execute (TC_AE_GEN_UPD_001_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_ABS());}
if(true) {execute (TC_AE_GEN_UPD_002_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_CSR());}
if(true) {execute (TC_AE_GEN_UPD_002_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_SPR());}
if(true) {execute (TC_AE_GEN_UPD_002_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_ABS());}
if(true) {execute (TC_AE_GEN_RET_001_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_CSR());}
if(true) {execute (TC_AE_GEN_RET_001_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_SPR());}
if(true) {execute (TC_AE_GEN_RET_001_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_ABS());}
if(true) {execute (TC_AE_GEN_RET_002_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_CSR());}
if(true) {execute (TC_AE_GEN_RET_002_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_SPR());}
if(true) {execute (TC_AE_GEN_RET_002_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_ABS());}
if(true) {execute (TC_AE_GEN_DEL_001_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_CSR());}
if(true) {execute (TC_AE_GEN_DEL_001_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_SPR());}
if(true) {execute (TC_AE_GEN_DEL_001_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_ABS());}
if(true) {execute (TC_AE_GEN_DEL_002_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_CSR());}
if(true) {execute (TC_AE_GEN_DEL_002_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_SPR());}
if(true) {execute (TC_AE_GEN_DEL_002_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_ABS());}
//AE_GEN_00002 //AE_GEN_00002
if(true) {execute (TC_AE_DMR_CRE_001());} if(true) {execute (TC_AE_DMR_CRE_001());}
if(true) {execute (TC_AE_DMR_RET_001_CB());} if(true) {execute (TC_AE_DMR_RET_001_CB());}
...@@ -72,13 +73,13 @@ module OneM2M_TestControl_ADN_profile_4 { ...@@ -72,13 +73,13 @@ module OneM2M_TestControl_ADN_profile_4 {
if(true) {execute (TC_AE_DMR_RET_001_AE());} if(true) {execute (TC_AE_DMR_RET_001_AE());}
//AE/DMR/00001 //AE/DMR/00001
if(true) {execute (TC_AE_DMR_CRE_001());} if(true) {execute (TC_AE_DMR_CRE_001());}
if(true) {execute (TC_AE_DMR_CRE_004_RN());} if(PICS_CNT_RN) {execute (TC_AE_DMR_CRE_004_RN());}
if(true) {execute (TC_AE_DMR_CRE_004_ET());} if(PICS_CNT_ET) {execute (TC_AE_DMR_CRE_004_ET());}
if(true) {execute (TC_AE_DMR_CRE_004_LBL());} if(PICS_CNT_LBL) {execute (TC_AE_DMR_CRE_004_LBL());}
if(true) {execute (TC_AE_DMR_CRE_004_CR());} if(PICS_CNT_CR) {execute (TC_AE_DMR_CRE_004_CR());}
if(true) {execute (TC_AE_DMR_CRE_004_MNI());} if(PICS_CNT_MNI) {execute (TC_AE_DMR_CRE_004_MNI());}
if(true) {execute (TC_AE_DMR_CRE_004_MBS());} if(PICS_CNT_MBS) {execute (TC_AE_DMR_CRE_004_MBS());}
if(true) {execute (TC_AE_DMR_CRE_004_MIA());} 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_ET());}
if(true) {execute (TC_AE_DMR_UPD_002_LBL());} if(true) {execute (TC_AE_DMR_UPD_002_LBL());}
if(true) {execute (TC_AE_DMR_UPD_002_MNI());} if(true) {execute (TC_AE_DMR_UPD_002_MNI());}
...@@ -88,11 +89,11 @@ module OneM2M_TestControl_ADN_profile_4 { ...@@ -88,11 +89,11 @@ module OneM2M_TestControl_ADN_profile_4 {
if(true) {execute (TC_AE_DMR_RET_004());} if(true) {execute (TC_AE_DMR_RET_004());}
//AE/DMR/00002 //AE/DMR/00002
if(true) {execute (TC_AE_DMR_CRE_002());} if(true) {execute (TC_AE_DMR_CRE_002());}
if(true) {execute (TC_AE_DMR_CRE_003_RN());} if(PICS_CIN_RN) {execute (TC_AE_DMR_CRE_003_RN());}
if(true) {execute (TC_AE_DMR_CRE_003_ET());} if(PICS_CIN_ET) {execute (TC_AE_DMR_CRE_003_ET());}
if(true) {execute (TC_AE_DMR_CRE_003_LBL());} if(PICS_CIN_LBL) {execute (TC_AE_DMR_CRE_003_LBL());}
if(true) {execute (TC_AE_DMR_CRE_003_CR());} if(PICS_CIN_CR) {execute (TC_AE_DMR_CRE_003_CR());}
if(true) {execute (TC_AE_DMR_CRE_003_CNF());} 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_005());}
if(true) {execute (TC_AE_DMR_RET_002());} if(true) {execute (TC_AE_DMR_RET_002());}
if(true) {execute (TC_AE_DMR_RET_003());} if(true) {execute (TC_AE_DMR_RET_003());}
...@@ -106,18 +107,18 @@ module OneM2M_TestControl_ADN_profile_4 { ...@@ -106,18 +107,18 @@ module OneM2M_TestControl_ADN_profile_4 {
if(true) {execute (TC_AE_REG_CRE_002_OR());} if(true) {execute (TC_AE_REG_CRE_002_OR());}
if(true) {execute (TC_AE_DMR_UPD_001_OR());} if(true) {execute (TC_AE_DMR_UPD_001_OR());}
// AE/DMR/00001 // AE/DMR/00001
if(true) {execute (TC_AE_DMR_CRE_004_ACPI());} if(PICS_CNT_ACPI) {execute (TC_AE_DMR_CRE_004_ACPI());}
if(true) {execute (TC_AE_DMR_CRE_004_OR());} if(PICS_CNT_OR) {execute (TC_AE_DMR_CRE_004_OR());}
//if(true) {execute (TC_AE_DMR_CRE_004_LI());}//TODO To be implemented //if(true) {execute (TC_AE_DMR_CRE_004_LI());}//TODO To be implemented
//AE/SUB/00001 //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_LBL());}//TODO To be implemented. TP As well
if(true) {execute (TC_AE_SUB_CRE_002_SU());} if(PICS_SUB_SU) {execute (TC_AE_SUB_CRE_002_SU());}
if(true) {execute (TC_AE_SUB_CRE_002_ACPI());} if(PICS_SUB_ACPI) {execute (TC_AE_SUB_CRE_002_ACPI());}
if(true) {execute (TC_AE_SUB_CRE_002_ENC());} if(PICS_SUB_ENC) {execute (TC_AE_SUB_CRE_002_ENC());}
if(true) {execute (TC_AE_SUB_CRE_002_EXC());} if(PICS_SUB_EXC) {execute (TC_AE_SUB_CRE_002_EXC());}
if(true) {execute (TC_AE_SUB_CRE_002_NFU());} if(PICS_SUB_NFU) {execute (TC_AE_SUB_CRE_002_NFU());}
if(true) {execute (TC_AE_SUB_CRE_002_NCT());} if(PICS_SUB_NCT) {execute (TC_AE_SUB_CRE_002_NCT());}
if(true) {execute (TC_AE_SUB_CRE_002_NEC());} 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_001());}
if(true) {execute (TC_AE_SUB_NTF_002());} if(true) {execute (TC_AE_SUB_NTF_002());}
......
...@@ -14,35 +14,36 @@ ...@@ -14,35 +14,36 @@
module OneM2M_TestControl_ASN_profile { 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 { control {
//CE_GEN_00001 //CE_GEN_00001
if(true) {execute (TC_CSE_GEN_CRE_001_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_001_CSR());}
if(true) {execute (TC_CSE_GEN_CRE_001_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_001_SPR());}
if(true) {execute (TC_CSE_GEN_CRE_001_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_001_ABS());}
if(true) {execute (TC_CSE_GEN_RET_001_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_001_CSR());}
if(true) {execute (TC_CSE_GEN_RET_001_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_001_SPR());}
if(true) {execute (TC_CSE_GEN_RET_001_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_001_ABS());}
if(true) {execute (TC_CSE_GEN_UPD_001_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_001_CSR());}
if(true) {execute (TC_CSE_GEN_UPD_001_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_001_SPR());}
if(true) {execute (TC_CSE_GEN_UPD_001_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_001_ABS());}
if(true) {execute (TC_CSE_GEN_DEL_001_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_001_CSR());}
if(true) {execute (TC_CSE_GEN_DEL_001_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_001_SPR());}
if(true) {execute (TC_CSE_GEN_DEL_001_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_001_ABS());}
if(true) {execute (TC_CSE_GEN_CRE_002_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_002_CSR());}
if(true) {execute (TC_CSE_GEN_CRE_002_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_002_SPR());}
if(true) {execute (TC_CSE_GEN_CRE_002_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_002_ABS());}
if(true) {execute (TC_CSE_GEN_RET_002_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_002_CSR());}
if(true) {execute (TC_CSE_GEN_RET_002_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_002_SPR());}
if(true) {execute (TC_CSE_GEN_RET_002_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_002_ABS());}
if(true) {execute (TC_CSE_GEN_UPD_002_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_002_CSR());}
if(true) {execute (TC_CSE_GEN_UPD_002_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_002_SPR());}
if(true) {execute (TC_CSE_GEN_UPD_002_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_002_ABS());}
if(true) {execute (TC_CSE_GEN_DEL_002_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_002_CSR());}
if(true) {execute (TC_CSE_GEN_DEL_002_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_002_SPR());}
if(true) {execute (TC_CSE_GEN_DEL_002_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_002_ABS());}
//CE_GEN_00002 //CE_GEN_00002
......
...@@ -15,34 +15,35 @@ module OneM2M_TestControl_Constrained_actuator_as_ADN { ...@@ -15,34 +15,35 @@ module OneM2M_TestControl_Constrained_actuator_as_ADN {
import from OneM2M_Testcases_AE_Release_1 all; import from OneM2M_Testcases_AE_Release_1 all;
import from OneM2M_Pics all;
control { control {
//AE_GEN_00001 //AE_GEN_00001
if(true) {execute (TC_AE_GEN_CRE_001_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_CSR());}
if(true) {execute (TC_AE_GEN_CRE_001_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_SPR());}
if(true) {execute (TC_AE_GEN_CRE_001_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_ABS());}
if(true) {execute (TC_AE_GEN_CRE_002_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_CSR());}
if(true) {execute (TC_AE_GEN_CRE_002_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_SPR());}
if(true) {execute (TC_AE_GEN_CRE_002_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_ABS());}
if(true) {execute (TC_AE_GEN_UPD_001_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_CSR());}
if(true) {execute (TC_AE_GEN_UPD_001_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_SPR());}
if(true) {execute (TC_AE_GEN_UPD_001_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_ABS());}
if(true) {execute (TC_AE_GEN_UPD_002_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_CSR());}
if(true) {execute (TC_AE_GEN_UPD_002_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_SPR());}
if(true) {execute (TC_AE_GEN_UPD_002_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_ABS());}
if(true) {execute (TC_AE_GEN_RET_001_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_CSR());}
if(true) {execute (TC_AE_GEN_RET_001_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_SPR());}
if(true) {execute (TC_AE_GEN_RET_001_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_ABS());}
if(true) {execute (TC_AE_GEN_RET_002_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_CSR());}
if(true) {execute (TC_AE_GEN_RET_002_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_SPR());}
if(true) {execute (TC_AE_GEN_RET_002_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_ABS());}
if(true) {execute (TC_AE_GEN_DEL_001_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_CSR());}
if(true) {execute (TC_AE_GEN_DEL_001_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_SPR());}
if(true) {execute (TC_AE_GEN_DEL_001_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_ABS());}
if(true) {execute (TC_AE_GEN_DEL_002_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_CSR());}
if(true) {execute (TC_AE_GEN_DEL_002_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_SPR());}
if(true) {execute (TC_AE_GEN_DEL_002_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_ABS());}
//AE_GEN_00002 //AE_GEN_00002
if(true) {execute (TC_AE_DMR_CRE_001());} if(true) {execute (TC_AE_DMR_CRE_001());}
//AE_REG_00002 //AE_REG_00002
......
...@@ -15,34 +15,35 @@ module OneM2M_TestControl_Constrained_sensor_as_ADN { ...@@ -15,34 +15,35 @@ module OneM2M_TestControl_Constrained_sensor_as_ADN {
import from OneM2M_Testcases_AE_Release_1 all; import from OneM2M_Testcases_AE_Release_1 all;
import from OneM2M_Pics all;
control { control {
//AE_GEN_00001 //AE_GEN_00001
if(true){execute (TC_AE_GEN_CRE_001_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_CRE_001_CSR());}
if(true){execute (TC_AE_GEN_CRE_001_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_CRE_001_SPR());}
if(true){execute (TC_AE_GEN_CRE_001_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_CRE_001_ABS());}
if(true){execute (TC_AE_GEN_CRE_002_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_CRE_002_CSR());}
if(true){execute (TC_AE_GEN_CRE_002_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_CRE_002_SPR());}
if(true){execute (TC_AE_GEN_CRE_002_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_CRE_002_ABS());}
if(true){execute (TC_AE_GEN_UPD_001_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_UPD_001_CSR());}
if(true){execute (TC_AE_GEN_UPD_001_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_UPD_001_SPR());}
if(true){execute (TC_AE_GEN_UPD_001_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_UPD_001_ABS());}
if(true){execute (TC_AE_GEN_UPD_002_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_UPD_002_CSR());}
if(true){execute (TC_AE_GEN_UPD_002_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_UPD_002_SPR());}
if(true){execute (TC_AE_GEN_UPD_002_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_UPD_002_ABS());}
if(true){execute (TC_AE_GEN_RET_001_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_RET_001_CSR());}
if(true){execute (TC_AE_GEN_RET_001_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_RET_001_SPR());}
if(true){execute (TC_AE_GEN_RET_001_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_RET_001_ABS());}
if(true) {execute (TC_AE_GEN_RET_002_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_CSR());}
if(true) {execute (TC_AE_GEN_RET_002_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_SPR());}
if(true) {execute (TC_AE_GEN_RET_002_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_ABS());}
if(true) {execute (TC_AE_GEN_DEL_001_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_CSR());}
if(true) {execute (TC_AE_GEN_DEL_001_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_SPR());}
if(true) {execute (TC_AE_GEN_DEL_001_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_ABS());}
if(true) {execute (TC_AE_GEN_DEL_002_CSR());} if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_CSR());}
if(true) {execute (TC_AE_GEN_DEL_002_SPR());} if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_SPR());}
if(true) {execute (TC_AE_GEN_DEL_002_ABS());} if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_ABS());}
//AE_GEN_00002 //AE_GEN_00002
if(true) {execute (TC_AE_DMR_CRE_001());} if(true) {execute (TC_AE_DMR_CRE_001());}
...@@ -61,19 +62,19 @@ module OneM2M_TestControl_Constrained_sensor_as_ADN { ...@@ -61,19 +62,19 @@ module OneM2M_TestControl_Constrained_sensor_as_ADN {
if(true) {execute (TC_AE_REG_CRE_002_APN());} if(true) {execute (TC_AE_REG_CRE_002_APN());}
//AE/DMR/00001 //AE/DMR/00001
if(true) {execute (TC_AE_DMR_CRE_001());} if(true) {execute (TC_AE_DMR_CRE_001());}
if(true) {execute (TC_AE_DMR_CRE_004_RN());} if(PICS_CNT_RN) {execute (TC_AE_DMR_CRE_004_RN());}
if(true) {execute (TC_AE_DMR_CRE_004_ET());} if(PICS_CNT_ET) {execute (TC_AE_DMR_CRE_004_ET());}
if(true) {execute (TC_AE_DMR_CRE_004_LBL());} if(PICS_CNT_LBL) {execute (TC_AE_DMR_CRE_004_LBL());}
if(true) {execute (TC_AE_DMR_CRE_004_CR());} if(PICS_CNT_CR) {execute (TC_AE_DMR_CRE_004_CR());}
if(true) {execute (TC_AE_DMR_CRE_004_MNI());} if(PICS_CNT_MNI) {execute (TC_AE_DMR_CRE_004_MNI());}
if(true) {execute (TC_AE_DMR_CRE_004_MBS());} if(PICS_CNT_MBS) {execute (TC_AE_DMR_CRE_004_MBS());}
if(true) {execute (TC_AE_DMR_CRE_004_MIA());} if(PICS_CNT_MIA) {execute (TC_AE_DMR_CRE_004_MIA());}
//AE/DMR/00002 //AE/DMR/00002
if(true) {execute (TC_AE_DMR_CRE_003_RN());} if(PICS_CIN_RN) {execute (TC_AE_DMR_CRE_003_RN());}
if(true) {execute (TC_AE_DMR_CRE_003_ET());} if(PICS_CIN_ET) {execute (TC_AE_DMR_CRE_003_ET());}
if(true) {execute (TC_AE_DMR_CRE_003_LBL());} if(PICS_CIN_LBL) {execute (TC_AE_DMR_CRE_003_LBL());}
if(true) {execute (TC_AE_DMR_CRE_003_CR());} if(PICS_CIN_CR) {execute (TC_AE_DMR_CRE_003_CR());}
if(true) {execute (TC_AE_DMR_CRE_003_CNF());} if(PICS_CIN_CNF) {execute (TC_AE_DMR_CRE_003_CNF());}
} }
......
This diff is collapsed.
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment