Moved to XSD 1.12.0 + Integration of all tests developed on the master (Release 2) branch

Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>

LibCommon/LibCommon_AbstractData.ttcn

 /** 
  *  @author   ETSI
- *  @version  $URL: https://forge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_AbstractData.ttcn $
- *            $Id: LibCommon_AbstractData.ttcn 46 2014-01-16 10:23:16Z filatov $
+ *  @version  $URL: https://oldforge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_AbstractData.ttcn $
+ *            $Id: LibCommon_AbstractData.ttcn 64 2016-12-14 15:09:43Z berge $
  *  @desc     A collection of functions for abstract data types which may be
  *            useful in the implementation of any TTCN-3 test suite.
  *  @remark   End users should be aware that any changes made to the  in
@@ -9,6 +9,11 @@
  *            End users are encouraged to contact the distributers of this
  *            module regarding their modifications or additions so that future
  *            updates will include your changes.
+ *  @copyright  ETSI Copyright Notification
+ *                No part may be reproduced except as authorized by written permission.
+ *                The copyright and the foregoing restriction extend to reproduction in all media.
+ *                All rights reserved.
+ *
  */
  module LibCommon_AbstractData {
 

LibCommon/LibCommon_BasicTypesAndValues.ttcn

 /**
  *  @author   ETSI
- *  @version  $URL: https://forge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_BasicTypesAndValues.ttcn $
- *            $Id: LibCommon_BasicTypesAndValues.ttcn 53 2014-07-01 13:29:07Z garciay $
+ *  @version  $URL: https://oldforge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_BasicTypesAndValues.ttcn $
+ *            $Id: LibCommon_BasicTypesAndValues.ttcn 64 2016-12-14 15:09:43Z berge $
  *  @desc     A collection of basic type and value definitions which may be 
  *            useful in the implementation of any TTCN-3 test suite. <br><br>
  *  @remark   End users should be aware that any changes made to the  in
@@ -9,6 +9,11 @@
  *            End users are encouraged to contact the distributers of this  
  *            module regarding their modifications or additions so that future 
  *            updates will include your changes.
+ *  @copyright  ETSI Copyright Notification
+ *                No part may be reproduced except as authorized by written permission.
+ *                The copyright and the foregoing restriction extend to reproduction in all media.
+ *                All rights reserved.
+ *
  */
  module LibCommon_BasicTypesAndValues {
   

LibCommon/LibCommon_DataStrings.ttcn

 /**
  *
  *  @author   ETSI
- *  @version  $URL: https://forge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_DataStrings.ttcn $
- *            $Id: LibCommon_DataStrings.ttcn 61 2016-08-24 13:29:29Z garciay $
+ *  @version  $URL: https://oldforge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_DataStrings.ttcn $
+ *            $Id: LibCommon_DataStrings.ttcn 64 2016-12-14 15:09:43Z berge $
  *  @desc     A collection of data string type and value definitions which
  *            may be useful in the implementation of any TTCN-3 test
  *            suite. "Data string" refers to TTCN-3 hexstring, octetstring
@@ -12,6 +12,11 @@
  *            End users are encouraged to contact the distributers of this
  *            module regarding their modifications or additions so that future
  *            updates will include your changes.
+ *  @copyright  ETSI Copyright Notification
+ *                No part may be reproduced except as authorized by written permission.
+ *                The copyright and the foregoing restriction extend to reproduction in all media.
+ *                All rights reserved.
+ *
  */
  module LibCommon_DataStrings {
 

LibCommon/LibCommon_Sync.ttcn

 /**
  *  @author   ETSI
- *  @version  $URL: https://forge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_Sync.ttcn $
- *            $Id: LibCommon_Sync.ttcn 46 2014-01-16 10:23:16Z filatov $
+ *  @version  $URL: https://oldforge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_Sync.ttcn $
+ *            $Id: LibCommon_Sync.ttcn 66 2017-03-06 09:59:41Z filatov $
  *  @desc     This module implements _one_ generic synchronization mechanism
  *            for TTCN-3 test cases with one or more test components.
  *            Key concept is here that one test component acts as a
@@ -53,6 +53,11 @@
  *            End users are encouraged to contact the distributers of this
  *            module regarding their modifications or additions so that future
  *            updates will include your changes.
+ *  @copyright  ETSI Copyright Notification
+ *                No part may be reproduced except as authorized by written permission.
+ *                The copyright and the foregoing restriction extend to reproduction in all media.
+ *                All rights reserved.
+ *
  */
 module LibCommon_Sync {
 
@@ -143,7 +148,11 @@ module LibCommon_Sync {
          * @see   LibCommon_Sync.ServerSyncComp
          * @see   LibCommon_Sync.ClientSyncComp
          */
-        type port SyncPort message { inout SyncCmd }
+        type port SyncPort message { 
+          inout SyncCmd 
+        } with {
+          extension "internal"
+        }
 
 
         /**

LibCommon/LibCommon_TextStrings.ttcn

 /**
  *  @author   ETSI
- *  @version  $URL: https://forge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_TextStrings.ttcn $
- *            $Id: LibCommon_TextStrings.ttcn 46 2014-01-16 10:23:16Z filatov $
+ *  @version  $URL: https://oldforge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_TextStrings.ttcn $
+ *            $Id: LibCommon_TextStrings.ttcn 64 2016-12-14 15:09:43Z berge $
  *  @desc     A collection of text string type and value definitions which
  *            may be useful in the implementation of any TTCN-3 test
  *            suite. "Text string" refers to TTCN-3 charstring and universal
@@ -11,6 +11,11 @@
  *            End users are encouraged to contact the distributers of this
  *            module regarding their modifications or additions so that future
  *            updates will include your changes.
+ *  @copyright  ETSI Copyright Notification
+ *                No part may be reproduced except as authorized by written permission.
+ *                The copyright and the foregoing restriction extend to reproduction in all media.
+ *                All rights reserved.
+ *
  */
 module LibCommon_TextStrings {
 

LibCommon/LibCommon_Time.ttcn

 /**
  *  @author   ETSI
- *  @version  $URL: https://forge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_Time.ttcn $
- *            $Id: LibCommon_Time.ttcn 46 2014-01-16 10:23:16Z filatov $
+ *  @version  $URL: https://oldforge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_Time.ttcn $
+ *            $Id: LibCommon_Time.ttcn 64 2016-12-14 15:09:43Z berge $
  *  @desc     A collection of time handling functions which may be useful in
  *            the implementation of any TTCN-3 test suite.
  *  @remark   End users should be aware that any changes made to the  in
@@ -9,6 +9,11 @@
  *            End users are encouraged to contact the distributers of this
  *            module regarding their modifications or additions so that future
  *            updates will include your changes.
+ *  @copyright  ETSI Copyright Notification
+ *                No part may be reproduced except as authorized by written permission.
+ *                The copyright and the foregoing restriction extend to reproduction in all media.
+ *                All rights reserved.
+ *
  */
 module LibCommon_Time {
 

LibCommon/LibCommon_VerdictControl.ttcn

 /**
  *  @author   ETSI
- *  @version  $URL: https://forge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_VerdictControl.ttcn $
- *            $Id: LibCommon_VerdictControl.ttcn 46 2014-01-16 10:23:16Z filatov $
+ *  @version  $URL: https://oldforge.etsi.org/svn/LibCommon/tags/v1.4.0/ttcn/LibCommon_VerdictControl.ttcn $
+ *            $Id: LibCommon_VerdictControl.ttcn 64 2016-12-14 15:09:43Z berge $
  *  @desc     Contains generic functions which set test component verdicts
  *            based on generic function return codes according to established
  *            test implementation practice. These functions should only be called
@@ -11,6 +11,11 @@
  *            End users are encouraged to contact the distributers of this
  *            module regarding their modifications or additions so that future
  *            updates will include your changes.
+ *  @copyright  ETSI Copyright Notification
+ *                No part may be reproduced except as authorized by written permission.
+ *                The copyright and the foregoing restriction extend to reproduction in all media.
+ *                All rights reserved.
+ *
  */
  module LibCommon_VerdictControl {
 

LibOneM2M/OneM2M_Pics.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/LibOneM2M/OneM2M_Pics.ttcn $
+ *              $Id: OneM2M_Pics.ttcn 347 2017-08-11 08:48:20Z reinaortega $
+ *  @desc       Module containing Pixits for oneM2M
+ *
+ */
+module OneM2M_Pics {
+
+	/**
+	 * @desc AccessControlPolicy resource support 
+	 * @see  oneM2M TS-0017 A.5.5.1/1
+	 */
+	modulepar boolean PICS_ACP_SUPPORT := true;
+	modulepar boolean PICS_IN_CSE := true;	
+	modulepar boolean PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT := true;
+	modulepar boolean PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT := true;
+	
+	
+}  // end of module

LibOneM2M/OneM2M_Pixits.ttcn

@@ -6,8 +6,8 @@
  *  All rights reserved.
  *  
  *  @author     ETSI
- *  @version    $URL: https://forge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_Pixits.ttcn $
- *              $Id: OneM2M_Pixits.ttcn 175 2016-11-22 12:39:39Z reinaortega $
+ *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_Pixits.ttcn $
+ *              $Id: OneM2M_Pixits.ttcn 347 2017-08-11 08:48:20Z reinaortega $
  *  @desc       Module containing Pixits for oneM2M
  *
  */
@@ -16,27 +16,37 @@ module OneM2M_Pixits {
 	import from XSD all;
 	import from OneM2M_Types all;
 	
-	group testAdapterParameters {}
+	group TestAdapterParameters {}
 
 	modulepar boolean PX_DELETE_CREATED_RESOURCES 	:= true;
 	
 	modulepar XSD.AnyURI PX_RESOURCE_TO_BE_DELETED 	:= "/ae_test";
 	
-	modulepar XSD.IDREFS PX_RESOURCES_TO_BE_DELETED := {"/ae_test", "/MyAcp"};
+	modulepar XSD.IDREFS PX_RESOURCES_TO_BE_DELETED := {"MyAe"};
 	
 	modulepar charstring PX_SUT_ADDRESS 			:= "127.0.0.1:8080";
+		
+	modulepar charstring PX_AE1_ADDRESS				:= "127.0.0.1:3131";
 	
-	modulepar charstring PX_TESTER_ADDRESS 			:= "127.0.0.1:3131";
+	modulepar charstring PX_AE2_ADDRESS				:= "127.0.0.1:3132";
 	
-	modulepar charstring PX_XML_NAMESPACE 			:= "om2m=""http://www.onem2m.org/xml/protocols""";
+	modulepar charstring PX_CSE1_ADDRESS			:= "127.0.0.1:3141";
 	
-	modulepar XSD.ID PX_CSE_NAME 				:= "in-name";
+	modulepar charstring PX_XML_NAMESPACE 			:= "m2m=""http://www.onem2m.org/xml/protocols""";
 	
-	modulepar XSD.AnyURI PX_URI_CSE 				:= "in-name";//TODO to be deleted
+	modulepar XSD.ID PX_CSE_NAME 				:= "cseName";
 		
-	modulepar boolean PX_UNSTRUCTURED 				:= false;
+	modulepar XSD.ID PX_CSE_ID 					:= "cseId";
+	
+	modulepar XSD.ID PX_SP_ID					:= "om2m.org";
+	
+	modulepar XSD.ID PX_CSE1_ID					:= "MyCSEId";
+	
+	modulepar XSD.ID PX_CSE_RESOURCE_ID			:= "cseResourceId";
+	
+	modulepar XSD.ID PX_AE1_ID_STEM				:= "";
 	
-	modulepar XSD.ID PX_AE_ID_STEM				:= "";
+	modulepar XSD.ID PX_AE2_ID_STEM				:= "";
 	
 	modulepar XSD.ID PX_SUPER_USER				:= "admin:admin";
 	
@@ -46,22 +56,21 @@ module OneM2M_Pixits {
 	
 	modulepar ListOfURIs PX_ACOR 					:= {"*"};
 	
-	modulepar AddressingFormat PX_ADDRESSING_FORMAT := e_cseRelative;
+	modulepar AddressingMethod PX_ADDRESSING_METHOD := e_hierarchical;
+	
+	modulepar PrimitiveScope PX_PRIMITIVE_SCOPE 	:= e_cseRelative;
 	
 	modulepar charstring PX_SERIALIZATION			:= "XML";
 	
 	modulepar charstring PX_PROTOCOL_BINDING 		:= "HTTP";
-		
-	modulepar XSD.ID PX_CSE_ID 					:= "in-cse";
 	
-	modulepar boolean PX_FROM_IS_AE_ID 				:= true;
-	//@Martin
+	modulepar boolean PX_USE_RESOURCE_ID_AS_ORIGINATOR 				:= true;
+	
 	//for checking whether the locationPolicy creation request is originated from a ASN-AE
 	//NOTE: Apply to Device-based location request, and this requires Test System (TS) to activate ASN-AE mode to test IUT  	
 	modulepar boolean PX_IUT_IS_ASN_CSE				:= false; //default //set it to true when running Device-based location testcases 	
 	modulepar boolean PX_IUT_IS_MN_CSE				:= false; //default //set it to true when running Share-based location testcases
 	
-	//@Martin
 	//constant parameters for LOC  
 	modulepar XSD.Token PX_LOCATION_TARGET_ID				:= "{LOCATION-TARGET-ID}"; //SUPPOSE TO BE RECEIVED FROM LOCATION SERVER
 	modulepar XSD.AnyURI PX_LOCATION_SERVER_ADDRESS		:= "{LOCATION-SERVER-ADDRESS}";
@@ -69,8 +78,11 @@ module OneM2M_Pixits {
 	modulepar charstring PX_LOCATION_UPDATE_PERIOD			:= "PT10M10S" ;//10 Minute 10 Seconds
 	modulepar charstring PX_LOCATION_CONTAINER_NAME		:= "myLoContainer";
 	
-	modulepar Labels LABELS := {"VALUE_1"}; 	
+	modulepar Labels PX_LABELS := {"VALUE_1"}; 	
 	modulepar boolean PX_IS_LOC_CONTAINER	:= false;//default //set it to true when the container is created to store location information
 	
+	modulepar PoaList PX_POA := {""};
+	modulepar ResourceTypeList_1 PX_SRT := {int1, int2, int3, int4};
+	
 }  // end of module
 

LibOneM2M/OneM2M_Ports.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     oneM2M
+ *  @version    
+ *  @desc       Port modules for oneM2M Test System       
+ *
+ */
+
+module OneM2M_Ports {
+	
+	import from OneM2M_Types all;
+	/* ***************************************
+ 	 * 		oneM2M Ports 
+  	 * ***************************************
+	 */
+	/**
+	 * @desc Port to transport oneM2M primitives
+	 * @desc Output MsgOut   
+	 * @desc Input MsgIn 
+	 * @desc this port is allowed to extend for futher usage  
+     * @desc e.g. extend OneM2MPort to dual-faced port
+	 */
+	type port OneM2MPort message {
+		in 
+			MsgIn;
+		out 
+			MsgOut;
+	};
+	
+	/**
+	 * @desc Port to transport Adaptor Control primitives
+	 */
+	type port AdapterControlPort message {
+		in
+			AcResponsePrimitive;
+		out
+			AcRequestPrimitive;
+	}
+
+}//end module

LibOneM2M/OneM2M_TestSystem.ttcn

@@ -6,48 +6,33 @@
  *  All rights reserved.
  *  
  *  @author     ETSI
- *  @version    $URL: https://forge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_TestSystem.ttcn $
- *              $Id: OneM2M_TestSystem.ttcn 175 2016-11-22 12:39:39Z reinaortega $
+ *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_TestSystem.ttcn $
+ *              $Id: OneM2M_TestSystem.ttcn 347 2017-08-11 08:48:20Z reinaortega $
  *  @desc       Test System module for oneM2M
  *
  */
 module OneM2M_TestSystem {
 
 	import from OneM2M_Types all;
-	import from OneM2M_TypesAndValues all;
-	import from LibCommon_Time {modulepar all};
-	import from XSD all;
-	
-	/* Ports */
-	/**
-	 * @desc Port to transport oneM2M primitives
-	 */
-	type port OneM2MPort message {
-		in
-			MsgIn;
-		out
-			MsgOut;
-	}
-	
-	/**
-	 * @desc Port to transport Adaptor Control primitives
-	 */
-	type port AdapterControlPort message {
-		in
-			AcResponsePrimitive;
-		out
-			AcRequestPrimitive;
-	}
+	import from LibCommon_Time all;
+	import from OneM2M_Ports all;
+	import from OneM2M_Pixits all;
 
-	/* Components */	
+/* ***************************************
+ * 		Test System Components 
+ * ***************************************
+ */	
 	type component Tester {
 		port AdapterControlPort acPort;
 		//timers
 		timer tc_ac := PX_TAC;
 		timer tc_wait;
 		//global variables
+		var Configurations vc_config;
 		var MyResourcesList vc_resourcesList;
 		var IntegerList vc_resourcesIndexToBeDeleted := {};
+		var PrimitiveScope vc_primitiveScope := PX_PRIMITIVE_SCOPE;
+		var AddressingMethod vc_addressingMethod := PX_ADDRESSING_METHOD;
 	}
 		
 	type component CseTester extends Tester {
@@ -56,6 +41,7 @@ module OneM2M_TestSystem {
 
 		//global variables
 		var AE_optional vc_aeAux;//TODO To be removed
+		var RemoteCSE_optional vc_remoteCSEAux;//TODO To be removed
 		var AccessControlPolicy_optional vc_acpAux;
 		var integer vc_acpAuxIndex := -1;
 
@@ -80,54 +66,7 @@ module OneM2M_TestSystem {
 	
 			
 	
-	/* Primitives */
-	/**
-	 * @desc Type for the oneM2M primitives exchange
-	 * @member primitive oneM2M primitive
-	 * @member host IP Address of the destination
-	 * @member xmlNamespace XML Namespace to be used
-	 * @member protocolBinding Protocol binding to be used
-	 * @member serialization Serialization to be used
-	 * @member nullFields Fields that are to be included in the oneM2M primitive but empty, i.e. <labels></labels>
-	 */
-	type record MsgOut {
-		union {
-			RequestPrimitive requestPrimitive,
-			ResponsePrimitive responsePrimitive
-		} primitive, 
-		charstring host optional,
-		charstring xmlNamespace optional, 
-		charstring protocolBinding optional,
-		charstring serialization optional,
-		AttributeList_1 nullFields optional
-	}
-	
-	/**
-	 * @desc Type for the oneM2M primitives exchange
-	 * @member primitive oneM2M primitive
-	 */
-	type record MsgIn {
-		union {
-			RequestPrimitive requestPrimitive,
-			ResponsePrimitive responsePrimitive
-		} primitive
-	}
-	
-	type record AcRequestPrimitive {
-		charstring event,
-		anytype data
-	}
-	with {
-		encode "adapter";
-	}
 	
-	type record AcResponsePrimitive {
-		charstring event,
-		anytype data
-	}
-	with {
-		encode "adapter";
-	}
 
 }// end of module
 with {

LibOneM2M/OneM2M_TypesAndValues.ttcn

@@ -6,23 +6,43 @@
  *  All rights reserved.
  *  
  *  @author     ETSI
- *  @version    $URL: https://forge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/OneM2M_TypesAndValues.ttcn $
- *              $Id: OneM2M_TypesAndValues.ttcn 175 2016-11-22 12:39:39Z reinaortega $
+ *  @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
  *
  */
 module OneM2M_TypesAndValues {
 
 	import from XSD all;
-	import from OneM2M_Types all;
 
-	/* Constants */
-	const charstring c_uri_cse := "/~/in-cse/";
-	const charstring c_cse_name := "in-cse";
+	/* Constants */	
 	const XSD.String c_defaultResourceName := "MyResource";
-	const charstring c_aeAuxName := "MyAe";
+	const XSD.String c_defaultGroupResourceName := "MyGroupResource";
+	const XSD.String c_defaultAccessControlPolicyResourceName := "MyAccessControlPolicyResource";
+	const XSD.String c_defaultScheduleResourceName := "MyScheduleResource";
+	const XSD.String c_defaultPollingChannelResourceName := "MyPollingChannelResource";
+	const XSD.String c_defaultSubscriptionResourceName := "MySubscriptionResource";
+	const XSD.String c_defaultContentInstanceResourceName := "MyContentInstanceResource";
+	const XSD.String c_defaultContainerResourceName := "MyContainerResource";
+	const XSD.String c_defaultDeliveryResourceName := "MyDeliveryResource";
+	const XSD.String c_defaultRemoteCSEResourceName := "MyRemoteCSEResource";
+	const XSD.String c_defaultMgmtObjResourceName := "MyMgmtObjResource";
+	const XSD.String c_defaultMgmtCmdResourceName := "MyMgmtCmdResource";
+	const XSD.String c_defaultAeResourceName := "MyAeResource";
+	const XSD.String c_defaultLocationPolicyResourceName := "MyLocationPolicyResource";
+	const XSD.String c_defaultNodeResourceName := "MyNodeResource";
+	const XSD.String c_defaultNodeID := "MyNodeId";
+	const XSD.String c_defaultRequestResourceName := "MyRequestResource";
+	const XSD.String c_defaultStatsConfigResourceName := "MyStatsConfigResource";
+	const XSD.String c_defaultStatsCollectResourceName := "MyStatsCollectResource";
+	const XSD.String c_defaultm2mServiceSubscriptionProfileResourceName := "Mym2mServiceSubscriptionProfileResource";
+	const XSD.String c_defaultServiceSubscribedAppRuleResourceName := "MyServiceSubscribedAppRuleResource";
+	const XSD.ID c_aeAuxName := "MyAe";
 	const XSD.String c_acpAuxName := "MyAcp";
 	const charstring c_invalid_location_update_period	:= "-PT30M10S" ;//duration set to invalid value  (minus value)
+	const XSD.ID c_resourceShortNameLatest := "la";		//<latest>
+	const XSD.ID c_resourceShortNameOldest := "ol";		//<oldest>
+	const XSD.ID c_resourceShortNameFanOutPoint := "fopt"; //<fanOutPoint>
 	
 	//AccessControlOperations
 	const XSD.Integer c_C   := 1;
@@ -87,11 +107,7 @@ module OneM2M_TypesAndValues {
 	const XSD.Integer c_UDNDi   := 60;
 	const XSD.Integer c_CUDNDi   := 61; 
 	const XSD.Integer c_RUDNDi   := 62; 
-	const XSD.Integer c_CRUDNDi   := 63;
+	const XSD.Integer c_CRUDNDi   := 63;	
 	
-	type NhURI ParentID;
-	type record length(0 .. infinity) of RequestPrimitive RequestPrimitiveList;
-	type record length(1 .. infinity) of RequestPrimitiveList RequestPrimitiveMatrix;
-
 } 
 // end of module

LibOneM2M/UsefulTtcn3Types.ttcn

@@ -6,7 +6,7 @@
  *  All rights reserved.
  *  
  *  @author     ETSI
- *  @version    $URL: https://forge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/UsefulTtcn3Types.ttcn $
+ *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/UsefulTtcn3Types.ttcn $
  *              $Id: UsefulTtcn3Types.ttcn 173 2016-11-22 08:10:48Z reinaortega $
  *  @desc       Test System module for oneM2M
  *

LibOneM2M/XSD.ttcn

@@ -6,8 +6,8 @@
  *  All rights reserved.
  *  
  *  @author     ETSI
- *  @version    $URL: https://forge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/XSD.ttcn $
- *              $Id: XSD.ttcn 120 2016-09-20 14:48:51Z reinaortega $
+ *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/branches/Release1/ttcn/LibOneM2M/XSD.ttcn $
+ *              $Id: XSD.ttcn 347 2017-08-11 08:48:20Z reinaortega $
  *  @desc       Test System module for oneM2M
  *
  */
@@ -53,9 +53,9 @@ type record AnyType
 }
 with {
 variant "XSD:anyType";
-//variant "embedValues";
-//variant (attr) "anyAttributes";
-//variant (elem_list) "anyElement";
+variant "embedValues";
+variant (attr) "anyAttributes";
+variant (elem_list) "anyElement";
 };
 // String types
 

OneM2M_TestControl.ttcn

@@ -6,8 +6,8 @@
  *  All rights reserved.
  *  
  *  @author     ETSI
- *  @version    $URL: https://forge.etsi.org/svn/oneM2M/branches/Release1/ttcn/OneM2M_TestControl.ttcn $
- *              $Id: OneM2M_TestControl.ttcn 97 2016-06-01 15:38:10Z reinaortega $
+ *  @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
  *
  */
@@ -17,7 +17,339 @@ module OneM2M_TestControl {
 	import from OneM2M_Testcases all;	
 
 	control {
-  
+		execute(TC_CSE_GEN_CRE_001_CSR());
+		execute(TC_CSE_GEN_CRE_001_SPR());
+		execute(TC_CSE_GEN_CRE_001_ABS());
+		execute(TC_CSE_GEN_RET_001_CSR());
+		execute(TC_CSE_GEN_RET_001_SPR());
+		execute(TC_CSE_GEN_RET_001_ABS());
+		execute(TC_CSE_GEN_UPD_001_CSR());
+		execute(TC_CSE_GEN_UPD_001_SPR());
+		execute(TC_CSE_GEN_UPD_001_ABS());
+		execute(TC_CSE_GEN_DEL_001_CSR());
+		execute(TC_CSE_GEN_DEL_001_SPR());
+		execute(TC_CSE_GEN_DEL_001_ABS());
+		execute(TC_CSE_REG_CRE_001());
+		execute(TC_CSE_REG_CRE_002());
+		execute(TC_CSE_REG_CRE_004());
+		execute(TC_CSE_REG_CRE_005());
+		execute(TC_CSE_REG_CRE_008());
+		execute(TC_CSE_REG_CRE_009());
+		execute(TC_CSE_REG_CRE_010());
+		execute(TC_CSE_REG_CRE_016_LBL());
+		execute(TC_CSE_REG_CRE_016_CST());
+		execute(TC_CSE_REG_CRE_016_POA());
+		execute(TC_CSE_REG_CRE_016_NL());
+		execute(TC_CSE_REG_CRE_018());
+		execute(TC_CSE_REG_CRE_022());
+		execute(TC_CSE_REG_CRE_023());
+		execute(TC_CSE_REG_CRE_024());
+		execute(TC_CSE_REG_CRE_026());
+		execute(TC_CSE_REG_RET_001());
+		execute(TC_CSE_REG_RET_005());
+		execute(TC_CSE_REG_RET_008());
+		execute(TC_CSE_REG_UPD_001());
+		execute(TC_CSE_REG_DEL_001());
+
+		execute(TC_CSE_DMR_CRE_001_CNT_CB());
+		execute(TC_CSE_DMR_CRE_001_CNT_AE());
+		execute(TC_CSE_DMR_CRE_001_CNT_CNT());
+		execute(TC_CSE_DMR_CRE_001_GRP_CB());
+		execute(TC_CSE_DMR_CRE_001_GRP_AE());
+		execute(TC_CSE_DMR_CRE_001_ACP_CB());
+		execute(TC_CSE_DMR_CRE_001_ACP_AE());
+		execute(TC_CSE_DMR_CRE_001_SCH_CB());
+		execute(TC_CSE_DMR_CRE_001_SCH_AE());
+		execute(TC_CSE_DMR_CRE_001_SCH_SUB());
+		execute(TC_CSE_DMR_CRE_001_PCH_AE());
+		execute(TC_CSE_DMR_CRE_001_SUB_CB());
+		execute(TC_CSE_DMR_CRE_001_SUB_AE());
+		execute(TC_CSE_DMR_CRE_001_SUB_CNT());
+		execute(TC_CSE_DMR_CRE_001_SUB_ACP());
+		execute(TC_CSE_DMR_CRE_001_SUB_SCH());
+		execute(TC_CSE_DMR_CRE_001_SUB_GRP());
+		execute(TC_CSE_DMR_CRE_001_NOD_CB());
+		execute(TC_CSE_DMR_CRE_001_MGC_CB());
+		execute(TC_CSE_DMR_CRE_001_LCP_CB());
+		execute(TC_CSE_DMR_CRE_001_STCG_CB());
+		execute(TC_CSE_DMR_CRE_001_STCL_CB());
+		execute(TC_CSE_DMR_CRE_001_MSSP_CB());
+		execute(TC_CSE_DMR_CRE_001_ASAR_CB());
+		execute(TC_CSE_DMR_CRE_001_CIN_CNT());
+		execute(TC_CSE_DMR_CRE_002_CNT());
+		execute(TC_CSE_DMR_CRE_002_GRP());
+		execute(TC_CSE_DMR_CRE_002_ACP());
+		execute(TC_CSE_DMR_CRE_002_SCH());
+		execute(TC_CSE_DMR_CRE_002_PCH());
+		execute(TC_CSE_DMR_CRE_002_SUB());
+		execute(TC_CSE_DMR_CRE_003_CNT());
+		execute(TC_CSE_DMR_CRE_003_GRP());
+		execute(TC_CSE_DMR_CRE_003_ACP());
+		execute(TC_CSE_DMR_CRE_003_SCH());
+		execute(TC_CSE_DMR_CRE_003_PCH());
+		execute(TC_CSE_DMR_CRE_003_SUB());
+		execute(TC_CSE_DMR_CRE_004_CNT());
+		execute(TC_CSE_DMR_CRE_004_GRP());
+		execute(TC_CSE_DMR_CRE_004_ACP());
+		execute(TC_CSE_DMR_CRE_004_SCH());
+		execute(TC_CSE_DMR_CRE_004_PCH());
+		execute(TC_CSE_DMR_CRE_004_SUB());
+		execute(TC_CSE_DMR_RET_001_CNT());
+		execute(TC_CSE_DMR_RET_001_GRP());
+		execute(TC_CSE_DMR_RET_001_ACP());
+		execute(TC_CSE_DMR_RET_001_SCH());
+		execute(TC_CSE_DMR_RET_001_PCH());
+		execute(TC_CSE_DMR_RET_001_SUB());
+		execute(TC_CSE_DMR_RET_001_CIN());
+		execute(TC_CSE_DMR_RET_002());
+		execute(TC_CSE_DMR_RET_003_CNT());
+		execute(TC_CSE_DMR_RET_003_GRP());
+		execute(TC_CSE_DMR_RET_003_ACP());
+		execute(TC_CSE_DMR_RET_003_SCH());
+		execute(TC_CSE_DMR_RET_003_PCH());
+		execute(TC_CSE_DMR_RET_003_SUB());
+		execute(TC_CSE_DMR_RET_004_CNT());
+		execute(TC_CSE_DMR_RET_004_GRP());
+		execute(TC_CSE_DMR_RET_004_ACP());
+		execute(TC_CSE_DMR_RET_004_SCH());
+		execute(TC_CSE_DMR_RET_004_PCH());
+		execute(TC_CSE_DMR_RET_004_SUB());
+		execute(TC_CSE_DMR_RET_005_CNT());
+		execute(TC_CSE_DMR_RET_005_GRP());
+		execute(TC_CSE_DMR_RET_005_ACP());
+		execute(TC_CSE_DMR_RET_005_SCH());
+		execute(TC_CSE_DMR_RET_005_PCH());
+		execute(TC_CSE_DMR_RET_005_SUB());
+		execute(TC_CSE_DMR_RET_006_CNT());
+		execute(TC_CSE_DMR_RET_006_GRP());
+		execute(TC_CSE_DMR_RET_006_ACP());
+		execute(TC_CSE_DMR_RET_006_SCH());
+		execute(TC_CSE_DMR_RET_006_PCH());
+		execute(TC_CSE_DMR_RET_006_SUB());
+		execute(TC_CSE_DMR_RET_007_CNT_LBL());
+		execute(TC_CSE_DMR_RET_007_GRP_LBL());
+		execute(TC_CSE_DMR_RET_007_ACP_LBL());
+		execute(TC_CSE_DMR_RET_007_SCH_LBL());
+		execute(TC_CSE_DMR_RET_007_PCH_LBL());
+		execute(TC_CSE_DMR_RET_007_SUB_LBL());
+		execute(TC_CSE_DMR_RET_008_CNT_AT());
+		execute(TC_CSE_DMR_RET_008_GRP_AT());
+		execute(TC_CSE_DMR_RET_008_ACP_AT());
+		execute(TC_CSE_DMR_RET_008_SCH_AT());
+		execute(TC_CSE_DMR_RET_008_PCH_AT());
+		execute(TC_CSE_DMR_RET_008_SUB_AT());
+		execute(TC_CSE_DMR_RET_020_RCN_0());
+		execute(TC_CSE_DMR_RET_020_RCN_2());
+		execute(TC_CSE_DMR_RET_020_RCN_3());
+		execute(TC_CSE_DMR_RET_021_CNT());
+		execute(TC_CSE_DMR_RET_021_GRP());
+		execute(TC_CSE_DMR_RET_021_ACP());
+		execute(TC_CSE_DMR_RET_021_SCH());
+		execute(TC_CSE_DMR_RET_021_PCH());
+		execute(TC_CSE_DMR_RET_021_SUB());
+		execute(TC_CSE_DMR_RET_022_CNT());
+		execute(TC_CSE_DMR_RET_022_GRP());
+		execute(TC_CSE_DMR_RET_022_ACP());
+		execute(TC_CSE_DMR_RET_022_SCH());
+		execute(TC_CSE_DMR_RET_022_PCH());
+		execute(TC_CSE_DMR_RET_022_SUB());
+		execute(TC_CSE_DMR_RET_023_CNT());
+		execute(TC_CSE_DMR_RET_023_GRP());
+		execute(TC_CSE_DMR_RET_023_ACP());
+		execute(TC_CSE_DMR_RET_023_SCH());
+		execute(TC_CSE_DMR_RET_023_PCH());
+		execute(TC_CSE_DMR_RET_023_SUB());
+		execute(TC_CSE_DMR_RET_024_CNT());
+		execute(TC_CSE_DMR_RET_024_GRP());
+		execute(TC_CSE_DMR_RET_024_ACP());
+		execute(TC_CSE_DMR_RET_024_SCH());
+		execute(TC_CSE_DMR_RET_024_PCH());
+		execute(TC_CSE_DMR_RET_024_SUB());
+		execute(TC_CSE_DMR_UPD_001_CNT_LBL());
+		execute(TC_CSE_DMR_UPD_001_GRP_LBL());
+		execute(TC_CSE_DMR_UPD_001_ACP_LBL());
+		execute(TC_CSE_DMR_UPD_001_SCH_LBL());
+		execute(TC_CSE_DMR_UPD_001_PCH_LBL());
+		execute(TC_CSE_DMR_UPD_001_SUB_LBL());
+		execute(TC_CSE_DMR_UPD_002_CNT_LBL());
+		execute(TC_CSE_DMR_UPD_002_GRP_LBL());
+		execute(TC_CSE_DMR_UPD_002_ACP_LBL());
+		execute(TC_CSE_DMR_UPD_002_SCH_LBL());
+		execute(TC_CSE_DMR_UPD_002_PCH_LBL());
+		execute(TC_CSE_DMR_UPD_002_SUB_LBL());
+		execute(TC_CSE_DMR_UPD_003_CNT_LBL());
+		execute(TC_CSE_DMR_UPD_003_GRP_LBL());
+		execute(TC_CSE_DMR_UPD_003_ACP_LBL());
+		execute(TC_CSE_DMR_UPD_003_SCH_LBL());
+		execute(TC_CSE_DMR_UPD_003_PCH_LBL());
+		execute(TC_CSE_DMR_UPD_003_SUB_LBL());
+		execute(TC_CSE_DMR_UPD_004_CNT_ET_MNI_LBL());
+		execute(TC_CSE_DMR_UPD_004_GRP_ET_GN_LBL());
+		execute(TC_CSE_DMR_UPD_004_ACP_PV_AT_LBL());
+		execute(TC_CSE_DMR_UPD_004_SCH_SE_AT_LBL());
+		execute(TC_CSE_DMR_UPD_004_PCH_LBL_ACP_LBL());
+		execute(TC_CSE_DMR_UPD_004_SUB_ET_LBL_EXC());
+		execute(TC_CSE_DMR_UPD_005_CNT_EXC());
+		execute(TC_CSE_DMR_UPD_005_GRP_EXC());
+		execute(TC_CSE_DMR_UPD_005_ACP_EXC());
+		execute(TC_CSE_DMR_UPD_005_SCH_EXC());
+		execute(TC_CSE_DMR_UPD_005_PCH_EXC());
+		execute(TC_CSE_DMR_UPD_005_SUB_MNI());
+		execute(TC_CSE_DMR_UPD_006_CNT_LBL());
+		execute(TC_CSE_DMR_UPD_006_GRP_LBL());
+		execute(TC_CSE_DMR_UPD_006_ACP_LBL());
+		execute(TC_CSE_DMR_UPD_006_SCH_LBL());
+		execute(TC_CSE_DMR_UPD_006_PCH_LBL());
+		execute(TC_CSE_DMR_UPD_006_SUB_LBL());
+		execute(TC_CSE_DMR_UPD_007_CNT_CT());
+		execute(TC_CSE_DMR_UPD_007_GRP_CT());
+		execute(TC_CSE_DMR_UPD_007_ACP_CT());
+		execute(TC_CSE_DMR_UPD_007_SCH_CT());
+		execute(TC_CSE_DMR_UPD_007_PCH_CT());
+		execute(TC_CSE_DMR_UPD_007_SUB_CT());
+		execute(TC_CSE_DMR_UPD_008_CNT_ET());
+		execute(TC_CSE_DMR_UPD_008_GRP_ET());
+		execute(TC_CSE_DMR_UPD_008_ACP_ET());
+		execute(TC_CSE_DMR_UPD_008_SCH_ET());
+		execute(TC_CSE_DMR_UPD_008_PCH_ET());
+		execute(TC_CSE_DMR_UPD_008_SUB_ET());
+		execute(TC_CSE_DMR_UPD_010());
+		execute(TC_CSE_DMR_DEL_001_CNT());
+		execute(TC_CSE_DMR_DEL_001_GRP());
+		execute(TC_CSE_DMR_DEL_001_ACP());
+		execute(TC_CSE_DMR_DEL_001_SCH());
+		execute(TC_CSE_DMR_DEL_001_PCH());
+		execute(TC_CSE_DMR_DEL_001_SUB());
+		execute(TC_CSE_DMR_DEL_001_CIN());
+		execute(TC_CSE_DMR_DEL_002_CNT());
+		execute(TC_CSE_DMR_DEL_002_GRP());
+		execute(TC_CSE_DMR_DEL_002_ACP());
+		execute(TC_CSE_DMR_DEL_002_SCH());
+		execute(TC_CSE_DMR_DEL_002_PCH());
+		execute(TC_CSE_DMR_DEL_002_SUB());
+		execute(TC_CSE_DMR_DEL_003());
+		execute(TC_CSE_DMR_DEL_004_CNT());
+		execute(TC_CSE_DMR_DEL_004_GRP());
+		execute(TC_CSE_DMR_DEL_004_ACP());
+		execute(TC_CSE_DMR_DEL_004_SCH());
+		execute(TC_CSE_DMR_DEL_004_PCH());
+		execute(TC_CSE_DMR_DEL_004_SUB());
+		execute(TC_CSE_DMR_DEL_005());
+		execute(TC_CSE_DMR_DEL_007());
+		execute(TC_CSE_DMR_DEL_008());
+		execute(TC_CSE_DMR_DEL_009());
+		execute(TC_CSE_DMR_DEL_010());
+		execute(TC_CSE_LOC_BV_001());
+		execute(TC_CSE_LOC_BV_002());
+		execute(TC_CSE_LOC_BO_003());
+		execute(TC_CSE_LOC_BO_004());
+		execute(TC_CSE_LOC_BI_005());
+		execute(TC_CSE_LOC_BV_006());
+		execute(TC_CSE_LOC_BV_007());
+		execute(TC_CSE_LOC_BV_008());
+		execute(TC_CSE_LOC_BV_009_01());
+		execute(TC_CSE_LOC_BV_009_02());
+		execute(TC_CSE_LOC_BV_009_03());
+		//execute(TC_CSE_LOC_BV_007());
+		//execute(TC_CSE_LOC_BV_008());
+		execute(TC_CSE_LOC_BV_012());
+		execute(TC_CSE_LOC_BV_013());
+		execute(TC_CSE_GMG_CRE_001());
+		execute(TC_CSE_GMG_CRE_002());
+		execute(TC_CSE_GMG_CRE_003());
+		execute(TC_CSE_GMG_CRE_004());
+		execute(TC_CSE_GMG_CRE_005());
+		execute(TC_CSE_GMG_CRE_006());
+		execute(TC_CSE_GMG_CRE_007());
+		execute(TC_CSE_GMG_CRE_008_CRE());
+		execute(TC_CSE_GMG_CRE_008_UPD());
+		execute(TC_CSE_GMG_CRE_008_RET());
+		execute(TC_CSE_GMG_CRE_008_DEL());
+		execute(TC_CSE_GMG_CRE_009());
+		execute(TC_CSE_GMG_UPD_001());
+		execute(TC_CSE_GMG_UPD_002());
+		execute(TC_CSE_GMG_UPD_003());
+		execute(TC_CSE_GMG_UPD_004());
+		execute(TC_CSE_GMG_UPD_005());
+		execute(TC_CSE_GMG_UPD_006());
+		execute(TC_CSE_GMG_UPD_007());
+		execute(TC_CSE_GMG_UPD_008());
+		execute(TC_CSE_GMG_UPD_009());
+		execute(TC_CSE_GMG_UPD_010());
+		execute(TC_CSE_GMG_RET_001());
+		execute(TC_CSE_GMG_001_CRE());
+		execute(TC_CSE_GMG_001_UPD());
+		execute(TC_CSE_GMG_001_RET());
+		execute(TC_CSE_GMG_001_DEL());
+		execute(TC_CSE_GMG_002_CRE());
+		execute(TC_CSE_GMG_002_UPD());
+		execute(TC_CSE_GMG_002_RET());
+		execute(TC_CSE_GMG_002_DEL());
+		execute(TC_CSE_GMG_003_CRE());
+		execute(TC_CSE_GMG_003_UPD());
+		execute(TC_CSE_GMG_003_RET());
+		execute(TC_CSE_GMG_003_DEL());
+		execute(TC_CSE_GMG_004_CRE());
+		execute(TC_CSE_GMG_004_UPD());
+		execute(TC_CSE_GMG_004_RET());
+		execute(TC_CSE_GMG_004_DEL());
+		execute(TC_CSE_DIS_001());
+		execute(TC_CSE_DIS_003());
+		execute(TC_CSE_DIS_004());
+		execute(TC_CSE_DIS_005());
+		execute(TC_CSE_DIS_006());
+		execute(TC_CSE_DIS_007());
+		execute(TC_CSE_SUB_CRE_001_SUB());
+		execute(TC_CSE_SUB_CRE_001_CIN());
+		execute(TC_CSE_SUB_CRE_002());
+		execute(TC_CSE_SUB_CRE_003());
+		execute(TC_CSE_SUB_CRE_004());
+		execute(TC_CSE_SUB_CRE_005());
+		execute(TC_CSE_SUB_NTF_001());
+		execute(TC_CSE_SUB_NTF_002());
+		execute(TC_CSE_SUB_NTF_003());
+		execute(TC_CSE_SUB_UPD_001());
+		execute(TC_CSE_SUB_UPD_002());
+		execute(TC_CSE_SUB_UPD_003());
+		execute(TC_CSE_SUB_UPD_004());
+		execute(TC_CSE_SUB_UPD_005());
+		execute(TC_CSE_SUB_UPD_006());
+		execute(TC_CSE_SUB_UPD_007());
+		execute(TC_CSE_SUB_UPD_008());
+		execute(TC_CSE_SUB_UPD_009());
+		execute(TC_CSE_SUB_DEL_001());
+		execute(TC_CSE_SUB_DEL_002());
+		execute(TC_CSE_SUB_DEL_003());
+				
+		execute(TC_CSE_SEC_ACP_001_CRE());
+		execute(TC_CSE_SEC_ACP_001_UPD());
+		execute(TC_CSE_SEC_ACP_001_RET());
+		execute(TC_CSE_SEC_ACP_001_DEL());
+		execute(TC_CSE_SEC_ACP_002_CRE());
+		execute(TC_CSE_SEC_ACP_002_UPD());
+		execute(TC_CSE_SEC_ACP_002_RET());
+		execute(TC_CSE_SEC_ACP_002_DEL());
+		execute(TC_CSE_SEC_ACP_003_CRE());
+		execute(TC_CSE_SEC_ACP_003_UPD());
+		execute(TC_CSE_SEC_ACP_003_RET());
+		execute(TC_CSE_SEC_ACP_003_DEL());
+		execute(TC_CSE_SEC_ACP_004_CRE());
+		execute(TC_CSE_SEC_ACP_004_UPD());
+		execute(TC_CSE_SEC_ACP_004_RET());
+		execute(TC_CSE_SEC_ACP_004_DEL());
+		execute(TC_CSE_SEC_ACP_011_CRE());
+		execute(TC_CSE_SEC_ACP_011_UPD());
+		execute(TC_CSE_SEC_ACP_011_RET());
+		execute(TC_CSE_SEC_ACP_011_DEL());
+		execute(TC_CSE_SEC_ACP_012_CRE());
+		execute(TC_CSE_SEC_ACP_012_UPD());
+		execute(TC_CSE_SEC_ACP_012_RET());
+		execute(TC_CSE_SEC_ACP_012_DEL());
+		execute(TC_CSE_SEC_ACP_CRE_001());
+		execute(TC_CSE_SEC_ACP_CRE_002());    
+		execute(TC_CSE_SEC_ACP_UPD_001());
+		execute(TC_CSE_SEC_ACP_UPD_002());        
 	}
 
 }  // end of module
+