Commit f5fd610e authored by garciay's avatar garciay
Browse files

STF490:

1) Terminate RO_OCF_TC and Add new TCs for RO_OCF_EC
2) Built with both TTCN-3 tools
parent 39f356f0
Loading
Loading
Loading
Loading
+11 −8
Original line number Diff line number Diff line
@@ -167,14 +167,17 @@
                
                /**
                 * @desc Function used to send CC-Request and receive CC-Answer
                 * @param CC_Request_Ty_Type accounting record type - EVENT_REQUEST
                 *        p_cC_Request_Number acc   record number
                 *        p_ts               timestamp of event
                 * @param p_cC_Request_Ty_Type      Request type - EVENT_REQUEST
                 * @param p_cC_Request_Number acc   Request number
                 * @param p_service_Context_Id      Service context ID
                 * @verdict depend on receive message and its matching with template
                 */
                function f_sendCCR_awaitCCA_(
                                             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) Service_Context_Id_AVP                  p_service_Context_Id := 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
                ) runs on DiameterComponent {
                    f_send_CCR(
                        md_cCR(
@@ -189,9 +192,9 @@
                                md_cC_Request_Number_AVP(
                                    p_cC_Request_Number
                                ),
                                m_service_Context_Id(
                                    "ContextId" // FIXME Use a PIXIT?
                                )
                                p_service_Context_Id,
                                p_requested_Action,
                                p_multiple_Services_Credit_Control
                           )
                       )
                   );
+1696 −1211

File changed.

Preview size limit exceeded, changes collapsed.

