Commit a5f96610d0d4f19d629022c1fa79b173ee507914

Authored by Antonio Castillo Verdugo
1 parent 7af1b2f0

- Updated default values in some PIXIT

- Updated profiles TestContol with PICS
- New PICS

Signed-off-by: acverdugo <acverdugo@at4wireless.com>
... ... @@ -28,5 +28,85 @@ module OneM2M_Pics {
28 28 modulepar boolean PICS_PRIMITIVE_SCOPE_SP_RELATIVE := true;
29 29 modulepar boolean PICS_PRIMITIVE_SCOPE_ABSOLUTE := true;
30 30  
  31 + //AccessControlPolicy optional attributes
  32 +
  33 + modulepar boolean PICS_ACP_LBL := true;
  34 + modulepar boolean PICS_ACP_AT := true;
  35 + modulepar boolean PICS_ACP_ET := true;
  36 +
  37 + //AE optional attributes
  38 +
  39 + modulepar boolean PICS_AE_LBL := true;
  40 + modulepar boolean PICS_AE_APN := true;
  41 + modulepar boolean PICS_AE_POA := true;
  42 + modulepar boolean PICS_AE_NL := true;
  43 + modulepar boolean PICS_AE_CSZ := true;
  44 + modulepar boolean PICS_AE_OR := true;
  45 + modulepar boolean PICS_AE_ACPI := true;
  46 +
  47 + //Container optional attributes
  48 +
  49 + modulepar boolean PICS_CNT_ACPI := true;
  50 + modulepar boolean PICS_CNT_MNI := true;
  51 + modulepar boolean PICS_CNT_MBS := true;
  52 + modulepar boolean PICS_CNT_MIA := true;
  53 + modulepar boolean PICS_CNT_OR := true;
  54 + modulepar boolean PICS_CNT_LI := true;
  55 + modulepar boolean PICS_CNT_RN := true;
  56 + modulepar boolean PICS_CNT_ET := true;
  57 + modulepar boolean PICS_CNT_LBL := true;
  58 + modulepar boolean PICS_CNT_CR := true;
  59 +
  60 + //ContentInstance optional attributes
  61 +
  62 + modulepar boolean PICS_CIN_CNF := true;
  63 + modulepar boolean PICS_CIN_RN := true;
  64 + modulepar boolean PICS_CIN_ET := true;
  65 + modulepar boolean PICS_CIN_LBL := true;
  66 + modulepar boolean PICS_CIN_CR := true;
  67 + modulepar boolean PICS_CIN_OR := true;
  68 +
  69 + //CSEBase optional attributes
  70 +
  71 + modulepar boolean PICS_CB_CST := true;
  72 + modulepar boolean PICS_CB_NL := true;
  73 +
  74 + //Group optional attributes
  75 +
  76 + modulepar boolean PICS_GRP_LBL := true;
  77 + modulepar boolean PICS_GRP_GN := true;
  78 + modulepar boolean PICS_GRP_ACPI := true;
  79 + modulepar boolean PICS_GRP_MACP := true;
  80 +
  81 + //RemoteCSE optional attributes
  82 +
  83 + modulepar boolean PICS_CSR_LBL := true;
  84 + modulepar boolean PICS_CSR_CST := true;
  85 + modulepar boolean PICS_CSR_POA := true;
  86 + modulepar boolean PICS_CSR_NL := true;
  87 + modulepar boolean PICS_CSR_RN := true;
  88 + modulepar boolean PICS_CSR_ET := true;
  89 + modulepar boolean PICS_CSR_RR := true;
  90 +
  91 + //Subscription optional attributes
  92 +
  93 + modulepar boolean PICS_SUB_ACPI := true;
  94 + modulepar boolean PICS_SUB_ENC := true;
  95 + modulepar boolean PICS_SUB_EXC := true;
  96 + modulepar boolean PICS_SUB_NFU := true;
  97 + modulepar boolean PICS_SUB_NCT := true;
  98 + modulepar boolean PICS_SUB_NEC := true;
  99 + modulepar boolean PICS_SUB_SU := true;
  100 + modulepar boolean PICS_SUB_LBL := true;
  101 + modulepar boolean PICS_SUB_ET := true;
  102 + modulepar boolean PICS_SUB_GPI := true;
  103 + modulepar boolean PICS_SUB_BN := true;
  104 + modulepar boolean PICS_SUB_RL := true;
  105 + modulepar boolean PICS_SUB_PN := true;
  106 + modulepar boolean PICS_SUB_NSP := true;
  107 + modulepar boolean PICS_SUB_LN := true;
  108 + modulepar boolean PICS_SUB_PSN := true;
  109 + modulepar boolean PICS_SUB_CR := true;
  110 +
31 111  
32 112 } // end of module
... ...
... ... @@ -59,13 +59,13 @@ module OneM2M_Pixits {
59 59 */
60 60 modulepar XSD.ID PX_SUPER_CSE_ID := "/admin:admin";
61 61  
62   - modulepar XSD.IDREFS PX_ALLOWED_C_AE_IDS := {"C"};
  62 + modulepar XSD.IDREFS PX_ALLOWED_C_AE_IDS := {"C-AllowedAeId"};
63 63  
64   - modulepar XSD.IDREFS PX_NOT_ALLOWED_C_AE_IDS := {"MyAe"};
  64 + modulepar XSD.IDREFS PX_NOT_ALLOWED_C_AE_IDS := {"C-NotAllowedAeId"};
65 65  
66   - modulepar XSD.IDREFS PX_ALLOWED_S_AE_IDS := {"S"};
  66 + modulepar XSD.IDREFS PX_ALLOWED_S_AE_IDS := {"S-AllowedAeId"};
67 67  
68   - modulepar XSD.IDREFS PX_NOT_ALLOWED_S_AE_IDS := {"MyAe"};
  68 + modulepar XSD.IDREFS PX_NOT_ALLOWED_S_AE_IDS := {"S-NotAllowedAeId"};
69 69  
70 70 modulepar AddressingMethod PX_ADDRESSING_METHOD := e_hierarchical;
71 71  
... ...
... ... @@ -15,34 +15,35 @@ module OneM2M_TestControl_ADN_profile_3 {
15 15  
16 16  
17 17 import from OneM2M_Testcases_AE_Release_1 all;
  18 + import from OneM2M_Pics all;
18 19  
19 20 control {
20 21  
21 22 //AE_GEN_00001
22   - if(true) {execute (TC_AE_GEN_CRE_001_CSR());}
23   - if(true) {execute (TC_AE_GEN_CRE_001_SPR());}
24   - if(true) {execute (TC_AE_GEN_CRE_001_ABS());}
25   - if(true) {execute (TC_AE_GEN_CRE_002_CSR());}
26   - if(true) {execute (TC_AE_GEN_CRE_002_SPR());}
27   - if(true) {execute (TC_AE_GEN_CRE_002_ABS());}
28   - if(true) {execute (TC_AE_GEN_UPD_001_CSR());}
29   - if(true) {execute (TC_AE_GEN_UPD_001_SPR());}
30   - if(true) {execute (TC_AE_GEN_UPD_001_ABS());}
31   - if(true) {execute (TC_AE_GEN_UPD_002_CSR());}
32   - if(true) {execute (TC_AE_GEN_UPD_002_SPR());}
33   - if(true) {execute (TC_AE_GEN_UPD_002_ABS());}
34   - if(true) {execute (TC_AE_GEN_RET_001_CSR());}
35   - if(true) {execute (TC_AE_GEN_RET_001_SPR());}
36   - if(true) {execute (TC_AE_GEN_RET_001_ABS());}
37   - if(true) {execute (TC_AE_GEN_RET_002_CSR());}
38   - if(true) {execute (TC_AE_GEN_RET_002_SPR());}
39   - if(true) {execute (TC_AE_GEN_RET_002_ABS());}
40   - if(true) {execute (TC_AE_GEN_DEL_001_CSR());}
41   - if(true) {execute (TC_AE_GEN_DEL_001_SPR());}
42   - if(true) {execute (TC_AE_GEN_DEL_001_ABS());}
43   - if(true) {execute (TC_AE_GEN_DEL_002_CSR());}
44   - if(true) {execute (TC_AE_GEN_DEL_002_SPR());}
45   - if(true) {execute (TC_AE_GEN_DEL_002_ABS());}
  23 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_CSR());}
  24 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_SPR());}
  25 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_ABS());}
  26 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_CSR());}
  27 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_SPR());}
  28 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_ABS());}
  29 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_CSR());}
  30 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_SPR());}
  31 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_ABS());}
  32 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_CSR());}
  33 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_SPR());}
  34 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_ABS());}
  35 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_CSR());}
  36 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_SPR());}
  37 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_ABS());}
  38 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_CSR());}
  39 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_SPR());}
  40 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_ABS());}
  41 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_CSR());}
  42 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_SPR());}
  43 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_ABS());}
  44 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_CSR());}
  45 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_SPR());}
  46 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_ABS());}
46 47 //AE_GEN_00002
47 48 if(true) {execute (TC_AE_DMR_CRE_001());}
48 49 //AE_REG_00002
... ...
... ... @@ -15,33 +15,34 @@ module OneM2M_TestControl_ADN_profile_4 {
15 15  
16 16  
17 17 import from OneM2M_Testcases_AE_Release_1 all;
  18 + import from OneM2M_Pics all;
18 19  
19 20 control {
20 21 //AE_GEN_00001
21   - if(true) {execute (TC_AE_GEN_CRE_001_CSR());}
22   - if(true) {execute (TC_AE_GEN_CRE_001_SPR());}
23   - if(true) {execute (TC_AE_GEN_CRE_001_ABS());}
24   - if(true) {execute (TC_AE_GEN_CRE_002_CSR());}
25   - if(true) {execute (TC_AE_GEN_CRE_002_SPR());}
26   - if(true) {execute (TC_AE_GEN_CRE_002_ABS());}
27   - if(true) {execute (TC_AE_GEN_UPD_001_CSR());}
28   - if(true) {execute (TC_AE_GEN_UPD_001_SPR());}
29   - if(true) {execute (TC_AE_GEN_UPD_001_ABS());}
30   - if(true) {execute (TC_AE_GEN_UPD_002_CSR());}
31   - if(true) {execute (TC_AE_GEN_UPD_002_SPR());}
32   - if(true) {execute (TC_AE_GEN_UPD_002_ABS());}
33   - if(true) {execute (TC_AE_GEN_RET_001_CSR());}
34   - if(true) {execute (TC_AE_GEN_RET_001_SPR());}
35   - if(true) {execute (TC_AE_GEN_RET_001_ABS());}
36   - if(true) {execute (TC_AE_GEN_RET_002_CSR());}
37   - if(true) {execute (TC_AE_GEN_RET_002_SPR());}
38   - if(true) {execute (TC_AE_GEN_RET_002_ABS());}
39   - if(true) {execute (TC_AE_GEN_DEL_001_CSR());}
40   - if(true) {execute (TC_AE_GEN_DEL_001_SPR());}
41   - if(true) {execute (TC_AE_GEN_DEL_001_ABS());}
42   - if(true) {execute (TC_AE_GEN_DEL_002_CSR());}
43   - if(true) {execute (TC_AE_GEN_DEL_002_SPR());}
44   - if(true) {execute (TC_AE_GEN_DEL_002_ABS());}
  22 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_CSR());}
  23 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_SPR());}
  24 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_ABS());}
  25 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_CSR());}
  26 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_SPR());}
  27 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_ABS());}
  28 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_CSR());}
  29 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_SPR());}
  30 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_ABS());}
  31 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_CSR());}
  32 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_SPR());}
  33 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_ABS());}
  34 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_CSR());}
  35 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_SPR());}
  36 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_ABS());}
  37 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_CSR());}
  38 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_SPR());}
  39 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_ABS());}
  40 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_CSR());}
  41 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_SPR());}
  42 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_ABS());}
  43 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_CSR());}
  44 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_SPR());}
  45 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_ABS());}
