Commit 2e6d1a86 authored by Yann Garcia's avatar Yann Garcia
Browse files

Update AtsCAM with CAMv2; Add missing certificate profiles; Uodate v2 certificate profiles for CAM

parent 9fc200bf
Loading
Loading
Loading
Loading
+2844 −2434

File changed.

Preview size limit exceeded, changes collapsed.

+25 −0
Original line number Diff line number Diff line
@@ -27,6 +27,12 @@ module ItsCam_TestControl {
                execute(TC_CAM_MSD_FMT_BV_03());
                execute(TC_CAM_MSD_FMT_BV_04());
                execute(TC_CAM_MSD_FMT_BV_05());
                if (PICS_RELEASE2 and PICS_EXTENSIONSCONTAINER) {
                    execute(TC_CAM_MSD_FMT_BV_06());
                    execute(TC_CAM_MSD_FMT_BV_07());
                    execute(TC_CAM_MSD_FMT_BV_08());
                    execute(TC_CAM_MSD_FMT_BV_09());
                }
                execute(TC_CAM_MSD_INA_BV_01_01());
                execute(TC_CAM_MSD_INA_BV_01_02());
                execute(TC_CAM_MSD_INA_BV_01_03());
@@ -105,6 +111,25 @@ module ItsCam_TestControl {
                if (PICS_SPECIALTRANS and PICS_SPECIALVEHICLECONTAINER) {
                    execute(TC_CAM_MSD_SSP_BO_03());
                }
                if (PICS_SPECIALTRANS and PICS_DANGEROUSGOODS) {
                    execute(TC_CAM_MSD_SSP_BO_04());
                }
                if (PICS_SPECIALTRANS and PICS_ROADWORKS) {
                    execute(TC_CAM_MSD_SSP_BO_05());
                }
                if (PICS_SPECIALTRANS and PICS_RESCUE) {
                    execute(TC_CAM_MSD_SSP_BO_06());
                }
                if (PICS_SPECIALTRANS and PICS_EMERGENCY) {
                    execute(TC_CAM_MSD_SSP_BO_07());
                }
                if (PICS_SPECIALTRANS and PICS_SAFETY_CAR) {
                    execute(TC_CAM_MSD_SSP_BO_08());
                }
                if (PICS_RELEASE2 and PICS_EXTENSIONSCONTAINER) {
                    execute(TC_CAM_MSD_SSP_BO_15());
                    execute(TC_CAM_MSD_SSP_BO_16());
                }
            }
        }
        
+516 −173

File changed.

Preview size limit exceeded, changes collapsed.

