Commit 8b4ca277 authored by pintar's avatar pintar
Browse files

Corrections were done due to STF 512/Diameter RfRo validation against Iskratel SUT

parent 30f99493
Loading
Loading
Loading
Loading
+165 −84

File changed.

Preview size limit exceeded, changes collapsed.

+44 −1
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@
        
        function f_preamble_Rf_CDF() runs on DiameterRfRo
        {
            var default     v_def_diameter_catchEvent;
            if(PX_DIAM_LLP_ENABLED)
            {
                f_preambleServer();
@@ -201,10 +202,16 @@
            
            f_DiameterRf_init();
            f_preambleDiameterBaseServer(c_applIdRf);
            //catch ACR(Event) before test body starts(on 200 OK REGISTER, 200 OK, SUBSCRIBE, 200 OK NOTIFY)
            v_def_diameter_catchEvent := activate (a_diameter_event());
            
            //delay before preamble is done - SIP starts with MESSAGE, INVITE request later
            f_wait(0.5);
        }
        
        function f_preamble_Rf_CDF2() runs on DiameterRfRo
        {
            var default     v_def_diameter_catchEvent;
            if(PX_DIAM_LLP_ENABLED)
            {
                f_preambleServer();
@@ -212,6 +219,11 @@
            
            f_DiameterRf_init2();
            f_preambleDiameterBaseServer(c_applIdRf);
            //catch ACR(Event) before test body starts(on 200 OK REGISTER, 200 OK, SUBSCRIBE, 200 OK NOTIFY)
            v_def_diameter_catchEvent := activate (a_diameter_event());
            
            //delay before preamble is done - SIP starts with MESSAGE, INVITE request later
            f_wait(0.5);
        }
        
        function f_preamble_Rf_CTF() runs on DiameterRfRo
@@ -611,6 +623,7 @@
              {
                vc_recv_hopid:= vc_recvDiamMsgDefault.aCR_MSG.header.hopid;
                vc_recv_endid:= vc_recvDiamMsgDefault.aCR_MSG.header.endid;
                vc_accountingRecordNumber := vc_recvDiamMsgDefault.aCR_MSG.aCR_Body.accounting_Record_Number;

                f_send_ACA(
                    md_aCA( 
@@ -629,7 +642,37 @@
                );
                repeat;
              }
        } //end altstep a_diameter_interim()

        altstep a_diameter_event() runs on DiameterRfRo
        {
            
            [] DIAMP.receive (DIAMETER_MSG:{aCR_MSG := 
                mdw_aCR(?,mdw_acrBody_ServiceInfo_EventTimestamp(?,?,?,mw_accounting_Record_Type(EVENT_RECORD_E),?,*,*))
            }) -> value vc_recvDiamMsgDefault
              {
                vc_recv_hopid:= vc_recvDiamMsgDefault.aCR_MSG.header.hopid;
                vc_recv_endid:= vc_recvDiamMsgDefault.aCR_MSG.header.endid;
                vc_accountingRecordNumber := vc_recvDiamMsgDefault.aCR_MSG.aCR_Body.accounting_Record_Number;

                f_send_ACA(
                    md_aCA( 
                        vc_sessionId,                       // containing a Session-ID AVP
                        md_acaBodyAvps(
                            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
                            m_accounting_Record_Type(       // containing an Accounting-Record-Type AVP
                                EVENT_RECORD_E
                            ),
                            vc_accountingRecordNumber
                    ))
                );
                repeat;
              }
        }//end altstep a_diameter_event()
    }//end group DefaultTestStep
    
} // End of module DiameterGx_Steps
 No newline at end of file