45 46 //AE_GEN_00002
46 47 if(true) {execute (TC_AE_DMR_CRE_001());}
47 48 if(true) {execute (TC_AE_DMR_RET_001_CB());}
... ... @@ -72,13 +73,13 @@ module OneM2M_TestControl_ADN_profile_4 {
72 73 if(true) {execute (TC_AE_DMR_RET_001_AE());}
73 74 //AE/DMR/00001
74 75 if(true) {execute (TC_AE_DMR_CRE_001());}
75   - if(true) {execute (TC_AE_DMR_CRE_004_RN());}
76   - if(true) {execute (TC_AE_DMR_CRE_004_ET());}
77   - if(true) {execute (TC_AE_DMR_CRE_004_LBL());}
78   - if(true) {execute (TC_AE_DMR_CRE_004_CR());}
79   - if(true) {execute (TC_AE_DMR_CRE_004_MNI());}
80   - if(true) {execute (TC_AE_DMR_CRE_004_MBS());}
81   - if(true) {execute (TC_AE_DMR_CRE_004_MIA());}
  76 + if(PICS_CNT_RN) {execute (TC_AE_DMR_CRE_004_RN());}
  77 + if(PICS_CNT_ET) {execute (TC_AE_DMR_CRE_004_ET());}
  78 + if(PICS_CNT_LBL) {execute (TC_AE_DMR_CRE_004_LBL());}
  79 + if(PICS_CNT_CR) {execute (TC_AE_DMR_CRE_004_CR());}
  80 + if(PICS_CNT_MNI) {execute (TC_AE_DMR_CRE_004_MNI());}
  81 + if(PICS_CNT_MBS) {execute (TC_AE_DMR_CRE_004_MBS());}
  82 + if(PICS_CNT_MIA) {execute (TC_AE_DMR_CRE_004_MIA());}
82 83 if(true) {execute (TC_AE_DMR_UPD_002_ET());}
83 84 if(true) {execute (TC_AE_DMR_UPD_002_LBL());}
84 85 if(true) {execute (TC_AE_DMR_UPD_002_MNI());}
... ... @@ -88,11 +89,11 @@ module OneM2M_TestControl_ADN_profile_4 {
88 89 if(true) {execute (TC_AE_DMR_RET_004());}
89 90 //AE/DMR/00002
90 91 if(true) {execute (TC_AE_DMR_CRE_002());}
91   - if(true) {execute (TC_AE_DMR_CRE_003_RN());}
92   - if(true) {execute (TC_AE_DMR_CRE_003_ET());}
93   - if(true) {execute (TC_AE_DMR_CRE_003_LBL());}
94   - if(true) {execute (TC_AE_DMR_CRE_003_CR());}
95   - if(true) {execute (TC_AE_DMR_CRE_003_CNF());}
  92 + if(PICS_CIN_RN) {execute (TC_AE_DMR_CRE_003_RN());}
  93 + if(PICS_CIN_ET) {execute (TC_AE_DMR_CRE_003_ET());}
  94 + if(PICS_CIN_LBL) {execute (TC_AE_DMR_CRE_003_LBL());}
  95 + if(PICS_CIN_CR) {execute (TC_AE_DMR_CRE_003_CR());}
  96 + if(PICS_CIN_CNF) {execute (TC_AE_DMR_CRE_003_CNF());}
96 97 if(true) {execute (TC_AE_DMR_RET_005());}
97 98 if(true) {execute (TC_AE_DMR_RET_002());}
98 99 if(true) {execute (TC_AE_DMR_RET_003());}
... ... @@ -106,18 +107,18 @@ module OneM2M_TestControl_ADN_profile_4 {
106 107 if(true) {execute (TC_AE_REG_CRE_002_OR());}
107 108 if(true) {execute (TC_AE_DMR_UPD_001_OR());}
108 109 // AE/DMR/00001
109   - if(true) {execute (TC_AE_DMR_CRE_004_ACPI());}
110   - if(true) {execute (TC_AE_DMR_CRE_004_OR());}
  110 + if(PICS_CNT_ACPI) {execute (TC_AE_DMR_CRE_004_ACPI());}
  111 + if(PICS_CNT_OR) {execute (TC_AE_DMR_CRE_004_OR());}
111 112 //if(true) {execute (TC_AE_DMR_CRE_004_LI());}//TODO To be implemented
112 113 //AE/SUB/00001
113 114 //if(true) {execute (TC_AE_SUB_CRE_002_LBL());}//TODO To be implemented. TP As well
114   - if(true) {execute (TC_AE_SUB_CRE_002_SU());}
115   - if(true) {execute (TC_AE_SUB_CRE_002_ACPI());}
116   - if(true) {execute (TC_AE_SUB_CRE_002_ENC());}
117   - if(true) {execute (TC_AE_SUB_CRE_002_EXC());}
118   - if(true) {execute (TC_AE_SUB_CRE_002_NFU());}
119   - if(true) {execute (TC_AE_SUB_CRE_002_NCT());}
120   - if(true) {execute (TC_AE_SUB_CRE_002_NEC());}
  115 + if(PICS_SUB_SU) {execute (TC_AE_SUB_CRE_002_SU());}
  116 + if(PICS_SUB_ACPI) {execute (TC_AE_SUB_CRE_002_ACPI());}
  117 + if(PICS_SUB_ENC) {execute (TC_AE_SUB_CRE_002_ENC());}
  118 + if(PICS_SUB_EXC) {execute (TC_AE_SUB_CRE_002_EXC());}
  119 + if(PICS_SUB_NFU) {execute (TC_AE_SUB_CRE_002_NFU());}
  120 + if(PICS_SUB_NCT) {execute (TC_AE_SUB_CRE_002_NCT());}
  121 + if(PICS_SUB_NEC) {execute (TC_AE_SUB_CRE_002_NEC());}
121 122 if(true) {execute (TC_AE_SUB_NTF_001());}
122 123 if(true) {execute (TC_AE_SUB_NTF_002());}
123 124  
... ...
... ... @@ -14,35 +14,36 @@
14 14 module OneM2M_TestControl_ASN_profile {
15 15  
16 16  
17   - import from OneM2M_Testcases_CSE_Release_1 all;
  17 + import from OneM2M_Testcases_CSE_Release_1 all;
  18 + import from OneM2M_Pics all;
18 19  
19 20 control {
20 21  
21 22 //CE_GEN_00001
22   - if(true) {execute (TC_CSE_GEN_CRE_001_CSR());}
23   - if(true) {execute (TC_CSE_GEN_CRE_001_SPR());}
24   - if(true) {execute (TC_CSE_GEN_CRE_001_ABS());}
25   - if(true) {execute (TC_CSE_GEN_RET_001_CSR());}
26   - if(true) {execute (TC_CSE_GEN_RET_001_SPR());}
27   - if(true) {execute (TC_CSE_GEN_RET_001_ABS());}
28   - if(true) {execute (TC_CSE_GEN_UPD_001_CSR());}
29   - if(true) {execute (TC_CSE_GEN_UPD_001_SPR());}
30   - if(true) {execute (TC_CSE_GEN_UPD_001_ABS());}
31   - if(true) {execute (TC_CSE_GEN_DEL_001_CSR());}
32   - if(true) {execute (TC_CSE_GEN_DEL_001_SPR());}
33   - if(true) {execute (TC_CSE_GEN_DEL_001_ABS());}
34   - if(true) {execute (TC_CSE_GEN_CRE_002_CSR());}
35   - if(true) {execute (TC_CSE_GEN_CRE_002_SPR());}
36   - if(true) {execute (TC_CSE_GEN_CRE_002_ABS());}
37   - if(true) {execute (TC_CSE_GEN_RET_002_CSR());}
38   - if(true) {execute (TC_CSE_GEN_RET_002_SPR());}
39   - if(true) {execute (TC_CSE_GEN_RET_002_ABS());}
40   - if(true) {execute (TC_CSE_GEN_UPD_002_CSR());}
41   - if(true) {execute (TC_CSE_GEN_UPD_002_SPR());}
42   - if(true) {execute (TC_CSE_GEN_UPD_002_ABS());}
43   - if(true) {execute (TC_CSE_GEN_DEL_002_CSR());}
44   - if(true) {execute (TC_CSE_GEN_DEL_002_SPR());}
45   - if(true) {execute (TC_CSE_GEN_DEL_002_ABS());}
  23 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_001_CSR());}
  24 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_001_SPR());}
  25 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_001_ABS());}
  26 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_001_CSR());}
  27 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_001_SPR());}
  28 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_001_ABS());}
  29 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_001_CSR());}
  30 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_001_SPR());}
  31 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_001_ABS());}
  32 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_001_CSR());}
  33 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_001_SPR());}
  34 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_001_ABS());}
  35 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_002_CSR());}
  36 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_002_SPR());}
  37 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_002_ABS());}
  38 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_002_CSR());}
  39 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_002_SPR());}
  40 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_002_ABS());}
  41 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_002_CSR());}
  42 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_002_SPR());}
  43 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_002_ABS());}
  44 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_002_CSR());}
  45 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_002_SPR());}
  46 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_002_ABS());}
46 47  
47 48 //CE_GEN_00002
48 49  
... ...
... ... @@ -15,34 +15,35 @@ module OneM2M_TestControl_Constrained_actuator_as_ADN {
15 15  
16 16  
17 17 import from OneM2M_Testcases_AE_Release_1 all;
  18 + import from OneM2M_Pics all;
18 19  
19 20 control {
20 21  
21 22 //AE_GEN_00001
22   - if(true) {execute (TC_AE_GEN_CRE_001_CSR());}
23   - if(true) {execute (TC_AE_GEN_CRE_001_SPR());}
24   - if(true) {execute (TC_AE_GEN_CRE_001_ABS());}
25   - if(true) {execute (TC_AE_GEN_CRE_002_CSR());}
26   - if(true) {execute (TC_AE_GEN_CRE_002_SPR());}
27   - if(true) {execute (TC_AE_GEN_CRE_002_ABS());}
28   - if(true) {execute (TC_AE_GEN_UPD_001_CSR());}
29   - if(true) {execute (TC_AE_GEN_UPD_001_SPR());}
30   - if(true) {execute (TC_AE_GEN_UPD_001_ABS());}
31   - if(true) {execute (TC_AE_GEN_UPD_002_CSR());}
32   - if(true) {execute (TC_AE_GEN_UPD_002_SPR());}
33   - if(true) {execute (TC_AE_GEN_UPD_002_ABS());}
34   - if(true) {execute (TC_AE_GEN_RET_001_CSR());}
35   - if(true) {execute (TC_AE_GEN_RET_001_SPR());}
36   - if(true) {execute (TC_AE_GEN_RET_001_ABS());}
37   - if(true) {execute (TC_AE_GEN_RET_002_CSR());}
38   - if(true) {execute (TC_AE_GEN_RET_002_SPR());}
39   - if(true) {execute (TC_AE_GEN_RET_002_ABS());}
40   - if(true) {execute (TC_AE_GEN_DEL_001_CSR());}
41   - if(true) {execute (TC_AE_GEN_DEL_001_SPR());}
42   - if(true) {execute (TC_AE_GEN_DEL_001_ABS());}
43   - if(true) {execute (TC_AE_GEN_DEL_002_CSR());}
44   - if(true) {execute (TC_AE_GEN_DEL_002_SPR());}
45   - if(true) {execute (TC_AE_GEN_DEL_002_ABS());}
  23 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_CSR());}
  24 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_SPR());}
  25 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_ABS());}
  26 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_CSR());}
  27 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_SPR());}
  28 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_ABS());}
  29 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_CSR());}
  30 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_SPR());}
  31 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_ABS());}
  32 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_CSR());}
  33 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_SPR());}
  34 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_ABS());}
  35 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_CSR());}
  36 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_SPR());}
  37 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_ABS());}
  38 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_CSR());}
  39 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_SPR());}
  40 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_ABS());}
  41 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_CSR());}
  42 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_SPR());}
  43 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_ABS());}
  44 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_CSR());}
  45 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_SPR());}
  46 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_ABS());}
