Resolve merge conflicts (176419e1) · Commits · ITS - Intelligent Transport Systems / ttcn / DENM TS 102 869-3

ItsDenm_TestCases.ttcn

+0 −36

Original line number	Original line	Diff line number	Diff line
	@@ -1381,42 +1381,6 @@ module ItsDenm_TestCases {

	} // End of TC_DEN_SSP_BV_01_03		} // End of TC_DEN_SSP_BV_01_03

	/**
	* @desc Check that IUT does not send a DENM if it is not permitted by signing certificate
	*
	* <pre>
	* PICS Selection: PICS_DENM_GENERATION AND PICS_IS_IUT_SECURED
	* Initial conditions:
	* with {
	* the IUT being in the "initial state"
	* the IUT is authorized to sign DENMs with the certificate
	* containing DENM SSP
	* not containing pemisions to send 'roadworks' cause code
	* }
	* Expected behaviour:
	* ensure that {
	* when {
	* the IUT receives an AppDENM_trigger request from the application layer
	* containing situation container
	* containing eventType
	* containing causeCode
	* indicating 'roadworks'
	* }
	* then {
	* the IUT does not send this DENM
	* }
	* }
	* </pre>
	*
	* @see ETSI 102 869-2 v2.1.x TP/DEN/SSP/BV-01
	* @reference ETSI TS 103 831, clause 6.2.2 and clause 8.4.2
	*/
	testcase TC_DEN_SSP_BV_01_03() runs on ItsDenm system ItsDenmSystem {

	f_DEN_SSP_BV_01_03();

	} // End of TC_DEN_SSP_BV_01_03

	/**		/**
	* @desc Check that IUT does not send a DENM if it is not permitted by signing certificate		* @desc Check that IUT does not send a DENM if it is not permitted by signing certificate
	*		*

ItsDenm_TestControl.ttcn

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -30,7 +30,6 @@ module ItsDenm_TestControl {
	execute(TC_DEN_EVGN_BV_04());		execute(TC_DEN_EVGN_BV_04());
	execute(TC_DEN_EVGN_BV_05());		execute(TC_DEN_EVGN_BV_05());
	execute(TC_DEN_EVGN_BV_07());		execute(TC_DEN_EVGN_BV_07());
	execute(TC_DEN_EVGN_BV_10());
	}		}

	if(PICS_DENM_UPDATE) {		if(PICS_DENM_UPDATE) {

ItsDenm_TpFunctions.ttcn

+11 −11

Original line number	Original line	Diff line number	Diff line
	@@ -2266,7 +2266,7 @@ module ItsDenm_TpFunctions {
	function f_DEN_SSP_BV_XX(		function f_DEN_SSP_BV_XX(
	in charstring p_certName,		in charstring p_certName,
	in template (value) SituationContainer p_situation,		in template (value) SituationContainer p_situation,
	in template (present) Bit256 pmw_ssp)		in template (present) Bit256 p_ssp)
	runs on ItsDenm {		runs on ItsDenm {

	var ActionId v_actionId;		var ActionId v_actionId;
	@@ -2320,7 +2320,7 @@ module ItsDenm_TpFunctions {
	p_situation		p_situation
	)		)
	),		),
	pmw_ssp		p_ssp
	)		)
	) {		) {
	tc_ac.stop;		tc_ac.stop;
	@@ -2370,7 +2370,7 @@ module ItsDenm_TpFunctions {
	function f_DEN_SSP_BV_01_04( ) runs on ItsDenm {		function f_DEN_SSP_BV_01_04( ) runs on ItsDenm {
	f_DEN_SSP_BV_XX (		f_DEN_SSP_BV_XX (
	PX_CERT_IUT_DENM_04,		PX_CERT_IUT_DENM_04,
	m_situation(CauseCodeChoice: { adhesion6 := LibItsCommon_ASN1_NamedNumbers.AdverseWeatherCondition_AdhesionSubCauseCode_snowOnRoad_ }),		m_situation(CauseCodeChoice: { adverseWeatherCondition_Adhesion6 := LibItsCommon_ASN1_NamedNumbers.AdverseWeatherCondition_AdhesionSubCauseCode_snowOnRoad_ }),
	mw_sspNoAdhesion		mw_sspNoAdhesion
	);		);
	}		}
	@@ -2378,7 +2378,7 @@ module ItsDenm_TpFunctions {
	function f_DEN_SSP_BV_01_05( ) runs on ItsDenm {		function f_DEN_SSP_BV_01_05( ) runs on ItsDenm {
	f_DEN_SSP_BV_XX (		f_DEN_SSP_BV_XX (
	PX_CERT_IUT_DENM_05,		PX_CERT_IUT_DENM_05,
	m_situation(CauseCodeChoice: { surfaceCondition9 := LibItsCommon_ASN1_NamedNumbers.HazardousLocation_SurfaceConditionSubCauseCode_rockfalls_ }),		m_situation(CauseCodeChoice: { hazardousLocation_SurfaceCondition9 := LibItsCommon_ASN1_NamedNumbers.HazardousLocation_SurfaceConditionSubCauseCode_rockfalls_ }),
	mw_sspNoSurfaceCondition		mw_sspNoSurfaceCondition
	);		);
	}		}
	@@ -2386,7 +2386,7 @@ module ItsDenm_TpFunctions {
	function f_DEN_SSP_BV_01_06( ) runs on ItsDenm {		function f_DEN_SSP_BV_01_06( ) runs on ItsDenm {
	f_DEN_SSP_BV_XX (		f_DEN_SSP_BV_XX (
	PX_CERT_IUT_DENM_06,		PX_CERT_IUT_DENM_06,
	m_situation(CauseCodeChoice: { obstacleOnTheRoad10 := LibItsCommon_ASN1_NamedNumbers.HazardousLocation_ObstacleOnTheRoadSubCauseCode_waitingVehicles_ }),		m_situation(CauseCodeChoice: { hazardousLocation_ObstacleOnTheRoad10 := LibItsCommon_ASN1_NamedNumbers.HazardousLocation_ObstacleOnTheRoadSubCauseCode_waitingVehicles_ }),
	mw_sspNoObstacleOnTheRoad		mw_sspNoObstacleOnTheRoad
	);		);
	}		}
	@@ -2394,7 +2394,7 @@ module ItsDenm_TpFunctions {
	function f_DEN_SSP_BV_01_07( ) runs on ItsDenm {		function f_DEN_SSP_BV_01_07( ) runs on ItsDenm {
	f_DEN_SSP_BV_XX (		f_DEN_SSP_BV_XX (
	PX_CERT_IUT_DENM_07,		PX_CERT_IUT_DENM_07,
	m_situation(CauseCodeChoice: { animalOnTheRoad11 := LibItsCommon_ASN1_NamedNumbers.HazardousLocation_AnimalOnTheRoadSubCauseCode_unavailable_ }),		m_situation(CauseCodeChoice: { hazardousLocation_AnimalOnTheRoad11 := LibItsCommon_ASN1_NamedNumbers.HazardousLocation_AnimalOnTheRoadSubCauseCode_unavailable_ }),
	mw_sspNoAnimalOnTheRoad		mw_sspNoAnimalOnTheRoad
	);		);
	}		}
	@@ -2426,7 +2426,7 @@ module ItsDenm_TpFunctions {
	function f_DEN_SSP_BV_01_11( ) runs on ItsDenm {		function f_DEN_SSP_BV_01_11( ) runs on ItsDenm {
	f_DEN_SSP_BV_XX (		f_DEN_SSP_BV_XX (
	PX_CERT_IUT_DENM_11,		PX_CERT_IUT_DENM_11,
	m_situation(CauseCodeChoice: { extremeWeatherCondition17 := LibItsCommon_ASN1_NamedNumbers.AdverseWeatherCondition_ExtremeWeatherConditionSubCauseCode_thunderstorm_ }),		m_situation(CauseCodeChoice: { adverseWeatherCondition_ExtremeWeatherCondition17:= LibItsCommon_ASN1_NamedNumbers.AdverseWeatherCondition_ExtremeWeatherConditionSubCauseCode_thunderstorm_ }),
	mw_sspNoExtremeWeatherCondition		mw_sspNoExtremeWeatherCondition
	);		);
	}		}
	@@ -2434,7 +2434,7 @@ module ItsDenm_TpFunctions {
	function f_DEN_SSP_BV_01_12( ) runs on ItsDenm {		function f_DEN_SSP_BV_01_12( ) runs on ItsDenm {
	f_DEN_SSP_BV_XX (		f_DEN_SSP_BV_XX (
	PX_CERT_IUT_DENM_12,		PX_CERT_IUT_DENM_12,
	m_situation(CauseCodeChoice: { visibility18 := LibItsCommon_ASN1_NamedNumbers.AdverseWeatherCondition_VisibilitySubCauseCode_heavyRain_ }),		m_situation(CauseCodeChoice: { adverseWeatherCondition_Visibility18 := LibItsCommon_ASN1_NamedNumbers.AdverseWeatherCondition_VisibilitySubCauseCode_heavyRain_ }),
	mw_sspNoVisibility		mw_sspNoVisibility
	);		);
	}		}
	@@ -2442,7 +2442,7 @@ module ItsDenm_TpFunctions {
	function f_DEN_SSP_BV_01_13( ) runs on ItsDenm {		function f_DEN_SSP_BV_01_13( ) runs on ItsDenm {
	f_DEN_SSP_BV_XX (		f_DEN_SSP_BV_XX (
	PX_CERT_IUT_DENM_13,		PX_CERT_IUT_DENM_13,
	m_situation(CauseCodeChoice: { precipitation19 := LibItsCommon_ASN1_NamedNumbers.AdverseWeatherCondition_PrecipitationSubCauseCode_unavailable_ }),		m_situation(CauseCodeChoice: { adverseWeatherCondition_Precipitation19 := LibItsCommon_ASN1_NamedNumbers.AdverseWeatherCondition_PrecipitationSubCauseCode_unavailable_ }),
	mw_sspNoPrecipitation		mw_sspNoPrecipitation
	);		);
	}		}
	@@ -2506,7 +2506,7 @@ module ItsDenm_TpFunctions {
	function f_DEN_SSP_BV_01_21( ) runs on ItsDenm {		function f_DEN_SSP_BV_01_21( ) runs on ItsDenm {
	f_DEN_SSP_BV_XX (		f_DEN_SSP_BV_XX (
	PX_CERT_IUT_DENM_21,		PX_CERT_IUT_DENM_21,
	m_situation(CauseCodeChoice: { dangerousCurve96 := LibItsCommon_ASN1_NamedNumbers.HazardousLocation_DangerousCurveSubCauseCode_unavailable_ }),		m_situation(CauseCodeChoice: { hazardousLocation_DangerousCurve96 := LibItsCommon_ASN1_NamedNumbers.HazardousLocation_DangerousCurveSubCauseCode_unavailable_ }),
	mw_sspNoDangerousCurve		mw_sspNoDangerousCurve
	);		);
	}		}

lib/LibItsDenm_Pics.ttcn

+31 −1

Original line number	Original line	Diff line number	Diff line
	@@ -69,10 +69,40 @@ module LibItsDenm_Pics {

	/**		/**
	* @desc Does the IUT support DENMv2?		* @desc Does the IUT support DENMv2?
	* @see ETSI TS 102 868-1 Table A.4		* @see ETSI TS 102 868-1 Table A.4/1
	*/		*/
	modulepar boolean PICS_RELEASE2 := true;		modulepar boolean PICS_RELEASE2 := true;

			/**
			* @desc Does the IUT support alacarte container?
			* @see ETSI TS 102 868-1 Table A.5/1
			*/
			modulepar boolean PICS_A_LA_CARTE := true;

			/**
			* @desc Does the IUT support alacarte external temperature?
			* @see ETSI TS 102 868-1 Table A.5/2
			*/
			modulepar boolean PICS_ALC_EXT_TEMP := true;

			/**
			* @desc Does the IUT support alacarte ImpactReduction container?
			* @see ETSI TS 102 868-1 Table A.5/3
			*/
			modulepar boolean PICS_ALC_IMPACT_REDUCTION := true;

			/**
			* @desc Does the IUT support alacarte PreCrash container?
			* @see ETSI TS 102 868-1 Table A.5/4
			*/
			modulepar boolean PICS_ALC_PRE_CRASH := true;

			/**
			* @desc Does the IUT support alacarte RoadConfiguration container?
			* @see ETSI TS 102 868-1 Table A.5/5
			*/
			modulepar boolean PICS_ALC_ROAD_CONFIGURATION := true;

	} // end denmPics		} // end denmPics

	}		}
			No newline at end of file

