Merge from Release 1 branch +

adaptation to Release 2 types
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>

LibOneM2M/OneM2M_Pics.ttcn

@@ -18,7 +18,8 @@ module OneM2M_Pics {
 	 * @see  oneM2M TS-0017 A.5.5.1/1
 	 */
 	modulepar boolean PICS_ACP_SUPPORT := true;
-	modulepar boolean PICS_IN_CSE := true;	
+	modulepar boolean PICS_IN_CSE := true;
+	modulepar boolean PICS_MN_CSE := true;	
 	modulepar boolean PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT := true;
 	modulepar boolean PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT := true;
 	

LibOneM2M/OneM2M_Pixits.ttcn

@@ -27,6 +27,8 @@ module OneM2M_Pixits {
 		
 			modulepar charstring PX_SUT_ADDRESS := "127.0.0.1:8080";
 			
+			modulepar boolean PX_UT_IMPLEMENTED := false;
+			
 			/**
 			 * @desc IUT CSE Name
 			 */	
@@ -57,6 +59,14 @@ module OneM2M_Pixits {
 			 */	
 			modulepar XSD.ID PX_SUPER_CSE_ID				:= "/admin:admin";	
 			
+			modulepar XSD.IDREFS PX_ALLOWED_C_AE_IDS := {"C"};
+			
+			modulepar XSD.IDREFS PX_NOT_ALLOWED_C_AE_IDS := {"MyAe"};
+			
+			modulepar XSD.IDREFS PX_ALLOWED_S_AE_IDS := {"S"};
+			
+			modulepar XSD.IDREFS PX_NOT_ALLOWED_S_AE_IDS := {"MyAe"};
+			
 			modulepar AddressingMethod PX_ADDRESSING_METHOD := e_hierarchical;
 	
 			modulepar PrimitiveScope PX_PRIMITIVE_SCOPE 	:= e_cseRelative;
@@ -67,7 +77,8 @@ module OneM2M_Pixits {
 			
 			modulepar charstring PX_XML_NAMESPACE 			:= "m2m=""http://www.onem2m.org/xml/protocols""";
 			
-			modulepar ListOfURIs PX_ACOR 					:= {"*"};			
+			modulepar ListOfURIs PX_ACOR 					:= {"*"};
+						
 		}
 		
 		group TesterParameters {
@@ -78,10 +89,31 @@ module OneM2M_Pixits {
 	
 			modulepar charstring PX_CSE1_ADDRESS			:= "127.0.0.1:3141";
 	
+
+			/**
+			 * @desc Test System CSE1 Name
+			 */	
+			modulepar XSD.ID PX_CSE1_NAME := "CSE1_NAME";
+		
 			/**
 			 * @desc Test System CSE1-ID with SP-relative-CSE-ID format (relative) according to TS-0001-7.2-1
 			 */		
-			modulepar XSD.ID PX_CSE1_ID					:= "/MyCSEId";
+			modulepar XSD.ID PX_CSE1_ID := "/CSE1_ID";
+			
+			/**
+			 * @desc Test System CSE1 resource ID with Unstructured-CSE-relative-Resource-ID (relative) format according to TS-0001-7.2-1
+			 */			
+			modulepar XSD.ID PX_CSE1_RESOURCE_ID	:= "CSE1_RESOURCE_ID";
+			
+			/**
+			 * @desc CSE1 Supported resource type
+			 */	
+			modulepar ResourceTypeList_1 PX_CSE1_SRT := {int1, int2, int3, int16};
+			 
+			/**
+			 * @desc Test System M2M-SP1-ID with M2M-SP-ID format (absolute) according to TS-0001-7.2-1 Unstructured-CSE-relative -Resource-ID
+			 */
+			modulepar XSD.ID PX_SP1_ID := "//onem2m.org";
 		
 			/**
 			 * @desc Test System AE1-ID with AE-ID-Stem format (relative) according to TS-0001-7.2-1

LibOneM2M/OneM2M_Templates.ttcn

@@ -710,6 +710,14 @@ module OneM2M_Templates {
 				primitiveContent := {remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
 			};
 			
+			/**
+			 * @desc Reception template for CREATE RemoteCSE
+			 */
+			template RequestPrimitive mw_createRemoteCSE(template XSD.ID p_from := *, template XSD.ID p_to := ?) modifies mw_create := {
+				resourceType := int16,
+				primitiveContent := {remoteCSE := ?}	//{remoteCSE := m_contentCreateRemoteCSE(p_resourceName, p_accessControlPolicyIds,p_cSEBase, p_cSE_ID)}
+			};			
+			
 			/**
 			 * @desc CREATE request primitive for remoteCSE resource
 			 */
@@ -1134,7 +1142,7 @@ module OneM2M_Templates {
 				tokenRequestIndicator := omit
 			};
 
-			template RequestPrimitive mw_deleteRequest(template XSD.ID p_resourceAddress := ?) := {
+			template RequestPrimitive mw_deleteRequest(template XSD.ID p_resourceAddress := ?, template XSD.ID p_from := *) := {
 				operation := int4,
 				to_ := p_resourceAddress,
 				from_ := ?,
@@ -1311,8 +1319,12 @@ module OneM2M_Templates {
         template PrimitiveContent m_primitiveContentCSEBase(template CSEBase_optional p_cSEBase) := {
 	        cSEBase := p_cSEBase
 		}
-		
-		 template PrimitiveContent mw_primitiveContent := ?;
+
+		template PrimitiveContent m_primitiveContentRemoteCSE(template RemoteCSE_optional p_remoteCSE) := {
+			remoteCSE := p_remoteCSE
+		}
+				
+		template PrimitiveContent mw_primitiveContent := ?;
 		 
 		/**
 		 * @desc Base primitiveContent for CREATE operation for AEAnnc resource
@@ -3990,7 +4002,7 @@ module OneM2M_Templates {
 			localTokenIDs := omit, 
 			tokenRequestIndicator := omit
 		};
-	
+		
 		template (value) UtTriggerPrimitive m_utCreateContainer modifies m_utCreate := {
 			requestIdentifier := testcasename() & "-m_utCreateContainer" & f_rnd(1, 1000000),
 			resourceType := int3,
@@ -4009,6 +4021,12 @@ module OneM2M_Templates {
 			primitiveContent := {subscription := m_contentSubscription}
 		}
 		
+		template (value) UtTriggerPrimitive m_utCreateRemoteCSE modifies m_utCreate := {
+			requestIdentifier := testcasename() & "-m_utCreateRemoteCSE" & f_rnd(1, 1000000),
+			resourceType := int16,
+			primitiveContent := {remoteCSE := m_contentRemoteCSE_allOmit}
+		}
+ 		
 		template (value) UtTriggerPrimitive m_utRetrieveResource(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) := {
 			operation := int2,
 			to_ := p_targetResourceAddress,

LibOneM2M/OneM2M_TestSystem.ttcn

@@ -31,13 +31,14 @@ module OneM2M_TestSystem {
 		timer tc_wait := PX_TWAIT;
 		//global variables
 		var Configurations vc_config;
+		var TestSystemRole vc_testSystemRole;
 		var MyResourcesList vc_resourcesList;
 		var IntegerList vc_resourcesIndexToBeDeleted := {};
-		//var PrimitiveScope vc_primitiveScope := PX_PRIMITIVE_SCOPE;
-		//var AddressingMethod vc_addressingMethod := PX_ADDRESSING_METHOD;
-		var integer vc_aeAuxIndex;//TODO To be removed
-		var integer vc_acpAuxIndex;
+		var integer vc_aeAuxIndex := -1;//TODO To be removed
+		var integer vc_acpAuxIndex := -1;
 		var AccessControlPolicy_optional vc_acpAux;
+		var MsgIn vc_request;
+		var MsgIn vc_response;
 	};
 	
 	type component AeSimu extends Tester {
@@ -48,24 +49,21 @@ module OneM2M_TestSystem {
 		//global variables
 		var PrimitiveContent vc_primitiveContentRetrievedResource;
 
-		var MsgIn vc_request;
-		var MsgIn vc_response;
-		var CseSimu vc_cseSimu;//For CF02 when AeSimu is master
+		var CseSimu vc_cse1;//For CF02 when AeSimu is master
 		var boolean vc_auxiliaryAe2Up := false;
-		//var AeSimu vc_ae2;
-	
 	};
 		
 	type component CseSimu extends Tester {
 		port OneM2MPort mcaPort;
+		port OneM2MPort mcaPortIn;
 		port OneM2MPort mccPort;
 		port OneM2MPort mccPortIn;
 
 		//global variables
-		var AeSimu vc_aeSimu;//For CF02 when CseSimu is master
+		var MyResourcesList vc_localResourcesList;
+		var AeSimu vc_ae1;//For CF02 when CseSimu is master
 		var integer vc_remoteCseIndex;
-		var MsgIn vc_request;
-		var MsgIn vc_response;
+		var integer vc_cSEBaseIndex;	//Index of the CSEBase resource of the Tester inside vc_localResourcesList
 	};
 	
 	type component InCseSimu extends CseSimu {}
@@ -76,12 +74,14 @@ module OneM2M_TestSystem {
 		port OneM2MPort mcaPort;
 		port OneM2MPort mcaPortIn;
 		port OneM2MPort mccPort;
+		port OneM2MPort mccPortIn;
 		port AdapterControlPort acPort;
 	}	
 	
 	type component AeSystem {
 		port OneM2MPort mcaPort;
 		port AdapterControlPort acPort;
+		port UpperTesterPort utPort;
 	}		
 	
 			

LibOneM2M/OneM2M_Types.ttcn

@@ -8248,77 +8248,79 @@ group InvalidTypes {
        
 }//end group invalidTypes
 
-	group OtherTypes {
+group OtherTypes {
 		
-		type enumerated Configurations {
-			e_cf01,
-			e_cf02,
-			e_cf03,
-			e_cf04
-		};
+	type enumerated Configurations {
+		e_cf01,
+		e_cf02,
+		e_cf02CseSimuMaster,
+		e_cf03,
+		e_cf04
+	};
+	
+	type enumerated TestSystemRole {
+		e_cse,
+		e_ae
+	};
 		
-		type NhURI ParentID;
+	type NhURI ParentID;
     	
-		type record MyResource {
-			integer parentIndex,
-			ResourceType resourceType,
-			PrimitiveContent resource
-		};
-		
-		type record of MyResource MyResourcesList;
+	type record MyResource {
+		integer parentIndex,
+		ResourceType resourceType,
+		PrimitiveContent resource
+	};
 		
-		type record of integer IntegerList;
+	type record of MyResource MyResourcesList;
 		
-		type enumerated PrimitiveScope {
-			e_cseRelative,
-			e_spRelative, 
-			e_absolute
-		}
+	type record of integer IntegerList;
 		
-		type enumerated AddressingMethod {
-			e_nonHierarchical,
-			e_hierarchical
-		}
+	type enumerated PrimitiveScope {
+		e_cseRelative,
+		e_spRelative, 
+		e_absolute
+	}
 		
-		type union Resource_2 {
-			//ResourceTypes
-			AEAnnc_optional aEAnnc,
-			AE_optional aE,
-			AccessControlPolicy_optional accessControlPolicy,
-			AccessControlPolicyAnnc_optional accessControlPolicyAnnc,
-			ContentInstance_optional contentInstance,
-			ContentInstanceAnnc_optional contentInstanceAnnc,
-			Container_optional container,
-			ContainerAnnc_optional containerAnnc,
-			FlexContainerResource_optional flexContainer,
-			CSEBase_optional cSEBase,
-			Group_optional group_,
-			GroupAnnc_optional groupAnnc,
-			LocationPolicy_optional locationPolicy,
-			LocationPolicyAnnc_optional locationPolicyAnnc,
-			MgmtResource_optional mgmtResource,//MgmtResource
-			AnnouncedMgmtResource_optional announcedMgmtResource,//AnnouncedMgmtResource
-			Node_optional node,
-			NodeAnnc_optional nodeAnnc,
-			PollingChannel_optional pollingChannel,
-			RemoteCSE_optional remoteCSE,
-			Schedule_optional schedule,
-			ScheduleAnnc_optional scheduleAnnc,
-			StatsConfig_optional statsConfig,
-			StatsCollect_optional statsCollect,
-			M2mServiceSubscriptionProfile_optional m2mServiceSubscriptionProfile,
-			ServiceSubscribedAppRule_optional serviceSubscribedAppRule,
-			Subscription_optional subscription,
-			SemanticDescriptor_optional semanticDescriptor,
-			GenericInterworkingOperationInstance_optional genericInterworkingOperationInstance	
-		}
-		with {
-			variant "untagged";
-		}		
+	type enumerated AddressingMethod {
+		e_nonHierarchical,
+		e_hierarchical
+	}
 		
-		type record of ResourceType ResourceTypeList_1;
+	type union Resource_2 {
+		//ResourceTypes
+		AEAnnc_optional aEAnnc,
+		AE_optional aE,
+		AccessControlPolicy_optional accessControlPolicy,
+		AccessControlPolicyAnnc_optional accessControlPolicyAnnc,
+		ContentInstance_optional contentInstance,
+		ContentInstanceAnnc_optional contentInstanceAnnc,
+		Container_optional container,
+		ContainerAnnc_optional containerAnnc,
+		CSEBase_optional cSEBase,
+		Group_optional group_,
+		GroupAnnc_optional groupAnnc,
+		LocationPolicy_optional locationPolicy,
+		LocationPolicyAnnc_optional locationPolicyAnnc,
+		MgmtResource_optional mgmtResource,//MgmtResource
+		AnnouncedMgmtResource_optional announcedMgmtResource,//AnnouncedMgmtResource
+		Node_optional node,
+		NodeAnnc_optional nodeAnnc,
+		PollingChannel_optional pollingChannel,
+		RemoteCSE_optional remoteCSE,
+		Schedule_optional schedule,
+		ScheduleAnnc_optional scheduleAnnc,
+		StatsConfig_optional statsConfig,
+		StatsCollect_optional statsCollect,
+		M2mServiceSubscriptionProfile_optional m2mServiceSubscriptionProfile,
+		ServiceSubscribedAppRule_optional serviceSubscribedAppRule,
+		Subscription_optional subscription
 	}
-
+	with {
+		variant "untagged";
+	}		
+		
+	type record of ResourceType ResourceTypeList_1;
+}
 }
 with {
   encode "XML";

LibOneM2M/OneM2M_TypesAndValues.ttcn

@@ -5,9 +5,9 @@
  *  © 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
  *  All rights reserved.
  *  
- *  @author     oneM2M
- *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_TypesAndValues.ttcn $
- *              $Id: OneM2M_TypesAndValues.ttcn 340 2017-08-07 12:08:41Z reinaortega $
+ *  @author     ETSI
+ *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_TypesAndValues.ttcn $
+ *              $Id: OneM2M_TypesAndValues.ttcn 347 2017-08-11 08:48:20Z reinaortega $
  *  @desc       Module containing types and values for oneM2M
  *
  */

OneM2M_TestControl_ADN_profile_3.ttcn

+/**
+ *  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     ETSI
+ *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_TestControl.ttcn $
+ *              $Id: OneM2M_TestControl.ttcn 347 2017-08-11 08:48:20Z reinaortega $
+ *  @desc       Test control module for oneM2M
+ *
+ */
+module OneM2M_TestControl_ADN_profile_3 {
+
+
+	import from OneM2M_Testcases_AE all;	
+
+	control {
+
+		//AE_GEN_00001
+		if(true) {execute (TC_AE_GEN_CRE_001_CSR());}
+		if(true) {execute (TC_AE_GEN_CRE_001_SPR());}
+		if(true) {execute (TC_AE_GEN_CRE_001_ABS());}
+		if(true) {execute (TC_AE_GEN_CRE_002_CSR());}
+		if(true) {execute (TC_AE_GEN_CRE_002_SPR());}
+		if(true) {execute (TC_AE_GEN_CRE_002_ABS());}
+		if(true) {execute (TC_AE_GEN_UPD_001_CSR());}
+		if(true) {execute (TC_AE_GEN_UPD_001_SPR());}
+		if(true) {execute (TC_AE_GEN_UPD_001_ABS());}
+		if(true) {execute (TC_AE_GEN_UPD_002_CSR());}
+		if(true) {execute (TC_AE_GEN_UPD_002_SPR());}
+		if(true) {execute (TC_AE_GEN_UPD_002_ABS());}
+		if(true) {execute (TC_AE_GEN_RET_001_CSR());}
+		if(true) {execute (TC_AE_GEN_RET_001_SPR());}
+		if(true) {execute (TC_AE_GEN_RET_001_ABS());}
+		if(true) {execute (TC_AE_GEN_RET_002_CSR());}
+		if(true) {execute (TC_AE_GEN_RET_002_SPR());}
+		if(true) {execute (TC_AE_GEN_RET_002_ABS());}
+		if(true) {execute (TC_AE_GEN_DEL_001_CSR());}
+		if(true) {execute (TC_AE_GEN_DEL_001_SPR());}
+		if(true) {execute (TC_AE_GEN_DEL_001_ABS());}
+		if(true) {execute (TC_AE_GEN_DEL_002_CSR());}
+		if(true) {execute (TC_AE_GEN_DEL_002_SPR());}
+		if(true) {execute (TC_AE_GEN_DEL_002_ABS());}
+		//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());}
+		//AE_DMR_00001 
+		if(true) {execute (TC_AE_DMR_CRE_001());}
+		//AE_DMR_00002
+		if(true) {execute (TC_AE_DMR_CRE_002());}
+		
+	}		
+
+}  // end of module OneM2M_TestControl_ADN_profile_3
+

OneM2M_TestControl_ADN_profile_4.ttcn

+/**
+ *  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     ETSI
+ *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_TestControl.ttcn $
+ *              $Id: OneM2M_TestControl.ttcn 347 2017-08-11 08:48:20Z reinaortega $
+ *  @desc       Test control module for oneM2M
+ *
+ */
+module OneM2M_TestControl_ADN_profile_4 {
+
+
+	import from OneM2M_Testcases_AE all;	
+
+	
+	control {
+		//AE_GEN_00001
+		if(true) {execute (TC_AE_GEN_CRE_001_CSR());}
+		if(true) {execute (TC_AE_GEN_CRE_001_SPR());}
+		if(true) {execute (TC_AE_GEN_CRE_001_ABS());}
+		if(true) {execute (TC_AE_GEN_CRE_002_CSR());}
+		if(true) {execute (TC_AE_GEN_CRE_002_SPR());}
+		if(true) {execute (TC_AE_GEN_CRE_002_ABS());}
+		if(true) {execute (TC_AE_GEN_UPD_001_CSR());}
+		if(true) {execute (TC_AE_GEN_UPD_001_SPR());}
+		if(true) {execute (TC_AE_GEN_UPD_001_ABS());}
+		if(true) {execute (TC_AE_GEN_UPD_002_CSR());}
+		if(true) {execute (TC_AE_GEN_UPD_002_SPR());}
+		if(true) {execute (TC_AE_GEN_UPD_002_ABS());}
+		if(true) {execute (TC_AE_GEN_RET_001_CSR());}
+		if(true) {execute (TC_AE_GEN_RET_001_SPR());}
+		if(true) {execute (TC_AE_GEN_RET_001_ABS());}
+		if(true) {execute (TC_AE_GEN_RET_002_CSR());}
+		if(true) {execute (TC_AE_GEN_RET_002_SPR());}
+		if(true) {execute (TC_AE_GEN_RET_002_ABS());}
+		if(true) {execute (TC_AE_GEN_DEL_001_CSR());}
+		if(true) {execute (TC_AE_GEN_DEL_001_SPR());}
+		if(true) {execute (TC_AE_GEN_DEL_001_ABS());}
+		if(true) {execute (TC_AE_GEN_DEL_002_CSR());}
+		if(true) {execute (TC_AE_GEN_DEL_002_SPR());}
+		if(true) {execute (TC_AE_GEN_DEL_002_ABS());}
+		//AE_GEN_00002 
+		if(true) {execute (TC_AE_DMR_CRE_001());}
+		if(true) {execute (TC_AE_DMR_RET_001_CB());}
+		if(true) {execute (TC_AE_DMR_RET_001_AE());}
+		if(true) {execute (TC_AE_DMR_RET_001_CNT());}
+		if(true) {execute (TC_AE_DMR_UPD_002_LBL());}
+		if(true) {execute (TC_AE_DMR_DEL_003());}
+		//AE_REG_00001
+		if(true) {execute (TC_AE_DMR_RET_001_CB());}
+		//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_RN());}
+		if(true) {execute (TC_AE_REG_CRE_002_ET());}
+		if(true) {execute (TC_AE_REG_CRE_002_LBL());}
+		if(true) {execute (TC_AE_REG_CRE_002_APN());}
+		if(true) {execute (TC_AE_REG_CRE_002_POA());}
+		if(true) {execute (TC_AE_REG_CRE_002_NL());}
+		if(true) {execute (TC_AE_REG_CRE_002_CSZ());}
+		if(true) {execute (TC_AE_DMR_UPD_001_ET());}
+		if(true) {execute (TC_AE_DMR_UPD_001_LBL());}
+		if(true) {execute (TC_AE_DMR_UPD_001_APN());}
+		if(true) {execute (TC_AE_DMR_UPD_001_POA());}
+		if(true) {execute (TC_AE_DMR_UPD_001_NL());}
+		if(true) {execute (TC_AE_DMR_UPD_001_RR());}
+		if(true) {execute (TC_AE_DMR_UPD_001_CSZ());}
+		if(true) {execute (TC_AE_REG_DEL_001());}
+		if(true) {execute (TC_AE_DMR_RET_001_AE());}
+		//AE/DMR/00001
+		if(true) {execute (TC_AE_DMR_CRE_001());}
+		if(true) {execute (TC_AE_DMR_CRE_004_RN());}
+		if(true) {execute (TC_AE_DMR_CRE_004_ET());}
+		if(true) {execute (TC_AE_DMR_CRE_004_LBL());}
+		if(true) {execute (TC_AE_DMR_CRE_004_CR());}
+		if(true) {execute (TC_AE_DMR_CRE_004_MNI());}
+		if(true) {execute (TC_AE_DMR_CRE_004_MBS());}
+		if(true) {execute (TC_AE_DMR_CRE_004_MIA());}
+		if(true) {execute (TC_AE_DMR_UPD_002_ET());}
+		if(true) {execute (TC_AE_DMR_UPD_002_LBL());}
+		if(true) {execute (TC_AE_DMR_UPD_002_MNI());}
+		if(true) {execute (TC_AE_DMR_UPD_002_MBS());}
+		if(true) {execute (TC_AE_DMR_UPD_002_MIA());}
+		if(true) {execute (TC_AE_DMR_DEL_003());}
+		if(true) {execute (TC_AE_DMR_RET_004());}
+		//AE/DMR/00002
+		if(true) {execute (TC_AE_DMR_CRE_002());}
+		if(true) {execute (TC_AE_DMR_CRE_003_RN());}
+		if(true) {execute (TC_AE_DMR_CRE_003_ET());}
+		if(true) {execute (TC_AE_DMR_CRE_003_LBL());}
+		if(true) {execute (TC_AE_DMR_CRE_003_CR());}
+		if(true) {execute (TC_AE_DMR_CRE_003_CNF());}
+		if(true) {execute (TC_AE_DMR_RET_005());}
+		if(true) {execute (TC_AE_DMR_RET_002());}
+		if(true) {execute (TC_AE_DMR_RET_003());}
+		if(true) {execute (TC_AE_DMR_DEL_004());}
+		if(true) {execute (TC_AE_DMR_DEL_001());}
+		if(true) {execute (TC_AE_DMR_DEL_002());}
+
+		//Extendable features
+		//AE/REG/00002
+		if(true) {execute (TC_AE_REG_CRE_002_API());}
+		if(true) {execute (TC_AE_REG_CRE_002_OR());}
+		if(true) {execute (TC_AE_DMR_UPD_001_OR());}
+		// AE/DMR/00001
+		if(true) {execute (TC_AE_DMR_CRE_004_ACPI());}
+		if(true) {execute (TC_AE_DMR_CRE_004_OR());}
+		//if(true) {execute (TC_AE_DMR_CRE_004_LI());}//TODO To be implemented
+		//AE/SUB/00001
+		//if(true) {execute (TC_AE_SUB_CRE_002_LBL());}//TODO To be implemented. TP As well
+		if(true) {execute (TC_AE_SUB_CRE_002_SU());}
+		if(true) {execute (TC_AE_SUB_CRE_002_ACPI());}
+		if(true) {execute (TC_AE_SUB_CRE_002_ENC());}
+		if(true) {execute (TC_AE_SUB_CRE_002_EXC());}
+		if(true) {execute (TC_AE_SUB_CRE_002_NFU());}
+		if(true) {execute (TC_AE_SUB_CRE_002_NCT());}
+		if(true) {execute (TC_AE_SUB_CRE_002_NEC());}
+		if(true) {execute (TC_AE_SUB_NTF_001());}
+		if(true) {execute (TC_AE_SUB_NTF_002());}
+
+	}
+
+}  // end of module OneM2M_TestControl_ADN_profile_4
+

OneM2M_TestControl_ASN_profile.ttcn

+/**
+ *  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     ETSI
+ *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_TestControl.ttcn $
+ *              $Id: OneM2M_TestControl.ttcn 347 2017-08-11 08:48:20Z reinaortega $
+ *  @desc       Test control module for oneM2M
+ *
+ */
+module OneM2M_TestControl_ASN_profile {
+
+
+	import from OneM2M_Testcases_CSE all;	
+
+	control {	
+
+		//CE_GEN_00001
+		if(true) {execute (TC_CSE_GEN_CRE_001_CSR());}
+		if(true) {execute (TC_CSE_GEN_CRE_001_SPR());}
+		if(true) {execute (TC_CSE_GEN_CRE_001_ABS());}
+		if(true) {execute (TC_CSE_GEN_RET_001_CSR());}
+		if(true) {execute (TC_CSE_GEN_RET_001_SPR());}
+		if(true) {execute (TC_CSE_GEN_RET_001_ABS());}
+		if(true) {execute (TC_CSE_GEN_UPD_001_CSR());}
+		if(true) {execute (TC_CSE_GEN_UPD_001_SPR());}
+		if(true) {execute (TC_CSE_GEN_UPD_001_ABS());}
+		if(true) {execute (TC_CSE_GEN_DEL_001_CSR());}
+		if(true) {execute (TC_CSE_GEN_DEL_001_SPR());}
+		if(true) {execute (TC_CSE_GEN_DEL_001_ABS());}
+		if(true) {execute (TC_CSE_GEN_CRE_002_CSR());}
+		if(true) {execute (TC_CSE_GEN_CRE_002_SPR());}
+		if(true) {execute (TC_CSE_GEN_CRE_002_ABS());}
+		if(true) {execute (TC_CSE_GEN_RET_002_CSR());}
+		if(true) {execute (TC_CSE_GEN_RET_002_SPR());}
+		if(true) {execute (TC_CSE_GEN_RET_002_ABS());}
+		if(true) {execute (TC_CSE_GEN_UPD_002_CSR());}
+		if(true) {execute (TC_CSE_GEN_UPD_002_SPR());}
+		if(true) {execute (TC_CSE_GEN_UPD_002_ABS());}
+		if(true) {execute (TC_CSE_GEN_DEL_002_CSR());}
+		if(true) {execute (TC_CSE_GEN_DEL_002_SPR());}
+		if(true) {execute (TC_CSE_GEN_DEL_002_ABS());}
+		
+		//CE_GEN_00002 
+				
+		//CE_REG_00005
+		if(true) {execute (TC_CSE_REG_CRE_024());}
+		if(true) {execute (TC_CSE_DMR_RET_013_CSR());}
+		if(true) {execute (TC_CSE_REG_CRE_026_POA());}
+		
+		//CE_DMR_00002
+		if(true) {execute (TC_CSE_DMR_CRE_001_CIN_CNT());}
+		if(true) {execute (TC_CSE_DMR_RET_001_CIN());}
+		if(true) {execute (TC_CSE_DMR_UPD_011());}
+		if(true) {execute (TC_CSE_DMR_DEL_001_CIN());}
+	
+	}
+
+}  // end of module OneM2M_TestControl_IN_profile
+

OneM2M_TestControl_Constrained_actuator_as_ADN.ttcn

+/**
+ *  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     ETSI
+ *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_TestControl.ttcn $
+ *              $Id: OneM2M_TestControl.ttcn 347 2017-08-11 08:48:20Z reinaortega $
+ *  @desc       Test control module for oneM2M
+ *
+ */
+module OneM2M_TestControl_Constrained_actuator_as_ADN {
+
+
+	import from OneM2M_Testcases_AE all;	
+
+	
+			
+	control {
+		
+		//AE_GEN_00001
+		if(true) {execute (TC_AE_GEN_CRE_001_CSR());}
+		if(true) {execute (TC_AE_GEN_CRE_001_SPR());}
+		if(true) {execute (TC_AE_GEN_CRE_001_ABS());}
+		if(true) {execute (TC_AE_GEN_CRE_002_CSR());}
+		if(true) {execute (TC_AE_GEN_CRE_002_SPR());}
+		if(true) {execute (TC_AE_GEN_CRE_002_ABS());}
+		if(true) {execute (TC_AE_GEN_UPD_001_CSR());}
+		if(true) {execute (TC_AE_GEN_UPD_001_SPR());}
+		if(true) {execute (TC_AE_GEN_UPD_001_ABS());}
+		if(true) {execute (TC_AE_GEN_UPD_002_CSR());}
+		if(true) {execute (TC_AE_GEN_UPD_002_SPR());}
+		if(true) {execute (TC_AE_GEN_UPD_002_ABS());}
+		if(true) {execute (TC_AE_GEN_RET_001_CSR());}
+		if(true) {execute (TC_AE_GEN_RET_001_SPR());}
+		if(true) {execute (TC_AE_GEN_RET_001_ABS());}
+		if(true) {execute (TC_AE_GEN_RET_002_CSR());}
+		if(true) {execute (TC_AE_GEN_RET_002_SPR());}
+		if(true) {execute (TC_AE_GEN_RET_002_ABS());}
+		if(true) {execute (TC_AE_GEN_DEL_001_CSR());}
+		if(true) {execute (TC_AE_GEN_DEL_001_SPR());}
+		if(true) {execute (TC_AE_GEN_DEL_001_ABS());}
+		if(true) {execute (TC_AE_GEN_DEL_002_CSR());}
+		if(true) {execute (TC_AE_GEN_DEL_002_SPR());}
+		if(true) {execute (TC_AE_GEN_DEL_002_ABS());}
+		//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
+

OneM2M_TestControl_Constrained_sensor_as_ADN.ttcn

+/**
+ *  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     ETSI
+ *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_TestControl.ttcn $
+ *              $Id: OneM2M_TestControl.ttcn 347 2017-08-11 08:48:20Z reinaortega $
+ *  @desc       Test control module for oneM2M
+ *
+ */
+module OneM2M_TestControl_Constrained_sensor_as_ADN {
+
+
+	import from OneM2M_Testcases_AE all;	
+
+	
+			
+	control {
+	
+		//AE_GEN_00001
+		if(true){execute (TC_AE_GEN_CRE_001_CSR());}
+		if(true){execute (TC_AE_GEN_CRE_001_SPR());}
+		if(true){execute (TC_AE_GEN_CRE_001_ABS());}
+		if(true){execute (TC_AE_GEN_CRE_002_CSR());}
+		if(true){execute (TC_AE_GEN_CRE_002_SPR());}
+		if(true){execute (TC_AE_GEN_CRE_002_ABS());}
+		if(true){execute (TC_AE_GEN_UPD_001_CSR());}
+		if(true){execute (TC_AE_GEN_UPD_001_SPR());}
+		if(true){execute (TC_AE_GEN_UPD_001_ABS());}
+		if(true){execute (TC_AE_GEN_UPD_002_CSR());}
+		if(true){execute (TC_AE_GEN_UPD_002_SPR());}
+		if(true){execute (TC_AE_GEN_UPD_002_ABS());}
+		if(true){execute (TC_AE_GEN_RET_001_CSR());}
+		if(true){execute (TC_AE_GEN_RET_001_SPR());}
+		if(true){execute (TC_AE_GEN_RET_001_ABS());}
+		if(true) {execute (TC_AE_GEN_RET_002_CSR());}
+		if(true) {execute (TC_AE_GEN_RET_002_SPR());}
+		if(true) {execute (TC_AE_GEN_RET_002_ABS());}
+		if(true) {execute (TC_AE_GEN_DEL_001_CSR());}
+		if(true) {execute (TC_AE_GEN_DEL_001_SPR());}
+		if(true) {execute (TC_AE_GEN_DEL_001_ABS());}
+		if(true) {execute (TC_AE_GEN_DEL_002_CSR());}
+		if(true) {execute (TC_AE_GEN_DEL_002_SPR());}
+		if(true) {execute (TC_AE_GEN_DEL_002_ABS());}
+		
+		//AE_GEN_00002 
+		if(true) {execute (TC_AE_DMR_CRE_001());}
+		
+		//AE_DMR_00002 
+		if(true) {execute (TC_AE_DMR_CRE_002());}
+		
+		
+		//Extendable feature set
+		//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_RN());}
+		if(true) {execute (TC_AE_REG_CRE_002_ET());}
+		if(true) {execute (TC_AE_REG_CRE_002_LBL());}
+		if(true) {execute (TC_AE_REG_CRE_002_APN());}
+		//AE/DMR/00001
+		if(true) {execute (TC_AE_DMR_CRE_001());}
+		if(true) {execute (TC_AE_DMR_CRE_004_RN());}
+		if(true) {execute (TC_AE_DMR_CRE_004_ET());}
+		if(true) {execute (TC_AE_DMR_CRE_004_LBL());}
+		if(true) {execute (TC_AE_DMR_CRE_004_CR());}
+		if(true) {execute (TC_AE_DMR_CRE_004_MNI());}
+		if(true) {execute (TC_AE_DMR_CRE_004_MBS());}
+		if(true) {execute (TC_AE_DMR_CRE_004_MIA());}
+		//AE/DMR/00002
+		if(true) {execute (TC_AE_DMR_CRE_003_RN());}
+		if(true) {execute (TC_AE_DMR_CRE_003_ET());}
+		if(true) {execute (TC_AE_DMR_CRE_003_LBL());}
+		if(true) {execute (TC_AE_DMR_CRE_003_CR());}
+		if(true) {execute (TC_AE_DMR_CRE_003_CNF());}
+		
+	}
+			
+}  // end of module OneM2M_TestControl_Constrained_sensor_as_ADN
+