Start UpperTester changes (3c7286f4) · Commits · TTCN-3 Libraries / LibIts

ttcn/GeoNetworking/LibItsGeoNetworking_EncdecDeclarations.ttcn

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -35,4 +35,7 @@ module LibItsGeoNetworking_EncdecDeclarations {
	with {extension "prototype(sliding) decode(LibItsSecurity)"}		with {extension "prototype(sliding) decode(LibItsSecurity)"}
	*/		*/

			external function fx_enc_UtGnInitialize (UtGnInitialize p) return bitstring
			with {extension "prototype(convert) encode(UpperTester)"}

	} // End of module LibItsGeoNetworking_EncdecDeclarations		} // End of module LibItsGeoNetworking_EncdecDeclarations

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -46,7 +46,7 @@ module LibItsGeoNetworking_Functions {
	* @desc Requests to bring the IUT in an initial state		* @desc Requests to bring the IUT in an initial state
	* @param p_init The initialisation to trigger.		* @param p_init The initialisation to trigger.
	*/		*/
	function f_utInitializeIut(template (value) UtInitialize p_init) runs on ItsBaseGeoNetworking {		function f_utInitializeIut(template (value) UtGnInitialize p_init) runs on ItsBaseGeoNetworking {

	//deactivate gnPort default alts		//deactivate gnPort default alts
	vc_gnDefaultActive := false;		vc_gnDefaultActive := false;
	@@ -54,7 +54,7 @@ module LibItsGeoNetworking_Functions {
	utPort.send(p_init);		utPort.send(p_init);
	tc_wait.start;		tc_wait.start;
	alt {		alt {
	[] utPort.receive(UtInitializeResult:true) {		[] utPort.receive(UtGnResults: { utGnInitializeResult := true }) {
	tc_wait.stop;		tc_wait.stop;
	log("* f_utInitializeIut: INFO: IUT initialized *");		log("* f_utInitializeIut: INFO: IUT initialized *");
	}		}

ttcn/GeoNetworking/LibItsGeoNetworking_Templates.ttcn

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -97,7 +97,7 @@ module LibItsGeoNetworking_Templates {
	/**		/**
	* @desc Initializes the GN IUT.		* @desc Initializes the GN IUT.
	*/		*/
	template (value) UtInitialize m_gnInitialize := {		template (value) UtGnInitialize m_gnInitialize := {
	hashedId8 := '0000000000000000'O		hashedId8 := '0000000000000000'O
	}		}

ttcn/GeoNetworking/LibItsGeoNetworking_TestSystem.ttcn

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -50,11 +50,11 @@ module LibItsGeoNetworking_TestSystem {
	*/		*/
	type port UpperTesterPort message {		type port UpperTesterPort message {
	out		out
	UtInitialize, UtChangePosition, UtAutoInteropTrigger, UtGnTrigger;		UtGnInitialize, UtChangePosition, UtAutoInteropTrigger, UtGnTrigger;
	in		in
	//FIXME RGY As discussed, boolean results are replaced by a top-level union of results		//FIXME RGY As discussed, boolean results are replaced by a top-level union of results
	// UtInitializeResult, UtChangePositionResult, UtGnTriggerResult, UtGnEventInd;		// UtInitializeResult, UtChangePositionResult, UtGnTriggerResult, UtGnEventInd;
	UtCommonResults, UtGnTriggerResult, UtGnEventInd;		UtGnResults, /UtCommonResults,/ UtGnTriggerResult, UtGnEventInd;
	} // end UpperTesterPort		} // end UpperTesterPort

	} // end portDefinitions		} // end portDefinitions

ttcn/GeoNetworking/LibItsGeoNetworking_TypesAndValues.ttcn

+46 −14

Original line number	Original line	Diff line number	Diff line
	@@ -929,16 +929,41 @@ module LibItsGeoNetworking_TypesAndValues {

	group utPrimitives {		group utPrimitives {

			/**
			* @desc Upper Tester message to initialize IUT
			* @member hashedId8 In case of secured mode set, hashedId8 indicate which certificate the IUT shall use
			*/
			type record UtGnInitialize {
			Oct8 hashedId8
			} with {
			variant "FIELDORDER(msb)"
			}

			/**
			* @desc Upper Tester results message of the GeoNetworking
			* @member utGnInitialize -
			* @member utGnTriggerResult -
			* @member utAutoInteropTriggerResult -

			*/
			type union UtGnResults {
			boolean utGnInitializeResult,
			boolean utGnTriggerResult,
			boolean utAutoInteropTriggerResult
			} with {
			variant ""
			} // End of type UtGnResults

	/**		/**
	* @desc AutoInterop UpperTester trigger		* @desc AutoInterop UpperTester trigger
	* @member utRadioOnOff Set to true to power on the radio (on-link mode), false to power off the radio (off-link).		* @member utRadioOnOff Set to true to power on the radio (on-link mode), false to power off the radio (off-link).
	*/		*/
	type union UtAutoInteropTrigger {		type union UtAutoInteropTrigger {
	boolean utRadioOnOff		boolean utRadioOnOff
			} with {
			variant ""
	} // End of type UtAutoInteropTrigger		} // End of type UtAutoInteropTrigger

	type boolean UtAutoInteropTriggerResult;

	/**		/**
	* @desc UT primitives for GeoNetworking		* @desc UT primitives for GeoNetworking
	* @member geoUnicast -		* @member geoUnicast -
	@@ -955,6 +980,8 @@ module LibItsGeoNetworking_TypesAndValues {
	GenerateGeoAnycastMessage geoAnycast,		GenerateGeoAnycastMessage geoAnycast,
	GenerateSHBMessage shb,		GenerateSHBMessage shb,
	GenerateTSBMessage tsb		GenerateTSBMessage tsb
			} with {
			variant ""
	}		}

	type boolean UtGnTriggerResult;		type boolean UtGnTriggerResult;
	@@ -972,7 +999,7 @@ module LibItsGeoNetworking_TypesAndValues {
	TrafficClass trafficClass,		TrafficClass trafficClass,
	GnRawPayload payload		GnRawPayload payload
	} with {		} with {
	encode (payload) "UpperTester"		variant "FIELDORDER(msb)"
	}		}

	/**		/**
	@@ -991,7 +1018,7 @@ module LibItsGeoNetworking_TypesAndValues {
	Area area,		Area area,
	GnRawPayload payload		GnRawPayload payload
	} with {		} with {
	encode (payload) "UpperTester"		variant "FIELDORDER(msb)"
	}		}

	/**		/**
	@@ -1008,7 +1035,7 @@ module LibItsGeoNetworking_TypesAndValues {
	TrafficClass trafficClass,		TrafficClass trafficClass,
	GnRawPayload payload		GnRawPayload payload
	} with {		} with {
	encode (payload) "UpperTester"		variant "FIELDORDER(msb)"
	}		}

	/**		/**
	@@ -1024,7 +1051,7 @@ module LibItsGeoNetworking_TypesAndValues {
	TrafficClass trafficClass,		TrafficClass trafficClass,
	GnRawPayload payload		GnRawPayload payload
	} with {		} with {
	encode (payload) "UpperTester"		variant "FIELDORDER(msb)"
	}		}

	/**		/**
	@@ -1033,6 +1060,8 @@ module LibItsGeoNetworking_TypesAndValues {
	type record UtGnEventInd {		type record UtGnEventInd {
	// GeoNetworkingPdu gnPdu		// GeoNetworkingPdu gnPdu
	GnRawPayload rawPayload		GnRawPayload rawPayload
			} with {
			variant "FIELDORDER(msb)"
	}		}

	/**		/**
	@@ -1042,9 +1071,8 @@ module LibItsGeoNetworking_TypesAndValues {

	} // end utPrimitives		} // end utPrimitives
	with {		with {
	//FIXME RGY temporarily changed to RAW, until encoding functions are changed to UpperTester		encode "UpperTester";
	// encode "UpperTester"		variant ""
	encode "RAW"; variant ""
	}		}

	group acPrimitives {		group acPrimitives {
	@@ -1067,6 +1095,8 @@ module LibItsGeoNetworking_TypesAndValues {
	AcStartBeaconingMultipleNeighbour startBeaconingMultipleNeighbour,		AcStartBeaconingMultipleNeighbour startBeaconingMultipleNeighbour,
	AcStopBeaconingMultipleNeighbour stopBeaconingMultipleNeighbour,		AcStopBeaconingMultipleNeighbour stopBeaconingMultipleNeighbour,
	AcGetLongPosVector getLongPosVector		AcGetLongPosVector getLongPosVector
			} with {
			variant ""
	}		}

	/**		/**
	@@ -1078,8 +1108,9 @@ module LibItsGeoNetworking_TypesAndValues {
	AcGnResponseFailure failure		AcGnResponseFailure failure
	}		}
	with {		with {
			variant ""
	encode(getLongPosVector) "LibItsGeoNetworking"		encode(getLongPosVector) "LibItsGeoNetworking"
	};		}

	type record AcGnResponseFailure {		type record AcGnResponseFailure {
	boolean failure		boolean failure
	@@ -1094,7 +1125,7 @@ module LibItsGeoNetworking_TypesAndValues {
	}		}
	with {		with {
	encode(beaconPacket) "LibItsGeoNetworking"		encode(beaconPacket) "LibItsGeoNetworking"
	};		}

	/**		/**
	* @desc Primitive for TA to stop sending beacons for the test component		* @desc Primitive for TA to stop sending beacons for the test component
	@@ -1151,6 +1182,7 @@ module LibItsGeoNetworking_TypesAndValues {

	} // end acPrimitives		} // end acPrimitives
	with {		with {
			variant ""
	encode "AdapterControl"		encode "AdapterControl"
	}		}
	}		}

Admin message