46 47 //AE_GEN_00002
47 48 if(true) {execute (TC_AE_DMR_CRE_001());}
48 49 //AE_REG_00002
... ...
... ... @@ -15,34 +15,35 @@ module OneM2M_TestControl_Constrained_sensor_as_ADN {
15 15  
16 16  
17 17 import from OneM2M_Testcases_AE_Release_1 all;
  18 + import from OneM2M_Pics all;
18 19  
19 20 control {
20 21  
21 22 //AE_GEN_00001
22   - if(true){execute (TC_AE_GEN_CRE_001_CSR());}
23   - if(true){execute (TC_AE_GEN_CRE_001_SPR());}
24   - if(true){execute (TC_AE_GEN_CRE_001_ABS());}
25   - if(true){execute (TC_AE_GEN_CRE_002_CSR());}
26   - if(true){execute (TC_AE_GEN_CRE_002_SPR());}
27   - if(true){execute (TC_AE_GEN_CRE_002_ABS());}
28   - if(true){execute (TC_AE_GEN_UPD_001_CSR());}
29   - if(true){execute (TC_AE_GEN_UPD_001_SPR());}
30   - if(true){execute (TC_AE_GEN_UPD_001_ABS());}
31   - if(true){execute (TC_AE_GEN_UPD_002_CSR());}
32   - if(true){execute (TC_AE_GEN_UPD_002_SPR());}
33   - if(true){execute (TC_AE_GEN_UPD_002_ABS());}
34   - if(true){execute (TC_AE_GEN_RET_001_CSR());}
35   - if(true){execute (TC_AE_GEN_RET_001_SPR());}
36   - if(true){execute (TC_AE_GEN_RET_001_ABS());}
37   - if(true) {execute (TC_AE_GEN_RET_002_CSR());}
38   - if(true) {execute (TC_AE_GEN_RET_002_SPR());}
39   - if(true) {execute (TC_AE_GEN_RET_002_ABS());}
40   - if(true) {execute (TC_AE_GEN_DEL_001_CSR());}
41   - if(true) {execute (TC_AE_GEN_DEL_001_SPR());}
42   - if(true) {execute (TC_AE_GEN_DEL_001_ABS());}
43   - if(true) {execute (TC_AE_GEN_DEL_002_CSR());}
44   - if(true) {execute (TC_AE_GEN_DEL_002_SPR());}
45   - if(true) {execute (TC_AE_GEN_DEL_002_ABS());}
  23 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_CRE_001_CSR());}
  24 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_CRE_001_SPR());}
  25 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_CRE_001_ABS());}
  26 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_CRE_002_CSR());}
  27 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_CRE_002_SPR());}
  28 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_CRE_002_ABS());}
  29 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_UPD_001_CSR());}
  30 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_UPD_001_SPR());}
  31 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_UPD_001_ABS());}
  32 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_UPD_002_CSR());}
  33 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_UPD_002_SPR());}
  34 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_UPD_002_ABS());}
  35 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_RET_001_CSR());}
  36 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_RET_001_SPR());}
  37 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT){execute (TC_AE_GEN_RET_001_ABS());}
  38 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_CSR());}
  39 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_SPR());}
  40 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_ABS());}
  41 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_CSR());}
  42 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_SPR());}
  43 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_ABS());}
  44 + if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_CSR());}
  45 + if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_SPR());}
  46 + if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_ABS());}
46 47  
47 48 //AE_GEN_00002
48 49 if(true) {execute (TC_AE_DMR_CRE_001());}
... ... @@ -61,19 +62,19 @@ module OneM2M_TestControl_Constrained_sensor_as_ADN {
61 62 if(true) {execute (TC_AE_REG_CRE_002_APN());}
62 63 //AE/DMR/00001
63 64 if(true) {execute (TC_AE_DMR_CRE_001());}
64   - if(true) {execute (TC_AE_DMR_CRE_004_RN());}
65   - if(true) {execute (TC_AE_DMR_CRE_004_ET());}
66   - if(true) {execute (TC_AE_DMR_CRE_004_LBL());}
67   - if(true) {execute (TC_AE_DMR_CRE_004_CR());}
68   - if(true) {execute (TC_AE_DMR_CRE_004_MNI());}
69   - if(true) {execute (TC_AE_DMR_CRE_004_MBS());}
70   - if(true) {execute (TC_AE_DMR_CRE_004_MIA());}
  65 + if(PICS_CNT_RN) {execute (TC_AE_DMR_CRE_004_RN());}
  66 + if(PICS_CNT_ET) {execute (TC_AE_DMR_CRE_004_ET());}
  67 + if(PICS_CNT_LBL) {execute (TC_AE_DMR_CRE_004_LBL());}
  68 + if(PICS_CNT_CR) {execute (TC_AE_DMR_CRE_004_CR());}
  69 + if(PICS_CNT_MNI) {execute (TC_AE_DMR_CRE_004_MNI());}
  70 + if(PICS_CNT_MBS) {execute (TC_AE_DMR_CRE_004_MBS());}
  71 + if(PICS_CNT_MIA) {execute (TC_AE_DMR_CRE_004_MIA());}
71 72 //AE/DMR/00002
72   - if(true) {execute (TC_AE_DMR_CRE_003_RN());}
73   - if(true) {execute (TC_AE_DMR_CRE_003_ET());}
74   - if(true) {execute (TC_AE_DMR_CRE_003_LBL());}
75   - if(true) {execute (TC_AE_DMR_CRE_003_CR());}
76   - if(true) {execute (TC_AE_DMR_CRE_003_CNF());}
  73 + if(PICS_CIN_RN) {execute (TC_AE_DMR_CRE_003_RN());}
  74 + if(PICS_CIN_ET) {execute (TC_AE_DMR_CRE_003_ET());}
  75 + if(PICS_CIN_LBL) {execute (TC_AE_DMR_CRE_003_LBL());}
  76 + if(PICS_CIN_CR) {execute (TC_AE_DMR_CRE_003_CR());}
  77 + if(PICS_CIN_CNF) {execute (TC_AE_DMR_CRE_003_CNF());}
77 78  
78 79 }
79 80  
... ...
... ... @@ -15,34 +15,35 @@ module OneM2M_TestControl_IN_profile {
15 15  
16 16  
17 17 import from OneM2M_Testcases_CSE_Release_1 all;
  18 + import from OneM2M_Pics all;
18 19  
19 20 control {
20 21  
21 22 //CE_GEN_00001
22   - if(true) {execute (TC_CSE_GEN_CRE_001_CSR());}
23   - if(true) {execute (TC_CSE_GEN_CRE_001_SPR());}
24   - if(true) {execute (TC_CSE_GEN_CRE_001_ABS());}
25   - if(true) {execute (TC_CSE_GEN_RET_001_CSR());}
26   - if(true) {execute (TC_CSE_GEN_RET_001_SPR());}
27   - if(true) {execute (TC_CSE_GEN_RET_001_ABS());}
28   - if(true) {execute (TC_CSE_GEN_UPD_001_CSR());}
29   - if(true) {execute (TC_CSE_GEN_UPD_001_SPR());}
30   - if(true) {execute (TC_CSE_GEN_UPD_001_ABS());}
31   - if(true) {execute (TC_CSE_GEN_DEL_001_CSR());}
32   - if(true) {execute (TC_CSE_GEN_DEL_001_SPR());}
33   - if(true) {execute (TC_CSE_GEN_DEL_001_ABS());}
34   - if(true) {execute (TC_CSE_GEN_CRE_002_CSR());}
35   - if(true) {execute (TC_CSE_GEN_CRE_002_SPR());}
36   - if(true) {execute (TC_CSE_GEN_CRE_002_ABS());}
37   - if(true) {execute (TC_CSE_GEN_RET_002_CSR());}
38   - if(true) {execute (TC_CSE_GEN_RET_002_SPR());}
39   - if(true) {execute (TC_CSE_GEN_RET_002_ABS());}
40   - if(true) {execute (TC_CSE_GEN_UPD_002_CSR());}
41   - if(true) {execute (TC_CSE_GEN_UPD_002_SPR());}
42   - if(true) {execute (TC_CSE_GEN_UPD_002_ABS());}
43   - if(true) {execute (TC_CSE_GEN_DEL_002_CSR());}
44   - if(true) {execute (TC_CSE_GEN_DEL_002_SPR());}
45   - if(true) {execute (TC_CSE_GEN_DEL_002_ABS());}
  23 + if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_001_CSR());}
  24 + if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_001_SPR());}
  25 + if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_001_ABS());}
  26 + if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_001_CSR());}
  27 + if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_001_SPR());}
  28 + if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_001_ABS());}
  29 + if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_001_CSR());}
  30 + if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_001_SPR());}
  31 + if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_001_ABS());}
  32 + if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_001_CSR());}
  33 + if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_001_SPR());}
  34 + if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_001_ABS());}
  35 + if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_002_CSR());}
  36 + if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_002_SPR());}
  37 + if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_002_ABS());}
  38 + if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_002_CSR());}
  39 + if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_002_SPR());}
  40 + if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_002_ABS());}
  41 + if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_002_CSR());}
  42 + if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_002_SPR());}
  43 + if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_002_ABS());}
  44 + if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_002_CSR());}
  45 + if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_002_SPR());}
  46 + if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_002_ABS());}
