Rename cps -> cpm (6bb83e61) · Commits · ITS - Intelligent Transport Systems / ttcn / CPS TS 104 019-3

lib/LibItsCps_EncdecDeclarations.ttcn

+2 −2

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

		external function fx_enc_UtCpsInitialize (UtCpsInitialize p) return bitstring
		external function fx_enc_UtCpmInitialize (UtCpmInitialize p) return bitstring
		with {extension "prototype(convert) encode(UpperTester)"}

		external function fx_dec_UtCpsEventInd (inout bitstring b, out UtCpsEventInd p) return integer
		external function fx_dec_UtCpmEventInd (inout bitstring b, out UtCpmEventInd p) return integer
		with {extension "prototype(sliding) decode(UpperTester)"}

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

lib/LibItsCps_Templates.ttcn

+12 −12

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

		/**
		* @desc Receive template for CPS Message (CpmPort Primitive)
		* @param p_cpsMsg Expected CPS Message
		* @param p_cpmMsg Expected CPS Message
		*/
		template CpmInd mw_cpsInd (
		in template (present) CollectivePerceptionMessage p_cpsMsg
		in template (present) CollectivePerceptionMessage p_cpmMsg
		) := {
		msgIn := p_cpsMsg,
		msgIn := p_cpmMsg,
		recvTime := ?,
		gnNextHeader := *,
		gnHeaderType := *,
		@@ -43,7 +43,7 @@ module LibItsCps_Templates {

		/**
		* @desc Receive template for CPS Message (CpmPort Primitive)
		* @param p_cpsMsg Expected CPS Message
		* @param p_cpmMsg Expected CPS 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 LibItsCps_Templates {
		* @param p_gnTrafficClass GN traffic class value
		*/
		template CpmInd mw_cpsIndWithGnParameters (
		in template (present) CollectivePerceptionMessage p_cpsMsg,
		in template (present) CollectivePerceptionMessage p_cpmMsg,
		in template UInt8 p_gnNextHeader := *,
		in template UInt8 p_gnHeaderType := *,
		in template UInt8 p_gnHeaderSubtype := *,
		@@ -72,7 +72,7 @@ module LibItsCps_Templates {
		* @param p_its_aid ITS-AID value
		*/
		template CpmInd mw_cpsIndWithSecurityParameters(
		template (present) CollectivePerceptionMessage p_cpsMsg,
		template (present) CollectivePerceptionMessage p_cpmMsg,
		template Bit256 p_ssp := *,
		template UInt32 p_its_aid := c_its_aid_CAM
		) modifies mw_cpsInd := {
		@@ -82,12 +82,12 @@ module LibItsCps_Templates {

		/**
		* @desc Receive template for CPS Message (CpmPort Primitive)
		* @param p_cpsMsg Expected CPS Message
		* @param p_cpmMsg Expected CPS 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 CpmInd mw_cpsIndWithBtpParameters(
		in template (present) CollectivePerceptionMessage p_cpsMsg,
		in template (present) CollectivePerceptionMessage p_cpmMsg,
		in template UInt16 p_btpDestinationPort := *,
		in template UInt16 p_btpInfo := *
		) modifies mw_cpsInd := {
		@@ -97,12 +97,12 @@ module LibItsCps_Templates {

		/**
		* @desc Send template for CPS Message (CpmPort Primitive)
		* @param p_cpsMsg CPS Message to be received
		* @param p_cpmMsg CPS Message to be received
		*/
		template (value) CpmReq m_cpsReq(
		in template (value) CollectivePerceptionMessage p_cpsMsg
		in template (value) CollectivePerceptionMessage p_cpmMsg
		) := {
		msgOut := p_cpsMsg
		msgOut := p_cpmMsg
		} // End of template m_cpsReq

		group cpsUtPrimitives {
		@@ -110,7 +110,7 @@ module LibItsCps_Templates {
		/**
		* @desc Initializes the CPS IUT.
		*/
		template (value) UtCpsInitialize m_cpsInitialize := {
		template (value) UtCpmInitialize m_cpsInitialize := {
		hashedId8 := '0000000000000000'O
		}

lib/LibItsCps_TypesAndValues.ttcn

+8 −8

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ module LibItsCps_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 UtCpsInitialize {
		type record UtCpmInitialize {
		Oct8 hashedId8
		} with {
		variant "FIELDORDER(msb)"
		@@ -30,25 +30,25 @@ module LibItsCps_TypesAndValues {
		/**
		* @desc Upper Tester results message of the CPS IUT
		*/
		type union UtCpsResults {
		boolean utCpsInitializeResult
		type union UtCpmResults {
		boolean utCpmInitializeResult
		} with {
		variant ""
		} // End of type UtCpsResults
		} // End of type UtCpmResults

		/**
		* @desc Upper Tester message to check event/status on CPS IUT
		*/
		type record UtCpsEventInd {
		CollectivePerceptionMessage cpsMsg // TODO Rename into caMsg to be compliant with UtDenmEventInd
		type record UtCpmEventInd {
		CollectivePerceptionMessage cpmMsg // TODO Rename into caMsg to be compliant with UtDenmEventInd
		} with {
		encode (cpsMsg) "LibItsCps_asn1"
		encode (cpmMsg) "LibItsCps_asn1"
		}

		/**
		* @desc List of Upper Tester messages to check event/status on CPS IUT
		*/
		type record of UtCpsEventInd UtCpsEventIndList;
		type record of UtCpmEventInd UtCpmEventIndList;

		} with {
		encode "UpperTester"

asn1 @ 69893f8e

Original line number	Diff line number	Diff line
		Subproject commit 23323f2a0bed03f1d6fd7cb2ed6328b361d7df85
		Subproject commit 69893f8eb3181b068c3fa2b6431137a74602a12a

lib_system/LibItsCps_Functions.ttcn

+5 −5

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

		//deactivate cpmPort default alts
		vc_cpsDefaultActive := false;
		@@ -35,7 +35,7 @@ module LibItsCps_Functions {
		utPort.send(p_init);
		tc_wait.start;
		alt {
		[] utPort.receive(UtCpsResults: { utCpsInitializeResult := true }) {
		[] utPort.receive(UtCpmResults: { utCpmInitializeResult := true }) {
		tc_wait.stop;
		log("* f_utInitializeIut: INFO: IUT initialized *");
		}
		@@ -297,8 +297,8 @@ module LibItsCps_Functions {
		* @desc The default for handling upper tester messages.
		*/
		altstep a_utDefault() runs on ItsCps {
		var UtCpsEventInd v_event;
		[] utPort.receive(UtCpsEventInd:?) -> value v_event {
		var UtCpmEventInd v_event;
		[] utPort.receive(UtCpmEventInd:?) -> value v_event {
		//store every upper tester indication received
		vc_utEvents[lengthof(vc_utEvents)] := v_event;
		repeat;
		@@ -328,7 +328,7 @@ module LibItsCps_Functions {
		function f_prInitialState(
		in Scenario p_scenario := e_staticPosition,
		in boolean p_awaitInitialCPM := true,
		in template (value) UtCpsInitialize p_cpsInitialize := m_cpsInitialize,
		in template (value) UtCpmInitialize p_cpsInitialize := m_cpsInitialize,
		in boolean p_awaitTimeInRunningScenario := true
		) runs on ItsCps {