Merge branch 'Release1' into STF531-REG-CRE

LibOneM2M/OneM2M_Functions.ttcn

@@ -168,6 +168,7 @@ module OneM2M_Functions {
 			// Map
 			map(self:mcaPort, system:mcaPort);//TODO To be consistent, we should use mcaPortIn for AE testing
 			map(self:acPort, system:acPort);
+			map(self:utPort, system:utPort);
 			activate(a_default());
 			activate(a_ae_cf03());
 		
@@ -187,6 +188,7 @@ module OneM2M_Functions {
 	
 			// Map
 			map(self:mccPort, system:mccPort);
+			map(self:mccPortIn, system:mccPortIn);
 			map(self:acPort, system:acPort);
 			activate(a_default());
 			activate(a_cse_cf04());
@@ -247,6 +249,7 @@ module OneM2M_Functions {
 		function f_cf03Down() runs on CseSimu {
 			
 			unmap(self:mcaPort, system:mcaPort);
+			unmap(self:utPort, system:utPort);
 			unmap(self:acPort, system:acPort);
 		}
 		
@@ -256,6 +259,7 @@ module OneM2M_Functions {
 		function f_cf04Down() runs on CseSimu {
 	
 			unmap(self:mccPort, system:mccPort);
+			unmap(self:mccPortIn, system:mccPortIn);
 			unmap(self:acPort, system:acPort);
 		}
 
@@ -1599,7 +1603,7 @@ module OneM2M_Functions {
 						v_remoteCSEResource := f_cse_generateLocalResource(v_request.primitive.requestPrimitive.primitiveContent, 1, int16);//TODO Get index from v_request.primitive.requestPrimitive.to_
 						v_localResourceIndex := f_setLocalResource(v_remoteCSEResource, int16, -1);
 						
-						v_response := m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier);
+						v_response := valueof(m_responsePrimitive(int2001,v_request.primitive.requestPrimitive.requestIdentifier));
 						v_response.from_ := PX_CSE1_ID;
 						v_response.to_ := v_request.primitive.requestPrimitive.from_;
 						v_response.primitiveContent.remoteCSE := vc_localResourcesList[v_localResourceIndex].resource.remoteCSE;

LibOneM2M/OneM2M_TestSystem.ttcn

@@ -78,6 +78,7 @@ module OneM2M_TestSystem {
 	type component AeSystem {
 		port OneM2MPort mcaPort;
 		port AdapterControlPort acPort;
+		port UpperTesterPort utPort;
 	}		
 	
 			

LibOneM2M/OneM2M_Types.ttcn

@@ -4131,10 +4131,16 @@ module OneM2M_Types {
 			encode "adapter";
 		}
 		
-		type RequestPrimitive UtTriggerPrimitive;
+		type RequestPrimitive UtTriggerPrimitive
+		with {
+			encode "UpperTester"
+		}
+		
+		type ResponsePrimitive UtTriggerAckPrimitive
+		with {			
+			encode "UpperTester"
+		}
 		
-		type ResponsePrimitive UtTriggerAckPrimitive;
-	
 		type record AttributeAux {
 			XSD.NCName name,
 			charstring value_ optional

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_CSE all;	
+
+	
+
+	control {
+
+		//AE_GEN_00001 
+		
+		//AE_GEN_00002 
+		
+		//AE_REG_00002 
+		
+		//AE_DMR_00001 
+		
+		//AE_DMR_00002
+		
+	}		
+
+}  // 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_CSE all;	
+
+	
+	control {
+
+		//AE_GEN_00001 
+		
+		//AE_GEN_00002 
+		
+		//AE_REG_00001 
+		
+		//AE_REG_00002 
+		
+		//AE_DMR_00001 
+		
+		//AE_DMR_00002 
+						
+	}
+
+}  // end of module OneM2M_TestControl_ADN_profile_4
+

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_CSE all;	
+
+	
+			
+	control {
+		
+		//AE_GEN_00001
+		
+		//AE_GEN_00002
+		
+		//AE_REG_00002 
+		
+		//AE_SUB_00001 
+		
+	}
+
+
+}  // 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_CSE all;	
+
+	
+			
+	control {
+	
+		//AE_GEN_00001
+		
+		//AE_GEN_00002 
+		
+		//AE_DMR_00002 
+	}
+			
+}  // end of module OneM2M_TestControl_Constrained_sensor_as_ADN
+