diff --git a/OneM2M_TestControl_ADN_profile_3.ttcn b/OneM2M_TestControl_ADN_profile_3.ttcn
index eaec8dd84fda3d53d2cb2a770c5d77d05b1e2d2a..8fa19b6a3cf9ddd59a026ba3c9a1a738eb81520f 100644
--- a/OneM2M_TestControl_ADN_profile_3.ttcn
+++ b/OneM2M_TestControl_ADN_profile_3.ttcn
@@ -50,15 +50,21 @@ module OneM2M_TestControl_ADN_profile_3 {
if(true) {execute (TC_AE_REG_CRE_002_API());}
if(true) {execute (TC_AE_REG_CRE_002_SRV());}
+ //Container ADN-3
//AE_DMR_00001
if(true) {execute (TC_AE_DMR_CRE_001());}
//AE_DMR_00002
if(true) {execute (TC_AE_DMR_CRE_002());}
- //AE_SUB_00004
- if(true) {execute (TC_AE_SUB_NTF_001());}
- if(true) {execute (TC_AE_SUB_NTF_002());}
+ //FlexcContainer ADN-3
+ //AE_DMR_00003
+ //TODO Missing
+ //TimeSeries ADN-3
+ //AE_DMR_00004
+ //TODO Missing
+ //AE_DMR_00005
+ //TODO Missing
}
} // end of module OneM2M_TestControl_ADN_profile_3
diff --git a/OneM2M_TestControl_Constrained_actuator_as_ADN1_requestReachable.ttcn b/OneM2M_TestControl_Actuator_as_ADN.ttcn
similarity index 91%
rename from OneM2M_TestControl_Constrained_actuator_as_ADN1_requestReachable.ttcn
rename to OneM2M_TestControl_Actuator_as_ADN.ttcn
index 7f51c9356da30c7369bc9e48ab23a0b3375b7d1c..8bd8599cb7dea40b6048035ee9f9d7a3581df588 100644
--- a/OneM2M_TestControl_Constrained_actuator_as_ADN1_requestReachable.ttcn
+++ b/OneM2M_TestControl_Actuator_as_ADN.ttcn
@@ -9,7 +9,7 @@
* @desc Test control module for oneM2M
*
*/
-module OneM2M_TestControl_Constrained_actuator_as_ADN1_requestReachable {
+module OneM2M_TestControl_Actuator_as_ADN {
import from OneM2M_Testcases_AE_Release_1 all;
@@ -51,11 +51,27 @@ module OneM2M_TestControl_Constrained_actuator_as_ADN1_requestReachable {
//AE_SUB_00001
if(true) {execute (TC_AE_SUB_CRE_001());}
+ //Container actuator
+ //AE_DMR_00001
+ if(true) {execute (TC_AE_DMR_CRE_001());}
+
+ //Flex container actuator
+ //TODO Missing
+
+ //Notification actuator
//AE_SUB_00004
if(true) {execute (TC_AE_SUB_NTF_001());}
if(true) {execute (TC_AE_SUB_NTF_002());}
+
+ //Polling channel actuator
+ //AE_PCH_00001
+ //TODO Missing
+
+ //AE_PCH_00002
+ if(true) {execute (TC_AE_PCH_001());}
+
}
-} // end of module OneM2M_TestControl_Constrained_actuator_as_ADN
+} // end of module OneM2M_TestControl_Actuator_as_ADN
diff --git a/OneM2M_TestControl_Constrained_actuator_as_ADN.ttcn b/OneM2M_TestControl_Constrained_actuator_as_ADN.ttcn
deleted file mode 100644
index 7fe3d472a0be36ad179278be0ab3230e09b99aaf..0000000000000000000000000000000000000000
--- a/OneM2M_TestControl_Constrained_actuator_as_ADN.ttcn
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Copyright Notification
- * No part of this document may be reproduced, in an electronic retrieval system or otherwise, except as authorized by written permission.
- * The copyright and the foregoing restriction extend to reproduction in all media.
- * © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
- * All rights reserved.
- *
- * @author oneM2M/ETSI
- * @desc Test control module for oneM2M
- *
- */
-module OneM2M_TestControl_Constrained_actuator_as_ADN {
-
-
- import from OneM2M_Testcases_AE_Release_1 all;
- import from OneM2M_Pics all;
-
- control {
-
- //AE_GEN_00001
- if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_CSR());}
- if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_SPR());}
- if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_ABS());}
- if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_CSR());}
- if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_SPR());}
- if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_ABS());}
- if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_CSR());}
- if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_SPR());}
- if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_ABS());}
- if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_CSR());}
- if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_SPR());}
- if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_ABS());}
- if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_CSR());}
- if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_SPR());}
- if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_ABS());}
- if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_CSR());}
- if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_SPR());}
- if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_ABS());}
- if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_CSR());}
- if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_SPR());}
- if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_ABS());}
- if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_CSR());}
- if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_SPR());}
- if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_ABS());}
- //AE_GEN_00002
- if(true) {execute (TC_AE_DMR_CRE_001());}
- //AE_REG_00002
- if(true) {execute (TC_AE_REG_CRE_001());}
- if(true) {execute (TC_AE_REG_CRE_002_RR());}
- if(true) {execute (TC_AE_REG_CRE_002_POA());}
- //AE_SUB_00001
- if(true) {execute (TC_AE_SUB_CRE_001());}
-
- }
-
-
-} // end of module OneM2M_TestControl_Constrained_actuator_as_ADN
-
diff --git a/OneM2M_TestControl_Constrained_actuator_as_ADN1_pollingChannel.ttcn b/OneM2M_TestControl_Constrained_actuator_as_ADN1_pollingChannel.ttcn
deleted file mode 100644
index 98432e26f4e77595096bcc0f19d56f3b4ece2d6c..0000000000000000000000000000000000000000
--- a/OneM2M_TestControl_Constrained_actuator_as_ADN1_pollingChannel.ttcn
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * Copyright Notification
- * No part of this document may be reproduced, in an electronic retrieval system or otherwise, except as authorized by written permission.
- * The copyright and the foregoing restriction extend to reproduction in all media.
- * © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
- * All rights reserved.
- *
- * @author oneM2M/ETSI
- * @desc Test control module for oneM2M
- *
- */
-module OneM2M_TestControl_Constrained_actuator_as_ADN1_pollingChannel {
-
-
- import from OneM2M_Testcases_AE_Release_1 all;
- import from OneM2M_Pics all;
-
- control {
-
- //AE_GEN_00001
- if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_CSR());}
- if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_SPR());}
- if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_001_ABS());}
- if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_CSR());}
- if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_SPR());}
- if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_CRE_002_ABS());}
- if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_CSR());}
- if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_SPR());}
- if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_001_ABS());}
- if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_CSR());}
- if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_SPR());}
- if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_UPD_002_ABS());}
- if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_CSR());}
- if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_SPR());}
- if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_001_ABS());}
- if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_CSR());}
- if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_SPR());}
- if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_RET_002_ABS());}
- if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_CSR());}
- if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_SPR());}
- if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_001_ABS());}
- if(PICS_PRIMITIVE_SCOPE_CSE_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_CSR());}
- if(PICS_PRIMITIVE_SCOPE_SP_RELATIVE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_SPR());}
- if(PICS_PRIMITIVE_SCOPE_ABSOLUTE and PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT) {execute (TC_AE_GEN_DEL_002_ABS());}
- //AE_GEN_00002
- if(true) {execute (TC_AE_DMR_CRE_001());}
- //AE_REG_00002
- if(true) {execute (TC_AE_REG_CRE_001());}
- if(true) {execute (TC_AE_REG_CRE_002_RR());}
- if(true) {execute (TC_AE_REG_CRE_002_POA());}
- //AE_SUB_00001
- if(true) {execute (TC_AE_SUB_CRE_001());}
-
- //AE_PCH_00001
- //TODO Missing
-
- //AE_PCH_00002
- if(true) {execute (TC_AE_PCH_001());}
- }
-
-
-} // end of module OneM2M_TestControl_Constrained_actuator_as_ADN
-