46 47  
47 48 //CE_GEN_00002
48 49  
... ... @@ -52,9 +53,9 @@ module OneM2M_TestControl_IN_profile {
52 53 if(true) {execute (TC_CSE_REG_RET_008());}
53 54 if(true) {execute (TC_CSE_REG_UPD_001());}
54 55 if(true) {execute (TC_CSE_REG_DEL_001());}
55   - if(true) {execute (TC_CSE_REG_RET_002_CST());}
56   - if(true) {execute (TC_CSE_REG_RET_005());}
57   - if(true) {execute (TC_CSE_REG_RET_002_NL());}
  56 + if(PICS_CB_CST) {execute (TC_CSE_REG_RET_002_CST());}
  57 + if(PICS_IN_CSE) {execute (TC_CSE_REG_RET_005());}
  58 + if(PICS_CB_NL) {execute (TC_CSE_REG_RET_002_NL());}
58 59  
59 60 //CE_REG_00002
60 61 if(true) {execute (TC_CSE_REG_RET_003());}
... ... @@ -63,23 +64,23 @@ module OneM2M_TestControl_IN_profile {
63 64 if(true) {execute (TC_CSE_DMR_UPD_016_AE_ET());}
64 65 if(true) {execute (TC_CSE_DMR_UPD_016_AE_RR());}
65 66 if(true) {execute (TC_CSE_REG_CRE_004());}
66   - if(true) {execute (TC_CSE_REG_CRE_009());}
  67 + if(PICS_IN_CSE) {execute (TC_CSE_REG_CRE_009());}
67 68 if(true) {execute (TC_CSE_REG_CRE_011());}
68 69 if(true) {execute (TC_CSE_REG_CRE_016());}
69 70 if(true) {execute (TC_CSE_REG_CRE_017_API());}
70 71 if(true) {execute (TC_CSE_REG_CRE_017_RR());}
71 72 if(true) {execute (TC_CSE_REG_CRE_022());}
72 73 if(true) {execute (TC_CSE_REG_CRE_023());}
73   - if(true) {execute (TC_CSE_REG_CRE_012_AE_LBL());}
74   - if(true) {execute (TC_CSE_REG_RET_004_LBL());}
  74 + if(PICS_AE_LBL) {execute (TC_CSE_REG_CRE_012_AE_LBL());}
  75 + if(PICS_AE_LBL) {execute (TC_CSE_REG_RET_004_LBL());}
75 76 if(true) {execute (TC_CSE_DMR_UPD_015_AE_LBL());}
76   - if(true) {execute (TC_CSE_REG_CRE_012_AE_APN());}
77   - if(true) {execute (TC_CSE_REG_RET_004_APN());}
  77 + if(PICS_AE_APN) {execute (TC_CSE_REG_CRE_012_AE_APN());}
  78 + if(PICS_AE_APN) {execute (TC_CSE_REG_RET_004_APN());}
78 79 if(true) {execute (TC_CSE_DMR_UPD_015_AE_APN());}
79   - if(true) {execute (TC_CSE_REG_CRE_012_AE_POA());}
80   - if(true) {execute (TC_CSE_REG_RET_004_POA());}
  80 + if(PICS_AE_POA) {execute (TC_CSE_REG_CRE_012_AE_POA());}
  81 + if(PICS_AE_POA) {execute (TC_CSE_REG_RET_004_POA());}
81 82 if(true) {execute (TC_CSE_DMR_UPD_015_AE_POA());}
82   - if(true) {execute (TC_CSE_REG_CRE_001());}
  83 + if(PICS_IN_CSE) {execute (TC_CSE_REG_CRE_001());}
83 84 if(true) {execute (TC_CSE_REG_CRE_002());}
84 85  
85 86 //CE_REG_00004
... ... @@ -91,20 +92,20 @@ module OneM2M_TestControl_IN_profile {
91 92 if(true) {execute (TC_CSE_REG_DEL_002());}
92 93 if(true) {execute (TC_CSE_DMR_UPD_016_CSR_ET());}
93 94 if(true) {execute (TC_CSE_DMR_UPD_016_CSR_RR());}
94   - if(true) {execute (TC_CSE_REG_CRE_013_LBL());}
95   - if(true) {execute (TC_CSE_REG_CRE_028_LBL());}
96   - if(true) {execute (TC_CSE_REG_RET_007_LBL());}
97   - if(true) {execute (TC_CSE_REG_UPD_002_LBL());}
98   - if(true) {execute (TC_CSE_REG_CRE_013_CST());}
99   - if(true) {execute (TC_CSE_REG_RET_007_CST());}
100   - if(true) {execute (TC_CSE_REG_CRE_013_POA());}
101   - if(true) {execute (TC_CSE_REG_CRE_028_POA());}
102   - if(true) {execute (TC_CSE_REG_RET_007_POA());}
103   - if(true) {execute (TC_CSE_REG_UPD_002_POA());}
104   - if(true) {execute (TC_CSE_REG_CRE_013_NL());}
105   - if(true) {execute (TC_CSE_REG_CRE_028_NL());}
106   - if(true) {execute (TC_CSE_REG_RET_007_NL());}
107   - if(true) {execute (TC_CSE_REG_UPD_002_NL());}
  95 + if(PICS_CSR_LBL) {execute (TC_CSE_REG_CRE_013_LBL());}
  96 + if(PICS_CSR_LBL) {execute (TC_CSE_REG_CRE_028_LBL());}
  97 + if(PICS_CSR_LBL) {execute (TC_CSE_REG_RET_007_LBL());}
  98 + if(PICS_CSR_LBL) {execute (TC_CSE_REG_UPD_002_LBL());}
  99 + if(PICS_CSR_CST) {execute (TC_CSE_REG_CRE_013_CST());}
  100 + if(PICS_CSR_CST) {execute (TC_CSE_REG_RET_007_CST());}
  101 + if(PICS_CSR_POA) {execute (TC_CSE_REG_CRE_013_POA());}
  102 + if(PICS_CSR_POA) {execute (TC_CSE_REG_CRE_028_POA());}
  103 + if(PICS_CSR_POA) {execute (TC_CSE_REG_RET_007_POA());}
  104 + if(PICS_CSR_POA) {execute (TC_CSE_REG_UPD_002_POA());}
  105 + if(PICS_CSR_NL) {execute (TC_CSE_REG_CRE_013_NL());}
  106 + if(PICS_CSR_NL) {execute (TC_CSE_REG_CRE_028_NL());}
  107 + if(PICS_CSR_NL) {execute (TC_CSE_REG_RET_007_NL());}
  108 + if(PICS_CSR_NL) {execute (TC_CSE_REG_UPD_002_NL());}
108 109  
109 110  
110 111 //CE_DMR_00001
... ... @@ -118,9 +119,9 @@ module OneM2M_TestControl_IN_profile {
118 119 if(true) {execute (TC_CSE_DMR_RET_001_CNT());}
119 120 if(true) {execute (TC_CSE_DMR_RET_013_CNT());}
120 121 if(true) {execute (TC_CSE_DMR_UPD_001_CNT_LBL());}
121   - if(true) {execute (TC_CSE_DMR_UPD_002_CNT_LBL());}
122   - if(true) {execute (TC_CSE_DMR_UPD_003_CNT_LBL());}
123   - if(true) {execute (TC_CSE_DMR_UPD_004_CNT_ET_MNI_LBL());}
  122 + if(PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_002_CNT_LBL());}
  123 + if(PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_003_CNT_LBL());}
  124 + if(PICS_CNT_MNI and PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_004_CNT_ET_MNI_LBL());}
124 125 if(true) {execute (TC_CSE_DMR_UPD_005_CNT_EXC());}
125 126 if(true) {execute (TC_CSE_DMR_UPD_007_CNT_CT());}
126 127 if(true) {execute (TC_CSE_DMR_UPD_008_CNT_ET());}
... ... @@ -128,24 +129,24 @@ module OneM2M_TestControl_IN_profile {
128 129 if(true) {execute (TC_CSE_DMR_UPD_016_CNT_ET());}
129 130 if(true) {execute (TC_CSE_DMR_DEL_001_CNT());}
130 131 if(true) {execute (TC_CSE_DMR_DEL_006());}
131   - if(true) {execute (TC_CSE_DMR_CRE_012_CNT_LBL());}
  132 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_LBL());}
132 133 if(true) {execute (TC_CSE_DMR_UPD_014_CNT_LBL());}
133 134 if(true) {execute (TC_CSE_DMR_UPD_015_CNT_LBL());}
134   - if(true) {execute (TC_CSE_DMR_CRE_012_CNT_CR());}
  135 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_CR());}
135 136 if(true) {execute (TC_CSE_DMR_CRE_005_MNI());}
136 137 if(true) {execute (TC_CSE_DMR_CRE_006_MNI());}
137   - if(true) {execute (TC_CSE_DMR_CRE_012_CNT_MNI());}
  138 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_MNI());}
138 139 if(true) {execute (TC_CSE_DMR_UPD_014_CNT_MNI());}
139 140 if(true) {execute (TC_CSE_DMR_UPD_015_CNT_MNI());}
140 141 if(true) {execute (TC_CSE_DMR_CRE_005_MBS());}
141 142 if(true) {execute (TC_CSE_DMR_CRE_006_MBS());}
142   - if(true) {execute (TC_CSE_DMR_CRE_012_CNT_MBS());}
  143 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_MBS());}
143 144 if(true) {execute (TC_CSE_DMR_CRE_013());}
144 145 if(true) {execute (TC_CSE_DMR_UPD_014_CNT_MBS());}
145 146 if(true) {execute (TC_CSE_DMR_UPD_015_CNT_MBS());}
146 147 if(true) {execute (TC_CSE_DMR_CRE_005_MIA());}
147 148 if(true) {execute (TC_CSE_DMR_CRE_006_MIA());}
148   - if(true) {execute (TC_CSE_DMR_CRE_012_CNT_MIA());}
  149 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_MIA());}
149 150 if(true) {execute (TC_CSE_DMR_UPD_014_CNT_MIA());}
150 151 if(true) {execute (TC_CSE_DMR_UPD_015_CNT_MIA());}
151 152  
... ... @@ -154,9 +155,9 @@ module OneM2M_TestControl_IN_profile {
154 155 if(true) {execute (TC_CSE_DMR_RET_001_CIN());}
155 156 if(true) {execute (TC_CSE_DMR_UPD_011());}
156 157 if(true) {execute (TC_CSE_DMR_DEL_001_CIN());}
157   - if(true) {execute (TC_CSE_DMR_CRE_012_CIN_LBL());}
158   - if(true) {execute (TC_CSE_DMR_CRE_012_CIN_CR());}
159   - if(true) {execute (TC_CSE_DMR_CRE_012_CIN_CNF());}
  158 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CIN_LBL());}
  159 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CIN_CR());}
  160 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CIN_CNF());}
160 161 if(true) {execute (TC_CSE_DMR_RET_012());}
161 162 if(true) {execute (TC_CSE_DMR_UPD_012());}
162 163 if(true) {execute (TC_CSE_DMR_DEL_007());}
... ... @@ -175,9 +176,9 @@ module OneM2M_TestControl_IN_profile {
175 176 if(true) {execute (TC_CSE_DMR_RET_001_SUB());}
176 177 if(true) {execute (TC_CSE_DMR_RET_013_SUB());}
177 178 if(true) {execute (TC_CSE_DMR_UPD_001_SUB_LBL());}
178   - if(true) {execute (TC_CSE_DMR_UPD_002_SUB_LBL());}
179   - if(true) {execute (TC_CSE_DMR_UPD_003_SUB_LBL());}
180   - if(true) {execute (TC_CSE_DMR_UPD_004_SUB_ET_LBL_EXC());}
  179 + if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_002_SUB_LBL());}
  180 + if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_003_SUB_LBL());}
  181 + if(PICS_SUB_LBL and PICS_SUB_EXC) {execute (TC_CSE_DMR_UPD_004_SUB_ET_LBL_EXC());}
181 182 if(true) {execute (TC_CSE_DMR_UPD_005_SUB_MNI());}
182 183 if(true) {execute (TC_CSE_DMR_UPD_007_SUB_CT());}
183 184 if(true) {execute (TC_CSE_DMR_UPD_008_SUB_ET());}
... ... @@ -186,10 +187,10 @@ module OneM2M_TestControl_IN_profile {
186 187 if(true) {execute (TC_CSE_DMR_UPD_016_SUB_NU());}
187 188 if(true) {execute (TC_CSE_DMR_UPD_016_SUB_NCT());}
188 189 if(true) {execute (TC_CSE_DMR_DEL_001_SUB());}
189   - if(true) {execute (TC_CSE_DMR_CRE_012_SUB_LBL());}
  190 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_SUB_LBL());}
