Validation of IVIM ATS againt CNIT (c60111cf) · Commits · TTCN-3 Libraries / LibIts

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+3 −0

Original line number	Diff line number	Diff line
		@@ -1275,6 +1275,9 @@ module LibItsGeoNetworking_Functions {
		var UtGnEventInd v_ind;
		[vc_utDefaultActive] utPort.receive(UtGnEventInd:?) -> value v_ind {
		//store every upper tester indication received
		log("################# v_ind: ", v_ind);
		log("################# vc_utInds: ", vc_utInds);
		log("################# lengthof(vc_utInds): ", lengthof(vc_utInds));
		vc_utInds[lengthof(vc_utInds)] := v_ind;
		repeat;
		}

ttcn/IVIM/LibItsIvim_Templates.ttcn

+26 −26

Original line number	Diff line number	Diff line
		@@ -83,11 +83,11 @@ module LibItsIvim_Templates {
		*/
		template IvimInd mw_ivimIndWithGnParameters(
		template (present) IVIM p_iviMsg := ?,
		in template UInt8 p_gnNextHeader := *,
		in template UInt8 p_gnHeaderType := *,
		in template UInt8 p_gnHeaderSubtype := *,
		in template UInt32 p_gnLifetime := *,
		in template UInt8 p_gnTrafficClass := *
		template UInt8 p_gnNextHeader := *,
		template UInt8 p_gnHeaderType := *,
		template UInt8 p_gnHeaderSubtype := *,
		template UInt32 p_gnLifetime := *,
		template UInt8 p_gnTrafficClass := *
		) modifies mw_ivimInd := {
		gnNextHeader := p_gnNextHeader,
		gnHeaderType := p_gnHeaderType,
		@@ -146,7 +146,7 @@ module LibItsIvim_Templates {
		* @param p_optional_ Optional field (Default: omit)
		*/
		template (value) UtIvimTrigger m_utTriggerEvent(
		template (omit) TimestampIts p_repetitionInterval := c_duration_4sec,
		template (omit) TimestampIts p_repetitionInterval := c_duration_4sec * 1000, // TimeStampIts in millseconds
		template (omit) TimestampIts p_validFrom := omit,
		template (omit) TimestampIts p_validTo := omit,
		template (omit) ZidList p_zoneIds := omit,
		@@ -181,7 +181,7 @@ module LibItsIvim_Templates {
		*/
		template (omit) UtIvimUpdate m_utIvimUpdateEvent(
		template (value) IviIdentificationNumber p_iviIdentificationNumber,
		template (omit) TimestampIts p_timeStamp := c_duration_2sec,
		template (omit) TimestampIts p_timeStamp := c_duration_2sec * 1000, // TimeStampIts in millseconds
		template (omit) TimestampIts p_validFrom := omit,
		template (omit) TimestampIts p_validTo := omit,
		template (omit) IVIManagementContainer.connectedIviStructures p_connectedIviStructures := omit

ttcn/IVIM/LibItsIvim_TypesAndValues.ttcn

+2 −2

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ module LibItsIvim_TypesAndValues {
		group ivimConstants {

		const TimestampIts c_repetition_interval_deactivated := 0;
		const TimestampIts c_duration_2sec := 2;
		const TimestampIts c_duration_2sec := 2; // FIXME Change them into milliseconds and remove *1000 factor in Tp & Template (default values)
		const TimestampIts c_duration_4sec := 4;
		const TimestampIts c_duration_6sec := 6;

		@@ -141,7 +141,7 @@ module LibItsIvim_TypesAndValues {
		IviIdentificationNumber iviIdentificationNumber,
		TimestampIts validFrom optional,
		TimestampIts validTo optional,
		TimestampIts timeStamp optional,
		TimestampIts timeStamp optional, // FIXME Rename timeStamp into repetitionInterval as described in ETSI TR 103 099 Clause C.9.2 UpdateIvimEvent
		IVIManagementContainer.connectedIviStructures connectedIviStructures optional
		} with {
		variant "FIELDORDER(msb)"

ttcn/MapemSpatem/LibItsMapemSpatem_Templates.ttcn

+4 −4

Original line number	Diff line number	Diff line
		@@ -224,13 +224,13 @@ module LibItsMapemSpatem_Templates {
		template (omit) UtMapemSpatemTrigger m_utTriggerEvent(
		in Event p_event,
		in template (omit) IntersectionID p_intersectionID := omit,
		in template (omit) RegulatorySpeedLimit p_regulatorySpeedLimit := omit,
		in template (omit) Latitude p_latitude := omit
		in template (omit) RegulatorySpeedLimit p_regulatorySpeedLimit := omit/*,
		in template (omit) Latitude p_latitude := omit*/
		) := {
		event := p_event,
		intersectionID := p_intersectionID,
		regulatorySpeedLimit := p_regulatorySpeedLimit,
		latitude := p_latitude
		regulatorySpeedLimit := p_regulatorySpeedLimit/*,
		latitude := p_latitude*/
		}
		}

ttcn/MapemSpatem/LibItsMapemSpatem_TypesAndValues.ttcn

+2 −3

Original line number	Diff line number	Diff line
		@@ -65,9 +65,8 @@ module LibItsMapemSpatem_TypesAndValues {
		type record UtMapemSpatemTrigger {
		Event event,
		IntersectionID intersectionID optional,
		RegulatorySpeedLimit regulatorySpeedLimit optional,
		Latitude latitude optional

		RegulatorySpeedLimit regulatorySpeedLimit optional/*,
		Latitude latitude optional*/
		} with {
		variant "FIELDORDER(msb)"
		}

Admin message