Commit 385391c4 authored by garciay's avatar garciay
Browse files

STF512:

- Finalise installation of the Test Adapter and the Spectra2 software 
- Start validation for both Rf and Ro interfaces
- Bug fixed on the ATS and the Test Adapter
parent 200717a6
Loading
Loading
Loading
Loading
+98 −22
Original line number Original line Diff line number Diff line
@@ -196,66 +196,66 @@
        {
        {
            if(PX_DIAM_LLP_ENABLED)
            if(PX_DIAM_LLP_ENABLED)
            {
            {
                f_preambleClient();
                f_preambleServer();
            }
            }
            
            
            f_DiameterRf_init();
            f_DiameterRf_init();
            f_preambleDiameterBaseClient(c_applIdRfRo);
            f_preambleDiameterBaseServer(c_applIdRf);
        }
        }
        
        
        function f_preamble_Rf_CDF2() runs on DiameterRfRo
        function f_preamble_Rf_CDF2() runs on DiameterRfRo
        {
        {
            if(PX_DIAM_LLP_ENABLED)
            if(PX_DIAM_LLP_ENABLED)
            {
            {
                f_preambleClient();
                f_preambleServer();
            }
            }
            
            
            f_DiameterRf_init2();
            f_DiameterRf_init2();
            f_preambleDiameterBaseClient(c_applIdRfRo);
            f_preambleDiameterBaseServer(c_applIdRf);
        }
        }
        
        
        function f_preamble_Rf_CTF() runs on DiameterRfRo
        function f_preamble_Rf_CTF() runs on DiameterRfRo
        {
        {
            if(PX_DIAM_LLP_ENABLED)
            if(PX_DIAM_LLP_ENABLED)
            {
            {
                f_preambleServer();
                f_preambleClient();
            }
            }
            
            
            f_DiameterRf_init();
            f_DiameterRf_init();
            f_preambleDiameterBaseServer(c_applIdRfRo);
            f_preambleDiameterBaseClient_acct_Application_Id_AVP(c_applIdRf);
        }
        }
        
        
        function f_preamble_Ro_OCF() runs on DiameterRfRo
        function f_preamble_Ro_OCF() runs on DiameterRfRo
        {
        {
            if(PX_DIAM_LLP_ENABLED)
            if(PX_DIAM_LLP_ENABLED)
            {
            {
                f_preambleClient();
                f_preambleServer();
            }
            }
            
            
            f_DiameterRo_init();
            f_DiameterRo_init();
            f_preambleDiameterBaseClient(c_applIdRfRo);
            f_preambleDiameterBaseServer(c_applIdRo);
        }
        }
        
        
        function f_preamble_Ro_OCF2() runs on DiameterRfRo
        function f_preamble_Ro_OCF2() runs on DiameterRfRo
        {
        {
            if(PX_DIAM_LLP_ENABLED)
            if(PX_DIAM_LLP_ENABLED)
            {
            {
                f_preambleClient();
                f_preambleServer();
            }
            }
            
            
            f_DiameterRo_init2();
            f_DiameterRo_init2();
            f_preambleDiameterBaseClient(c_applIdRfRo);
            f_preambleDiameterBaseServer(c_applIdRo);
        }
        }
        
        
        function f_preamble_Ro_CTF() runs on DiameterRfRo
        function f_preamble_Ro_CTF() runs on DiameterRfRo
        {
        {
            if(PX_DIAM_LLP_ENABLED)
            if(PX_DIAM_LLP_ENABLED)
            {
            {
                f_preambleServer();
                f_preambleClient();
            }
            }
            
            
            f_DiameterRo_init();
            f_DiameterRo_init();
            f_preambleDiameterBaseServer(c_applIdRfRo);
            f_preambleDiameterBaseClient(c_applIdRo);
        }
        }
        
        
    } // End of group Preambles
    } // End of group Preambles
@@ -385,8 +385,8 @@
                               mw_resultCode(                  // containing a Result-Code AVP
                               mw_resultCode(                  // containing a Result-Code AVP
                                   DIAMETER_SUCCESS_E          //     indicating DIAMETER_SUCCESS
                                   DIAMETER_SUCCESS_E          //     indicating DIAMETER_SUCCESS
                               ),
                               ),
                               vc_originHost,                  // containing an Origin-Host AVP
                               vc_originHost_IUT,              // containing an Origin-Host AVP
                               vc_originRealm,                 // containing an Origin-Realm AVP
                               vc_originRealm_IUT,             // containing an Origin-Realm AVP
                               mw_accounting_Record_Type(  // containing an Accounting-Record-Type AVP
                               mw_accounting_Record_Type(  // containing an Accounting-Record-Type AVP
                                   p_art
                                   p_art
                               ),
                               ),
