Commit 36544377 authored by garciay's avatar garciay
Browse files

Merge Dirk's changes

parent 10c89447

ttcn/AtsDENM/ItsDenm_TpFunctions.ttcn

+1 −1
Original line number Original line Diff line number Diff line
@@ -2305,7 +2305,7 @@ module ItsDenm_TpFunctions { 
          

          

          function f_DEN_SSP_BV_XX( in Oct8 p_certHashedId8,

          function f_DEN_SSP_BV_XX( in Oct8 p_certHashedId8,

                                  in template (value) SituationContainer p_situation,

                                  in template (value) SituationContainer p_situation,

                                  in template (present) bitstring pmw_ssp)

                                  in template (present) Bit256 pmw_ssp)

          runs on ItsDenm {

          runs on ItsDenm {

              

              

            var ActionID v_actionId;

            var ActionID v_actionId;

ttcn/AtsSecurity/ItsSecurity_Functions.ttcn

+6 −3
Original line number Original line Diff line number Diff line
@@ -44,6 +44,9 @@ module ItsSecurity_Functions { 
    import from LibItsSecurity_Functions all;

    import from LibItsSecurity_Functions all;

    import from LibItsSecurity_Pixits all;

    import from LibItsSecurity_Pixits all;

    

    

    // AtsSecurity

    import from ItsSecurity_TestSystem all;

    

    group secCam {

    group secCam {

        

        

        /**

        /**
@@ -625,7 +628,7 @@ module ItsSecurity_Functions { 
        /**

        /**

        * @desc Behaviour function for triggering a CAM change speed event on IUT

        * @desc Behaviour function for triggering a CAM change speed event on IUT

        */

        */

        function fb_setCamFrequencyGreatherThan1Hz() runs on ItsCam {

        function fb_setCamFrequencyGreatherThan1Hz() runs on ItsCam system ItsSecSystem {

            

            

            // Local variables

            // Local variables

            var SpeedValue v_speedValues[5] := { 1000, 2000, 3000, 4000, 5000 } //cm/s

            var SpeedValue v_speedValues[5] := { 1000, 2000, 3000, 4000, 5000 } //cm/s
@@ -677,7 +680,7 @@ module ItsSecurity_Functions { 
        /**

        /**

        * @desc Behaviour function for triggering a DENM event on IUT

        * @desc Behaviour function for triggering a DENM event on IUT

        */

        */

        function fb_secTriggerDenmEvent() runs on ItsDenm {

        function fb_secTriggerDenmEvent() runs on ItsDenm system ItsSecSystem {

            

            

            // Local variables

            // Local variables

            var template (value) SituationContainer v_situation := m_situation(CauseCodeType_vehicleBreakdown_, VehicleBreakdownSubCauseCode_unavailable_);

            var template (value) SituationContainer v_situation := m_situation(CauseCodeType_vehicleBreakdown_, VehicleBreakdownSubCauseCode_unavailable_);
@@ -693,7 +696,7 @@ module ItsSecurity_Functions { 
        /**

        /**

        * @desc Behaviour function for cancelling previously triggered DENM events on IUT

        * @desc Behaviour function for cancelling previously triggered DENM events on IUT

        */

        */

        function fb_secCancelDenmEvent() runs on ItsDenm {

        function fb_secCancelDenmEvent() runs on ItsDenm system ItsSecSystem {

            

            

            // Local variables

            // Local variables

            var integer v_counter;

            var integer v_counter;

ttcn/AtsSecurity/ItsSecurity_TestCases.ttcn

+1 −1
Original line number Original line Diff line number Diff line
@@ -2844,7 +2844,7 @@ module ItsSecurity_TestCases { 
            } // End of testcase TC_SEC_ITSS_SND_DENM_05_01_BV

            } // End of testcase TC_SEC_ITSS_SND_DENM_05_01_BV

            

            

            function f_TC_SEC_ITSS_SND_DENM_05_BV(

            function f_TC_SEC_ITSS_SND_DENM_05_BV(

                                                  in template GeographicRegion p_region := ?

                                                  in template (present) GeographicRegion p_region := ?

            ) runs on ItsGeoNetworking {

            ) runs on ItsGeoNetworking {

                

                

                // Local variables

                // Local variables