Commit 2aa117ed authored by wattelet's avatar wattelet
Browse files

TC_VPCRF_VPQ_02 corrected

parent 0cae613a

ttcn/LibDiameter_Steps.ttcn

+29 −0
Original line number Original line Diff line number Diff line
@@ -94,6 +94,30 @@ group AwaitingMessage { 
        }

        }

    } // end f_awaitingDiameterMsg

    } // end f_awaitingDiameterMsg





    /**

    *

    * @desc receive DIAMETER message

    * @param p_diameterMSG1 template of the message 1 to be received

    * @param p_diameterMSG2 template of the message 2 to be received

    */

    function f_awaiting2DiameterMsgs ( in template DIAMETER_MSG p_diameterMSG1, in template DIAMETER_MSG p_diameterMSG2 ) runs on DiameterComponent

    {

        //var Lower_Layer_Primitive v_MSG;

        var DIAMETER_MSG v_MSG;



        tc_wait.start;

        alt {

			[]DIAMP.receive(p_diameterMSG1) -> value v_MSG {

				 tc_wait.stop;

				 vc_recvDiamMsg := v_MSG; }

            []DIAMP.receive(p_diameterMSG2) -> value v_MSG {

                 tc_wait.stop;

                 vc_recvDiamMsg := v_MSG; }

            [] tc_wait.timeout {

                 setverdict(fail,"*** " & __SCOPE__ & ": FAIL: Message was not received in due time. ***") }

        }

    } // end f_awaiting2DiameterMsgs



     function f_awaiting_CER(template (present)CER_MSG p_CER) runs on DiameterComponent

     function f_awaiting_CER(template (present)CER_MSG p_CER) runs on DiameterComponent

    {

    {

        f_awaitingDiameterMsg({cER_MSG:=p_CER});

        f_awaitingDiameterMsg({cER_MSG:=p_CER});
@@ -201,6 +225,11 @@ group AwaitingMessage { 
        //store specific parameter for RAA if needed

        //store specific parameter for RAA if needed

    }

    }





    function f_awaiting_2RAA(template (present)RAA_MSG p_RAA1, template (present)RAA_MSG p_RAA2) runs on DiameterComponent

    {

		f_awaiting2DiameterMsgs({rAA_MSG:=p_RAA1}, {rAA_MSG:=p_RAA2});

    }



    function f_awaiting_CCR(template (present)CCR_MSG p_CCR) runs on DiameterComponent

    function f_awaiting_CCR(template (present)CCR_MSG p_CCR) runs on DiameterComponent

    {

    {

        f_awaitingDiameterMsg({cCR_MSG:=p_CCR});

        f_awaitingDiameterMsg({cCR_MSG:=p_CCR});

ttcn/LibDiameter_Types_Base_AVPs.ttcn

+2 −1
Original line number Original line Diff line number Diff line
@@ -255,7 +255,8 @@ module LibDiameter_Types_Base_AVPs { 
                DIAMETER_INVALID_AVP_LENGTH_E (5014),

                DIAMETER_INVALID_AVP_LENGTH_E (5014),

                DIAMETER_INVALID_MESSAGE_LENGTH_E (5015),

                DIAMETER_INVALID_MESSAGE_LENGTH_E (5015),

                DIAMETER_INVALID_AVP_BIT_COMBO_E (5016),

                DIAMETER_INVALID_AVP_BIT_COMBO_E (5016),

                DIAMETER_NO_COMMON_SECURITY_E (5017)

                DIAMETER_NO_COMMON_SECURITY_E (5017),

                DIAMETER_ERROR_SUBSESSION_E (5470)

            }

            }

            with {

            with {

                    variant "length=32"

                    variant "length=32"