Commit 8f4e82db authored by garciay's avatar garciay
Browse files

Add receive template mw_denmMgmtConTermination() 

Introduce PX_IUT_STATION_TYPE pixit
Bug fixed in function f_poCancelEvent()
parent abea3243

ttcn/Common/LibItsCommon_Functions.ttcn

+7 −0
Original line number Diff line number Diff line
@@ -115,6 +115,13 @@ module LibItsCommon_Functions { 
                

        } // end f_getIutStationId

        

        function f_getIutStationType()

        return StationType {

            

            return PX_IUT_STATION_TYPE;

                

        } // end f_getIutStationType

        

        /** 

         * @desc    Gets the station identifier of test system

         * @return  Test system's station ID

ttcn/Common/LibItsCommon_Pixits.ttcn

+6 −0
Original line number Diff line number Diff line
@@ -13,6 +13,12 @@ module LibItsCommon_Pixits { 
     */

    modulepar integer PX_IUT_STATION_ID := 1;

    

    /**

     * @desc IUT Station Type

     *       Station Type used in CAM/DENM messages sent by the IUT

     */

    modulepar integer PX_IUT_STATION_TYPE := 5;

    

    /**

     * @desc Tester Station Id

     *       Station Id used in CAM/DENM messages sent by the tester

ttcn/DENM/LibItsDenm_Functions.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ module LibItsDenm_Functions { 
            var FncRetCode v_ret := e_success;

            

            if (valueof(p_trigger) == e_ets) {

                f_sendDenMessage( m_denmCancellation ( p_actionId , f_getTsStationId( ) ) );

                f_sendDenMessage( m_denmCancellation ( p_actionId , f_getTsStationType( ) ) );

                f_sleep(PX_TNOAC);

            }

            else {

ttcn/DENM/LibItsDenm_Templates.ttcn

+22 −1
Original line number Diff line number Diff line
@@ -486,6 +486,27 @@ module LibItsDenm_Templates { 
            termination := p_termination

        }

        

        /**

         * @desc    Send template for Management Container

         * @param   p_actionID              The action id

         * @param   p_isNegation            The negation flag (Default: false)

         * @param   p_isCancellation        The cancellation flag (Default: false)

         * @param   p_validityDuration      The validity duration (Default: omit)

         * @param   p_transmissionInterval  The transmission interval (Default: omit)

         * @param   p_detectionTime         The detection time (Default: current time)

         * @param   p_referenceTime         The reference time (Default: current time)

         */

        template (present) ManagementContainer mw_denmMgmtConTermination (

            template (present) ActionID p_actionID,

            template (present) StationType p_stationType := f_getIutStationType(),

            template (present) TimestampIts p_referenceTime := ?,

            template ValidityDuration p_validityDuration := ?,

            template TransmissionInterval p_transmissionInterval := *,

            template Termination p_termination := *

        ) modifies mw_denmMgmtCon := {

            termination := p_termination

        }

        

        /**

         * @desc    Receive template for Management Container

         * @param   p_actionID              The expected action id
@@ -496,7 +517,7 @@ module LibItsDenm_Templates { 
         */

        template (present) ManagementContainer mw_denmMgmtCon(

            template (present) ActionID p_actionID,

            template (present) StationType p_stationType := f_getTsStationType(),

            template (present) StationType p_stationType := f_getIutStationType(),

            template (present) TimestampIts p_referenceTime := ?,

            template ValidityDuration p_validityDuration := ?,

            template TransmissionInterval p_transmissionInterval := *,