190 191 if(true) {execute (TC_CSE_DMR_UPD_014_SUB_LBL());}
191 192 if(true) {execute (TC_CSE_DMR_UPD_015_SUB_LBL());}
192   - if(true) {execute (TC_CSE_DMR_CRE_012_SUB_CR());}
  193 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_SUB_CR());}
193 194  
194 195 //CE_SUB_00004
195 196 if(true) {execute (TC_CSE_SUB_CRE_001_SUB());}
... ... @@ -208,9 +209,9 @@ module OneM2M_TestControl_IN_profile {
208 209 if(true) {execute (TC_CSE_DMR_RET_001_ACP());}
209 210 if(true) {execute (TC_CSE_DMR_RET_013_ACP());}
210 211 if(true) {execute (TC_CSE_DMR_UPD_001_ACP_LBL());}
211   - if(true) {execute (TC_CSE_DMR_UPD_002_ACP_LBL());}
212   - if(true) {execute (TC_CSE_DMR_UPD_003_ACP_LBL());}
213   - if(true) {execute (TC_CSE_DMR_UPD_004_ACP_PV_AT_LBL());}
  212 + if(PICS_ACP_LBL) {execute (TC_CSE_DMR_UPD_002_ACP_LBL());}
  213 + if(PICS_ACP_LBL) {execute (TC_CSE_DMR_UPD_003_ACP_LBL());}
  214 + if(PICS_ACP_AT and PICS_ACP_LBL) {execute (TC_CSE_DMR_UPD_004_ACP_PV_AT_LBL());}
214 215 if(true) {execute (TC_CSE_DMR_UPD_005_ACP_EXC());}
215 216 if(true) {execute (TC_CSE_DMR_UPD_007_ACP_CT());}
216 217 if(true) {execute (TC_CSE_DMR_UPD_008_ACP_ET());}
... ... @@ -223,37 +224,37 @@ module OneM2M_TestControl_IN_profile {
223 224 if(true) {execute (TC_CSE_SEC_ACP_CRE_002());}
224 225 if(true) {execute (TC_CSE_SEC_ACP_CRE_003());}
225 226 if(true) {execute (TC_CSE_SEC_ACP_CRE_004());}
226   - if(true) {execute (TC_CSE_DMR_CRE_012_ACP_LBL());}
  227 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_ACP_LBL());}
227 228 if(true) {execute (TC_CSE_DMR_UPD_014_ACP_LBL());}
228 229 if(true) {execute (TC_CSE_DMR_UPD_015_ACP_LBL());}
229 230  
230 231 //CE_SEC_00002
231   - if(true) {execute (TC_CSE_DMR_CRE_012_SUB_ACPI());}
232   - if(true) {execute (TC_CSE_DMR_CRE_012_CNT_ACPI());}
  232 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_SUB_ACPI());}
  233 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_ACPI());}
233 234 if(true) {execute (TC_CSE_DMR_UPD_014_CNT_ACPI());}
234 235 if(true) {execute (TC_CSE_DMR_UPD_015_AE_ACPI());}
235 236 if(true) {execute (TC_CSE_DMR_UPD_015_CNT_ACPI());}
236 237 if(true) {execute (TC_CSE_DMR_UPD_015_SUB_ACPI());}
237 238 if(true) {execute (TC_CSE_SEC_ACP_UPD_001());}
238 239 if(true) {execute (TC_CSE_SEC_ACP_UPD_002());}
239   - if(true) {execute (TC_CSE_DMR_CRE_004_CNT());}
240   - if(true) {execute (TC_CSE_DMR_CRE_004_ACP());}
241   - if(true) {execute (TC_CSE_DMR_CRE_004_SUB());}
242   - if(true) {execute (TC_CSE_DMR_RET_003_ACP());}
243   - if(true) {execute (TC_CSE_DMR_RET_003_CNT());}
244   - if(true) {execute (TC_CSE_DMR_RET_003_SUB());}
245   - if(true) {execute (TC_CSE_DMR_RET_014_ACP());}
246   - if(true) {execute (TC_CSE_DMR_RET_014_AE());}
247   - if(true) {execute (TC_CSE_DMR_RET_014_CNT());}
248   - if(true) {execute (TC_CSE_DMR_RET_014_CSR());}
249   - if(true) {execute (TC_CSE_DMR_RET_014_SUB());}
250   - if(true) {execute (TC_CSE_DMR_UPD_006_CNT_LBL());}
251   - if(true) {execute (TC_CSE_DMR_UPD_006_ACP_LBL());}
252   - if(true) {execute (TC_CSE_DMR_UPD_006_SUB_LBL());}
253   - if(true) {execute (TC_CSE_DMR_DEL_002_CNT());}
254   - if(true) {execute (TC_CSE_DMR_DEL_002_ACP());}
255   - if(true) {execute (TC_CSE_DMR_DEL_002_SUB());}
256   - if(true) {execute (TC_CSE_SUB_CRE_002());}
  240 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_004_CNT());}
  241 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_004_ACP());}
  242 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_004_SUB());}
  243 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_003_ACP());}
  244 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_003_CNT());}
  245 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_003_SUB());}
  246 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_ACP());}
  247 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_AE());}
  248 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_CNT());}
  249 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_CSR());}
  250 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_SUB());}
  251 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_UPD_006_CNT_LBL());}
  252 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_UPD_006_ACP_LBL());}
  253 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_UPD_006_SUB_LBL());}
  254 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_DEL_002_CNT());}
  255 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_DEL_002_ACP());}
  256 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_DEL_002_SUB());}
  257 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_SUB_CRE_002());}
257 258 if(true) {execute (TC_CSE_SEC_ACP_001_CRE());}
258 259 if(true) {execute (TC_CSE_SEC_ACP_001_UPD());}
259 260 if(true) {execute (TC_CSE_SEC_ACP_001_RET());}
... ... @@ -308,7 +309,7 @@ module OneM2M_TestControl_IN_profile {
308 309 if(true) {execute (TC_CSE_DIS_002());}
309 310 if(true) {execute (TC_CSE_DIS_003());}
310 311 if(true) {execute (TC_CSE_DIS_004());}
311   - if(true) {execute (TC_CSE_DIS_005());}
  312 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DIS_005());}
312 313 if(true) {execute (TC_CSE_DIS_006());}
313 314 if(true) {execute (TC_CSE_DIS_007());}
314 315 if(true) {execute (TC_CSE_DIS_008_CRB_CRA());}
... ... @@ -320,17 +321,17 @@ module OneM2M_TestControl_IN_profile {
320 321 if(true) {execute (TC_CSE_DMR_CRE_001_GRP_AE());}
321 322 if(true) {execute (TC_CSE_DMR_CRE_002_GRP());}
322 323 if(true) {execute (TC_CSE_DMR_CRE_003_GRP());}
323   - if(true) {execute (TC_CSE_DMR_CRE_004_GRP());}
  324 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_004_GRP());}
324 325 if(true) {execute (TC_CSE_DMR_RET_001_GRP());}
325   - if(true) {execute (TC_CSE_DMR_RET_003_GRP());}
  326 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_003_GRP());}
326 327 if(true) {execute (TC_CSE_DMR_RET_013_GRP());}
327   - if(true) {execute (TC_CSE_DMR_RET_014_GRP());}
  328 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_GRP());}
328 329 if(true) {execute (TC_CSE_DMR_UPD_001_GRP_LBL());}
329   - if(true) {execute (TC_CSE_DMR_UPD_002_GRP_LBL());}
330   - if(true) {execute (TC_CSE_DMR_UPD_003_GRP_LBL());}
331   - if(true) {execute (TC_CSE_DMR_UPD_004_GRP_ET_GN_LBL());}
  330 + if(PICS_GRP_LBL) {execute (TC_CSE_DMR_UPD_002_GRP_LBL());}
  331 + if(PICS_GRP_LBL) {execute (TC_CSE_DMR_UPD_003_GRP_LBL());}
  332 + if(PICS_GRP_GN and PICS_GRP_LBL) {execute (TC_CSE_DMR_UPD_004_GRP_ET_GN_LBL());}
332 333 if(true) {execute (TC_CSE_DMR_UPD_005_GRP_EXC());}
333   - if(true) {execute (TC_CSE_DMR_UPD_006_GRP_LBL());}
  334 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_UPD_006_GRP_LBL());}
334 335 if(true) {execute (TC_CSE_DMR_UPD_007_GRP_CT());}
335 336 if(true) {execute (TC_CSE_DMR_UPD_008_GRP_ET());}
336 337 if(true) {execute (TC_CSE_DMR_UPD_009_GRP_ET());}
... ... @@ -338,7 +339,7 @@ module OneM2M_TestControl_IN_profile {
338 339 if(true) {execute (TC_CSE_DMR_UPD_016_GRP_MNM());}
339 340 if(true) {execute (TC_CSE_DMR_UPD_016_GRP_MID());}
340 341 if(true) {execute (TC_CSE_DMR_DEL_001_GRP());}
341   - if(true) {execute (TC_CSE_DMR_DEL_002_GRP());}
  342 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_DEL_002_GRP());}
342 343 if(true) {execute (TC_CSE_GMG_CRE_001());}
343 344 if(true) {execute (TC_CSE_GMG_CRE_003());}
344 345 if(true) {execute (TC_CSE_GMG_UPD_002());}
... ... @@ -347,43 +348,43 @@ module OneM2M_TestControl_IN_profile {
347 348 if(true) {execute (TC_CSE_DMR_UPD_015_GRP_LBL());}
348 349 if(true) {execute (TC_CSE_DMR_UPD_015_GRP_GN());}
349 350 if(true) {execute (TC_CSE_DMR_UPD_015_GRP_ACPI());}
350   - if(true) {execute (TC_CSE_GMG_CRE_002());}
  351 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_CRE_002());}
351 352 if(true) {execute (TC_CSE_GMG_CRE_004());}
352 353 if(true) {execute (TC_CSE_GMG_CRE_005());}
353 354 if(true) {execute (TC_CSE_GMG_CRE_006());}
354 355 if(true) {execute (TC_CSE_GMG_CRE_007());}
355   - if(true) {execute (TC_CSE_GMG_UPD_001());}
  356 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_UPD_001());}
356 357 if(true) {execute (TC_CSE_GMG_UPD_003());}
357 358 if(true) {execute (TC_CSE_GMG_UPD_004());}
358 359 if(true) {execute (TC_CSE_GMG_UPD_005());}
359 360 if(true) {execute (TC_CSE_GMG_UPD_006());}
360 361 if(true) {execute (TC_CSE_GMG_UPD_009());}
361 362 if(true) {execute (TC_CSE_GMG_UPD_010());}
362   - if(true) {execute (TC_CSE_GMG_RET_001());}
363   - if(true) {execute (TC_CSE_GMG_001_CRE());}
364   - if(true) {execute (TC_CSE_GMG_001_RET());}
365   - if(true) {execute (TC_CSE_GMG_001_UPD());}
366   - if(true) {execute (TC_CSE_GMG_001_DEL());}
367   - if(true) {execute (TC_CSE_GMG_002_CRE());}
368   - if(true) {execute (TC_CSE_GMG_002_RET());}
369   - if(true) {execute (TC_CSE_GMG_002_UPD());}
370   - if(true) {execute (TC_CSE_GMG_002_DEL());}
371   - if(true) {execute (TC_CSE_GMG_003_CRE());}
372   - if(true) {execute (TC_CSE_GMG_003_RET());}
373   - if(true) {execute (TC_CSE_GMG_003_UPD());}
374   - if(true) {execute (TC_CSE_GMG_003_DEL());}
375   - if(true) {execute (TC_CSE_GMG_004_CRE());}
376   - if(true) {execute (TC_CSE_GMG_004_RET());}
377   - if(true) {execute (TC_CSE_GMG_004_UPD());}
378   - if(true) {execute (TC_CSE_GMG_004_DEL());}
  363 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_RET_001());}
  364 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_001_CRE());}
  365 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_001_RET());}
  366 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_001_UPD());}
  367 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_001_DEL());}
  368 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_002_CRE());}
  369 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_002_RET());}
  370 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_002_UPD());}
  371 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_002_DEL());}
  372 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_003_CRE());}
  373 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_003_RET());}
  374 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_003_UPD());}
  375 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_003_DEL());}
  376 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_004_CRE());}
  377 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_004_RET());}
  378 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_004_UPD());}
  379 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_004_DEL());}