lib/LibItsDenm_Templates.ttcn

+30 −6

Original line number	Original line	Diff line number	Diff line
	@@ -617,7 +617,13 @@ module LibItsDenm_Templates {
	}		}
	}		}
	},		},
	roadType := omit		roadType := omit,
			lanePositions := omit,
			occupiedLanes := omit,
			linkedIvims := omit,
			linkedMapems := omit,
			detectionZonesToSpecifiedEventPoint := omit,
			predictedPaths := omit
	}		}

	/**		/**
	@@ -627,7 +633,13 @@ module LibItsDenm_Templates {
	eventSpeed := *,		eventSpeed := *,
	eventPositionHeading := *,		eventPositionHeading := *,
	detectionZonesToEventPosition := ?,		detectionZonesToEventPosition := ?,
	roadType := *		roadType := *,
			lanePositions := *,
			occupiedLanes := *,
			linkedIvims := *,
			linkedMapems := *,
			detectionZonesToSpecifiedEventPoint := *,
			predictedPaths := *
	}		}

	/**		/**
	@@ -640,7 +652,13 @@ module LibItsDenm_Templates {
	eventSpeed := *,		eventSpeed := *,
	eventPositionHeading := *,		eventPositionHeading := *,
	detectionZonesToEventPosition := p_traces,		detectionZonesToEventPosition := p_traces,
	roadType := *		roadType := *,
			lanePositions := *,
			occupiedLanes := *,
			linkedIvims := *,
			linkedMapems := *,
			detectionZonesToSpecifiedEventPoint := *,
			predictedPaths := *
	}		}

	} // end group decentralizedLocationTemplates		} // end group decentralizedLocationTemplates
	@@ -656,7 +674,9 @@ module LibItsDenm_Templates {
	externalTemperature := omit,		externalTemperature := omit,
	roadWorks := omit,		roadWorks := omit,
	positioningSolution := omit,		positioningSolution := omit,
	stationaryVehicle := omit		stationaryVehicle := omit,
			roadConfiguration := omit,
			preCrash := omit
	}		}

	/**		/**
	@@ -668,7 +688,9 @@ module LibItsDenm_Templates {
	externalTemperature := omit,		externalTemperature := omit,
	roadWorks := omit,		roadWorks := omit,
	positioningSolution := omit,		positioningSolution := omit,
	stationaryVehicle := omit		stationaryVehicle := omit,
			roadConfiguration := omit,
			preCrash := omit
	}		}

	/**		/**
	@@ -698,7 +720,9 @@ module LibItsDenm_Templates {
	externalTemperature := *,		externalTemperature := *,
	roadWorks := *,		roadWorks := *,
	positioningSolution := *,		positioningSolution := *,
	stationaryVehicle := *		stationaryVehicle := *,
			roadConfiguration := *,
			preCrash := *
	}		}

	/**		/**