Fix inconsistency between transmission interval and repetition interval (1e302758) · Commits · TTCN-3 Libraries / LibIts

ttcn/DENM/LibItsDenm_Templates.ttcn

+27 −13

Original line number	Diff line number	Diff line
		@@ -73,22 +73,22 @@ module LibItsDenm_Templates {
		* @param p_situation The Situation Container
		* @param p_location The Location Container
		* @param p_validityDuration The validity duration (Default: omit)
		* @param p_transmissionInterval The transmission interval (Default: omit)
		* @param p_repetitionDuration The repetition duration (Default: omit)
		* @param p_keepAliveForwardingRequest The keep alive forwarding request flag (Default: omit)
		* @param p_repetitionInterval The repetition interval (Default: omit)
		* @param p_transmissionInterval The transmission interval (Default: omit)
		* @param p_alacarte The Alacarte container (Default: omit)
		*/
		template (value) UtDenmTrigger m_utTriggerEvent(
		template (value) SituationContainer p_situation,
		template (value) LocationContainer p_location,
		template (omit) ValidityDuration p_validityDuration := omit,
		template (omit) TransmissionInterval p_transmissionInterval := omit,
		template (omit) ValidityDuration p_repetitionDuration := omit,
		template (value) boolean p_keepAliveForwardingRequest := false,
		template (omit) TransmissionInterval p_repetitionInterval := omit,
		template (omit) TransmissionInterval p_transmissionInterval := omit,
		template (omit) AlacarteContainer p_alacarte := omit
		) := {
		detectionTime := f_getCurrentTime(),
		validityDuration := c_validityDuration_2sec,
		validityDuration := c_duration_2sec,
		repetitionDuration := p_repetitionDuration,
		situtation := p_situation,
		location := p_location,
		@@ -97,7 +97,7 @@ module LibItsDenm_Templates {
		relevanceTrafficDirection := allTrafficDirections,
		trafficClass := 0,
		transmissionInterval := p_transmissionInterval,
		keepAliveForwardingRequest := p_keepAliveForwardingRequest
		repetitionInterval := p_repetitionInterval
		}

		/**
		@@ -109,8 +109,8 @@ module LibItsDenm_Templates {
		* @param p_relevanceDistance The relevance distance (Default: omit)
		* @param p_relevanceTrafficDirection The relevance traffic direction (Default: omit)
		* @param p_trafficClass The traffic class (Default: omit)
		* @param p_repetitionInterval The repetition interval (Default: omit)
		* @param p_transmissionInterval The transmission interval (Default: omit)
		* @param p_keepAliveForwardingRequest The keep alive forwarding request flag (Default: omit)
		* @param p_alacarte The Alacarte Container (Default: omit)
		*/
		template (value) UtDenmUpdate m_utUpdateEvent(
		@@ -121,8 +121,9 @@ module LibItsDenm_Templates {
		template (omit) RelevanceDistance p_relevanceDistance := omit,
		template (omit) RelevanceTrafficDirection p_relevanceTrafficDirection := omit,
		template (omit) integer p_trafficClass := omit,
		template (omit) ValidityDuration p_repetitionDuration := omit,
		template (omit) TransmissionInterval p_repetitionInterval := omit,
		template (omit) TransmissionInterval p_transmissionInterval := omit,
		template (value) boolean p_keepAliveForwardingRequest := false,
		template (omit) AlacarteContainer p_alacarte := omit
		) := {
		actionId := p_actionId,
		@@ -135,7 +136,7 @@ module LibItsDenm_Templates {
		relevanceTrafficDirection := p_relevanceTrafficDirection,
		trafficClass := p_trafficClass,
		transmissionInterval := p_transmissionInterval,
		keepAliveForwardingRequest := p_keepAliveForwardingRequest
		repetitionInterval := p_repetitionInterval
		}

		/**
		@@ -398,6 +399,7 @@ module LibItsDenm_Templates {
		template (value) ActionID p_actionID,
		template (value) StationType p_stationType := f_getTsStationId(),
		template (value) ValidityDuration p_validityDuration := c_defaultValidity,
		template (omit) TransmissionInterval p_transmissionInterval := omit,
		template (value) TimestampIts p_detectionTime := f_getCurrentTime(),
		template (value) TimestampIts p_referenceTime := f_getCurrentTime()
		) := {
		@@ -409,13 +411,25 @@ module LibItsDenm_Templates {
		relevanceDistance := lessThan50m,
		relevanceTrafficDirection := allTrafficDirections,
		validityDuration := p_validityDuration,
		transmissionInterval := omit,
		transmissionInterval := p_transmissionInterval,
		stationType := p_stationType
		}

		/**
		* @desc Send template for Management Container
		* @param p_actionID The action id
		* @param p_isNegation The negation flag (Default: false)
		* @param p_isCancellation The cancellation flag (Default: false)
		* @param p_validityDuration The validity duration (Default: omit)
		* @param p_transmissionInterval The transmission interval (Default: omit)
		* @param p_detectionTime The detection time (Default: current time)
		* @param p_referenceTime The reference time (Default: current time)
		*/
		template (value) ManagementContainer m_denmMgmtConTermination (
		template (value) ActionID p_actionID,
		template (value) StationType p_stationType := f_getTsStationId(),
		template (value) ValidityDuration p_validityDuration := c_defaultValidity,
		template (omit) TransmissionInterval p_transmissionInterval := omit,
		template (value) TimestampIts p_detectionTime := f_getCurrentTime(),
		template (value) TimestampIts p_referenceTime := f_getCurrentTime(),
		template (value) Termination p_termination

ttcn/DENM/LibItsDenm_TypesAndValues.ttcn

+12 −12

Original line number	Diff line number	Diff line
		@@ -42,17 +42,17 @@ module LibItsDenm_TypesAndValues {

		const ItsPduHeader.messageID c_messageId := 1;

		const ValidityDuration c_validityDuration_2sec := 2;
		const ValidityDuration c_validityDuration_10sec := 10;
		const ValidityDuration c_defaultValidity := 600;
		const ValidityDuration c_duration_2sec := 2;
		const ValidityDuration c_duration_5sec := 5;
		const ValidityDuration c_duration_10sec := 10;

		const ValidityDuration c_repetitionDuration_5sec := 5;
		const ValidityDuration c_defaultValidity := 600;

		const TransmissionInterval c_transmissionInterval_1sec := 1000;
		const TransmissionInterval c_transmissionInterval_2sec := 2000;
		const TransmissionInterval c_transmissionInterval_4sec := 4000;
		const TransmissionInterval c_transmissionInterval_5sec := 5000;
		const TransmissionInterval c_transmissionInterval_10sec := 10000;
		const TransmissionInterval c_interval_1sec := 1000;
		const TransmissionInterval c_interval_2sec := 2000;
		const TransmissionInterval c_interval_4sec := 4000;
		const TransmissionInterval c_interval_5sec := 5000;
		const TransmissionInterval c_interval_10sec := 10000;

		} // end group denmConstants

		@@ -72,7 +72,7 @@ module LibItsDenm_TypesAndValues {
		RelevanceTrafficDirection relevanceTrafficDirection,
		integer trafficClass, // FIXME: check if useful
		TransmissionInterval transmissionInterval optional,
		boolean keepAliveForwardingRequest
		TransmissionInterval repetitionInterval optional
		}
		/**
		* @desc Upper Tester result message of request of triggering of an event at IUT
		@@ -96,7 +96,7 @@ module LibItsDenm_TypesAndValues {
		RelevanceTrafficDirection relevanceTrafficDirection optional,
		integer trafficClass optional, // FIXME: check if useful
		TransmissionInterval transmissionInterval optional,
		boolean keepAliveForwardingRequest
		TransmissionInterval repetitionInterval optional
		}

		/**