379 380 if(true) {execute (TC_CSE_GMG_005_CRE());}
380 381 if(true) {execute (TC_CSE_GMG_005_RET());}
381 382 if(true) {execute (TC_CSE_GMG_005_UPD());}
382 383 if(true) {execute (TC_CSE_GMG_005_DEL());}
383   - if(true) {execute (TC_CSE_GMG_006_CRE());}
384   - if(true) {execute (TC_CSE_GMG_006_RET());}
385   - if(true) {execute (TC_CSE_GMG_006_UPD());}
386   - if(true) {execute (TC_CSE_GMG_006_DEL());}
  384 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_006_CRE());}
  385 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_006_RET());}
  386 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_006_UPD());}
  387 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_006_DEL());}
387 388 if(true) {execute (TC_CSE_DMR_UPD_015_GRP_MACP());}
388 389 }
389 390 } // end of module OneM2M_TestControl_IN_profile
... ...
... ... @@ -15,34 +15,35 @@ module OneM2M_TestControl_MN_profile {
15 15  
16 16  
17 17 import from OneM2M_Testcases_CSE_Release_1 all;
  18 + import from OneM2M_Pics all;
18 19  
19 20 control {
20 21  
21 22 //CE_GEN_00001
22   - if(true) {execute (TC_CSE_GEN_CRE_001_CSR());}
23   - if(true) {execute (TC_CSE_GEN_CRE_001_SPR());}
24   - if(true) {execute (TC_CSE_GEN_CRE_001_ABS());}
25   - if(true) {execute (TC_CSE_GEN_RET_001_CSR());}
26   - if(true) {execute (TC_CSE_GEN_RET_001_SPR());}
27   - if(true) {execute (TC_CSE_GEN_RET_001_ABS());}
28   - if(true) {execute (TC_CSE_GEN_UPD_001_CSR());}
29   - if(true) {execute (TC_CSE_GEN_UPD_001_SPR());}
30   - if(true) {execute (TC_CSE_GEN_UPD_001_ABS());}
31   - if(true) {execute (TC_CSE_GEN_DEL_001_CSR());}
32   - if(true) {execute (TC_CSE_GEN_DEL_001_SPR());}
33   - if(true) {execute (TC_CSE_GEN_DEL_001_ABS());}
34   - if(true) {execute (TC_CSE_GEN_CRE_002_CSR());}
35   - if(true) {execute (TC_CSE_GEN_CRE_002_SPR());}
36   - if(true) {execute (TC_CSE_GEN_CRE_002_ABS());}
37   - if(true) {execute (TC_CSE_GEN_RET_002_CSR());}
38   - if(true) {execute (TC_CSE_GEN_RET_002_SPR());}
39   - if(true) {execute (TC_CSE_GEN_RET_002_ABS());}
40   - if(true) {execute (TC_CSE_GEN_UPD_002_CSR());}
41   - if(true) {execute (TC_CSE_GEN_UPD_002_SPR());}
42   - if(true) {execute (TC_CSE_GEN_UPD_002_ABS());}
43   - if(true) {execute (TC_CSE_GEN_DEL_002_CSR());}
44   - if(true) {execute (TC_CSE_GEN_DEL_002_SPR());}
45   - if(true) {execute (TC_CSE_GEN_DEL_002_ABS());}
  23 + if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_001_CSR());}
  24 + if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_001_SPR());}
  25 + if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_001_ABS());}
  26 + if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_001_CSR());}
  27 + if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_001_SPR());}
  28 + if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_001_ABS());}
  29 + if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_001_CSR());}
  30 + if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_001_SPR());}
  31 + if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_001_ABS());}
  32 + if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_001_CSR());}
  33 + if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_001_SPR());}
  34 + if(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_001_ABS());}
  35 + if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_002_CSR());}
  36 + if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_002_SPR());}
  37 + if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_CRE_002_ABS());}
  38 + if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_002_CSR());}
  39 + if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_002_SPR());}
  40 + if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_RET_002_ABS());}
  41 + if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_002_CSR());}
  42 + if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_002_SPR());}
  43 + if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_UPD_002_ABS());}
  44 + if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_002_CSR());}
  45 + if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_002_SPR());}
  46 + if(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_CSE_GEN_DEL_002_ABS());}
46 47  
47 48 //CE_GEN_00002
48 49  
... ... @@ -52,9 +53,9 @@ module OneM2M_TestControl_MN_profile {
52 53 if(true) {execute (TC_CSE_REG_RET_008());}
53 54 if(true) {execute (TC_CSE_REG_UPD_001());}
54 55 if(true) {execute (TC_CSE_REG_DEL_001());}
55   - if(true) {execute (TC_CSE_REG_RET_002_CST());}
  56 + if(PICS_CB_CST) {execute (TC_CSE_REG_RET_002_CST());}
56 57 if(true) {execute (TC_CSE_REG_RET_005());}
57   - if(true) {execute (TC_CSE_REG_RET_002_NL());}
  58 + if(PICS_CB_NL) {execute (TC_CSE_REG_RET_002_NL());}
58 59  
59 60 //CE_REG_00002
60 61 if(true) {execute (TC_CSE_REG_RET_003());}
... ... @@ -64,28 +65,28 @@ module OneM2M_TestControl_MN_profile {
64 65 if(true) {execute (TC_CSE_DMR_UPD_016_AE_RR());}
65 66 if(true) {execute (TC_CSE_REG_CRE_004());}
66 67 if(true) {execute (TC_CSE_REG_CRE_005());}
67   - //if(true) {execute (TC_CSE_REG_CRE_006());}//TODO TO BE IMPLEMENTED
68   - //if(true) {execute (TC_CSE_REG_CRE_007());}//TODO TO BE IMPLEMENTED
69   - if(true) {execute (TC_CSE_REG_CRE_008());}
70   - if(true) {execute (TC_CSE_REG_CRE_010());}
  68 + if(PICS_MN_CSE or PICS_ASN_CSE) {execute (TC_CSE_REG_CRE_006());}
  69 + if(PICS_MN_CSE) {execute (TC_CSE_REG_CRE_007());}
  70 + if(PICS_MN_CSE) {execute (TC_CSE_REG_CRE_008());}
  71 + if(PICS_MN_CSE) {execute (TC_CSE_REG_CRE_010());}
71 72 if(true) {execute (TC_CSE_REG_CRE_011());}
72 73 if(true) {execute (TC_CSE_REG_CRE_016());}
73 74 if(true) {execute (TC_CSE_REG_CRE_017_API());}
74 75 if(true) {execute (TC_CSE_REG_CRE_017_RR());}
75 76 if(true) {execute (TC_CSE_REG_CRE_022());}
76 77 if(true) {execute (TC_CSE_REG_CRE_023());}
77   - if(true) {execute (TC_CSE_REG_CRE_012_AE_LBL());}
78   - if(true) {execute (TC_CSE_REG_RET_004_LBL());}
  78 + if(PICS_AE_LBL) {execute (TC_CSE_REG_CRE_012_AE_LBL());}
  79 + if(PICS_AE_LBL) {execute (TC_CSE_REG_RET_004_LBL());}
79 80 if(true) {execute (TC_CSE_DMR_UPD_015_AE_LBL());}
80   - if(true) {execute (TC_CSE_REG_CRE_012_AE_APN());}
81   - if(true) {execute (TC_CSE_REG_RET_004_APN());}
  81 + if(PICS_AE_APN) {execute (TC_CSE_REG_CRE_012_AE_APN());}
  82 + if(PICS_AE_APN) {execute (TC_CSE_REG_RET_004_APN());}
82 83 if(true) {execute (TC_CSE_DMR_UPD_015_AE_APN());}
83   - if(true) {execute (TC_CSE_REG_CRE_012_AE_POA());}
84   - if(true) {execute (TC_CSE_REG_RET_004_POA());}
  84 + if(PICS_AE_POA) {execute (TC_CSE_REG_CRE_012_AE_POA());}
  85 + if(PICS_AE_POA) {execute (TC_CSE_REG_RET_004_POA());}
85 86 if(true) {execute (TC_CSE_DMR_UPD_015_AE_POA());}
86 87 if(true) {execute (TC_CSE_REG_CRE_002());}
87 88 //if(true) {execute (TC_CSE_REG_CRE_003());} //TO BE IMPLEMENTED
88   - if(true) {execute (TC_CSE_REG_CRE_020());}
  89 + if(PICS_MN_CSE or PICS_ASN_CSE) {execute (TC_CSE_REG_CRE_020());}
89 90  
90 91 //CE_REG_00004
91 92 if(true) {execute (TC_CSE_REG_CRE_018());}
... ... @@ -96,40 +97,40 @@ module OneM2M_TestControl_MN_profile {
96 97 if(true) {execute (TC_CSE_REG_DEL_002());}
97 98 if(true) {execute (TC_CSE_DMR_UPD_016_CSR_ET());}
98 99 if(true) {execute (TC_CSE_DMR_UPD_016_CSR_RR());}
99   - if(true) {execute (TC_CSE_REG_CRE_028_LBL());}
100   - if(true) {execute (TC_CSE_REG_RET_007_LBL());}
101   - if(true) {execute (TC_CSE_REG_UPD_002_LBL());}
102   - if(true) {execute (TC_CSE_REG_CRE_013_CST());}
  100 + if(PICS_CSR_LBL) {execute (TC_CSE_REG_CRE_028_LBL());}
  101 + if(PICS_CSR_LBL) {execute (TC_CSE_REG_RET_007_LBL());}
  102 + if(PICS_CSR_LBL) {execute (TC_CSE_REG_UPD_002_LBL());}
  103 + if(PICS_CSR_CST) {execute (TC_CSE_REG_CRE_013_CST());}
103 104 if(true) {execute (TC_CSE_REG_CRE_027());}
104   - if(true) {execute (TC_CSE_REG_RET_007_CST());}
105   - if(true) {execute (TC_CSE_REG_CRE_013_POA());}
106   - if(true) {execute (TC_CSE_REG_CRE_028_POA());}
107   - if(true) {execute (TC_CSE_REG_RET_007_POA());}
108   - if(true) {execute (TC_CSE_REG_UPD_002_POA());}
109   - if(true) {execute (TC_CSE_REG_CRE_013_NL());}
110   - if(true) {execute (TC_CSE_REG_CRE_028_NL());}
111   - if(true) {execute (TC_CSE_REG_RET_007_NL());}
112   - if(true) {execute (TC_CSE_REG_UPD_002_NL());}
  105 + if(PICS_CSR_CST) {execute (TC_CSE_REG_RET_007_CST());}
  106 + if(PICS_CSR_POA) {execute (TC_CSE_REG_CRE_013_POA());}
  107 + if(PICS_CSR_POA) {execute (TC_CSE_REG_CRE_028_POA());}
  108 + if(PICS_CSR_POA) {execute (TC_CSE_REG_RET_007_POA());}
  109 + if(PICS_CSR_POA) {execute (TC_CSE_REG_UPD_002_POA());}
  110 + if(PICS_CSR_NL) {execute (TC_CSE_REG_CRE_013_NL());}
  111 + if(PICS_CSR_NL) {execute (TC_CSE_REG_CRE_028_NL());}
  112 + if(PICS_CSR_NL) {execute (TC_CSE_REG_RET_007_NL());}
  113 + if(PICS_CSR_NL) {execute (TC_CSE_REG_UPD_002_NL());}
113 114  
114 115 //CE_REG_00005
115   - if(true) {execute (TC_CSE_REG_CRE_024());}
  116 + if(PICS_MN_CSE) {execute (TC_CSE_REG_CRE_024());}
116 117 if(true) {execute (TC_CSE_DMR_RET_013_CSR());}
117   - if(true) {execute (TC_CSE_REG_CRE_026_RN());}
118   - if(true) {execute (TC_CSE_REG_CRE_026_ET());}
119   - if(true) {execute (TC_CSE_REG_CRE_026_LBL());}
120   - if(true) {execute (TC_CSE_REG_CRE_026_CST());}
121   - if(true) {execute (TC_CSE_REG_CRE_026_POA());}
122   - if(true) {execute (TC_CSE_REG_CRE_026_NL());}
123   - if(true) {execute (TC_CSE_REG_UPD_003_LBL());}
  118 + if(PICS_MN_CSE and PICS_CSR_RN) {execute (TC_CSE_REG_CRE_026_RN());}
  119 + if(PICS_MN_CSE and PICS_CSR_ET) {execute (TC_CSE_REG_CRE_026_ET());}
  120 + if(PICS_MN_CSE and PICS_CSR_LBL) {execute (TC_CSE_REG_CRE_026_LBL());}
  121 + if(PICS_MN_CSE and PICS_CSR_CST) {execute (TC_CSE_REG_CRE_026_CST());}
  122 + if(PICS_MN_CSE and PICS_CSR_POA) {execute (TC_CSE_REG_CRE_026_POA());}
  123 + if(PICS_MN_CSE and PICS_CSR_NL) {execute (TC_CSE_REG_CRE_026_NL());}
  124 + if(PICS_MN_CSE and PICS_CSR_LBL) {execute (TC_CSE_REG_UPD_003_LBL());}
124 125 if(true) {execute (TC_CSE_DMR_UPD_015_CSR_LBL());}
125   - if(true) {execute (TC_CSE_REG_UPD_003_ET());}
126   - if(true) {execute (TC_CSE_REG_UPD_003_POA());}
  126 + if(PICS_MN_CSE and PICS_CSR_ET) {execute (TC_CSE_REG_UPD_003_ET());}
  127 + if(PICS_MN_CSE and PICS_CSR_POA) {execute (TC_CSE_REG_UPD_003_POA());}
127 128 if(true) {execute (TC_CSE_DMR_UPD_015_CSR_POA());}
128   - if(true) {execute (TC_CSE_REG_UPD_003_RR());}
129   - if(true) {execute (TC_CSE_REG_UPD_003_NL());}
  129 + if(PICS_MN_CSE and PICS_CSR_RR) {execute (TC_CSE_REG_UPD_003_RR());}
  130 + if(PICS_MN_CSE and PICS_CSR_NL) {execute (TC_CSE_REG_UPD_003_NL());}
130 131 if(true) {execute (TC_CSE_DMR_UPD_015_CSR_NL());}
131   - if(true) {execute (TC_CSE_REG_DEL_004());}
132   - if(true) {execute (TC_CSE_REG_RET_009());}
  132 + if(PICS_MN_CSE) {execute (TC_CSE_REG_DEL_004());}
  133 + if(PICS_MN_CSE) {execute (TC_CSE_REG_RET_009());}
133 134  
134 135 //CE_DMR_00001
135 136 if(true) {execute (TC_CSE_DMR_CRE_001_CNT_CB());}
... ... @@ -142,9 +143,9 @@ module OneM2M_TestControl_MN_profile {
142 143 if(true) {execute (TC_CSE_DMR_RET_001_CNT());}
143 144 if(true) {execute (TC_CSE_DMR_RET_013_CNT());}
144 145 if(true) {execute (TC_CSE_DMR_UPD_001_CNT_LBL());}
145   - if(true) {execute (TC_CSE_DMR_UPD_002_CNT_LBL());}
146   - if(true) {execute (TC_CSE_DMR_UPD_003_CNT_LBL());}
147   - if(true) {execute (TC_CSE_DMR_UPD_004_CNT_ET_MNI_LBL());}
  146 + if(PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_002_CNT_LBL());}
  147 + if(PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_003_CNT_LBL());}
  148 + if(PICS_CNT_MNI and PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_004_CNT_ET_MNI_LBL());}
148 149 if(true) {execute (TC_CSE_DMR_UPD_005_CNT_EXC());}
149 150 if(true) {execute (TC_CSE_DMR_UPD_007_CNT_CT());}
150 151 if(true) {execute (TC_CSE_DMR_UPD_008_CNT_ET());}
... ... @@ -152,24 +153,24 @@ module OneM2M_TestControl_MN_profile {
152 153 if(true) {execute (TC_CSE_DMR_UPD_016_CNT_ET());}
153 154 if(true) {execute (TC_CSE_DMR_DEL_001_CNT());}
154 155 if(true) {execute (TC_CSE_DMR_DEL_006());}
155   - if(true) {execute (TC_CSE_DMR_CRE_012_CNT_LBL());}
  156 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_LBL());}
