Commit b8f13a7a authored by poglitsch's avatar poglitsch
Browse files

new port for message exchange between monitor components and mtc added

parent 2a54547a

LibIot/LibIot_TestConfiguration.ttcn

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ module LibIot_TestConfiguration { 
	function f_cf_monitor_up(in InterfaceMonitor p_monitor) runs on TestCoordinator {

		// connect sync ports

		connect(p_monitor:syncPort, self:syncPort);

		connect(p_monitor.xPort, self:xPort);

		// mapp TSI port

		map(p_monitor:mPort, system:mPort);

		// configure oracle
@@ -81,6 +82,7 @@ module LibIot_TestConfiguration { 
	function f_cf_monitor_down(in InterfaceMonitor p_monitor) runs on TestCoordinator {

		// connect sync ports

		disconnect(p_monitor:syncPort, self:syncPort);

		disconnect(p_monitor.xPort, self:xPort);

		// mapp TSI port

		unmap(p_monitor:mPort, system:mPort);

		// configure oracle

LibIot/LibIot_TestInterface.ttcn

+15 −2
Original line number Diff line number Diff line
@@ -7,7 +7,9 @@ 


module LibIot_TestInterface {



	import from LibIot_TypesAndValues {type ComponentIdList, VerdictType;}

	import from LibIot_TypesAndValues {

		type ComponentIdList, IOTVerdict, VerdictType;

	}



	import from LibIot_PIXITS {modulepar PX_MAX_MSG_WAIT;}
@@ -32,6 +34,7 @@ module LibIot_TestInterface { 
		*/

		type component TestCoordinator extends OracleServer {

			var ComponentIdList vc_compIds;

			port MsgExchangePort xPort;

		}

    	

		/**
@@ -58,6 +61,8 @@ module LibIot_TestInterface { 
			timer tc_wait := PX_MAX_MSG_WAIT;

			var charstring vc_interfaceName := "Undefined";

			port MonitorPort mPort;

			port AdapterPort aPort;

			port MsgExchangePort xPort;

		}

    	

		/**
@@ -79,7 +84,11 @@ module LibIot_TestInterface { 
	

	group portDefinitions {

		type port VerdictPort message {

			inout all; // TODO specify this more in detail	

			inout IOTVerdict;

		}

		

		type port MsgExchangePort message {

			inout all;	

		}

		

		type port MonitorPort message {
@@ -93,5 +102,9 @@ module LibIot_TestInterface { 
		type port TriggerPort procedure {

			inout all; 

		}

		

		type port AdapterPort message {

			inout all;	

		}	

	}// end group portDefinitions

}
 
 No newline at end of file