TTITANIZATION: GeoNetworking (db0e9190) · Commits · TTCN-3 Libraries / LibIts

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+24 −1

Original line number	Diff line number	Diff line
		/**
		* @author ETSI / STF405 / STF449 / STF484 / STF517
		* @author ETSI / STF405 / STF449 / STF484 / STF517 / STF525
		* @version $URL$
		* $Id$
		* @desc Module containing functions for GeoNetworking
		@@ -155,6 +155,7 @@ module LibItsGeoNetworking_Functions {
		* - Area2 which only includes NodeB
		* NodeB being close to the area center
		*/
		//FIXME RGY Titan doesn't support mtc and system clauses yet
		function f_cf01Up(Scenario p_scenario := e_staticPosition) runs on ItsGeoNetworking /* TITAN TODO: system ItsGeoNetworkingSystem */ {

		// Variables
		@@ -183,6 +184,7 @@ module LibItsGeoNetworking_Functions {

		} // end f_cf01Up

		//FIXME RGY Titan doesn't support mtc and system clauses yet
		function f_cf01Down() runs on ItsGeoNetworking /* TITAN TODO: system ItsGeoNetworkingSystem */ {

		f_uninitialiseSecuredMode();
		@@ -208,6 +210,8 @@ module LibItsGeoNetworking_Functions {
		*
		* @param p_mainUtComponent Name of the component that will initialize IUT and handle default UT messages
		*/

		//FIXME RGY Titan doesn't support mtc and system clauses yet
		function f_cf02Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {

		// Variables
		@@ -271,6 +275,8 @@ module LibItsGeoNetworking_Functions {
		/**
		* @desc Deletes configuration cf02
		*/

		//FIXME RGY Titan doesn't support mtc and system clauses yet
		function f_cf02Down() runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {

		// Local variables
		@@ -302,6 +308,7 @@ module LibItsGeoNetworking_Functions {
		* NodeB being close to the area center
		* @param p_mainUtComponent Name of the component that will initialize IUT and handle default UT messages
		*/
		//FIXME RGY Titan doesn't support mtc and system clauses yet
		function f_cf03Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {

		// Variables
		@@ -365,6 +372,8 @@ module LibItsGeoNetworking_Functions {
		/**
		* @desc Deletes configuration cf03
		*/

		//FIXME RGY Titan doesn't support mtc and system clauses yet
		function f_cf03Down() runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {

		// Local variables
		@@ -398,6 +407,8 @@ module LibItsGeoNetworking_Functions {
		* NodeB being close to the area center
		* @param p_mainUtComponent Name of the component that will initialize IUT and handle default UT messages
		*/

		//FIXME RGY Titan doesn't support mtc and system clauses yet
		function f_cf04Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {

		// Variables
		@@ -461,6 +472,8 @@ module LibItsGeoNetworking_Functions {
		/**
		* @desc Deletes configuration cf04
		*/

		//FIXME RGY Titan doesn't support mtc and system clauses yet
		function f_cf04Down() runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */{

		// Local variables
		@@ -490,6 +503,8 @@ module LibItsGeoNetworking_Functions {
		* - Area1 which only includes NodeB, NodeD and IUT
		* @param p_mainUtComponent Name of the component that will initialize IUT and handle default UT messages
		*/

		//FIXME RGY Titan doesn't support mtc and system clauses yet
		function f_cf05Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {

		// Variables
		@@ -552,6 +567,8 @@ module LibItsGeoNetworking_Functions {
		/**
		* @desc Deletes configuration cf05
		*/

		//FIXME RGY Titan doesn't support mtc and system clauses yet
		function f_cf05Down() runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {

		// Local variables
		@@ -582,6 +599,7 @@ module LibItsGeoNetworking_Functions {
		* - IUT not in sectorial area of NodeB-NodeF
		* @param p_mainUtComponent Name of the component that will initialize IUT and handle default UT messages
		*/
		//FIXME RGY Titan doesn't support mtc and system clauses yet
		function f_cf06Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {

		// Variables
		@@ -644,6 +662,8 @@ module LibItsGeoNetworking_Functions {
		/**
		* @desc Deletes configuration cf06
		*/

		//FIXME RGY Titan doesn't support mtc and system clauses yet
		function f_cf06Down() runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {

		// Local variables
		@@ -673,6 +693,8 @@ module LibItsGeoNetworking_Functions {
		* - Area1 which only includes NodeB, NodeD and IUT
		* @param p_mainUtComponent Name of the component that will initialize IUT and handle default UT messages
		*/

		//FIXME RGY Titan doesn't support mtc and system clauses yet
		function f_cf07Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /* TITAN TODO mtc ItsMtc system ItsGeoNetworkingSystem */{

		// Variables
		@@ -735,6 +757,7 @@ module LibItsGeoNetworking_Functions {
		/**
		* @desc Deletes configuration cf06
		*/
		//FIXME RGY Titan doesn't support mtc and system clauses yet
		function f_cf07Down() runs on ItsMtc /* TITAN TODO: mtc ItsMtc system ItsGeoNetworkingSystem */ {

		// Local variables

ttcn/GeoNetworking/LibItsGeoNetworking_Templates.ttcn

+7 −7

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ module LibItsGeoNetworking_Templates {
		* @param p_geoNwMsg GeoNetworking packet to be sent
		* @param p_its_aid ITS-AID used in secured mode. Default: 0, means unused
		*/
		template (value) GeoNetworkingReq m_geoNwReq_linkLayerBroadcast(
		template (omit) GeoNetworkingReq m_geoNwReq_linkLayerBroadcast(
		in template (value) GeoNetworkingPdu p_geoNwMsg,
		in template (value) UInt32 p_its_aid := 0
		) := {
		@@ -59,7 +59,7 @@ module LibItsGeoNetworking_Templates {
		* @param p_its_aid ITS-AID used in secured mode. Default: 0, means unused
		* @param p_llDestinationAdress Link-layer destination address
		*/
		template (value) GeoNetworkingReq m_geoNwReq_withLinkLayerDestination(
		template (omit) GeoNetworkingReq m_geoNwReq_withLinkLayerDestination(
		in template (value) GeoNetworkingPdu p_geoNwMsg,
		in template (value) UInt32 p_its_aid := 0,
		in template (value) MacAddress p_llDestinationAdress

ttcn/GeoNetworking/LibItsGeoNetworking_TestSystem.ttcn

+17 −8

Original line number	Diff line number	Diff line
		@@ -39,7 +39,10 @@ module LibItsGeoNetworking_TestSystem {
		out
		AcGnPrimitive, AcGn6Primitive, AcGnssPrimitive, AcSecPrimitive;
		in
		AcGnResponse, AcGn6Response, AcGnssResponse, AcGnssDistanceCovered, AcSecResponse;

		//FIXME RGY As discussed, boolean results are replaced by a top-level union of results
		// AcGnResponse, AcGn6Response, AcGnssResponse, AcGnssDistanceCovered, AcSecResponse;
		AcGnResponse, AcGn6Response, AdapterControlResults;
		} // end AdapterControlPort

		/**
		@@ -49,7 +52,9 @@ module LibItsGeoNetworking_TestSystem {
		out
		UtInitialize, UtChangePosition, UtGnTrigger;
		in
		UtInitializeResult, UtChangePositionResult, UtGnTriggerResult, UtGnEventInd;
		//FIXME RGY As discussed, boolean results are replaced by a top-level union of results
		// UtInitializeResult, UtChangePositionResult, UtGnTriggerResult, UtGnEventInd;
		UtCommonResults, UtGnTriggerResult, UtGnEventInd;
		} // end UpperTesterPort

		} // end portDefinitions
		@@ -79,20 +84,24 @@ module LibItsGeoNetworking_TestSystem {
		/**
		* @desc ITS Main Test Component
		*/
		type component ItsMtc extends ItsBaseMtc, ServerSyncComp, ItsSecurityBaseComponent {

		//FIXME RGY ItsMtc can extend ItsBaseGeoNetworking instead of ItsSecurityBaseComponent, as it contains
		// everything defined here but vc_componentTable and already extends ItsSecurityBaseComponent
		// also, ItsBaseMtc already extends ServerSyncComp
		// type component ItsMtc extends ItsBaseMtc, ServerSyncComp, ItsSecurityBaseComponent { // TODO Extend ItsBaseMtc with ItsSecurityBaseComponent? {
		type component ItsMtc extends ItsBaseMtc, ItsBaseGeoNetworking {
		/*FIXME RGY all these objects are inherited from ItsBaseGeoNetworking, they shall not be defined again: see $6.2.10.2
		port UpperTesterPort utPort;
		port AdapterControlPort acPort;

		*/
		var ComponentTable vc_componentTable := {};

		/*
		// UT indications
		var UtGnEventIndList vc_utInds := {};

		var boolean vc_utDefaultActive := true;
		var boolean vc_acDefaultActive := true;
		var boolean vc_gnDefaultActive := true;

		*/
		} // end ItsMtc

		/**

Admin message