156 157 if(true) {execute (TC_CSE_DMR_UPD_014_CNT_LBL());}
157 158 if(true) {execute (TC_CSE_DMR_UPD_015_CNT_LBL());}
158   - if(true) {execute (TC_CSE_DMR_CRE_012_CNT_CR());}
  159 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_CR());}
159 160 if(true) {execute (TC_CSE_DMR_CRE_005_MNI());}
160 161 if(true) {execute (TC_CSE_DMR_CRE_006_MNI());}
161   - if(true) {execute (TC_CSE_DMR_CRE_012_CNT_MNI());}
  162 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_MNI());}
162 163 if(true) {execute (TC_CSE_DMR_UPD_014_CNT_MNI());}
163 164 if(true) {execute (TC_CSE_DMR_UPD_015_CNT_MNI());}
164 165 if(true) {execute (TC_CSE_DMR_CRE_005_MBS());}
165 166 if(true) {execute (TC_CSE_DMR_CRE_006_MBS());}
166   - if(true) {execute (TC_CSE_DMR_CRE_012_CNT_MBS());}
  167 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_MBS());}
167 168 if(true) {execute (TC_CSE_DMR_CRE_013());}
168 169 if(true) {execute (TC_CSE_DMR_UPD_014_CNT_MBS());}
169 170 if(true) {execute (TC_CSE_DMR_UPD_015_CNT_MBS());}
170 171 if(true) {execute (TC_CSE_DMR_CRE_005_MIA());}
171 172 if(true) {execute (TC_CSE_DMR_CRE_006_MIA());}
172   - if(true) {execute (TC_CSE_DMR_CRE_012_CNT_MIA());}
  173 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_MIA());}
173 174 if(true) {execute (TC_CSE_DMR_UPD_014_CNT_MIA());}
174 175 if(true) {execute (TC_CSE_DMR_UPD_015_CNT_MIA());}
175 176  
... ... @@ -178,9 +179,9 @@ module OneM2M_TestControl_MN_profile {
178 179 if(true) {execute (TC_CSE_DMR_RET_001_CIN());}
179 180 if(true) {execute (TC_CSE_DMR_UPD_011());}
180 181 if(true) {execute (TC_CSE_DMR_DEL_001_CIN());}
181   - if(true) {execute (TC_CSE_DMR_CRE_012_CIN_LBL());}
182   - if(true) {execute (TC_CSE_DMR_CRE_012_CIN_CR());}
183   - if(true) {execute (TC_CSE_DMR_CRE_012_CIN_CNF());}
  182 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CIN_LBL());}
  183 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CIN_CR());}
  184 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CIN_CNF());}
184 185 if(true) {execute (TC_CSE_DMR_RET_012());}
185 186 if(true) {execute (TC_CSE_DMR_UPD_012());}
186 187 if(true) {execute (TC_CSE_DMR_DEL_007());}
... ... @@ -199,8 +200,8 @@ module OneM2M_TestControl_MN_profile {
199 200 if(true) {execute (TC_CSE_DMR_RET_001_SUB());}
200 201 if(true) {execute (TC_CSE_DMR_RET_013_SUB());}
201 202 if(true) {execute (TC_CSE_DMR_UPD_001_SUB_LBL());}
202   - if(true) {execute (TC_CSE_DMR_UPD_002_SUB_LBL());}
203   - if(true) {execute (TC_CSE_DMR_UPD_003_SUB_LBL());}
  203 + if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_002_SUB_LBL());}
  204 + if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_003_SUB_LBL());}
204 205 if(true) {execute (TC_CSE_DMR_UPD_004_SUB_ET_LBL_EXC());}
205 206 if(true) {execute (TC_CSE_DMR_UPD_005_SUB_MNI());}
206 207 if(true) {execute (TC_CSE_DMR_UPD_007_SUB_CT());}
... ... @@ -210,10 +211,10 @@ module OneM2M_TestControl_MN_profile {
210 211 if(true) {execute (TC_CSE_DMR_UPD_016_SUB_NU());}
211 212 if(true) {execute (TC_CSE_DMR_UPD_016_SUB_NCT());}
212 213 if(true) {execute (TC_CSE_DMR_DEL_001_SUB());}
213   - if(true) {execute (TC_CSE_DMR_CRE_012_SUB_LBL());}
  214 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_SUB_LBL());}
214 215 if(true) {execute (TC_CSE_DMR_UPD_014_SUB_LBL());}
215 216 if(true) {execute (TC_CSE_DMR_UPD_015_SUB_LBL());}
216   - if(true) {execute (TC_CSE_DMR_CRE_012_SUB_CR());}
  217 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_SUB_CR());}
217 218  
218 219 //CE_SUB_00004
219 220 if(true) {execute (TC_CSE_SUB_CRE_001_SUB());}
... ... @@ -232,8 +233,8 @@ module OneM2M_TestControl_MN_profile {
232 233 if(true) {execute (TC_CSE_DMR_RET_001_ACP());}
233 234 if(true) {execute (TC_CSE_DMR_RET_013_ACP());}
234 235 if(true) {execute (TC_CSE_DMR_UPD_001_ACP_LBL());}
235   - if(true) {execute (TC_CSE_DMR_UPD_002_ACP_LBL());}
236   - if(true) {execute (TC_CSE_DMR_UPD_003_ACP_LBL());}
  236 + if(PICS_ACP_LBL) {execute (TC_CSE_DMR_UPD_002_ACP_LBL());}
  237 + if(PICS_ACP_LBL) {execute (TC_CSE_DMR_UPD_003_ACP_LBL());}
237 238 if(true) {execute (TC_CSE_DMR_UPD_004_ACP_PV_AT_LBL());}
238 239 if(true) {execute (TC_CSE_DMR_UPD_005_ACP_EXC());}
239 240 if(true) {execute (TC_CSE_DMR_UPD_007_ACP_CT());}
... ... @@ -247,37 +248,37 @@ module OneM2M_TestControl_MN_profile {
247 248 if(true) {execute (TC_CSE_SEC_ACP_CRE_002());}
248 249 if(true) {execute (TC_CSE_SEC_ACP_CRE_003());}
249 250 if(true) {execute (TC_CSE_SEC_ACP_CRE_004());}
250   - if(true) {execute (TC_CSE_DMR_CRE_012_ACP_LBL());}
  251 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_ACP_LBL());}
