Update implementation of TCs for TLC (5a7e5d25) · Commits · TTCN-3 Libraries / LibIts

ttcn/SremSsem/LibItsSremSsem_Functions.ttcn

+31 −1

Original line number	Original line	Diff line number	Diff line
	@@ -125,6 +125,36 @@ module LibItsSremSsem_Functions {
	return;		return;
	}		}

			/**
			* @desc Updates an event from the application layer
			* @param p_event The event to trigger.
			*/
			function f_utCancelationEvent(
			in template (value) UtSremCancelation p_event
			) runs on ItsSremSsem {

			utPort.send ( p_event );
			tc_wait.start;
			alt {
			[] utPort.receive ( UtSremResults: { utSremCancelationResult := true }) {
			tc_wait.stop;
			}
			[] utPort.receive ( UtSremResults: { utSremCancelationResult := false }) {
			tc_wait.stop;
			f_selfOrClientSyncAndVerdict("SREM cancelation failed", e_error);
			}
			[] tc_wait.timeout {
			log("* " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time *");
			f_selfOrClientSyncAndVerdict("error", e_timeout);
			}
			}

			//activate sremSsemPort default alts
			vc_sremSsemDefaultActive := true;

			return;
			}

	} // End of group utFuntions		} // End of group utFuntions

	group adapterControl {		group adapterControl {
	@@ -333,7 +363,7 @@ module LibItsSremSsem_Functions {
	group sendFunctions {		group sendFunctions {

	/**		/**
	* @desc Sends a IVI message		* @desc Sends a SSEM message
	* @param p_sendMsg The IVI message to send.		* @param p_sendMsg The IVI message to send.
	* @param p_overrideSeqNo Overrides the sequence number with the stored one.		* @param p_overrideSeqNo Overrides the sequence number with the stored one.
	*/		*/

ttcn/SremSsem/LibItsSremSsem_Pics.ttcn

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,6 +26,12 @@ module LibItsSremSsem_Pics {
	*/		*/
	modulepar boolean PICS_SREM_GENERATION := true;		modulepar boolean PICS_SREM_GENERATION := true;

			/**
			* @desc Support for SREM cancelation
			* @see ETSI TS 103 191-1 Table A.5
			*/
			modulepar boolean PICS_SREM_CANCELATION := true;

	/**		/**
	* @desc Support for SREM reception		* @desc Support for SREM reception
	* @see ETSI TS 103 191-1 Table A.5		* @see ETSI TS 103 191-1 Table A.5
	@@ -44,6 +50,12 @@ module LibItsSremSsem_Pics {
	*/		*/
	modulepar boolean PICS_SSEM_RECEPTION := true;		modulepar boolean PICS_SSEM_RECEPTION := true;

			/**
			* @desc Support for Short Range communication
			* @see ETSI TS 103 191-1 Table A.5
			*/
			modulepar boolean PICS_SHORT_RANGE := true;

	/**		/**
	* @desc Support for public transport vehicle		* @desc Support for public transport vehicle
	* @see ETSI TS 103 191-1 Table TODO		* @see ETSI TS 103 191-1 Table TODO

ttcn/SremSsem/LibItsSremSsem_Pixits.ttcn

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@ module LibItsSremSsem_Pixits {

	// LibIts		// LibIts
	import from DSRC language "ASN.1:1997" all;		import from DSRC language "ASN.1:1997" all;
			import from DSRC_REGION_noCircular language "ASN.1:1997" all;

	// LibItsSremSsem		// LibItsSremSsem
	import from LibItsSremSsem_TypesAndValues all;		import from LibItsSremSsem_TypesAndValues all;
	@@ -31,7 +32,9 @@ module LibItsSremSsem_Pixits {
	* @desc Used by tester in SREM trigger request		* @desc Used by tester in SREM trigger request
	* @see ETSI TS 103 191-3 Table B.9		* @see ETSI TS 103 191-3 Table B.9
	*/		*/
	modulepar RequestImportanceLevel PX_REQUESTIMPORTANCELEVEL := requestImportanceLevel13;		modulepar RequestImportanceLevel PX_REQUESTIMPORTANCELEVEL := requestImportanceLevel3;

			modulepar IntersectionID PX_INTERSECTION_ID := 123;

	/**		/**
	* @desc Used by tester in SREM trigger request		* @desc Used by tester in SREM trigger request

ttcn/SremSsem/LibItsSremSsem_Templates.ttcn

+91 −53

Original line number	Original line	Diff line number	Diff line
	@@ -110,7 +110,7 @@ module LibItsSremSsem_Templates {
	*/		*/
	template (present) SremInd mw_sremIndWithSecurityParameters(		template (present) SremInd mw_sremIndWithSecurityParameters(
	template (present) SREM p_sremMsg,		template (present) SREM p_sremMsg,
	template Bit256 p_ssp := *,		template Bit24 p_ssp := *,
	template UInt32 p_its_aid := *		template UInt32 p_its_aid := *
	) modifies mw_sremInd := {		) modifies mw_sremInd := {
	ssp := p_ssp,		ssp := p_ssp,
	@@ -193,7 +193,7 @@ module LibItsSremSsem_Templates {
	*/		*/
	template (present) SsemInd mw_ssemIndWithSecurityParameters(		template (present) SsemInd mw_ssemIndWithSecurityParameters(
	template (present) SSEM p_ssemMsg,		template (present) SSEM p_ssemMsg,
	template Bit256 p_ssp := *,		template Bit24 p_ssp := *,
	template UInt32 p_its_aid := *		template UInt32 p_its_aid := *
	) modifies mw_ssemInd := {		) modifies mw_ssemInd := {
	ssp := p_ssp,		ssp := p_ssp,
	@@ -217,10 +217,12 @@ module LibItsSremSsem_Templates {
	*/		*/
	template (value) UtSremTrigger m_utTriggerEvent(		template (value) UtSremTrigger m_utTriggerEvent(
	in template (value) BasicVehicleRole p_basicVehicleRole,		in template (value) BasicVehicleRole p_basicVehicleRole,
	in template (value) RequestImportanceLevel p_requestImportanceLevel		in template (value) RequestImportanceLevel p_requestImportanceLevel,
			in template (value) IntersectionID p_intersectionId
	) := {		) := {
	basicVehicleRole := p_basicVehicleRole,		basicVehicleRole := p_basicVehicleRole,
	requestImportanceLevel := p_requestImportanceLevel		requestImportanceLevel := p_requestImportanceLevel,
			intersectionId := p_intersectionId
	}		}

	template (value) UtSremUpdate m_utUpdateEvent(		template (value) UtSremUpdate m_utUpdateEvent(
	@@ -233,6 +235,12 @@ module LibItsSremSsem_Templates {
	requestImportanceLevel := p_requestImportanceLevel		requestImportanceLevel := p_requestImportanceLevel
	}		}

			template (value) UtSremCancelation m_UtSremCancelationEvent(
			in template (value) RequestID p_requestID
			) := {
			requestID := p_requestID
			}

	}		}

	group sremSsemPduTemplates {		group sremSsemPduTemplates {
	@@ -366,6 +374,14 @@ module LibItsSremSsem_Templates {
	id := p_intersectionID // a unique mapping to the intersection in question within the above region of use		id := p_intersectionID // a unique mapping to the intersection in question within the above region of use
	}		}

			template IntersectionReferenceID mw_intersectionReferenceID(
			template (present) IntersectionID p_intersectionID := ?,
			template RoadRegulatorID p_roadRegulatorID := *
			) := {
			region := p_roadRegulatorID, // a globally unique regional assignment value typical assigned to a regional DOT authority the value zero shall be used for testing needs
			id := p_intersectionID // a unique mapping to the intersection in question within the above region of use
			}

	group sremTemplates {		group sremTemplates {

	group sremTemplatesSend {		group sremTemplatesSend {
	@@ -474,22 +490,42 @@ module LibItsSremSsem_Templates {
	*/		*/
	template (present) SignalRequestMessage mw_sremWellFormatted(		template (present) SignalRequestMessage mw_sremWellFormatted(
	template (present) RequestorDescription p_requestor := ?,		template (present) RequestorDescription p_requestor := ?,
			template (present) SignalRequestList p_requests := ?,
			template (present) MsgCount p_sequenceNumber := ?,
	template MinuteOfTheYear p_timeStamp := *,		template MinuteOfTheYear p_timeStamp := *,
	template DSecond p_second := *		template DSecond p_second := *
	) modifies mw_defaultSrem := {		) modifies mw_defaultSrem := {
	timeStamp := p_timeStamp,		timeStamp := p_timeStamp,
	second := p_second,		second := p_second,
			sequenceNumber := p_sequenceNumber,
			requests := p_requests,
	requestor := p_requestor		requestor := p_requestor
	} // End of template mw_sremWellFormatted		} // End of template mw_sremWellFormatted

	template (present) SignalRequestMessage mw_srem_sequenceNumber(		template (present) SignalRequestPackage mw_signalRequestPackage(
	template (present) MsgCount p_sequenceNumber := ?		template (present) SignalRequest p_request := ?
	)		) := {
	modifies mw_defaultSrem := {		request := p_request,
	sequenceNumber := p_sequenceNumber		minute := *,
	} // End of template mw_srem_sequenceNumber		second := *,
			duration := *,
			regional := *
			}

	} // End of group sremTemplatesRecv		template SignalRequest mw_signalRequest(
			template (present) IntersectionReferenceID p_id := ?,
			template (present) RequestID p_requestID := ?,
			template (present) PriorityRequestType p_requestType := priorityRequest,
			template (present) IntersectionAccessPoint p_inBoundLane := ?,
			template IntersectionAccessPoint p_outBoundLane := *
			) := {
			id := p_id,
			requestID := p_requestID,
			requestType := p_requestType,
			inBoundLane := p_inBoundLane,
			outBoundLane := p_outBoundLane,
			regional := *
			}

	template (present) RequestorDescription mw_requestorDescription(		template (present) RequestorDescription mw_requestorDescription(
	template (present) VehicleID p_id := ?,		template (present) VehicleID p_id := ?,
	@@ -531,6 +567,8 @@ module LibItsSremSsem_Templates {
	regional := *		regional := *
	} // End of template mw_requestorType		} // End of template mw_requestorType

			} // End of group sremTemplatesRecv

	} // End of group sremTemplates		} // End of group sremTemplates

	group ssemTemplates {		group ssemTemplates {

ttcn/SremSsem/LibItsSremSsem_TestSystem.ttcn

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -47,7 +47,7 @@ module LibItsSremSsem_TestSystem {
	*/		*/
	type port UpperTesterPort message {		type port UpperTesterPort message {
	out		out
	UtSremInitialize, UtSremTrigger, UtSremUpdate;		UtSremInitialize, UtSremTrigger, UtSremUpdate, UtSremCancelation;
	in		in
	UtSremResults, UtSremEventInd , UtSsemEventInd;		UtSremResults, UtSremEventInd , UtSsemEventInd;
	} // end UpperTesterPort		} // end UpperTesterPort
	@@ -111,7 +111,7 @@ module LibItsSremSsem_TestSystem {
	UInt8 gnTrafficClass optional,		UInt8 gnTrafficClass optional,
	UInt16 btpDestinationPort optional,		UInt16 btpDestinationPort optional,
	UInt16 btpInfo optional,		UInt16 btpInfo optional,
	Bit256 ssp optional,		Bit24 ssp optional,
	UInt32 its_aid optional		UInt32 its_aid optional
	}		}
	with {		with {
	@@ -129,7 +129,7 @@ module LibItsSremSsem_TestSystem {
	UInt8 gnTrafficClass optional,		UInt8 gnTrafficClass optional,
	UInt16 btpDestinationPort optional,		UInt16 btpDestinationPort optional,
	UInt16 btpInfo optional,		UInt16 btpInfo optional,
	Bit256 ssp optional,		Bit24 ssp optional,
	UInt32 its_aid optional		UInt32 its_aid optional
	}		}
	with {		with {

Admin message