Update SSEM implementation of TCs (aa062387) · Commits · TTCN-3 Libraries / LibIts

ttcn/Common/LibItsCommon_TypesAndValues.ttcn

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -200,6 +200,7 @@ module LibItsCommon_TypesAndValues {
	const integer c_its_aid_IVI := 139;		const integer c_its_aid_IVI := 139;
	const integer c_its_aid_GPC := 140;		const integer c_its_aid_GPC := 140;
	const integer c_its_aid_TLC := 140;		const integer c_its_aid_TLC := 140;
			const integer c_its_aid_TLS := 140;
	const integer c_its_aid_GN := 141;		const integer c_its_aid_GN := 141;
	const integer c_its_aid_SCR := 623; // Secured Certificate Request, https://standards.ieee.org/products-services/regauth/psid/public.html		const integer c_its_aid_SCR := 623; // Secured Certificate Request, https://standards.ieee.org/products-services/regauth/psid/public.html
	}		}

ttcn/SremSsem/LibItsSremSsem_Functions.ttcn

+3 −3

Original line number	Original line	Diff line number	Diff line
	/**		/**
	* @author ETSI / STF517		* @author ETSI STF517 / STF581 / TTF002
	* @version $Url: https://oldforge.etsi.org/svn/LibIts/tags/20170222_STF527_Final/ttcn/SremSsem/LibItsSremSsem_Functions.ttcn $		* @version $Url: https://oldforge.etsi.org/svn/LibIts/tags/20170222_STF527_Final/ttcn/SremSsem/LibItsSremSsem_Functions.ttcn $
	* $Id: LibItsSremSsem_Functions.ttcn,v 1.2 2018/05/31 15:57:11 dte Exp $		* $Id: LibItsSremSsem_Functions.ttcn,v 1.2 2018/05/31 15:57:11 dte Exp $
	* @desc Module containing common functions for ITS SREMM SSEM		* @desc Module containing common functions for ITS SREMM SSEM
	@@ -236,12 +236,12 @@ module LibItsSremSsem_Functions {
	* @desc The base default.		* @desc The base default.
	*/		*/
	altstep a_default() runs on ItsSremSsem {		altstep a_default() runs on ItsSremSsem {
	[vc_sremSsemDefaultActive] sremSsemPort.receive(mw_sremInd(mw_sremPdu(mw_defaultSrem))) {		[vc_sremSsemDefaultActive] sremSsemPort.receive(mw_sremInd(mw_sremPdu)) {
	log("* " & testcasename() & ": INFO: SREMM received in default *");		log("* " & testcasename() & ": INFO: SREMM received in default *");
	vc_sremReceived := true;		vc_sremReceived := true;
	repeat;		repeat;
	}		}
	[vc_sremSsemDefaultActive] sremSsemPort.receive(mw_ssemInd(mw_ssemPdu(mw_defaultSsem))) {		[vc_sremSsemDefaultActive] sremSsemPort.receive(mw_ssemInd(mw_ssemPdu)) {
	log("* " & testcasename() & ": INFO: SREMM received in default *");		log("* " & testcasename() & ": INFO: SREMM received in default *");
	vc_ssemReceived := true;		vc_ssemReceived := true;
	repeat;		repeat;

ttcn/SremSsem/LibItsSremSsem_Pics.ttcn

+19 −1

Original line number	Original line	Diff line number	Diff line
	@@ -76,4 +76,22 @@ module LibItsSremSsem_Pics {
	*/		*/
	modulepar boolean PICS_SREM_HAS_TIMING := true;		modulepar boolean PICS_SREM_HAS_TIMING := true;

			/**
			* @desc Support for TODO
			* @see ETSI TS 103 191-1 Table TODO
			*/
			modulepar boolean PICS_SSEM_TRATEMENT_DELAY := true;

			modulepar float PICS_T_DELAY_GENSSEMMIN := 0.1;

			/**
			* @desc Support for TODO
			* @see ETSI TS 103 191-1 Table TODO
			*/
			modulepar boolean PICS_SSEM_TRANSMISSION_RATE := true;

			modulepar float PICS_T_RATE_GENSSEMMIN := 0.1;

			modulepar float PICS_T_RATE_GENSSEMMAX := 2.0;

	} // end LibItsSremSsem_Pics		} // end LibItsSremSsem_Pics

ttcn/SremSsem/LibItsSremSsem_Pixits.ttcn

+5 −1

Original line number	Original line	Diff line number	Diff line
	/**		/**
	* @author ETSI / STF517		* @author ETSI STF517 / STF581 / TTF002
	* @version $Url: https://oldforge.etsi.org/svn/LibIts/tags/20170222_STF527_Final/ttcn/SremSsem/LibItsSremSsem_Pixits.ttcn $		* @version $Url: https://oldforge.etsi.org/svn/LibIts/tags/20170222_STF527_Final/ttcn/SremSsem/LibItsSremSsem_Pixits.ttcn $
	* $Id: LibItsSremSsem_Pixits.ttcn 1315 2016-12-15 13:25:41Z garciay $		* $Id: LibItsSremSsem_Pixits.ttcn 1315 2016-12-15 13:25:41Z garciay $
	* @desc MAPEM SPATEM PIXIT		* @desc MAPEM SPATEM PIXIT
	@@ -42,6 +42,10 @@ module LibItsSremSsem_Pixits {
	*/		*/
	modulepar DSecond PX_SECOND := 0;		modulepar DSecond PX_SECOND := 0;

			modulepar MsgCount PX_SEQUENCE_NUMBER := 10;

			modulepar RequestID PX_REQUEST_ID := 5;

	/**		/**
	* @desc Used in SREM and SSEM sent by tester		* @desc Used in SREM and SSEM sent by tester
	* @see ETSI TS 103 191-3 Table B.9		* @see ETSI TS 103 191-3 Table B.9

ttcn/SremSsem/LibItsSremSsem_Templates.ttcn

+73 −33

Original line number	Original line	Diff line number	Diff line
	/**		/**
	* @author ETSI / STF517		* @author ETSI STF517
	* @version $Url: https://oldforge.etsi.org/svn/LibIts/tags/20170222_STF527_Final/ttcn/SremSsem/LibItsSremSsem_Templates.ttcn $		* @version $Url: https://oldforge.etsi.org/svn/LibIts/tags/20170222_STF527_Final/ttcn/SremSsem/LibItsSremSsem_Templates.ttcn $
	* $Id: LibItsSremSsem_Templates.ttcn 1312 2016-12-14 09:21:45Z garciay $		* $Id: LibItsSremSsem_Templates.ttcn 1312 2016-12-14 09:21:45Z garciay $
	* @desc Module containing base template definitions for SREM SSEM		* @desc Module containing base template definitions for SREM SSEM
	@@ -395,14 +395,14 @@ module LibItsSremSsem_Templates {
	template (value) SignalRequestMessage m_defaultSrem := {		template (value) SignalRequestMessage m_defaultSrem := {
	timeStamp := omit,		timeStamp := omit,
	second := PX_SECOND,		second := PX_SECOND,
	sequenceNumber := omit,		sequenceNumber := PX_SEQUENCE_NUMBER,
	requests := {		requests := {
	valueof(		valueof(
	m_signalRequestPackage(		m_signalRequestPackage(
	valueof(		valueof(
	m_signalRequest(		m_signalRequest(
	m_intersectionReferenceID,		m_intersectionReferenceID,
	1,		PX_REQUEST_ID,
	priorityRequestTypeReserved,		priorityRequestTypeReserved,
	{ lane := 1 }		{ lane := 1 }
	)))) },		)))) },
	@@ -594,7 +594,7 @@ module LibItsSremSsem_Templates {
	timeStamp := omit,		timeStamp := omit,
	second := PX_SECOND,		second := PX_SECOND,
	sequenceNumber := omit,		sequenceNumber := omit,
	status := { m_signalStatus(PX_STATUS) },		status := { m_signalStatus(PX_SEQUENCE_NUMBER, PX_STATUS) },
	regional := omit		regional := omit
	}		}

	@@ -605,23 +605,75 @@ module LibItsSremSsem_Templates {
	in SignalRequestMessage p_signalRequestMessage		in SignalRequestMessage p_signalRequestMessage
	) modifies m_defaultSsem := {		) modifies m_defaultSsem := {
	second := p_signalRequestMessage.second,		second := p_signalRequestMessage.second,
	status := { m_signalStatus(p_signalRequestMessage.requests[0].request.id) },		status := { m_signalStatus(p_signalRequestMessage.sequenceNumber, p_signalRequestMessage.requests[0].request.id) },
	regional := omit		regional := omit
	}		}

			/**
			* @desc Receive template for SSEM Message
			*/
			template (present) SignalStatusMessage mw_ssemWellFormatted(
			template (present) MsgCount p_sequenceNumber := ?,
			template (present) SignalStatus p_status := ?
			) := {
			timeStamp := *,
			second := ?,
			sequenceNumber := p_sequenceNumber,
			status := { p_status },
			regional := *
			}

	template (value) SignalStatus m_signalStatus(		template (value) SignalStatus m_signalStatus(
	in IntersectionReferenceID p_id		in template (value) MsgCount p_sequenceNumber,
			in template (value) IntersectionReferenceID p_id
	) := {		) := {
	sequenceNumber := 1, // FIXME To be reviewed		sequenceNumber := p_sequenceNumber,
	id := p_id,		id := p_id,
	sigStatus := { m_signalStatusPackage },		sigStatus := { m_signalStatusPackage(m_requester(m_vehicleID(f_getIutStationId()), 4, 6, basicVehicle)) },
	regional := omit		regional := omit
	}		}

	template (value) SignalStatusPackage m_signalStatusPackage		template (present) SignalStatus mw_signalStatus(
	:= {		template (present) MsgCount p_sequenceNumber := ?,
	requester := omit,		template (present) IntersectionReferenceID p_id := ?,
			template (present) SignalStatusPackage p_sigStatus := ?
			) := {
			sequenceNumber := p_sequenceNumber,
			id := p_id,
			sigStatus := { p_sigStatus },
			regional := *
			}

			template (omit) SignalRequesterInfo m_requester(
			in template (value) VehicleID p_id,
			in template (value) RequestID p_request,
			in template (value) MsgCount p_sequenceNumber,
			in template (omit) BasicVehicleRole role := omit
			) := {
			id := p_id,
			request := p_request,
			sequenceNumber := p_sequenceNumber,
			role := omit,
			typeData := omit
			}

			template SignalRequesterInfo mw_requester(
			template (present) VehicleID p_id := ?,
			template (present) RequestID p_request := ?,
			template (present) MsgCount p_sequenceNumber := ?,
			template BasicVehicleRole role := *
			) := {
			id := p_id,
			request := p_request,
			sequenceNumber := p_sequenceNumber,
			role := *,
			typeData := *
			}

			template (value) SignalStatusPackage m_signalStatusPackage(
			in template (value) SignalRequesterInfo p_requester
			) := {
			requester := p_requester,
	inboundOn := {		inboundOn := {
	approach := 0		approach := 0
	},		},
	@@ -633,31 +685,19 @@ module LibItsSremSsem_Templates {
	regional := omit		regional := omit
	}		}

	/**		template SignalStatusPackage mw_signalStatusPackage(
	* @desc Receive template for SSEM Message		template (present) SignalRequesterInfo p_requester := ?
	*/
	template (present) SignalStatusMessage mw_defaultSsem(
	template (present) MsgCount p_sequenceNumber := ?
	) := {		) := {
	timeStamp := *,		requester := p_requester,
	second := ?,		inboundOn := ?,
	sequenceNumber := p_sequenceNumber,		outboundOn := *,
			minute := *,
			second := *,
			duration := *,
	status := ?,		status := ?,
	regional := *		regional := *
	}		}

	template (present) SignalStatusMessage mw_ssemWellFormatted(
	template (present) MsgCount p_sequenceNumber := ?
	) modifies mw_defaultSsem := {
	}

	template (present) SignalStatusMessage mw_ssem_with_region_id(
	template (present) MsgCount p_sequenceNumber := ?,
	template (present) SignalStatusMessage.regional p_regional := ?
	) modifies mw_defaultSsem := {
	regional := p_regional
	}

	} // End of group ssemTemplates		} // End of group ssemTemplates

	} // End of group sremSsemTemplates		} // End of group sremSsemTemplates

Admin message