Merge branch 'Extendable_port_design'

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 64 2016-12-14 15:09:43Z berge $
+ *            $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
@@ -148,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"
+        }
 
 
         /**

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     KETI & EGM
+ *  @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

@@ -16,29 +16,12 @@ module OneM2M_TestSystem {
 	import from OneM2M_Types all;
 	import from OneM2M_TypesAndValues all;
 	import from LibCommon_Time {modulepar 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 OneM2M_Ports all;
 
-	/* Components */	
+/* ***************************************
+ * 		Test System Components 
+ * ***************************************
+ */	
 	type component Tester {
 		port AdapterControlPort acPort;
 		//timers
@@ -80,56 +63,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 forcedFields Attributes that need to be processed differently by the test adapter:
-	 * 			- empty fields (for instance, for attribute deletion), i.e. <labels></labels> -> value_ to be omitted
-	 * 			- invalid values, i.e. <maxNrOfInstances>-1</maxNrOfInstances>
-	 */
-	type record MsgOut {
-		union {
-			RequestPrimitive requestPrimitive,
-			ResponsePrimitive responsePrimitive
-		} primitive, 
-		charstring host optional,
-		charstring xmlNamespace optional, 
-		charstring protocolBinding optional,
-		charstring serialization optional,
-		AttributeAux_list forcedFields 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

@@ -99,11 +99,6 @@ module OneM2M_TypesAndValues {
 		e_cf03	
 	};
 	
-	type record AttributeAux {
-		XSD.NCName name,
-		charstring value_ optional
-	};
 	
-	type record of AttributeAux AttributeAux_list;
 } 
 // end of module