+43 −148
Original line number Diff line number Diff line
@@ -676,7 +676,7 @@ module DiameterRfRo_TCFunctions {
                    log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");

                    f_awaiting_ACR(
                        mw_ACR_CmdFlags_PET(mw_diameterHeaderReq_CmdFlags(ACR_E, ?, mw_cmdFlagsReq_PET('0'B,'0'B,'0'B)))
                        mw_ACR_CmdFlags_PET(mw_diameterHeaderReq_CmdFlags(ACR_E, ?, mw_cmdFlagsReq_PET(?,'0'B,'0'B)))
                    );

                    f_send_ACA(
@@ -1099,8 +1099,6 @@ module DiameterRfRo_TCFunctions {
                        ))
                    );
                    
                    f_awaitACR_sendACA_(INTERIM_RECORD_E);
                    
                    f_awaiting_DWR(mw_DWR_dummy);
                    
                    f_send_DWA(m_DWA_basic(vc_originHost, vc_originRealm));
@@ -1123,7 +1121,7 @@ module DiameterRfRo_TCFunctions {
                 *          the IUT sends an AC-Request [Interim] to the secondary CDF.
                 * @verdict pass on success, fail on error or inconc on timeout only 
                 */
                function f_TC_CTF_EC_02() runs on DiameterRfRo {
                function f_TC_CTF_EC_02(DiameterRfRo p_diameterComponent_cdf) runs on DiameterRfRo {
                    // Local variables
                    var DIAMETER_MSG v_MSG;
                    
@@ -1167,43 +1165,14 @@ module DiameterRfRo_TCFunctions {
                        ))
                    );

                    f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());
                    
                    
                    tc_wait.start;
                        alt
                        {
                            []DIAMP.receive(DIAMETER_MSG:{aCR_MSG:= mdw_aCR(
                                ?, 
                                mdw_acrBody_ServiceInfo_EventTimestamp(
                                    vc_originHost_IUT,              // containing an Origin-Host AVP
                                    vc_originRealm_IUT,             // containing an Origin-Realm AVP
                                    vc_destinationRealm_IUT,        // containing a Destination-Realm AVP
                                    mw_accounting_Record_Type(      // containing an Accounting-Record-Type AVP
                                        INTERIM_RECORD_E
                                    ),
                                    mw_accounting_Record_Number(    // containing an Accounting-Record-Number AVP
                                        ?                           //     indicating the value ?
                                    ),
                                    ?,                              // containing a Service-Information AVP
                                    ?                               // containing an Event-Timestamp AVP
                                    ))
                            
                            
                            })-> value v_MSG
                              {
                                vc_recvDiamMsg := v_MSG;
                                repeat;
                              }
                            [] tc_wait.timeout {
                                setverdict(pass,"PASS: Message received due to TP and NO answer was sent")
                            }
                        }
                    unmap(p_diameterComponent_cdf:DIAMP, system:CDF_Rf);

                    log("ACA message was not send out from primary CDF.");
                    f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
                    
                    map(p_diameterComponent_cdf:DIAMP, system:CDF_Rf); 

                    f_postamble_Rf_CDF();
                    f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict()); 
                    log("*** " & __SCOPE__ & ": INFO: Postamble done. ***");
@@ -1273,7 +1242,7 @@ module DiameterRfRo_TCFunctions {
                 *          to the primary CDF.
                 * @verdict pass on success, fail on error or inconc on timeout only 
                 */
                function f_TC_CTF_EC_03() runs on DiameterRfRo {
                function f_TC_CTF_EC_03(DiameterRfRo p_diameterComponent_cdf) runs on DiameterRfRo {
                    // Local variables
                    var DIAMETER_MSG v_MSG;
                    
@@ -1317,40 +1286,16 @@ module DiameterRfRo_TCFunctions {
                        ))
                    );
                    
                    f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());
                    unmap(p_diameterComponent_cdf:DIAMP, system:CDF_Rf);// Diameter Init test Configuration
                    

                    tc_wait.start;
                        alt
                        {
                            []DIAMP.receive(DIAMETER_MSG:{aCR_MSG:= mdw_aCR(
                                ?, 
                                mdw_acrBody_ServiceInfo_EventTimestamp(
                                    vc_originHost_IUT,              // containing an Origin-Host AVP
                                    vc_originRealm_IUT,             // containing an Origin-Realm AVP
                                    vc_destinationRealm_IUT,        // containing a Destination-Realm AVP
                                    mw_accounting_Record_Type(      // containing an Accounting-Record-Type AVP
                                        INTERIM_RECORD_E
                                    ),
                                    mw_accounting_Record_Number(    // containing an Accounting-Record-Number AVP
                                        ?                           //     indicating the value ?
                                    ),
                                    ?,                              // containing a Service-Information AVP
                                    ?                               // containing an Event-Timestamp AVP
                                    ))
                    f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());
                    
                    log("ACA message was not send out from primary CDF.");
                    
                            })-> value v_MSG
                              {
                                vc_recvDiamMsg := v_MSG;
                                repeat;
                              }
                            [] tc_wait.timeout {
                                setverdict(pass,"PASS: Message received due to TP and NO answer was sent")
                            }
                        }
                    f_selfOrClientSyncAndVerdict(c_sync2, f_getVerdict());
                    
                    log("ACA message was not send out from primary CDF.");
                    map(p_diameterComponent_cdf:DIAMP, system:CDF_Rf);// Diameter Init test Configuration
                    
                    f_awaiting_ACR(
                       mdw_aCR(
@@ -1445,6 +1390,8 @@ module DiameterRfRo_TCFunctions {
                        ))
                    );
                    
                    f_selfOrClientSyncAndVerdict(c_sync2, f_getVerdict());
                    
                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); 

                    f_postamble_Rf_CDF2();
