Commit aa3111a7 authored by garciay's avatar garciay
Browse files

Add security information (ssp, its-aid) transfer from lower layer to upper layer 

Start implementation of ETSI TS 103 V1.0.4 Test Purposes (ETSI TS 103 191-2)
Remove old MapSpat ATS
parent 3737f620

ttcn/CAM/LibItsCam_Templates.ttcn

+16 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ module LibItsCam_Templates { 
    

    // LibCommon

    import from LibCommon_BasicTypesAndValues all;

    import from LibCommon_DataStrings all;

    

    // LibIts

    import from ITS_Container language "ASN.1:1997" all;
@@ -68,6 +69,21 @@ module LibItsCam_Templates { 
            gnTrafficClass := p_gnTrafficClass    

        };

        

        /**

         * @desc    Receive template for CA Message (DenmPort Primitive)

         * @param   p_caMsg     The expected CA Message

         * @param   p_ssp       SSP security parameter

         * @param   p_its_aid   ITS-AID value

         */

        template CamInd mw_camIndWithSecurityParameters(

                                                          template (present) CAM p_camMsg,

                                                          template Oct16 p_ssp := *,

                                                          template Oct16 p_its_aid := *

        ) modifies mw_camInd := { 

            ssp             := p_ssp,

            its_aid         := p_its_aid

        };

        

        /**

         * @desc    Receive template for CAM Message (CamPort Primitive)

         * @param   p_camMsg                Expected CAM Message

ttcn/CAM/LibItsCam_TestSystem.ttcn

+3 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ module LibItsCam_TestSystem { 
    import from LibCommon_Time {modulepar all};

    import from LibCommon_Sync all;

    import from LibCommon_BasicTypesAndValues all;

    import from LibCommon_DataStrings all;

    

    // LibIts

    import from CAM_PDU_Descriptions language "ASN.1:1997" all;
@@ -125,8 +126,8 @@ module LibItsCam_TestSystem { 
                UInt8       gnTrafficClass optional,

                UInt16      btpDestinationPort optional,

                UInt16      btpInfo optional,

                octetstring ssp optional,

                octetstring its_aid optional

                Oct16       ssp optional,

                Oct16       its_aid optional

            }

            with {

                encode (msgIn) "LibItsCam_asn1"

ttcn/DENM/LibItsDenm_Templates.ttcn

+16 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ module LibItsDenm_Templates { 
    

    // LibCommon

    import from LibCommon_BasicTypesAndValues all;

    import from LibCommon_DataStrings all;

     

    // LibIts

    import from ITS_Container language "ASN.1:1997" all;
@@ -93,6 +94,21 @@ module LibItsDenm_Templates { 
            gnTrafficClass := p_gnTrafficClass    

        };

        

        /**

         * @desc    Receive template for DEN Message (DenmPort Primitive)

         * @param   p_denMsg    The expected DEN Message

         * @param   p_ssp       SSP security parameter

         * @param   p_its_aid   ITS-AID value

         */

        template DenmInd mw_denmIndWithSecurityParameters(

                                                          template (present) DENM p_denMsg,

                                                          template Oct16 p_ssp := *,

                                                          template Oct16 p_its_aid := *

        ) modifies mw_denmInd := { 

            ssp             := p_ssp,

            its_aid         := p_its_aid

        };

        

        /**

         * @desc    Receive template for DEN Message (DenmPort Primitive)

         * @param   p_denMsg                The expected DEN Message

ttcn/DENM/LibItsDenm_TestSystem.ttcn

+3 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ module LibItsDenm_TestSystem { 
    import from LibCommon_Time {modulepar all};

    import from LibCommon_Sync all;

    import from LibCommon_BasicTypesAndValues all;

    import from LibCommon_DataStrings all;



    // LibIts

    import from DENM_PDU_Descriptions language "ASN.1:1997" all;
@@ -130,8 +131,8 @@ module LibItsDenm_TestSystem { 
                UInt8       gnTrafficClass optional,

                UInt16      btpDestinationPort optional,

                UInt16      btpInfo optional,

                octetstring ssp optional,

                octetstring its_aid optional

                Oct16       ssp optional,

                Oct16       its_aid optional

            }

            with {

                encode (msgIn) "LibItsDenm_asn1"

ttcn/DENM/LibItsDenm_TypesAndValues.ttcn

+2 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ module LibItsDenm_TypesAndValues { 
         * @desc List of ActionIDs used in behaviours 

         */

        type record of ActionID ActionIDList;

        

    }

    

    group denmConstants {