Fixed naming convention issues in DENM (adf92ac0) · Commits · TTCN-3 Libraries / LibIts

ttcn/DENM/LibItsDenm_Functions.ttcn

+6 −7

Original line number	Diff line number	Diff line
		@@ -128,7 +128,7 @@ module LibItsDenm_Functions {
		var FncRetCode v_ret := e_success;

		if (p_trigger == e_ets) {
		f_sendDENM(
		f_sendDenMessage(
		m_denmReq(
		m_denmWithCause(c_dataVersionCancellation, p_event)
		)
		@@ -137,7 +137,6 @@ module LibItsDenm_Functions {
		else {
		v_ret := f_triggerEventCancellation(p_event);
		}
		//empty
		f_setVerdictPreOrPostamble(v_ret);

		f_poDefault();
		@@ -182,7 +181,7 @@ module LibItsDenm_Functions {
		*/
		function f_triggerEventNegation(template (value) Situation p_event) runs on ItsFa return FncRetCode {
		var FncRetCode v_ret := e_success;
		var DecentralizedEnvironmentalNotificationMessage.management.isNegation isNegation := true;
		var DecentralizedEnvironmentalNotificationMessage.management.isNegation v_isNegation := true;

		//TODO raise action or send message via port

		@@ -289,7 +288,7 @@ module LibItsDenm_Functions {
		* @param p_sendMsg The DEN message to send.
		* @return
		*/
		function f_sendDENM(template (value) DenmReq p_sendMsg) runs on ItsFa {
		function f_sendDenMessage(template (value) DenmReq p_sendMsg) runs on ItsFa {
		p_sendMsg.msgOut.management.actionID.sequenceNo := vc_sequenceNo;

		denmPort.send(p_sendMsg);
		@@ -304,9 +303,9 @@ module LibItsDenm_Functions {
		* @param p_rcvMsg The expected message to be received.
		* @return
		*/
		function f_awaitDENMessage(template (present) DenmInd p_rcvMsg) runs on ItsFa return FncRetCode {
		function f_awaitDenMessage(template (present) DenmInd p_rcvMsg) runs on ItsFa return FncRetCode {
		var DenmInd v_denmInd;
		return f_awaitDENMessageOut(p_rcvMsg, v_denmInd);
		return f_awaitDenMessageOut(p_rcvMsg, v_denmInd);
		}

		/**
		@@ -315,7 +314,7 @@ module LibItsDenm_Functions {
		* @param p_rcvdMsg The received message - OUT.
		* @return
		*/
		function f_awaitDENMessageOut(in template (present) DenmInd p_rcvMsg, out template (value) DenmInd p_rcvdMsg) runs on ItsFa return FncRetCode {
		function f_awaitDenMessageOut(in template (present) DenmInd p_rcvMsg, out template (value) DenmInd p_rcvdMsg) runs on ItsFa return FncRetCode {
		var FncRetCode v_ret := e_success;

		tc_wait.start;

ttcn/DENM/LibItsDenm_Templates.ttcn

+16 −16

Original line number	Diff line number	Diff line
		@@ -14,10 +14,10 @@ module LibItsDenm_Templates {
		import from LibIts_Interface all;
		import from LibItsDenm_TypesAndValues all;

		group primitives_Templates {
		group primitivesTemplates {

		template DenmReq m_denmReq(
		template (omit) DecentralizedEnvironmentalNotificationMessage p_denMsg
		template (value) DecentralizedEnvironmentalNotificationMessage p_denMsg
		) := {
		msgOut := p_denMsg
		}
		@@ -30,7 +30,7 @@ module LibItsDenm_Templates {

		} // end primitives

		group DecentralizedEnvironmentalNotificationMessage_Templates {
		group DecentralizedEnvironmentalNotificationMessageTemplates {

		template DecentralizedEnvironmentalNotificationMessage m_denm(
		template (value) DecentralizedSituationManagement p_mgmt,
		@@ -71,9 +71,9 @@ module LibItsDenm_Templates {
		management := m_denmMgmtCon_IsNeg(p_dataVersion, p_isNeg)
		}

		} // end group DecentralizedEnvironmentalNotificationMessage_Templates
		} // end group DecentralizedEnvironmentalNotificationMessageTemplates

		group DecentralizedSituationManagement_Templates {
		group DecentralizedSituationManagementTemplates {

		template DecentralizedSituationManagement m_denmMgmtCon(
		template (value) DataVersion p_dataVersion
		@@ -123,9 +123,9 @@ module LibItsDenm_Templates {
		isNegation := p_isNeg
		}

		} // end group DecentralizedSituationManagement_Templates
		} // end group DecentralizedSituationManagementTemplates

		group DecentralizedSituation_Templates {
		group DecentralizedSituationTemplates {

		template DecentralizedSituation m_denmSitCon(
		template (value) Situation p_sit,
		@@ -175,7 +175,7 @@ module LibItsDenm_Templates {
		eventCharact := p_ec
		}

		group Situation_Templates {
		group SituationTemplates {

		template Situation m_situation(
		template (value) DENM_PDU_Descriptions.CauseCode p_cause,
		@@ -193,9 +193,9 @@ module LibItsDenm_Templates {
		subCause := p_subCause
		}

		} // end group Situation_Templates
		} // end group SituationTemplates

		group EventCharact_Templates {
		group EventCharactTemplates {

		//TODO check if depending on kind of ITS station
		template DecentralizedSituation.eventCharact m_eventCharact := {
		@@ -207,9 +207,9 @@ module LibItsDenm_Templates {

		}

		} // end group DecentralizedSituation_Templates
		} // end group DecentralizedSituationTemplates

		group DecentralizedSituationLocation_Templates {
		group DecentralizedSituationLocationTemplates {

		template DecentralizedSituationLocation m_denmSitLoc(
		template (value) DecentralizedSituationLocation.eventPosition p_eventPosition,
		@@ -227,7 +227,7 @@ module LibItsDenm_Templates {
		locationRef := p_locationRef
		}

		group locationRef_Templates {
		group locationRefTemplates {

		template DecentralizedSituationLocation.locationRef m_locationRef := {
		trace := {
		@@ -236,8 +236,8 @@ module LibItsDenm_Templates {
		}
		}

		} // end group locationRef_Templates
		} // end group locationRefTemplates

		} // end group DecentralizedSituationLocation
		} // end group DecentralizedSituationLocationTemplates

		} // end LibItsDenm_Templates
		No newline at end of file
		} // end LibItsDenmTemplates
		No newline at end of file

Admin message