Merge branch 'TTF0002' of https://forge.etsi.org/gitlab/LIBS/LibIts into TTF0002 (2ef2658e) · Commits · TTCN-3 Libraries / LibIts

ttcn/IVIM/LibItsIvim_Pixits.ttcn

+36 −0

Original line number	Original line	Diff line number	Diff line
	@@ -15,6 +15,7 @@ module LibItsIvim_Pixits {
	import from EfcDsrcGeneric language "ASN.1:1997" all;		import from EfcDsrcGeneric language "ASN.1:1997" all;
	import from EfcDsrcApplication language "ASN.1:1997" all;		import from EfcDsrcApplication language "ASN.1:1997" all;
	import from IVI language "ASN.1:1997" all;		import from IVI language "ASN.1:1997" all;
			import from ITS_Container language "ASN.1:1997" all;

	/**		/**
	* @desc IUT Provider identifier		* @desc IUT Provider identifier
	@@ -40,4 +41,39 @@ module LibItsIvim_Pixits {
	*/		*/
	modulepar Zid PX_ZONEID_2 := 2		modulepar Zid PX_ZONEID_2 := 2

			/**
			* @desc IUT LaneId identifier
			* LaneId used in IVIM messages sent by the tester
			* @see ETSI TS 103 191-3 Table B.8
			*/
			modulepar LanePosition PX_LANE := 1 //innermostDrivingLane(1)

			/**
			* @desc IUT RelavanceZoneId identifier
			* RelavanceZoneId used in IVIM messages sent by the tester
			* @see ETSI TS 103 191-3 Table B.8
			*/
			modulepar Zid PX_RELAVANCE_ZONEID := 1

			/**
			* @desc IUT DetectionZoneId identifier
			* DetectionZoneId used in IVIM messages sent by the tester
			* @see ETSI TS 103 191-3 Table B.8
			*/
			modulepar Zid PX_DETECTION_ZONEID := 1

			/**
			* @desc IUT DriverAwarenesZoneId identifier
			* DriverAwarenesZoneId used in IVIM messages sent by the tester
			* @see ETSI TS 103 191-3 Table B.8
			*/
			modulepar Zid PX_DRIVER_AWARENES_ZONEID := 1

			/**
			* @desc IUT LayoutId identifier
			* LayoutId used in IVIM messages sent by the tester
			* @see ETSI TS 103 191-3 Table B.8
			*/
			modulepar integer PX_LAYOUTID := 1

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

ttcn/IVIM/LibItsIvim_Templates.ttcn

+99 −2

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@ module LibItsIvim_Templates {
	import from IVI language "ASN.1:1997" all;		import from IVI language "ASN.1:1997" all;
	import from EfcDsrcApplication language "ASN.1:1997" all;		import from EfcDsrcApplication language "ASN.1:1997" all;
	import from AVIAEINumberingAndDataStructures language "ASN.1:1997" all;		import from AVIAEINumberingAndDataStructures language "ASN.1:1997" all;
			import from CITSapplMgmtIDs language "ASN.1:1997" all;

	// LibItsCommon		// LibItsCommon
	import from LibItsCommon_TypesAndValues all;		import from LibItsCommon_TypesAndValues all;
	@@ -144,13 +145,25 @@ module LibItsIvim_Templates {
	template (omit) TimestampIts p_validFrom := omit,		template (omit) TimestampIts p_validFrom := omit,
	template (omit) TimestampIts p_validTo := omit,		template (omit) TimestampIts p_validTo := omit,
	template (omit) ZidList p_zoneIds := omit,		template (omit) ZidList p_zoneIds := omit,
	template (omit) LanePosition p_laneNumber := omit		template (omit) LanePosition p_laneNumber := omit,
			template (omit) RelavanceZidList p_relavanceZoneIds := omit,
			template (omit) DetectionZidList p_detectionZoneIds := omit,
			template (omit) DriverAwarenesZidList p_driverAwarenesZoneIds := omit,
			template (omit) VarLengthNumber p_itsRrid := omit,
			template (omit) Direction p_directionGic := omit,
			template (omit) integer p_layoutId := omit
	) := {		) := {
	validFrom := p_validFrom,		validFrom := p_validFrom,
	validTo := p_validTo,		validTo := p_validTo,
	repetitionInterval := p_repetitionInterval,		repetitionInterval := p_repetitionInterval,
	zoneIds := p_zoneIds,		zoneIds := p_zoneIds,
	laneNumber := p_laneNumber		laneNumber := p_laneNumber,
			relavanceZoneIds := p_relavanceZoneIds,
			detectionZoneIds := p_detectionZoneIds,
			driverAwarenesZoneIds := p_driverAwarenesZoneIds,
			itsRrid := p_itsRrid,
			directionGic := p_directionGic,
			layoutId := p_layoutId
	} // End of template m_utTriggerEvent		} // End of template m_utTriggerEvent

	/**		/**
	@@ -407,6 +420,22 @@ module LibItsIvim_Templates {
	validFrom := p_validFrom		validFrom := p_validFrom
	} // End of template mw_iviManagementContainer_validFrom		} // End of template mw_iviManagementContainer_validFrom

			/**
			* @desc Receive template for IVIManagement container
			* @param p_serviceProviderId The IUT provider description
			* @param p_iviIdentificationNumber The IVIM identification number
			* @param p_iviStatus The IVIM status
			* @param p_connectedIviStructures The IVIM connectedIviStructures
			*/
			template (present) IVIManagementContainer mw_iviManagementContainer_connectedIviStructures(
			template (present) Provider p_serviceProviderId := ?,
			template (present) IviIdentificationNumber p_iviIdentificationNumber := ?,
			template (present) IviStatus p_iviStatus := ?,
			template (present) IVIManagementContainer.connectedIviStructures p_connectedIviStructures := ?
			) modifies mw_iviManagementContainer := {
			connectedIviStructures := p_connectedIviStructures
			} // End of template mw_iviManagementContainer

	/**		/**
	* @desc Receive template for Porvide identifier		* @desc Receive template for Porvide identifier
	* @param p_countryCode Country code value		* @param p_countryCode Country code value
	@@ -566,6 +595,74 @@ module LibItsIvim_Templates {
	extraText := *		extraText := *
	} // End of template mw_gicPart		} // End of template mw_gicPart

			template (present) GicPart mw_gicPart_layoutId(
			template (present) IviType p_iviType := ?,
			template (present) GicPart.roadSignCodes p_roadSignCodes := ?,
			template (present) integer p_layoutId := ?
			) modifies mw_gicPart_basic := {
			layoutId := p_layoutId
			} // End of template mw_gicPart_layoutId

			template (present) GicPart mw_gicPart_allZoneIdsAndItsRridAndDirection(
			template (present) IviType p_iviType := ?,
			template (present) GicPart.roadSignCodes p_roadSignCodes := ?,
			template GicPart.detectionZoneIds p_detectionZoneIds := *,
			template VarLengthNumber p_varLengthNumber := *,
			template GicPart.relevanceZoneIds p_relevanceZoneIds := *,
			template Direction p_direction := *,
			template GicPart.driverAwarenessZoneIds p_driverAwarenessZoneIds := *
			) modifies mw_gicPart_basic := {
			detectionZoneIds := p_detectionZoneIds,
			its_Rrid := p_varLengthNumber,
			relevanceZoneIds := p_relevanceZoneIds,
			direction := p_direction,
			driverAwarenessZoneIds := p_driverAwarenessZoneIds
			} // End of template mw_gicPart

			template (present) RSCode mw_rSCode(
			template (present) RSCode.layoutComponentId p_layoutComponentId := ?,
			template (present) RSCode.code p_code := ?
			) := {
			layoutComponentId := p_layoutComponentId,
			code := p_code
			} // End of template mw_rSCode

			template (present) RSCode mw_rSCode_viennaConvention(
			template (present) RSCode.layoutComponentId p_layoutComponentId := ?
			) := {
			layoutComponentId := p_layoutComponentId,
			code := {
			viennaConvention := ?
			}
			} // End of template mw_rSCode_viennaConvention

			template (present) RSCode mw_rSCode_iso14823(
			template (present) RSCode.layoutComponentId p_layoutComponentId := ?
			) := {
			layoutComponentId := p_layoutComponentId,
			code := {
			iso14823 := ?
			}
			} // End of template mw_rSCode_iso14823

			template (present) RSCode mw_rSCode_itisCodes(
			template (present) RSCode.layoutComponentId p_layoutComponentId := ?
			) := {
			layoutComponentId := p_layoutComponentId,
			code := {
			itisCodes := ?
			}
			} // End of template mw_rSCode_itisCodes

			template (present) RSCode mw_rSCode_anyCatalogue(
			template (present) RSCode.layoutComponentId p_layoutComponentId := ?
			) := {
			layoutComponentId := p_layoutComponentId,
			code := {
			anyCatalogue := ?
			}
			} // End of template mw_rSCode_anyCatalogue

	} // End of group generalIviContainerGroup		} // End of group generalIviContainerGroup

	group roadConfigurationContainerGroup {		group roadConfigurationContainerGroup {

ttcn/IVIM/LibItsIvim_TypesAndValues.ttcn

+23 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,7 @@ module LibItsIvim_TypesAndValues {
	import from IVIM_PDU_Descriptions language "ASN.1:1997" all;		import from IVIM_PDU_Descriptions language "ASN.1:1997" all;
	import from IVI language "ASN.1:1997" all;		import from IVI language "ASN.1:1997" all;
	import from ITS_Container language "ASN.1:1997" all;		import from ITS_Container language "ASN.1:1997" all;
			import from CITSapplMgmtIDs language "ASN.1:1997" all;

	group actionTypes {		group actionTypes {

	@@ -59,6 +60,21 @@ module LibItsIvim_TypesAndValues {
	*/		*/
	type record of Zid ZidList;		type record of Zid ZidList;

			/**
			* @desc List of RelavanceZoneIds
			*/
			type record of Zid RelavanceZidList;

			/**
			* @desc List of DetectionZoneIds
			*/
			type record of Zid DetectionZidList;

			/**
			* @desc List of DriverAwarenesZoneIds
			*/
			type record of Zid DriverAwarenesZidList;

	}		}

	group utPrimitives {		group utPrimitives {
	@@ -98,7 +114,13 @@ module LibItsIvim_TypesAndValues {
	TimestampIts validTo optional,		TimestampIts validTo optional,
	TimestampIts repetitionInterval optional,		TimestampIts repetitionInterval optional,
	ZidList zoneIds optional,		ZidList zoneIds optional,
	LanePosition laneNumber optional		LanePosition laneNumber optional,
			RelavanceZidList relavanceZoneIds optional,
			DetectionZidList detectionZoneIds optional,
			DriverAwarenesZidList driverAwarenesZoneIds optional,
			VarLengthNumber itsRrid optional,
			Direction directionGic optional,
			integer layoutId optional
	} with {		} with {
	variant "FIELDORDER(msb)"		variant "FIELDORDER(msb)"
	}		}

Admin message