@@ -1459,7 +1406,7 @@ module DiameterRfRo_TCFunctions {
                 *          to the CDF, in the order they were stored in the buffer.
                 * @verdict pass on success, fail on error or inconc on timeout only 
                 */
                function f_TC_CTF_EC_04() runs on DiameterRfRo {
                function f_TC_CTF_EC_04(DiameterRfRo p_diameterComponent_cdf) runs on DiameterRfRo {
                    // Local variables
                    var DIAMETER_MSG v_MSG;
                    
@@ -1503,39 +1450,11 @@ module DiameterRfRo_TCFunctions {
                        ))
                    );
                    
                    f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());
                    unmap(p_diameterComponent_cdf:DIAMP, system:CDF_Rf);// Diameter Init test Configuration
                    
                    f_wait(3.0);
                    
                    tc_wait.start;
                    alt
                    {
                        []DIAMP.receive(DIAMETER_MSG:{aCR_MSG:= mdw_aCR(
                            ?, 
                            mdw_acrBody_ServiceInfo_EventTimestamp(
                                vc_originHost_IUT,              // containing an Origin-Host AVP
                                vc_originRealm_IUT,             // containing an Origin-Realm AVP
                                vc_destinationRealm_IUT,        // containing a Destination-Realm AVP
                                mw_accounting_Record_Type(      // containing an Accounting-Record-Type AVP
                                    INTERIM_RECORD_E
                                ),
                                mw_accounting_Record_Number(    // containing an Accounting-Record-Number AVP
                                    ?                           //     indicating the value ?
                                ),
                                ?,                              // containing a Service-Information AVP
                                ?                               // containing an Event-Timestamp AVP
                                ))
                        
                        
                        })-> value v_MSG
                          {
                            vc_recvDiamMsg := v_MSG;
                            log("Repeat loop");
                            repeat;
                          }
                        [] tc_wait.timeout {
                            setverdict(pass,"PASS: Message received due to TP and NO answer was sent")
                        }
                    }
                    map(p_diameterComponent_cdf:DIAMP, system:CDF_Rf);// Diameter Init test Configuration
                    
                    log("ACA message was not send out from primary CDF.");
                    
