Introduced ActionId param for DENM cancellation and negation. (1277ef57) · Commits · TTCN-3 Libraries / LibIts

DENM/LibItsDenm_Functions.ttcn

+10 −16

Original line number	Diff line number	Diff line
		@@ -85,10 +85,12 @@ module LibItsDenm_Functions {
		* @param p_trigger Indicates if the cancellation have to be raised by the test system(e_ets)
		* or at the application layer of the IUT(e_iut).
		* @param p_event The event to cancel.
		* @param p_actionId The action ID of the event to be cancelled
		*/
		altstep a_cancelEvent(in template (value) Trigger p_trigger, in template (value) Situation p_event) runs on ItsFa {
		altstep a_cancelEvent(in template (value) Trigger p_trigger, in template (value) Situation p_event, in template (omit) ActionID p_actionId)
		runs on ItsFa {
		[] a_shutdown() {
		f_poCancelEvent(p_trigger, p_event);
		f_poCancelEvent(p_trigger, p_event, p_actionId);
		f_cfDown();
		log("* a_cancelEvent: INFO: TEST COMPONENT NOW STOPPING ITSELF! *");
		stop;
		@@ -137,8 +139,10 @@ module LibItsDenm_Functions {
		* @param p_trigger Indicates if the cancellation have to be raised by the test system(e_ets)
		* or at the application layer of the IUT(e_iut).
		* @param p_event The event to cancel.
		* @param p_actionId The action ID of the event to be cancelled
		*/
		function f_poCancelEvent(template (value) Trigger p_trigger, template (value) Situation p_event) runs on ItsFa {
		function f_poCancelEvent(template (value) Trigger p_trigger, template (value) Situation p_event, template (omit) ActionID p_actionId)
		runs on ItsFa {
		var FncRetCode v_ret := e_success;

		if (valueof(p_trigger) == e_ets) {
		@@ -152,7 +156,7 @@ module LibItsDenm_Functions {
		f_sleep(PX_TNOAC);
		}
		else {
		f_utTriggerEvent(m_utEventCancellation(p_event, c_dataVersionCancellation));
		f_utTriggerEvent(m_utEventCancellation(p_event, p_actionId));
		}

		f_poDefault();
		@@ -176,22 +180,12 @@ module LibItsDenm_Functions {

		group receiveFunctions {

		/**
		* @desc Awaits a DEN message
		* @param p_rcvMsg The expected message to be received.

		*/
		function f_awaitDenMessage(template (present) DenmInd p_rcvMsg) runs on ItsFa {
		var DenmInd v_denmInd;
		f_awaitDenMessageOut(p_rcvMsg, v_denmInd);
		}

		/**
		* @desc Awaits a DEN message and returns it
		* @param p_rcvMsg The expected message to be received.
		* @param p_rcvdMsg The received message - OUT.
		*/
		function f_awaitDenMessageOut(in template (present) DenmInd p_rcvMsg, out DenmInd p_rcvdMsg) runs on ItsFa {
		function f_awaitDenMessage(in template (present) DenmInd p_rcvMsg, out DenmInd p_rcvdMsg) runs on ItsFa {

		tc_ac.start;
		alt {
		@@ -199,7 +193,7 @@ module LibItsDenm_Functions {
		tc_ac.stop;
		}
		[] tc_ac.timeout {
		log("* f_awaitDenMessageOut: INFO: Timeout while awaiting the reception of a message *");
		log("* f_awaitDenMessage: INFO: Timeout while awaiting the reception of a message *");
		f_selfOrClientSyncAndVerdict("error", e_timeout);
		}
		}

DENM/LibItsDenm_Templates.ttcn

+7 −7

Original line number	Diff line number	Diff line
		@@ -61,15 +61,15 @@ module LibItsDenm_Templates {
		/**
		* @desc Send template for Upper Tester event cancellation
		* @param p_situation Situation
		* @param p_dataVersion Data version
		* @param p_actionId Action ID of the event to be cancelled
		*/
		template (value) UtEvent m_utEventCancellation(
		in template (value) Situation p_situation,
		in template (value) DataVersion p_dataVersion
		in template (value) ActionID p_actionId
		) modifies m_utEvent := {
		utDenmEvent := {
		eventOption := {
		eventCancellation := p_dataVersion
		eventCancellation := p_actionId
		}
		}
		}
		@@ -77,16 +77,16 @@ module LibItsDenm_Templates {
		/**
		* @desc Send template for Upper Tester event negation
		* @param p_situation Situation
		* @param p_isNegation Is it a negation
		* @param p_actionId Action ID of the event to be negated
		* @see m_utEvent
		*/
		template (value) UtEvent m_utEventNegation(
		in template (value) Situation p_situation,
		in template (value) DecentralizedEnvironmentalNotificationMessage.management.isNegation p_isNegation
		in template (value) ActionID p_actionId
		) modifies m_utEvent := {
		utDenmEvent := {
		eventOption := {
		eventNegation := p_isNegation
		eventNegation := p_actionId
		}
		}
		}

DENM/LibItsDenm_TypesAndValues.ttcn

+2 −2

Original line number	Diff line number	Diff line
		@@ -159,8 +159,8 @@ module LibItsDenm_TypesAndValues {
		* @desc Upper Tester options for DENM action/event
		*/
		type union EventOption {
		DataVersion eventCancellation,
		DecentralizedEnvironmentalNotificationMessage.management.isNegation eventNegation,
		ActionID eventCancellation,
		ActionID eventNegation,
		TrafficFlowEffect eventTrafficFlowEffect,
		Situation eventLinkedCause,
		TimeStamp eventExpirationTime,