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

Report issues from devel2 to TTF_T036

parent d338f5d5
Loading
Loading
Loading
Loading
+80 −2
Changes for ItsSecurity_Functions.ttcn: 80 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -28,11 +28,13 @@ module ItsSecurity_Functions {
    import from LibItsCommon_ASN1_NamedNumbers all;
    
    // LibItsDenm
    import from LibItsDenm_TypesAndValues all;
    import from LibItsDenm_Templates all;
    import from LibItsDenm_Functions all;
    import from LibItsDenm_TestSystem all;
    
    // LibItsCam
    import from LibItsCam_TypesAndValues all;
    import from LibItsCam_Templates all;
    import from LibItsCam_Functions all;
    import from LibItsCam_TestSystem all;
@@ -766,6 +768,23 @@ module ItsSecurity_Functions {
            return v_camComponent;
        } // End of function f_setCamFrequencyGreatherThan1Hz
        
        /**
        * @desc    Triggers a CAM change pseudonum to load a specific certificate
        * @return  Reference to the component used to send the trigger
        * @remark  This function spawns an ItsCam component in alive mode
        * @see     fb_utCamChangePseudonym()
        */
        function f_camChangePseudonym(
                                      in template (value) UtCamChangePseudonym p_utCamChangePseudonym
                                      ) runs on ItsBaseComponent return ItsCam {
            var ItsCam v_camComponent;
            
            v_camComponent := ItsCam.create("CAM Trigger") alive;
            v_camComponent.start(fb_utCamChangePseudonym(p_utCamChangePseudonym));
            
            return v_camComponent;
        }

        /**
        * @desc    Terminate CAM component execution
        * @param   Reference to the component used to send the trigger
@@ -801,6 +820,22 @@ module ItsSecurity_Functions {
            unmap(self:utPort, system:camUtPort);
        }  // End of function fb_setCamFrequencyGreatherThan1Hz
        
        /**
         * @desc Behaviour function for triggering a CAM change pseudonym event on IUT
         */
        function fb_utCamChangePseudonym(
                                         in template (value) UtCamChangePseudonym p_utCamChangePseudonym
                                         ) runs on ItsCam {
            log(">>> fb_utCamChangePseudonym");
            
            map(self:utPort, system:camUtPort);
            vc_default := activate(LibItsCam_Functions.a_utDefault());
            
            LibItsCam_Functions.f_utCamChangePseudonym(p_utCamChangePseudonym);
            
            unmap(self:utPort, system:camUtPort);
        }

    } // End of group camTrigger 
    
    group denmTrigger {
@@ -827,14 +862,41 @@ module ItsSecurity_Functions {
            return v_denmComponent;
        } // End of function f_triggerDenmEvent
        
        function f_denmChangePseudonym(
                                       in template (value) UtDenmChangePseudonym p_utDenmChangePseudonym
                                       ) runs on ItsBaseGeoNetworking return ItsDenm {
            var ItsDenm v_denmComponent;
            
            //deactivate gnPort default alts
            vc_gnDefaultActive := false;
            
            v_denmComponent := ItsDenm.create("DENM Trigger 1") alive;
            v_denmComponent.start(fb_secDenmChangePseudonym(p_utDenmChangePseudonym));
            v_denmComponent.done;
            
            //activate gnPort default alts
            vc_gnDefaultActive := true;

            return v_denmComponent;            
        } // End of function f_denmChangePseudonym

        function f_triggerDenmEvent_1(ItsDenm p_denmComponent) runs on ItsBaseGeoNetworking {
            //deactivate gnPort default alts
            vc_gnDefaultActive := false;
            
            p_denmComponent.start(fb_secTriggerDenmEvent());
            p_denmComponent.done;
            
            //activate gnPort default alts
            vc_gnDefaultActive := true;
        } // End of function f_triggerDenmEvent_1
        
        /**
        * @desc    Cancels all previously triggered DENM events on IUT
        * @param   p_denmComponent     Reference of the component previously used to trigger DENM events
        * @see     fb_secCancelDenmEvent()
        */
        function f_cancelDenmEvent(ItsDenm p_denmComponent) runs on ItsBaseGeoNetworking {
            var ItsDenm v_denmComponent;
            
            //deactivate gnPort default alts
            vc_gnDefaultActive := false;
            
@@ -863,8 +925,24 @@ module ItsSecurity_Functions {
            vc_utActionIds[0] := LibItsDenm_Functions.f_utTriggerEvent(m_utTriggerEvent(v_situation, defaultValidity));
            log("fb_secTriggerDenmEvent: actionId=", vc_utActionIds[0]);
            
            unmap(self:utPort, system:denmUtPort);
        }  // End of function f_secTriggerDenmEvent
        
        function fb_secDenmChangePseudonym(
                                           in template (value) UtDenmChangePseudonym p_utDenmChangePseudonym
                                           ) runs on ItsDenm /* TITAN TODO: system ItsSecSystem */ {
            
            // Local variables

            log(">>> fb_secDenmChangePseudonym: ", p_utDenmChangePseudonym);
            map(self:utPort, system:denmUtPort);
            vc_default := activate(LibItsDenm_Functions.a_utDefault());

            LibItsDenm_Functions.f_utChangePseudonym(p_utDenmChangePseudonym);
            
            unmap(self:utPort, system:denmUtPort);
        }  // End of function fb_secDenmChangePseudonym
        
        /**
        * @desc Behaviour function for cancelling previously triggered DENM events on IUT
        */
+89 −28

File changed.

Preview size limit exceeded, changes collapsed.

+4 −4
Changes for ItsSecurity_TestSystem.ttcn: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -23,13 +23,13 @@ module ItsSecurity_TestSystem {
     * @member denmUtPort           DENM UT port
     * @member cammUtPort           CAM UT port
     */
    type component ItsSecSystem {
    type component ItsSecSystem extends ItsGeoNetworkingSystem {
        
        port LibItsGeoNetworking_TestSystem.AdapterControlPort acPort;
        //port LibItsGeoNetworking_TestSystem.AdapterControlPort acPort;
        
        // NT2 ports
        port LibItsGeoNetworking_TestSystem.UpperTesterPort utPort;
        port GeoNetworkingPort geoNetworkingPort;
        //port LibItsGeoNetworking_TestSystem.UpperTesterPort utPort;
        //port GeoNetworkingPort geoNetworkingPort;
        
        // FA ports
        port LibItsDenm_TestSystem.UpperTesterPort denmUtPort;