Commit e5f67a9c authored by pintar's avatar pintar
Browse files

New tests were added TP_RO_CTF_OP_19 to _21

Review of existing tests and corections
parent 56c07f0a
Loading
Loading
Loading
Loading
+11 −1
Original line number Original line Diff line number Diff line
@@ -426,7 +426,7 @@ module DiameterRfRo_PIXITS {
    modulepar Reporting_Reason PIXIT_REPORTING_REASON_TYPE_TABLE5 := THRESHOLD_E;
    modulepar Reporting_Reason PIXIT_REPORTING_REASON_TYPE_TABLE5 := THRESHOLD_E;
    
    
    /**
    /**
     * @desc Variant values for Reporting_Reason AVP
     * @desc Variant values for Time_Quota_Type AVP
     * @see ETSI DTS/INT-00103-2 V0.0.8 (2014-11) f_TC_RO_CTF_OP_18
     * @see ETSI DTS/INT-00103-2 V0.0.8 (2014-11) f_TC_RO_CTF_OP_18
     *     test purpose variants    Reporting_Reason AVP values:
     *     test purpose variants    Reporting_Reason AVP values:
     *     
     *     
@@ -435,6 +435,16 @@ module DiameterRfRo_PIXITS {
     */
     */
    modulepar Time_Quota_Type PIXIT_TIME_QUOTA_TYPE_TABLE6 := DISCRETE_TIME_PERIOD_E;
    modulepar Time_Quota_Type PIXIT_TIME_QUOTA_TYPE_TABLE6 := DISCRETE_TIME_PERIOD_E;
    
    
    /**
     * @desc Variant values for Time_Quota_Type AVP
     * @see ETSI DTS/INT-00103-2 V0.0.8 (2014-11) f_TC_RO_CTF_OP_21
     *     test purpose variants    Reporting_Reason AVP values:
     *     
     *         VA_01                    DISCRETE_TIME_PERIOD_E        (0)
     *         VA_02                    CONTINUOUS_TIME_PERIOD_E      (1)
     */
    modulepar Time_Quota_Type PIXIT_TIME_QUOTA_TYPE_TABLE7 := DISCRETE_TIME_PERIOD_E;
    
    /** 
    /** 
     * @desc    integer for variant selection
     * @desc    integer for variant selection
     * @see ETSI DTS/INT-00121-2 V0.0.19 (2015-10) 
     * @see ETSI DTS/INT-00121-2 V0.0.19 (2015-10) 
+65 −30
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@
        *  @param   
        *  @param   
        */
        */
        function f_DiameterRf_init()
        function f_DiameterRf_init()
        runs on DiameterComponent {
        runs on DiameterRfRo {


            //Defaults
            //Defaults
            vc_default_diameter := activate (a_diameter_default());
            vc_default_diameter := activate (a_diameter_default());
@@ -76,7 +76,7 @@
        *  @param   
        *  @param   
        */
        */
        function f_DiameterRf_init2()
        function f_DiameterRf_init2()
        runs on DiameterComponent {
        runs on DiameterRfRo {


            //Defaults
            //Defaults
            vc_default_diameter := activate (a_diameter_default());
            vc_default_diameter := activate (a_diameter_default());
@@ -117,7 +117,7 @@
        *  @param   
        *  @param   
        */
        */
        function f_DiameterRo_init()
        function f_DiameterRo_init()
        runs on DiameterComponent {
        runs on DiameterRfRo {
            
            
            //Defaults
            //Defaults
            vc_default_diameter := activate (a_diameter_default());
            vc_default_diameter := activate (a_diameter_default());
@@ -152,7 +152,7 @@
        *  @param   
        *  @param   
        */
        */
        function f_DiameterRo_init2()
        function f_DiameterRo_init2()
        runs on DiameterComponent {
        runs on DiameterRfRo {
            
            
            //Defaults
            //Defaults
            vc_default_diameter := activate (a_diameter_default());
            vc_default_diameter := activate (a_diameter_default());
@@ -194,7 +194,7 @@
                 *        p_ts         timestamp of event
                 *        p_ts         timestamp of event
                 * @verdict depend on receive message and its matching with template
                 * @verdict depend on receive message and its matching with template
                 */
                 */
                function f_sendACR_awaitACA_(in Acc_Record_Type p_art, in UInt32 p_cC_Request_Number, in UInt32 p_ts) runs on DiameterComponent
                function f_sendACR_awaitACA_(in Acc_Record_Type p_art, in UInt32 p_cC_Request_Number, in UInt32 p_ts) runs on DiameterRfRo
                {
                {
                    f_send_ACR(
                    f_send_ACR(
                       md_aCR(
                       md_aCR(
@@ -254,7 +254,7 @@
                                             in template (omit) Service_Context_Id_AVP                  p_service_Context_Id := omit,
                                             in template (omit) Service_Context_Id_AVP                  p_service_Context_Id := omit,
                                             in template (omit) Requested_Action_AVP                    p_requested_Action := omit,
                                             in template (omit) Requested_Action_AVP                    p_requested_Action := omit,
                                             in template (omit) Multiple_Services_Credit_Control_AVP    p_multiple_Services_Credit_Control := omit
                                             in template (omit) Multiple_Services_Credit_Control_AVP    p_multiple_Services_Credit_Control := omit
                ) runs on DiameterComponent {
                ) runs on DiameterRfRo {
                    f_send_CCR(
                    f_send_CCR(
                        md_cCR(
                        md_cCR(
                            vc_sessionId, 
                            vc_sessionId, 
@@ -308,7 +308,7 @@
                                             in UInt32                                                  p_cC_Request_Number,
                                             in UInt32                                                  p_cC_Request_Number,
                                             in template (omit) Requested_Action_AVP                    p_requested_Action := omit,
                                             in template (omit) Requested_Action_AVP                    p_requested_Action := omit,
                                             in template (omit) CCR_Body_AVP.multiple_Services_Credit_Control    p_multiple_Services_Credit_Control := omit
                                             in template (omit) CCR_Body_AVP.multiple_Services_Credit_Control    p_multiple_Services_Credit_Control := omit
                ) runs on DiameterComponent {
                ) runs on DiameterRfRo {
                    
                    
                    f_awaiting_CCR(
                    f_awaiting_CCR(
                        mdw_cCR(
                        mdw_cCR(
@@ -343,13 +343,58 @@
                
                
            } // End of group TypeOfCharging
            } // End of group TypeOfCharging
            
            
            group ReAuthorization {
                
                /**
                 * @desc Function used to await RA-Request and send RA-Answer
                 * @param p_ex
                 * @verdict depend on receive message and its matching with template
                 */
                function f_awaitRAR_sendRAA_(
                ) runs on DiameterRfRo {
                    
                    f_awaiting_RAR(
                        mdw_rAR(
                            ?, 
                            mdw_rarBodyAvps(
                                vc_originHost,                  // containing an Origin-Host AVP
                                vc_originRealm,                 // containing an Origin-Realm AVP
                                vc_destinationRealm,            // containing a Destination-Realm AVP
                                vc_destinationHost,             // containing a CC-Request-Type AVP
                                mw_auth_Application_Id(     // containing an Auth-Application-Id AVP
                                    4                           //     indicating the value 4
                                ),
                                mw_re_Auth_Request(             // containing a Re-Auth-Request-Type AVP
                                    AUTHORIZE_ONLY_E            //     indicating AUTHORIZE_ONLY
                                )
                            )
                        )
                    );

                    f_send_RAA(
                        md_rAA( 
                            vc_sessionId,                       // containing a Session-ID AVP
                            md_raaBodyAvps(
                                m_resultCode(                   // containing a Result-Code AVP
                                    DIAMETER_SUCCESS_E          //     indicating DIAMETER_SUCCESS
                                ),
                                vc_originHost,                  // containing an Origin-Host AVP
                                vc_originRealm                 // containing an Origin-Realm AVP
                        ))
                    );
                }//end function f_awaitRAR_sendRAA_(
                    
                
                
            }//end group ReAuthorization
            
        } // End of group RO
        } // End of group RO
        
        
    } // Endgroup GlobalSteps
    } // Endgroup GlobalSteps


    group Preambles{
    group Preambles{
        
        
        function f_preamble_Rf_CDF() runs on DiameterComponent
        function f_preamble_Rf_CDF() runs on DiameterRfRo
        {
        {
            if(PX_DIAM_LLP_ENABLED)
            if(PX_DIAM_LLP_ENABLED)
            {
            {
@@ -360,7 +405,7 @@
            f_preambleDiameterBaseClient(c_applIdRfRo);
            f_preambleDiameterBaseClient(c_applIdRfRo);
        }
        }
        
        
        function f_preamble_Rf_CDF2() runs on DiameterComponent
        function f_preamble_Rf_CDF2() runs on DiameterRfRo
        {
        {
            if(PX_DIAM_LLP_ENABLED)
            if(PX_DIAM_LLP_ENABLED)
            {
            {
@@ -371,7 +416,7 @@
            f_preambleDiameterBaseClient(c_applIdRfRo);
            f_preambleDiameterBaseClient(c_applIdRfRo);
        }
        }
        
        
        function f_preamble_Rf_CTF() runs on DiameterComponent
        function f_preamble_Rf_CTF() runs on DiameterRfRo
        {
        {
            if(PX_DIAM_LLP_ENABLED)
            if(PX_DIAM_LLP_ENABLED)
            {
            {
@@ -382,7 +427,7 @@
            f_preambleDiameterBaseServer(c_applIdRfRo);
            f_preambleDiameterBaseServer(c_applIdRfRo);
        }
        }
        
        
        function f_preamble_Ro_OCF() runs on DiameterComponent
        function f_preamble_Ro_OCF() runs on DiameterRfRo
        {
        {
            if(PX_DIAM_LLP_ENABLED)
            if(PX_DIAM_LLP_ENABLED)
            {
            {
@@ -393,7 +438,7 @@
            f_preambleDiameterBaseClient(c_applIdRfRo);
            f_preambleDiameterBaseClient(c_applIdRfRo);
        }
        }
        
        
        function f_preamble_Ro_OCF2() runs on DiameterComponent
        function f_preamble_Ro_OCF2() runs on DiameterRfRo
        {
        {
            if(PX_DIAM_LLP_ENABLED)
            if(PX_DIAM_LLP_ENABLED)
            {
            {
@@ -404,7 +449,7 @@
            f_preambleDiameterBaseClient(c_applIdRfRo);
            f_preambleDiameterBaseClient(c_applIdRfRo);
        }
        }
        
        
        function f_preamble_Ro_CTF() runs on DiameterComponent
        function f_preamble_Ro_CTF() runs on DiameterRfRo
        {
        {
            if(PX_DIAM_LLP_ENABLED)
            if(PX_DIAM_LLP_ENABLED)
            {
            {
@@ -419,7 +464,7 @@


    group Postambles {
    group Postambles {
        
        
        function f_postamble_Rf_CDF() runs on DiameterComponent
        function f_postamble_Rf_CDF() runs on DiameterRfRo
        {
        {
            f_postambleDiameterBase();
            f_postambleDiameterBase();
            
            
@@ -432,12 +477,12 @@
            deactivate;
            deactivate;
        }
        }
        
        
        function f_postamble_Rf_CDF2() runs on DiameterComponent
        function f_postamble_Rf_CDF2() runs on DiameterRfRo
        {
        {
            f_postamble_Rf_CDF();
            f_postamble_Rf_CDF();
        }
        }
        
        
        function f_postamble_Rf_CTF() runs on DiameterComponent
        function f_postamble_Rf_CTF() runs on DiameterRfRo
        {
        {
            
            
            f_postambleDiameterBase();
            f_postambleDiameterBase();
@@ -451,7 +496,7 @@
            deactivate;
            deactivate;
        }
        }
        
        
        function f_postamble_Ro_OCF() runs on DiameterComponent
        function f_postamble_Ro_OCF() runs on DiameterRfRo
        {
        {
            f_postambleDiameterBase();
            f_postambleDiameterBase();
            
            
@@ -464,7 +509,7 @@
            deactivate;
            deactivate;
        }
        }
        
        
        function f_postamble_Ro_OCF2() runs on DiameterComponent
        function f_postamble_Ro_OCF2() runs on DiameterRfRo
        {
        {
            f_postambleDiameterBase();
            f_postambleDiameterBase();
            
            
@@ -477,7 +522,7 @@
            deactivate;
            deactivate;
        }
        }
        
        
        function f_postamble_Ro_CTF() runs on DiameterComponent
        function f_postamble_Ro_CTF() runs on DiameterRfRo
        {
        {
            
            
            f_postambleDiameterBase();
            f_postambleDiameterBase();
@@ -503,17 +548,7 @@


    group SendMessage {
    group SendMessage {
        
        
        /**
        //SEND/AWAIT messages defined in LibDiameter_Steps module - where endid and hopid parameters are automaticali handled
         * @desc Function used to trigger a AC-Request message
         * @param p_acrMSG AC-Request message to send
         * @verdict Unchanged
         */
        function f_triggerAcRequest(in template (value) ACR_MSG p_acrMSG) 
        runs on DiameterComponent {
            DIAMP.send(
                DIAMETER_MSG : { aCR_MSG := p_acrMSG } 
            );
        } // End of function f_triggerAcRequest
        
        
    } // End of group SendMessage 
    } // End of group SendMessage 
    
    
+492 −264

File changed.

Preview size limit exceeded, changes collapsed.

+197 −159

File changed.

Preview size limit exceeded, changes collapsed.

+5 −5
Original line number Original line Diff line number Diff line
@@ -7517,7 +7517,7 @@ module DiameterRfRo_TestCases
                    f_cf_1Ro_1Gm_1Mw_ocfUp(v_diameterRo_ocf, v_imsComponent_ue, v_imsComponent_cscf);
                    f_cf_1Ro_1Gm_1Mw_ocfUp(v_diameterRo_ocf, v_imsComponent_ue, v_imsComponent_cscf);
                    
                    
                    // Start
                    // Start
                    //v_diameterRo_ocf.start(f_TC_RO_CTF_OP_17());
                    v_diameterRo_ocf.start(f_TC_RO_CTF_OP_17());
                    if (PX_SIPsupport) {
                    if (PX_SIPsupport) {
                        v_imsComponent_ue.start(f_TC_RO_CTF_TC_UE_08(p_cSeq_s));
                        v_imsComponent_ue.start(f_TC_RO_CTF_TC_UE_08(p_cSeq_s));
                        v_imsComponent_cscf.start(f_TC_RO_CTF_TC_CSCF_08(p_cSeq_s));
                        v_imsComponent_cscf.start(f_TC_RO_CTF_TC_CSCF_08(p_cSeq_s));
@@ -7592,7 +7592,7 @@ module DiameterRfRo_TestCases
                    f_cf_1Ro_1Gm_1Mw_ocfUp(v_diameterRo_ocf, v_imsComponent_ue, v_imsComponent_cscf);
                    f_cf_1Ro_1Gm_1Mw_ocfUp(v_diameterRo_ocf, v_imsComponent_ue, v_imsComponent_cscf);
                    
                    
                    // Start
                    // Start
                    //v_diameterRo_ocf.start(f_TC_RO_CTF_OP_18());
                    v_diameterRo_ocf.start(f_TC_RO_CTF_OP_18());
                    if (PX_SIPsupport) {
                    if (PX_SIPsupport) {
                        v_imsComponent_ue.start(f_TC_RO_CTF_TC_UE_08(p_cSeq_s));
                        v_imsComponent_ue.start(f_TC_RO_CTF_TC_UE_08(p_cSeq_s));
                        v_imsComponent_cscf.start(f_TC_RO_CTF_TC_CSCF_08(p_cSeq_s));
                        v_imsComponent_cscf.start(f_TC_RO_CTF_TC_CSCF_08(p_cSeq_s));
@@ -7672,7 +7672,7 @@ module DiameterRfRo_TestCases
                    f_cf_1Ro_1Gm_1Mw_ocfUp(v_diameterRo_ocf, v_imsComponent_ue, v_imsComponent_cscf);
                    f_cf_1Ro_1Gm_1Mw_ocfUp(v_diameterRo_ocf, v_imsComponent_ue, v_imsComponent_cscf);
                    
                    
                    // Start
                    // Start
                    //v_diameterRo_ocf.start(f_TC_RO_CTF_OP_19());
                    v_diameterRo_ocf.start(f_TC_RO_CTF_OP_19());
                    if (PX_SIPsupport) {
                    if (PX_SIPsupport) {
                        v_imsComponent_ue.start(f_TC_RO_CTF_TC_UE_08(p_cSeq_s));
                        v_imsComponent_ue.start(f_TC_RO_CTF_TC_UE_08(p_cSeq_s));
                        v_imsComponent_cscf.start(f_TC_RO_CTF_TC_CSCF_08(p_cSeq_s));
                        v_imsComponent_cscf.start(f_TC_RO_CTF_TC_CSCF_08(p_cSeq_s));
@@ -7748,7 +7748,7 @@ module DiameterRfRo_TestCases
                    f_cf_1Ro_1Gm_1Mw_ocfUp(v_diameterRo_ocf, v_imsComponent_ue, v_imsComponent_cscf);
                    f_cf_1Ro_1Gm_1Mw_ocfUp(v_diameterRo_ocf, v_imsComponent_ue, v_imsComponent_cscf);
                    
                    
                    // Start
                    // Start
                    //v_diameterRo_ocf.start(f_TC_RO_CTF_OP_20());
                    v_diameterRo_ocf.start(f_TC_RO_CTF_OP_20());
                    if (PX_SIPsupport) {
                    if (PX_SIPsupport) {
                        v_imsComponent_ue.start(f_TC_RO_CTF_TC_UE_08(p_cSeq_s));
                        v_imsComponent_ue.start(f_TC_RO_CTF_TC_UE_08(p_cSeq_s));
                        v_imsComponent_cscf.start(f_TC_RO_CTF_TC_CSCF_08(p_cSeq_s));
                        v_imsComponent_cscf.start(f_TC_RO_CTF_TC_CSCF_08(p_cSeq_s));
@@ -7828,7 +7828,7 @@ module DiameterRfRo_TestCases
                    f_cf_1Ro_1Gm_1Mw_ocfUp(v_diameterRo_ocf, v_imsComponent_ue, v_imsComponent_cscf);
                    f_cf_1Ro_1Gm_1Mw_ocfUp(v_diameterRo_ocf, v_imsComponent_ue, v_imsComponent_cscf);
                    
                    
                    // Start
                    // Start
                    //v_diameterRo_ocf.start(f_TC_RO_CTF_OP_21());
                    v_diameterRo_ocf.start(f_TC_RO_CTF_OP_21());
                    if (PX_SIPsupport) {
                    if (PX_SIPsupport) {
                        v_imsComponent_ue.start(f_TC_RO_CTF_TC_UE_08(p_cSeq_s));
                        v_imsComponent_ue.start(f_TC_RO_CTF_TC_UE_08(p_cSeq_s));
                        v_imsComponent_cscf.start(f_TC_RO_CTF_TC_CSCF_08(p_cSeq_s));
                        v_imsComponent_cscf.start(f_TC_RO_CTF_TC_CSCF_08(p_cSeq_s));