@@ -395,7 +395,51 @@
                               )
                               )
                       ))
                       ))
                   );
                   );
                }
                } //end function f_sendACR_awaitACA_
                
                /**
                 * @desc Function used to receive AC-Request and send AC-Answer
                 * @param p_art        accounting record type - EVENT_E,START_E,INTERIM_E,STOP_E
                 * @verdict depend on receive message and its matching with template
                 */
                function f_awaitACR_sendACA_(in Acc_Record_Type p_art) runs on DiameterRfRo
                {

                    f_awaiting_ACR(
                       mdw_aCR(
                            ?, 
                            mdw_acrBody_ServiceInfo_EventTimestamp(
                                vc_originHost,                  // containing an Origin-Host AVP
                                vc_originRealm,                 // containing an Origin-Realm AVP
                                vc_destinationRealm,            // containing a Destination-Realm AVP
                                mw_accounting_Record_Type(      // containing an Accounting-Record-Type AVP
                                    p_art
                                ),
                                mw_accounting_Record_Number(    // containing an Accounting-Record-Number AVP
                                    ?                           //     indicating the value ?
                                ),
                                *,                              // containing a Service-Information AVP
                                *                               // containing an Event-Timestamp AVP
                            )
                        )
                    );

                    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
                                    p_art
                                ),
                                vc_accountingRecordNumber
                        ))
                    );
                }//end  function f_awaitACR_sendACA_


            } // End of group TypeOfCharging
            } // End of group TypeOfCharging


@@ -417,7 +461,7 @@
                                             in UInt32                                                  p_cC_Request_Number,
                                             in UInt32                                                  p_cC_Request_Number,
                                             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) CCR_Body_AVP.multiple_Services_Credit_Control    p_multiple_Services_Credit_Control := omit
                ) runs on DiameterRfRo {
                ) runs on DiameterRfRo {
                    f_send_CCR(
                    f_send_CCR(
                        md_cCR(
                        md_cCR(
@@ -446,8 +490,8 @@
                               mw_resultCode(
                               mw_resultCode(
                                   DIAMETER_SUCCESS_E
                                   DIAMETER_SUCCESS_E
                               ),
                               ),
                               vc_originHost,
                               vc_originHost_IUT,
                               vc_originRealm,
                               vc_originRealm_IUT,
                               mw_auth_Application_Id(4),
                               mw_auth_Application_Id(4),
                               mw_cC_Request_Type(
                               mw_cC_Request_Type(
                                   p_cC_Request_Ty_Type
                                   p_cC_Request_Ty_Type
@@ -470,8 +514,8 @@
                function f_awaitCCR_sendCCA_(
                function f_awaitCCR_sendCCA_(
                                             in CC_Request_Ty_Type                                      p_cC_Request_Ty_Type, 
                                             in CC_Request_Ty_Type                                      p_cC_Request_Ty_Type, 
                                             in UInt32                                                  p_cC_Request_Number,
                                             in UInt32                                                  p_cC_Request_Number,
                                             in template (omit) Requested_Action_AVP                    p_requested_Action := omit,
                                             in template Requested_Action_AVP                           p_requested_Action := *,
                                             in template (omit) CCR_Body_AVP.multiple_Services_Credit_Control    p_multiple_Services_Credit_Control := omit
                                             in template CCR_Body_AVP.multiple_Services_Credit_Control  p_multiple_Services_Credit_Control := *
                ) runs on DiameterRfRo {
                ) runs on DiameterRfRo {
                    
                    
                    f_awaiting_CCR(
                    f_awaiting_CCR(
@@ -521,8 +565,8 @@
                        mdw_rAR(
                        mdw_rAR(
                            ?, 
                            ?, 
                            mdw_rarBodyAvps(
                            mdw_rarBodyAvps(
                                vc_originHost,                  // containing an Origin-Host AVP
                                vc_originHost_IUT,              // containing an Origin-Host AVP
                                vc_originRealm,                 // containing an Origin-Realm AVP
                                vc_originRealm_IUT,             // containing an Origin-Realm AVP
                                vc_destinationRealm,            // containing a Destination-Realm AVP
                                vc_destinationRealm,            // containing a Destination-Realm AVP
                                vc_destinationHost,             // containing a CC-Request-Type AVP
                                vc_destinationHost,             // containing a CC-Request-Type AVP
                                mw_auth_Application_Id(     // containing an Auth-Application-Id AVP
                                mw_auth_Application_Id(     // containing an Auth-Application-Id AVP
@@ -556,4 +600,36 @@
        
        
    } // End of group SendMessage 
    } // End of group SendMessage 
    
    
    group DefaultTestStep{

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

                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
                                INTERIM_RECORD_E
                            ),
                            vc_accountingRecordNumber
                    ))
                );
                repeat;
              }
        }
    }//end group DefaultTestStep
    
} // End of module DiameterGx_Steps
} // End of module DiameterGx_Steps
 No newline at end of file