251 252 if(true) {execute (TC_CSE_DMR_UPD_014_ACP_LBL());}
252 253 if(true) {execute (TC_CSE_DMR_UPD_015_ACP_LBL());}
253 254  
254 255 //CE_SEC_00002
255   - if(true) {execute (TC_CSE_DMR_CRE_012_SUB_ACPI());}
256   - if(true) {execute (TC_CSE_DMR_CRE_012_CNT_ACPI());}
  256 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_SUB_ACPI());}
  257 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_012_CNT_ACPI());}
257 258 if(true) {execute (TC_CSE_DMR_UPD_014_CNT_ACPI());}
258 259 if(true) {execute (TC_CSE_DMR_UPD_015_AE_ACPI());}
259 260 if(true) {execute (TC_CSE_DMR_UPD_015_CNT_ACPI());}
260 261 if(true) {execute (TC_CSE_DMR_UPD_015_SUB_ACPI());}
261 262 if(true) {execute (TC_CSE_SEC_ACP_UPD_001());}
262 263 if(true) {execute (TC_CSE_SEC_ACP_UPD_002());}
263   - if(true) {execute (TC_CSE_DMR_CRE_004_CNT());}
264   - if(true) {execute (TC_CSE_DMR_CRE_004_ACP());}
265   - if(true) {execute (TC_CSE_DMR_CRE_004_SUB());}
266   - if(true) {execute (TC_CSE_DMR_RET_003_ACP());}
267   - if(true) {execute (TC_CSE_DMR_RET_003_CNT());}
268   - if(true) {execute (TC_CSE_DMR_RET_003_SUB());}
269   - if(true) {execute (TC_CSE_DMR_RET_014_ACP());}
270   - if(true) {execute (TC_CSE_DMR_RET_014_AE());}
271   - if(true) {execute (TC_CSE_DMR_RET_014_CNT());}
272   - if(true) {execute (TC_CSE_DMR_RET_014_CSR());}
273   - if(true) {execute (TC_CSE_DMR_RET_014_SUB());}
274   - if(true) {execute (TC_CSE_DMR_UPD_006_CNT_LBL());}
275   - if(true) {execute (TC_CSE_DMR_UPD_006_ACP_LBL());}
276   - if(true) {execute (TC_CSE_DMR_UPD_006_SUB_LBL());}
277   - if(true) {execute (TC_CSE_DMR_DEL_002_CNT());}
278   - if(true) {execute (TC_CSE_DMR_DEL_002_ACP());}
279   - if(true) {execute (TC_CSE_DMR_DEL_002_SUB());}
280   - if(true) {execute (TC_CSE_SUB_CRE_002());}
  264 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_004_CNT());}
  265 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_004_ACP());}
  266 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_004_SUB());}
  267 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_003_ACP());}
  268 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_003_CNT());}
  269 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_003_SUB());}
  270 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_ACP());}
  271 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_AE());}
  272 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_CNT());}
  273 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_CSR());}
  274 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_SUB());}
  275 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_UPD_006_CNT_LBL());}
  276 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_UPD_006_ACP_LBL());}
  277 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_UPD_006_SUB_LBL());}
  278 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_DEL_002_CNT());}
  279 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_DEL_002_ACP());}
  280 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_DEL_002_SUB());}
  281 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_SUB_CRE_002());}
281 282 if(true) {execute (TC_CSE_SEC_ACP_001_CRE());}
282 283 if(true) {execute (TC_CSE_SEC_ACP_001_UPD());}
283 284 if(true) {execute (TC_CSE_SEC_ACP_001_RET());}
... ... @@ -332,7 +333,7 @@ module OneM2M_TestControl_MN_profile {
332 333 if(true) {execute (TC_CSE_DIS_002());}
333 334 if(true) {execute (TC_CSE_DIS_003());}
334 335 if(true) {execute (TC_CSE_DIS_004());}
335   - if(true) {execute (TC_CSE_DIS_005());}
  336 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DIS_005());}
336 337 if(true) {execute (TC_CSE_DIS_006());}
337 338 if(true) {execute (TC_CSE_DIS_007());}
338 339 if(true) {execute (TC_CSE_DIS_008_CRB_CRA());}
... ... @@ -344,16 +345,16 @@ module OneM2M_TestControl_MN_profile {
344 345 if(true) {execute (TC_CSE_DMR_CRE_001_GRP_AE());}
345 346 if(true) {execute (TC_CSE_DMR_CRE_002_GRP());}
346 347 if(true) {execute (TC_CSE_DMR_CRE_003_GRP());}
347   - if(true) {execute (TC_CSE_DMR_CRE_004_GRP());}
  348 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_CRE_004_GRP());}
348 349 if(true) {execute (TC_CSE_DMR_RET_001_GRP());}
349 350 if(true) {execute (TC_CSE_DMR_RET_013_GRP());}
350   - if(true) {execute (TC_CSE_DMR_RET_014_GRP());}
  351 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_RET_014_GRP());}
351 352 if(true) {execute (TC_CSE_DMR_UPD_001_GRP_LBL());}
352   - if(true) {execute (TC_CSE_DMR_UPD_002_GRP_LBL());}
353   - if(true) {execute (TC_CSE_DMR_UPD_003_GRP_LBL());}
  353 + if(PICS_GRP_LBL) {execute (TC_CSE_DMR_UPD_002_GRP_LBL());}
  354 + if(PICS_GRP_LBL) {execute (TC_CSE_DMR_UPD_003_GRP_LBL());}
354 355 if(true) {execute (TC_CSE_DMR_UPD_004_GRP_ET_GN_LBL());}
355 356 if(true) {execute (TC_CSE_DMR_UPD_005_GRP_EXC());}
356   - if(true) {execute (TC_CSE_DMR_UPD_006_GRP_LBL());}
  357 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_UPD_006_GRP_LBL());}
357 358 if(true) {execute (TC_CSE_DMR_UPD_007_GRP_CT());}
358 359 if(true) {execute (TC_CSE_DMR_UPD_008_GRP_ET());}
359 360 if(true) {execute (TC_CSE_DMR_UPD_009_GRP_ET());}
... ... @@ -361,7 +362,7 @@ module OneM2M_TestControl_MN_profile {
361 362 if(true) {execute (TC_CSE_DMR_UPD_016_GRP_MNM());}
362 363 if(true) {execute (TC_CSE_DMR_UPD_016_GRP_MID());}
363 364 if(true) {execute (TC_CSE_DMR_DEL_001_GRP());}
364   - if(true) {execute (TC_CSE_DMR_DEL_002_GRP());}
  365 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_DEL_002_GRP());}
365 366 if(true) {execute (TC_CSE_GMG_CRE_001());}
366 367 if(true) {execute (TC_CSE_GMG_CRE_003());}
367 368 if(true) {execute (TC_CSE_GMG_UPD_002());}
... ... @@ -370,43 +371,43 @@ module OneM2M_TestControl_MN_profile {
370 371 if(true) {execute (TC_CSE_DMR_UPD_015_GRP_LBL());}
371 372 if(true) {execute (TC_CSE_DMR_UPD_015_GRP_GN());}
372 373 if(true) {execute (TC_CSE_DMR_UPD_015_GRP_ACPI());}
373   - if(true) {execute (TC_CSE_GMG_CRE_002());}
  374 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_CRE_002());}
374 375 if(true) {execute (TC_CSE_GMG_CRE_004());}
375 376 if(true) {execute (TC_CSE_GMG_CRE_005());}
376 377 if(true) {execute (TC_CSE_GMG_CRE_006());}
377 378 if(true) {execute (TC_CSE_GMG_CRE_007());}
378   - if(true) {execute (TC_CSE_GMG_UPD_001());}
  379 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_UPD_001());}
379 380 if(true) {execute (TC_CSE_GMG_UPD_003());}
380 381 if(true) {execute (TC_CSE_GMG_UPD_004());}
381 382 if(true) {execute (TC_CSE_GMG_UPD_005());}
382 383 if(true) {execute (TC_CSE_GMG_UPD_006());}
383 384 if(true) {execute (TC_CSE_GMG_UPD_009());}
384 385 if(true) {execute (TC_CSE_GMG_UPD_010());}
385   - if(true) {execute (TC_CSE_GMG_RET_001());}
386   - if(true) {execute (TC_CSE_GMG_001_CRE());}
387   - if(true) {execute (TC_CSE_GMG_001_RET());}
388   - if(true) {execute (TC_CSE_GMG_001_UPD());}
389   - if(true) {execute (TC_CSE_GMG_001_DEL());}
390   - if(true) {execute (TC_CSE_GMG_002_CRE());}
391   - if(true) {execute (TC_CSE_GMG_002_RET());}
392   - if(true) {execute (TC_CSE_GMG_002_UPD());}
393   - if(true) {execute (TC_CSE_GMG_002_DEL());}
394   - if(true) {execute (TC_CSE_GMG_003_CRE());}
395   - if(true) {execute (TC_CSE_GMG_003_RET());}
396   - if(true) {execute (TC_CSE_GMG_003_UPD());}
397   - if(true) {execute (TC_CSE_GMG_003_DEL());}
398   - if(true) {execute (TC_CSE_GMG_004_CRE());}
399   - if(true) {execute (TC_CSE_GMG_004_RET());}
400   - if(true) {execute (TC_CSE_GMG_004_UPD());}
401   - if(true) {execute (TC_CSE_GMG_004_DEL());}
  386 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_RET_001());}
  387 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_001_CRE());}
  388 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_001_RET());}
  389 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_001_UPD());}
  390 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_001_DEL());}
  391 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_002_CRE());}
  392 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_002_RET());}
  393 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_002_UPD());}
  394 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_002_DEL());}
  395 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_003_CRE());}
  396 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_003_RET());}
  397 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_003_UPD());}
  398 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_003_DEL());}
  399 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_004_CRE());}
  400 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_004_RET());}
  401 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_004_UPD());}
  402 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_004_DEL());}
402 403 if(true) {execute (TC_CSE_GMG_005_CRE());}
403 404 if(true) {execute (TC_CSE_GMG_005_RET());}
404 405 if(true) {execute (TC_CSE_GMG_005_UPD());}
405 406 if(true) {execute (TC_CSE_GMG_005_DEL());}
406   - if(true) {execute (TC_CSE_GMG_006_CRE());}
407   - if(true) {execute (TC_CSE_GMG_006_RET());}
408   - if(true) {execute (TC_CSE_GMG_006_UPD());}
409   - if(true) {execute (TC_CSE_GMG_006_DEL());}
  407 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_006_CRE());}
  408 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_006_RET());}
  409 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_006_UPD());}
  410 + if(PICS_ACP_SUPPORT) {execute (TC_CSE_GMG_006_DEL());}
410 411 if(true) {execute (TC_CSE_DMR_UPD_015_GRP_MACP());}
411 412 }
412 413  
... ...