+77 −10
Original line number Diff line number Diff line
@@ -35,6 +35,17 @@ module DiameterRfRo_Templates {

    group HeaderFieldTemplates {

        template (value) Command_Flags m_cmdFlagsAns_CmdFlags_T modifies m_cmdFlagsAns := {
            t_bit := '1'B
        }
        
        template (value) DiameterHeader m_diameterHeaderReq_CmdFlags_T(
                                                                      in Command_Code p_cmdcode, 
                                                                      in UInt32 p_applid
        ) modifies m_diameterHeaderReq_dummy := {
            cmdflags := m_cmdFlagsAns_CmdFlags_T
        }
        
        template DiameterHeader mw_diameterHeaderReq_CmdFlags(Command_Code p_cmdcode, template (present) UInt32 p_applid, template (present) Command_Flags p_commandFlags) modifies mw_diameterHeaderReq_dummy := {
            cmdflags := p_commandFlags
        }
@@ -4963,10 +4974,26 @@ module DiameterRfRo_Templates {
                cCR_Body    := p_ccrBody
            } // End of template md_cCR
            
            /**
             * @desc Send template for CCR
             * @param p_sessionId   Session identifier
             * @param p_ccrBody     CCR message body
             * @param p_header      Specific Diameter header
             */
            template (value) CCR_MSG md_cCR_CmdFlags_T(
                                                       in template (value) DiameterHeader  p_header,
                                                       in template (value) Session_Id_AVP  p_sessionId,
                                                       in template (value) CCR_Body_AVP    p_ccrBody
            ) modifies m_CCR_dummy := {
                header      := p_header,
                session_Id  := p_sessionId,
                cCR_Body    := p_ccrBody
            } // End of template md_cCR_CmdFlags_T
            
            /**
             * @desc Send template for CCR message body
             */
            template (omit) CCR_Body_AVP md_ccrBodyAvps_TypeOfCharging( // TODO Rename into md_ccrBodyAvps
            template (omit) CCR_Body_AVP md_ccrBodyAvps_TypeOfCharging( 
                                                                       in template (value) Origin_Host_AVP                      p_originHost,
                                                                       in template (value) Origin_Realm_AVP                     p_originRealm,
                                                                       in template (value) Destination_Realm_AVP                p_destination_Realm,
@@ -5111,6 +5138,27 @@ module DiameterRfRo_Templates {
                    cost_Information                    := p_cost_Information
                } // End of template mdw_ccaBodyAvps_cost_Information
                
                template CCA_Body_AVP mdw_ccaBodyAvps_xxx( // TODO Find the right template name
                                                                                                 template (present) Result_Code_AVP                         p_resultCode := ?,
                                                                                                 template (present) Origin_Host_AVP                         p_originHost := ?,
                                                                                                 template (present) Origin_Realm_AVP                        p_originRealm := ?,
                                                                                                 template (present) CC_Request_Type_AVP                     p_cC_Request_Type := ?,
                                                                                                 template (present) CC_Request_Number_AVP                   p_cC_Request_Number := ?,
                                                                                                 template (present) Multiple_Services_Credit_Control_AVP    p_multiple_Services_Credit_Control := ?,
                                                                                                 template Cost_Information_AVP                              p_cost_Information := *,
                                                                                                 template Remaining_Balance_AVP                             p_remaining_Balance := *
                ) modifies mw_CCA_Body_dummy := {
                    result_Code                         := p_resultCode,
                    origin_Host                         := p_originHost,
                    origin_Realm                        := p_originRealm,
                    auth_Application_Id                 := mw_auth_Application_Id_AVP(4),
                    cC_Request_Type                     := p_cC_Request_Type,
                    cC_Request_Number                   := p_cC_Request_Number,
                    multiple_Services_Credit_Control    := { p_multiple_Services_Credit_Control },
                    cost_Information                    := p_cost_Information ifpresent,
                    remaining_Balance                   := p_remaining_Balance ifpresent
                } // End of template mdw_ccaBodyAvps_xxx
                
            } // End of group CCA_MSG_ 
            
        } // End of group Ro_answer_message_templates_receive 
@@ -5121,7 +5169,7 @@ module DiameterRfRo_Templates {
        
        group Ro_dummy_avps_templates_send { 
            
            template (omit) Multiple_Services_Credit_Control_AVP m_multiple_Services_Credit_Control_dummy := {
            template (omit) Multiple_Services_Credit_Control_AVP m_multiple_Services_Credit_Control_AVP_dummy := {
                aVP_Header                      := m_aVP_HeaderVid_Mbit1(c_multiple_Services_Credit_Control_AVP_Code, 0, c_vendId3gpp),
                granted_Service_Unit            := omit,
                requested_Service_Unit          := omit,
@@ -5149,9 +5197,9 @@ module DiameterRfRo_Templates {
                service_Specific_Info           := omit,
                qoS_Information                 := omit,
                aVP_Type                        := omit
            } // End of template m_multiple_Services_Credit_Control_dummy
            } // End of template m_multiple_Services_Credit_Control_AVP_dummy
            
            template (value) Requested_Service_Unit_AVP m_requested_Service_Unit_AVP := {
            template (value) Requested_Service_Unit_AVP m_requested_Service_Unit_AVP_dummy := {
                aVP_Header                  := m_aVP_HeaderVid_Mbit1(c_requested_Service_Unit_AVP_Code, 0, c_vendId3gpp),
                cC_Time                     := omit,
                cC_Money                    := omit,
@@ -5160,7 +5208,19 @@ module DiameterRfRo_Templates {
                cC_Output_Octets            := omit,
                cC_Service_Specific_Units   := omit,
                aVP_Type                    := omit
            } // End of template m_requested_Service_Unit_AVP
            } // End of template m_requested_Service_Unit_AVP_dummy
            
            template (value) Used_Service_Unit_AVP m_used_Service_Unit_AVP_dummy := {
                aVP_Header                  := m_aVP_HeaderVid_Mbit1(c_used_Service_Unit_AVP_Code, 0, c_vendId3gpp),
                tariff_Change_Usage         := omit,
                cC_Time                     := omit,
                cC_Money                    := omit,
                cC_Total_Octets             := omit,
                cC_Input_Octets             := omit,
                cC_Output_Octets            := omit,
                cC_Service_Specific_Units   := omit,
                aVP_Type                    := omit
            } // End of template m_requested_Service_Unit_AVP_dummy
            
        } // End of group Ro_dummy_avps_templates_send 
        
@@ -5210,24 +5270,31 @@ module DiameterRfRo_Templates {
            
            template (omit) Multiple_Services_Credit_Control_AVP m_multiple_Services_Credit_Control_AVP(
                                                                                                        in template (omit) Requested_Service_Unit_AVP p_requested_Service_Unit := omit,
                                                                                                        in template (omit) Used_Service_Unit_AVP      p_used_Service_Unit := omit,
                                                                                                        in template (omit) Service_Identifier_AVP     p_service_Identifier := omit
            ) modifies m_multiple_Services_Credit_Control_dummy := {
            ) modifies m_multiple_Services_Credit_Control_AVP_dummy := {
                requested_Service_Unit          := p_requested_Service_Unit ifpresent,
                service_Identifier              := { p_service_Identifier } ifpresent
            } // End of template m_multiple_Services_Credit_Control_AVP
            
            template (value) Requested_Service_Unit_AVP m_requested_Service_Unit_cC_Time_AVP(
                                                                                             in template (value) CC_Time_AVP p_cC_Time
            ) modifies m_requested_Service_Unit_AVP := {
            ) modifies m_requested_Service_Unit_AVP_dummy := {
                cC_Time                     := p_cC_Time
            } // End of template m_requested_Service_Unit_cC_Time_AVP 
            
            template (value) Requested_Service_Unit_AVP m_requested_Service_Unit_cC_Money_AVP(
                                                                                              in template (value) CC_Money_AVP p_cC_Money
            ) modifies m_requested_Service_Unit_AVP := {
            ) modifies m_requested_Service_Unit_AVP_dummy := {
                cC_Money                    := p_cC_Money
            } // End of template m_requested_Service_Unit_cC_Money 
            
            template (value) Used_Service_Unit_AVP m_used_Service_Unit_cC_Time_AVP(
                                                                                   in template (value) CC_Time_AVP p_cC_Time
            ) modifies m_used_Service_Unit_AVP_dummy := {
                cC_Time                     := p_cC_Time
            } // End of template m_used_Service_Unit_cC_Time_AVP 
            
            template (value) Service_Identifier_AVP m_service_Identifier_AVP(
                                                                             in template (value) UInt32 p_aVP_Data
            ) := {
+405 −27

File changed.

Preview size limit exceeded, changes collapsed.

+13 −3
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ module DiameterRfRo_TestControl {
            execute(TC_RF_CDF_MS_01());
            execute(TC_RF_CDF_MS_02());
            
            if (PICS_EVENT_BASED_CHARGING) {
            if (PICS_RF_CDF_EVENT_BASED_CHARGING) {
                execute(TC_RF_CDF_TC_01());
                execute(TC_RF_CDF_EC_03());
            }
            if (PICS_SESSION_BASED_CHARGING) {
            if (PICS_RF_CDF_SESSION_BASED_CHARGING) {
                execute(TC_RF_CDF_TC_02());
                execute(TC_RF_CDF_TC_03());
                execute(TC_RF_CDF_TC_04());
@@ -34,7 +34,7 @@ module DiameterRfRo_TestControl {
            execute(TC_RF_CTF_MS_01());
            execute(TC_RF_CTF_MS_02());
            
            if (PICS_EVENT_BASED_CHARGING_A4) {
            if (PICS_RF_CTF_EVENT_BASED_CHARGING) {
                execute(TC_RF_CTF_TC_01());
                
            }
@@ -50,6 +50,16 @@ module DiameterRfRo_TestControl {
                execute(TC_RO_OCF_TC_03());
                execute(TC_RO_OCF_TC_04());
            }
            
            if (PICS_RO_OCF_EVENT_CHARGING_WITH_UNIT_RESERVATION) {
                execute(TC_RO_OCF_TC_05());
                execute(TC_RO_OCF_TC_06());
            }
            if (PICS_RO_OCF_SESSION_CHARGING_WITH_UNIT_RESERVATION) {
                execute(TC_RO_OCF_TC_07());
                execute(TC_RO_OCF_TC_08());
                execute(TC_RO_OCF_TC_09());
            }
        }
        
    } // End of 'Control' statement