Rename vru -> vam (521d0e64) · Commits · ITS - Intelligent Transport Systems / ttcn / VRU TS 104 018-3

lib/LibItsVru_EncdecDeclarations.ttcn

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,10 +21,10 @@ module LibItsVru_EncdecDeclarations {
		external function fx_dec_VAM (inout bitstring b, out VAM p) return integer
		with {extension "prototype(sliding) decode(PER)"}

		external function fx_enc_UtVruInitialize (UtVruInitialize p) return bitstring
		external function fx_enc_UtVamInitialize (UtVamInitialize p) return bitstring
		with {extension "prototype(convert) encode(UpperTester)"}

		external function fx_dec_UtVruEventInd (inout bitstring b, out UtVruEventInd p) return integer
		external function fx_dec_UtVamEventInd (inout bitstring b, out UtVamEventInd p) return integer
		with {extension "prototype(sliding) decode(UpperTester)"}

		} // End of module LibItsVru_EncdecDeclarations
		No newline at end of file

lib/LibItsVru_Templates.ttcn

+12 −12

Original line number	Diff line number	Diff line
		@@ -23,12 +23,12 @@ module LibItsVru_Templates {

		/**
		* @desc Receive template for VRU Message (VamPort Primitive)
		* @param p_vruMsg Expected VRU Message
		* @param p_vamMsg Expected VRU Message
		*/
		template VamInd mw_vamInd (
		in template (present) VAM p_vruMsg
		in template (present) VAM p_vamMsg
		) := {
		msgIn := p_vruMsg,
		msgIn := p_vamMsg,
		recvTime := ?,
		gnNextHeader := *,
		gnHeaderType := *,
		@@ -43,7 +43,7 @@ module LibItsVru_Templates {

		/**
		* @desc Receive template for VRU Message (VamPort Primitive)
		* @param p_vruMsg Expected VRU Message
		* @param p_vamMsg Expected VRU Message
		* @param p_gnNextHeader GN next header value
		* @param p_gnHeaderType GN header type value
		* @param p_gnHeaderSubtype GN header subtype value
		@@ -51,7 +51,7 @@ module LibItsVru_Templates {
		* @param p_gnTrafficClass GN traffic class value
		*/
		template VamInd mw_vamIndWithGnParameters (
		in template (present) VAM p_vruMsg,
		in template (present) VAM p_vamMsg,
		in template UInt8 p_gnNextHeader := *,
		in template UInt8 p_gnHeaderType := *,
		in template UInt8 p_gnHeaderSubtype := *,
		@@ -72,7 +72,7 @@ module LibItsVru_Templates {
		* @param p_its_aid ITS-AID value
		*/
		template VamInd mw_vamIndWithSecurityParameters(
		template (present) VAM p_vruMsg,
		template (present) VAM p_vamMsg,
		template Bit256 p_ssp := *,
		template UInt32 p_its_aid := c_its_aid_CAM
		) modifies mw_vamInd := {
		@@ -82,12 +82,12 @@ module LibItsVru_Templates {

		/**
		* @desc Receive template for VRU Message (VamPort Primitive)
		* @param p_vruMsg Expected VRU Message
		* @param p_vamMsg Expected VRU Message
		* @param p_btpDestinationPort BTP destination port value
		* @param p_btpInfo BTP destination port info value (if BTP-B) or BTP source port value (if BTP-A)
		*/
		template VamInd mw_vamIndWithBtpParameters(
		in template (present) VAM p_vruMsg,
		in template (present) VAM p_vamMsg,
		in template UInt16 p_btpDestinationPort := *,
		in template UInt16 p_btpInfo := *
		) modifies mw_vamInd := {
		@@ -97,12 +97,12 @@ module LibItsVru_Templates {

		/**
		* @desc Send template for VRU Message (VamPort Primitive)
		* @param p_vruMsg VRU Message to be received
		* @param p_vamMsg VRU Message to be received
		*/
		template (value) VamReq m_vruReq(
		in template (value) VAM p_vruMsg
		in template (value) VAM p_vamMsg
		) := {
		msgOut := p_vruMsg
		msgOut := p_vamMsg
		} // End of template m_vruReq

		group vruUtPrimitives {
		@@ -110,7 +110,7 @@ module LibItsVru_Templates {
		/**
		* @desc Initializes the VRU IUT.
		*/
		template (value) UtVruInitialize m_vruInitialize := {
		template (value) UtVamInitialize m_vruInitialize := {
		hashedId8 := '0000000000000000'O
		}

lib/LibItsVru_TypesAndValues.ttcn

+6 −6

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@ module LibItsVru_TypesAndValues {
		* @desc Upper Tester message to initialize IUT
		* @member hashedId8 In case of secured mode set, hashedId8 indicate which certificate the IUT shall use
		*/
		type record UtVruInitialize {
		type record UtVamInitialize {
		Oct8 hashedId8
		} with {
		variant "FIELDORDER(msb)"
		@@ -23,16 +23,16 @@ module LibItsVru_TypesAndValues {
		/**
		* @desc Upper Tester results message of the VRU IUT
		*/
		type union UtVruResults {
		boolean utVruInitializeResult
		type union UtVamResults {
		boolean utVamInitializeResult
		} with {
		variant ""
		} // End of type UtVruResults
		} // End of type UtVamResults

		/**
		* @desc Upper Tester message to check event/status on VRU IUT
		*/
		type record UtVruEventInd {
		type record UtVamEventInd {
		VAM vamMsg // TODO Rename into caMsg to be compliant with UtDenmEventInd
		} with {
		encode (vamMsg) "LibItsVru_asn1"
		@@ -41,7 +41,7 @@ module LibItsVru_TypesAndValues {
		/**
		* @desc List of Upper Tester messages to check event/status on VRU IUT
		*/
		type record of UtVruEventInd UtVruEventIndList;
		type record of UtVamEventInd UtVamEventIndList;

		} with {
		encode "UpperTester"

asn1 @ 360191dc

Original line number	Diff line number	Diff line
		Subproject commit fa03ab93e257dde61c5157c1f858794463f019cb
		Subproject commit 360191dc8314cb71d146218821cf3a2b889ecf76

lib_system/LibItsVru_Functions.ttcn

+5 −5

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ module LibItsVru_Functions {
		* @desc Requests to bring the IUT in an initial state
		* @param p_init The initialisation to trigger.
		*/
		function f_utInitializeIut(template (value) UtVruInitialize p_init) runs on ItsVru {
		function f_utInitializeIut(template (value) UtVamInitialize p_init) runs on ItsVru {

		//deactivate vamPort default alts
		vc_vruDefaultActive := false;
		@@ -35,7 +35,7 @@ module LibItsVru_Functions {
		utPort.send(p_init);
		tc_wait.start;
		alt {
		[] utPort.receive(UtVruResults: { utVruInitializeResult := true }) {
		[] utPort.receive(UtVamResults: { utVamInitializeResult := true }) {
		tc_wait.stop;
		log("* f_utInitializeIut: INFO: IUT initialized *");
		}
		@@ -297,8 +297,8 @@ module LibItsVru_Functions {
		* @desc The default for handling upper tester messages.
		*/
		altstep a_utDefault() runs on ItsVru {
		var UtVruEventInd v_event;
		[] utPort.receive(UtVruEventInd:?) -> value v_event {
		var UtVamEventInd v_event;
		[] utPort.receive(UtVamEventInd:?) -> value v_event {
		//store every upper tester indication received
		vc_utEvents[lengthof(vc_utEvents)] := v_event;
		repeat;
		@@ -328,7 +328,7 @@ module LibItsVru_Functions {
		function f_prInitialState(
		in Scenario p_scenario := e_staticPosition,
		in boolean p_awaitInitialCPM := true,
		in template (value) UtVruInitialize p_vruInitialize := m_vruInitialize,
		in template (value) UtVamInitialize p_vruInitialize := m_vruInitialize,
		in boolean p_awaitTimeInRunningScenario := true
		) runs on ItsVru {