@@ -1656,7 +1575,7 @@ module DiameterRfRo_TCFunctions {

                    f_awaiting_ACR(
                       mdw_aCR_Header_ACRBody(
                            mw_diameterHeaderReq_CmdFlags(ACR_E, ?, mw_cmdFlagsReq_PET('0'B,'0'B,'1'B)),
                            mw_diameterHeaderReq_CmdFlags(ACR_E, ?, mw_cmdFlagsReq_PET(?,'0'B,'1'B)),
                            ?, 
                            mdw_acrBody_ServiceInfo_EventTimestamp(
                                vc_originHost_IUT,              // containing an Origin-Host AVP
@@ -1705,7 +1624,7 @@ module DiameterRfRo_TCFunctions {
                 *          AC-Requests [Interim] (T-flag), the IUT executes the CDF connection failure procedure.
                 * @verdict pass on success, fail on error or inconc on timeout only 
                 */
                function f_TC_CTF_EC_06() runs on DiameterRfRo {
                function f_TC_CTF_EC_06(DiameterRfRo p_diameterComponent_cdf) runs on DiameterRfRo {
                    // Local variables
                    var DIAMETER_MSG v_MSG;
                    // Preamble
@@ -1750,35 +1669,11 @@ module DiameterRfRo_TCFunctions {

                    f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());
                    
                    tc_wait.start;
                        alt
                        {
                            []DIAMP.receive(DIAMETER_MSG:{aCR_MSG:= mdw_aCR(
                                ?, 
                                mdw_acrBody_ServiceInfo_EventTimestamp(
                                    vc_originHost_IUT,              // containing an Origin-Host AVP
                                    vc_originRealm_IUT,             // containing an Origin-Realm AVP
                                    vc_destinationRealm_IUT,        // containing a Destination-Realm AVP
                                    mw_accounting_Record_Type(      // containing an Accounting-Record-Type AVP
                                        INTERIM_RECORD_E
                                    ),
                                    mw_accounting_Record_Number(    // containing an Accounting-Record-Number AVP
                                        ?                           //     indicating the value ?
                                    ),
                                    ?,                              // containing a Service-Information AVP
                                    ?                               // containing an Event-Timestamp AVP
                                    ))
                    unmap(p_diameterComponent_cdf:DIAMP, system:CDF_Rf);// Diameter Init test Configuration
                    
                    f_wait(3.0);
                    
                            })-> value v_MSG
                              {
                                vc_recvDiamMsg := v_MSG;
                                repeat;
                              }
                            [] tc_wait.timeout {
                                setverdict(pass,"PASS: Message received due to TP and NO answer was sent")
                            }
                        }
                    map(p_diameterComponent_cdf:DIAMP, system:CDF_Rf);// Diameter Init test Configuration
                    
                    action("After Communication restored CDF sends ACR again.");

@@ -5010,7 +4905,7 @@ module DiameterRfRo_TCFunctions {
                    log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");

                    f_awaiting_CCR(
                        mw_CCR_CmdFlags_PET(mw_diameterHeaderReq_CmdFlags(CCR_E, ?, mw_cmdFlagsReq_PET('0'B,'0'B,'0'B)))
                        mw_CCR_CmdFlags_PET(mw_diameterHeaderReq_CmdFlags(CCR_E, ?, mw_cmdFlagsReq_PET(?,'0'B,'0'B)))
                    );

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); 
@@ -5686,7 +5581,7 @@ module DiameterRfRo_TCFunctions {
                                CCR_E, 
                                ?, 
                                mw_cmdFlagsReq_PET(            //     containing Command-Flags
                                    '0'B,'0'B,
                                    ?,'0'B,
                                    '0'B                       //         containing T-flag
                                                               //             indicating value ‘0’
                                )
@@ -5719,7 +5614,7 @@ module DiameterRfRo_TCFunctions {
                                CCR_E, 
                                ?, 
                                mw_cmdFlagsReq_PET(            //     containing Command-Flags
                                    '0'B,'0'B,
                                    ?,'0'B,
                                    '1'B                       //         containing T-flag
                                                               //             indicating value ‘1’
                                )
@@ -5784,7 +5679,7 @@ module DiameterRfRo_TCFunctions {
                                CCR_E, 
                                ?, 
                                mw_cmdFlagsReq_PET(            //     containing Command-Flags
                                    '0'B,'0'B,
                                    ?,'0'B,
                                    '0'B                       //         containing T-flag
                                                               //             indicating value ‘0’
                                )
@@ -5818,7 +5713,7 @@ module DiameterRfRo_TCFunctions {
                                CCR_E, 
                                ?, 
                                mw_cmdFlagsReq_PET(            //     containing Command-Flags
                                    '0'B,'0'B,
                                    ?,'0'B,
                                    '1'B                       //         containing T-flag
                                                               //             indicating value ‘1’
                                )
@@ -5883,7 +5778,7 @@ module DiameterRfRo_TCFunctions {
                                CCR_E, 
                                ?, 
                                mw_cmdFlagsReq_PET(            //     containing Command-Flags
                                    '0'B,'0'B,
                                    ?,'0'B,
                                    '0'B                       //         containing T-flag
                                                               //             indicating value ‘0’
                                )
@@ -5910,7 +5805,7 @@ module DiameterRfRo_TCFunctions {
                                CCR_E, 
                                ?, 
                                mw_cmdFlagsReq_PET(            //     containing Command-Flags
                                    '0'B,'0'B,
                                    ?,'0'B,
                                    '1'B                       //         containing T-flag
                                                               //             indicating value ‘1’
                                )
@@ -5984,7 +5879,7 @@ module DiameterRfRo_TCFunctions {
                                CCR_E, 
                                ?, 
                                mw_cmdFlagsReq_PET(            //     containing Command-Flags
                                    '0'B,'0'B,
                                    ?,'0'B,
                                    '0'B                       //         containing T-flag
                                                               //             indicating value ‘0’
                                )
@@ -6018,7 +5913,7 @@ module DiameterRfRo_TCFunctions {
                                CCR_E, 
                                ?, 
                                mw_cmdFlagsReq_PET(            //     containing Command-Flags
                                    '0'B,'0'B,
                                    ?,'0'B,
                                    '1'B                       //         containing T-flag
                                                               //             indicating value ‘1’
                                )
@@ -6090,7 +5985,7 @@ module DiameterRfRo_TCFunctions {
                                CCR_E, 
                                ?, 
                                mw_cmdFlagsReq_PET(                     //     containing Command-Flags
                                    '0'B,'0'B,
                                    ?,'0'B,
                                    '0'B                                //         containing T-flag
                                                                        //             indicating value ‘0’
                                )
@@ -6124,7 +6019,7 @@ module DiameterRfRo_TCFunctions {
                                CCR_E, 
                                ?, 
                                mw_cmdFlagsReq_PET(                     //     containing Command-Flags
                                    '0'B,'0'B,
                                    ?,'0'B,
                                    '1'B                                //         containing T-flag
                                                                        //             indicating value ‘1’
                                )
@@ -6324,7 +6219,7 @@ module DiameterRfRo_TCFunctions {
                                CCR_E, 
                                ?, 
                                mw_cmdFlagsReq_PET(            //     containing Command-Flags
                                    '0'B,'0'B,
                                    ?,'0'B,
                                    '0'B                       //         containing T-flag
                                                               //             indicating value ‘0’
                                )
@@ -6354,7 +6249,7 @@ module DiameterRfRo_TCFunctions {
                                CCR_E, 
                                ?, 
                                mw_cmdFlagsReq_PET(            //     containing Command-Flags
                                    '0'B,'0'B,
                                    ?,'0'B,
                                    '0'B                       //         containing T-flag
                                                               //             indicating value ‘0’
                                )
@@ -6404,7 +6299,7 @@ module DiameterRfRo_TCFunctions {
                                CCR_E, 
                                ?, 
                                mw_cmdFlagsReq_PET(            //     containing Command-Flags
                                    '0'B,'0'B,
                                    ?,'0'B,
                                    '0'B                       //         containing T-flag
                                                               //             indicating value ‘0’
                                )
@@ -7409,7 +7304,7 @@ module DiameterRfRo_TCFunctions {
                                CCR_E, 
                                ?, 
                                mw_cmdFlagsReq_PET(            //     containing Command-Flags
                                    '0'B,'0'B,
                                    ?,'0'B,
                                    '1'B                       //         containing T-flag
                                                               //             indicating value ‘1’
                                )
+8 −6

File changed.

Preview size limit exceeded, changes collapsed.

+25 −11

File changed.

Preview size limit exceeded, changes collapsed.

Loading