+27 −15
Original line number Diff line number Diff line
@@ -17,76 +17,88 @@ module LibItsCam_Pics {
    group camPics {
        
        /**
         * @desc Is the IUT RSU?
         * @desc Does the IUT support CAMv2?
         * @see  ETSI TS 102 868-1 Table A.1
         */
        modulepar boolean PICS_RELEASE2 := true;

        /**
         * @desc Is the IUT RSU?
         * @see  ETSI TS 102 868-1 Table A.2
         */
        modulepar boolean PICS_RSU := false;
        
        /**
         * @desc Is the IUT running in secured mode?
         * @see  ETSI TS 102 868-1 Table A.1
         * @see  ETSI TS 102 868-1 Table A.7
         */
        modulepar boolean PICS_IS_IUT_SECURED := false;
        
        /**
         * @desc Is IUT a public transport vehicle 
         * @see  ETSI TS 102 868-1 Table A.2
         * @see  ETSI TS 102 868-1 Table A.4
         */
        modulepar boolean PICS_PUBLICTRANS := false;
        
        /**
         * @desc Is IUT a special transport vehicle 
         * @see  ETSI TS 102 868-1 Table A.2
         * @see  ETSI TS 102 868-1 Table A.4
         */
        modulepar boolean PICS_SPECIALTRANS := false;
        
        /**
         * @desc Is IUT a dangerous goods vehicle 
         * @see  ETSI TS 102 868-1 Table A.2
         * @see  ETSI TS 102 868-1 Table A.4
         */
        modulepar boolean PICS_DANGEROUSGOODS := false;
        
        /**
         * @desc Is IUT a road works vehicle 
         * @see  ETSI TS 102 868-1 Table A.2
         * @see  ETSI TS 102 868-1 Table A.4
         */
        modulepar boolean PICS_ROADWORKS := false;
        
        /**
         * @desc Is IUT a rescue vehicle 
         * @see  ETSI TS 102 868-1 Table A.2
         * @see  ETSI TS 102 868-1 Table A.4
         */
        modulepar boolean PICS_RESCUE := false;
        
        /**
         * @desc Is IUT an emergency vehicle 
         * @see  ETSI TS 102 868-1 Table A.2
         * @see  ETSI TS 102 868-1 Table A.4
         */
        modulepar boolean PICS_EMERGENCY := false;
        
        /**
         * @desc Is IUT a safety car vehicle 
         * @see  ETSI TS 102 868-1 Table A.2
         * @see  ETSI TS 102 868-1 Table A.4
         */
        modulepar boolean PICS_SAFETY_CAR := false;
        
        /**
         * @desc Does IUT support 'specialVehicleContainer' in CamParameters?
         * @see  ETSI TS 102 868-1 Table A.2
         * @see  ETSI TS 102 868-1 Table A.4
         */
        modulepar boolean PICS_SPECIALVEHICLECONTAINER := true;
        
        /**
         * @desc Does IUT support 'extensionsContainer' in CamParameters?
         * @see  ETSI TS 102 868-1 Table A.5
         */
        modulepar boolean PICS_EXTENSIONSCONTAINER := true;
        
        /**
         * @desc Maximum time interval between CAM generations (in seconds).
         *       Default value, as per base standard: 1.0s 
         * @see  ETSI TS 102 868-1 Table A.5
         * @see  ETSI TS 102 868-1 Table A.8
         */
        modulepar float PICS_T_GENCAMMAX := 1.000;
        
        /**
         * @desc Minimum time interval between CAM generations (in seconds).
         *       Default value, as per base standard: 0.1s 
         * @see  ETSI TS 102 868-1 Table A.5
         * @see  ETSI TS 102 868-1 Table A.8
         */
        modulepar float PICS_T_GENCAMMIN := 0.100;
        
@@ -95,19 +107,19 @@ module LibItsCam_Pics {
         *       according to the requirements of the 
         *       Decentralized Congestion Control(DCC).
         *       Default value, as per base standard: 0.1s 
         * @see  ETSI TS 102 868-1 Table A.5
         * @see  ETSI TS 102 868-1 Table A.8
         */
        modulepar float PICS_T_GENCAMDCC := 0.100;
        
        /**
         * @desc Support for CAM generation
         * @see  ETSI TS 102 868-1 Table A.3
         * @see  ETSI TS 102 868-1 Table A.6
         */
        modulepar boolean PICS_CAM_GENERATION := true;

        /**
         * @desc Support for CAM reception
         * @see  ETSI TS 102 868-1 Table A.3
         * @see  ETSI TS 102 868-1 Table A.6
         */
        modulepar boolean PICS_CAM_RECEPTION := true;
        
+69 −5
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ module LibItsCam_Templates {
         * @param   p_camMsg    Expected CAM Message
         */
        template CamInd mw_camInd (
            in template (present) CAM p_camMsg
            template (present) CAM p_camMsg
        ) := { 
            msgIn               := p_camMsg,
            recvTime            := ?,
@@ -62,7 +62,7 @@ module LibItsCam_Templates {
         * @param   p_gnTrafficClass    GN traffic class value
         */
        template CamInd mw_camIndWithGnParameters (
            in template (present) CAM p_camMsg,
            template (present) CAM p_camMsg,
            in template UInt8 p_gnNextHeader := *,
            in template UInt8 p_gnHeaderType := *,
            in template UInt8 p_gnHeaderSubtype := *,
@@ -98,7 +98,7 @@ module LibItsCam_Templates {
         * @param   p_btpInfo               BTP destination port info value (if BTP-B) or BTP source port value (if BTP-A)
         */
        template CamInd mw_camIndWithBtpParameters (
            in template (present) CAM p_camMsg,
            template (present) CAM p_camMsg,
            in template UInt16 p_btpDestinationPort := *,
            in template UInt16 p_btpInfo := *
        ) modifies mw_camInd := { 
@@ -196,6 +196,14 @@ module LibItsCam_Templates {
                setVehicleRole := p_vehicleRole
            }

            /**
             * @desc Set the station type
             * @param p_stationType The station type
             */
            template (value) UtCamTrigger m_setStationType(StationType p_stationType) := {
                setStationType := p_stationType
            }

            /**
             * @desc Set the dangerous good description
             * @param p_dangerousGoods The dangerous good description
@@ -454,7 +462,7 @@ module LibItsCam_Templates {
         * @param p_extLights The exterior lights
         */
        template(present) BasicVehicleContainerLowFrequency mw_LF_BV_extLights(
                                                                               in template (present) ExteriorLights p_extLights
                                                                               template (present) ExteriorLights p_extLights
        ) modifies mw_LF_BV_any := 
        {
            exteriorLights := p_extLights
@@ -484,7 +492,7 @@ module LibItsCam_Templates {
         * @param p_specialVehicleContainer The expected specialVehicleContainer
         */
        template (present) CAM mw_camMsg_SVC(
            in template (present) SpecialVehicleContainer p_specialVehicleContainer
            template (present) SpecialVehicleContainer p_specialVehicleContainer
        ) modifies mw_camMsg_SVC_any := {
            cam := {
                camParameters := {
@@ -493,6 +501,62 @@ module LibItsCam_Templates {
            }
        }

        template (present) CAM mw_camMsg_ext_two_wheelers_container_any(
                                                                        template (present) TwoWheelerContainer p_twoWheelerContainer := ?
                                                                        ) modifies mw_camMsg_SVC_any := {
            cam := {
                camParameters := {
                    extensionContainers :=
                        {
                            *,
                            {
                                containerId := twoWheelerContainer,
                                containerData := { TwoWheelerContainer := p_twoWheelerContainer }
                            },
                            *
                        }
                }
            }
        }

        template (present) CAM mw_camMsg_ext_location_sharing_container_any(
                                                                            template (present) EHorizonLocationSharingContainer p_eHorizonLocationSharingContainer := ?
                                                                            ) modifies mw_camMsg_SVC_any := {
            cam := {
                camParameters := {
                    extensionContainers :=
                        {
                            *,
                            {
                                containerId := eHorizonLocationSharingContainer,
                                containerData := { EHorizonLocationSharingContainer := p_eHorizonLocationSharingContainer }
                            },
                            *
                        }
                }
            }
        }

        template (present) CAM mw_camMsg_ext_low_frequency_container_any(
                                                                         template (present) VeryLowFrequencyContainer p_veryLowFrequencyContainer := ?
                                                                         ) modifies mw_camMsg_any := {
            cam := {
                camParameters := {
                    basicContainer := ?,
                    highFrequencyContainer := ?,
                    extensionContainers :=
                        {
                            *,
                            {
                                containerId := veryLowFrequencyContainer,
                                containerData := { VeryLowFrequencyContainer := p_veryLowFrequencyContainer }
                            },
                            *
                        }
                }
            }
        }

        /**
         * @desc Receive template for specialVehicleContainer public transport
         */
Loading