Architectural modifications - definition of new components, new port between...

Architectural modifications - definition of new components, new port between components, new functions and all corresponding changes in test cases. [Not finalised yet]
Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>

LibOneM2M/OneM2M_Ports.ttcn

@@ -41,5 +41,15 @@ module OneM2M_Ports {
 		out
 			AcRequestPrimitive;
 	}
+	
+	/**
+	 * @desc Port to exchange information between components
+	 */
+	type port InfoPort message {
+		in
+			ResponsePrimitive, PrimitiveContent, MyResource;
+		out
+			ResponsePrimitive, PrimitiveContent, MyResource;
+	}
 
 }//end module

LibOneM2M/OneM2M_Templates.ttcn

@@ -84,7 +84,7 @@ module OneM2M_Templates {
 		 * @desc Base template for response receiving operations
 		 * @param p_responsePrimitive
 		 */
-		template MsgIn mw_response(in template (present) ResponsePrimitive p_responsePrimitive) := {
+		template MsgIn mw_response(in template (present) ResponsePrimitive p_responsePrimitive := ?) := {
 			primitive := { responsePrimitive := p_responsePrimitive}
 		};
     	
@@ -1029,6 +1029,9 @@ module OneM2M_Templates {
 	}//end group RequestPrimitives
 	
 	group ContentCreate {
+		
+		 template PrimitiveContent mw_primitiveContent := ?;
+		 
 		/**
 		 * @desc Base primitiveContent for CREATE operation for AEAnnc resource
 		 * @param p_labels Labels
@@ -3279,6 +3282,8 @@ module OneM2M_Templates {
 			primitiveContent := p_content			
 		}
 		
+		template ResponsePrimitive mw_responsePrimitiveforInfoPort := ?;
+		
 		template ResponsePrimitive mw_responsePrimitive(in template (present) ResponseStatusCode p_statusCode, in template PrimitiveContent p_content := *) := {
 			responseStatusCode := p_statusCode,
 			requestIdentifier := ?,
@@ -3344,6 +3349,12 @@ module OneM2M_Templates {
 			resultExpirationTimestamp := omit,
 			eventCategory := omit
 		};
+		
+		group InfoPortTemplates {
+		
+			template MyResource mw_resource := ?;		
+		
+		}//end group InfoPortTemplates
     	
 	}//end group ResponsePrimitives	
 	

LibOneM2M/OneM2M_TestSystem.ttcn

@@ -24,6 +24,7 @@ module OneM2M_TestSystem {
  */	
 	type component Tester {
 		port AdapterControlPort acPort;
+		port InfoPort infoPort;
 		//timers
 		timer tc_ac := PX_TAC;
 		timer tc_wait;
@@ -31,22 +32,41 @@ module OneM2M_TestSystem {
 		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;
+		//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 AccessControlPolicy_optional vc_acpAux;
+	}
+	
+	type component AeSimu extends Tester {
+		port OneM2MPort mcaPort;
+		port OneM2MPort mcaPortIn;
+	
+		//global variables
+		var PrimitiveContent vc_primitiveContentRetrievedResource;
+
+		var MsgIn vc_request;
+		var MsgIn vc_response;
+		var CseSimu vc_cseSimu;//For CF02 when AeSimu is master
+	
 	}
 		
-	type component CseTester extends Tester {
+	type component CseSimu extends Tester {
 		port OneM2MPort mcaPort;
 		port OneM2MPort mccPort;
 
 		//global variables
-		var integer vc_aeAuxIndex;//TODO To be removed
-		var RemoteCSE_optional vc_remoteCSEAux;//TODO To be removed
-		var AccessControlPolicy_optional vc_acpAux;
-		var integer vc_acpAuxIndex := -1;
-
+		var AeSimu vc_aeSimu;//For CF02 when CseSimu is master
+		var integer vc_remoteCseIndex;
+		var MsgIn vc_request;
+		var MsgIn vc_response;
 	}
 	
+	type component InCseSimu extends CseSimu {}
+	
+	type component MnCseSimu extends CseSimu {}
+	
 	type component AeTester extends Tester {
 		port OneM2MPort mcaPort;
 
@@ -55,6 +75,7 @@ module OneM2M_TestSystem {
 			
 	type component CseSystem {
 		port OneM2MPort mcaPort;
+		port OneM2MPort mcaPortIn;
 		port OneM2MPort mccPort;
 		port AdapterControlPort acPort;
 	}