Commit b83dc67e authored by garciay's avatar garciay
Browse files

STF490:

1) Terminate RO_OCF_FH and RO_OCF_FA
2) Built with both TTCN-3 tools
parent 51a1c434
Loading
Loading
Loading
Loading
+435 −3

File changed.

Preview size limit exceeded, changes collapsed.

+158 −29
Original line number Diff line number Diff line
@@ -5005,7 +5005,8 @@ module DiameterRfRo_Templates {
                                                                       in template (value) CC_Request_Number_AVP                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
                                                                       in template (omit) Multiple_Services_Credit_Control_AVP  p_multiple_Services_Credit_Control := omit,
                                                                       in template (omit) Multiple_Services_Indicator_AVP       p_multiple_Services_Indicator := omit
            ) modifies m_CCR_Body_dummy := {
                    origin_Host                         := p_originHost,
                    origin_Realm                        := p_originRealm,
@@ -5015,7 +5016,8 @@ module DiameterRfRo_Templates {
                    cC_Request_Type                     := p_cC_Request_Type,
                    cC_Request_Number                   := p_cC_Request_Number,
                    requested_Action                    := p_requested_Action,
                    multiple_Services_Credit_Control    := { p_multiple_Services_Credit_Control }
                    multiple_Services_Credit_Control    := { p_multiple_Services_Credit_Control },
                    multiple_Services_Indicator         := p_multiple_Services_Indicator
            } // End of template md_ccrBodyAvps_TypeOfCharging
            
            // TODO Unify templates md_ccrBodyAvps_TypeOfCharging and md_ccrBodyAvps_TariffChangesUsage
@@ -5027,7 +5029,8 @@ module DiameterRfRo_Templates {
                                                                           in template (value) CC_Request_Number_AVP                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
                                                                           in template (omit) Multiple_Services_Credit_Control_AVP  p_multiple_Services_Credit_Control := omit,
                                                                           in template (omit) Multiple_Services_Indicator_AVP       p_multiple_Services_Indicator := omit
            )  
            modifies md_ccrBodyAvps_TypeOfCharging := { 
            } // End of template md_ccrBodyAvps_TariffChangesUsage
@@ -5299,7 +5302,7 @@ module DiameterRfRo_Templates {
                    remaining_Balance                   := p_remaining_Balance ifpresent
                } // End of template mdw_ccaBodyAvps_xxx
                
                template (present) CCA_Body_AVP mdw_ccaBodyAvps_failure_handling( 
                template (present) CCA_Body_AVP mdw_ccaBodyAvps_failure_handling_ccfh( 
                                                                                      template (present) Result_Code_AVP                     p_resultCode := ?,
                                                                                      template (present) Origin_Host_AVP                     p_originHost := ?,
                                                                                      template (present) Origin_Realm_AVP                    p_originRealm := ?,
@@ -5314,7 +5317,41 @@ module DiameterRfRo_Templates {
                    cC_Request_Type                    := p_cC_Request_Type,
                    cC_Request_Number                  := p_cC_Request_Number,
                    credit_Control_Failure_Handling    := p_credit_Control_Failure_Handling
                } // End of template mdw_ccaBodyAvps_failure_handling
                } // End of template mdw_ccaBodyAvps_failure_handling_ccfh
                
                template (present) CCA_Body_AVP mdw_ccaBodyAvps_failure_handling_ddfh( 
                                                                                      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) Direct_Debiting_Failure_Handling_AVP   p_direct_Debiting_Failure_Handling := ?
                ) 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,
                    direct_Debiting_Failure_Handling   := p_direct_Debiting_Failure_Handling
                } // End of template mdw_ccaBodyAvps_failure_handling_ddfh
                
                template (present) CCA_Body_AVP mdw_ccaBodyAvps_failure_handling_ccsf( 
                                                                                      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) CC_Session_Failover_AVP    p_cC_Session_Failover := ?
                ) 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,
                    cC_Session_Failover    := p_cC_Session_Failover
                } // End of template mdw_ccaBodyAvps_failure_handling_ccsf
                
                template (present) RAA_Body_AVP mdw_raaBodyAvps(
                                                                template (present) Result_Code_AVP              p_resultCode := ?,
@@ -5540,16 +5577,18 @@ module DiameterRfRo_Templates {
                aVP_Data    := p_aVP_Data
            } // End of template m_currency_Code

            template (value) CC_Request_Type_AVP m_cC_Request_Type(in template (value) CC_Request_Ty_Type p_avpData):=
            {
            template (value) CC_Request_Type_AVP m_cC_Request_Type(
                                                                   in template (value) CC_Request_Ty_Type p_aVP_Data
            ) := {
                aVP_Header := m_aVP_HeaderVid_Mbit1(c_cC_Request_Type_AVP_Code, f_getEnumLength(), omit),
                aVP_Data := p_avpData
                aVP_Data := p_aVP_Data
            }// End of template m_cC_Request_Type

            template (value) CC_Request_Number_AVP m_cC_Request_Number(in template (value) UInt32 p_avpData):=
            {
            template (value) CC_Request_Number_AVP m_cC_Request_Number(
                                                                       in template (value) UInt32 p_aVP_Data
            ) := {
                aVP_Header := m_aVP_HeaderVid_Mbit1(c_cC_Request_Number_AVP_Code, 4, omit),
                aVP_Data := p_avpData
                aVP_Data := p_aVP_Data
            }// End of template m_cC_Request_Number
            
            template (value) Tariff_Change_Usage_AVP m_tariff_Change_Usage_AVP(
@@ -5559,6 +5598,38 @@ module DiameterRfRo_Templates {
                aVP_Data    := p_aVP_Data
            } // End of template m_tariff_Change_Usage_AVP
            
            template (value) G_S_U_Pool_Reference_AVP m_g_S_U_Pool_Reference_AVP(
                                                                                   in template (value) G_S_U_Pool_Identifier_AVP    p_g_S_U_Pool_Identifier,
                                                                                   in template (value) CC_Unit_Type_AVP             p_cC_Unit_Type,
                                                                                   in template (value) Unit_Value_AVP               p_unit_Value
            ) := {
                aVP_Header              := m_aVP_HeaderVid_Mbit1(c_g_S_U_Pool_Reference_AVP_Code, 4, c_vendId3gpp),
                g_S_U_Pool_Identifier   := p_g_S_U_Pool_Identifier,
                cC_Unit_Type            := p_cC_Unit_Type,
                unit_Value              := p_unit_Value
            } // End of template m_g_S_U_Pool_Reference_AVP
            
            template (value) G_S_U_Pool_Identifier_AVP m_g_S_U_Pool_Identifier_AVP(
                                                                                   in template (value) UInt32 p_aVP_Data
            ) := {
                aVP_Header := m_aVP_HeaderVid_Mbit1(c_g_S_U_Pool_Identifier_AVP_Code, 4, omit),
                aVP_Data := p_aVP_Data
            } // End of template m_g_S_U_Pool_Identifier_AVP
            
            template (value) CC_Unit_Type_AVP m_cC_Unit_Type_AVP(
                                                                 in template (value) CC_Unit_Ty_Type p_aVP_Data
            ) := {
                aVP_Header := m_aVP_HeaderVid_Mbit1(c_cC_Unit_Type_AVP_Code, 4, omit),
                aVP_Data := p_aVP_Data
            } // End of template m_cC_Unit_Type_AVP
            
            template (value) Multiple_Services_Indicator_AVP m_multiple_Services_Indicator_AVP(
                                                                                               in template (value) Multiple_Serv_Indi_Type p_aVP_Data
            ) := {
                aVP_Header := m_aVP_HeaderVid_Mbit1(c_multiple_Services_Indicator_AVP_Code, 4, omit),
                aVP_Data := p_aVP_Data
            } // End of template m_multiple_Services_Indicator_AVP
            
        } // End of group Ro_avps_templates_send 
        
        group Ro_dummy_avps_templates_receive { 
@@ -5593,6 +5664,12 @@ module DiameterRfRo_Templates {
                aVP_Type                        := *
            } // End of template mw_multiple_Services_Credit_Control_dummy
            
            template (present) Multiple_Services_Credit_Control_AVP mw_multiple_Services_Credit_Control_Pool_Reference(
                                                                                                                       in template (present) G_S_U_Pool_Reference_AVP p_g_S_U_Pool_Reference := ?
            ) modifies mw_multiple_Services_Credit_Control_dummy := {
                g_S_U_Pool_Reference    := { p_g_S_U_Pool_Reference }
            } // End of template mw_multiple_Services_Credit_Control_Pool_Reference
            
            template (present) Granted_Service_Unit_AVP mw_granted_Service_Unit_dummy := {
                aVP_Header                  := mw_aVP_HeaderVid_Mbit1(c_granted_Service_Unit_AVP_Code, ?, c_vendId3gpp),
                tariff_Time_Change          := *,
@@ -5643,6 +5720,12 @@ module DiameterRfRo_Templates {
                refund_Information          := p_refund_Information
            } // End of template mdw_multiple_Services_Credit_Control_ReqServUnit_ServId
            
            template (present) Multiple_Services_Credit_Control_AVP mdw_multiple_Services_Credit_Control_Pool_Reference(
                                                                                                                        template (present) G_S_U_Pool_Reference_AVP p_g_S_U_Pool_Reference := ?
            ) modifies mw_multiple_Services_Credit_Control_dummy := {
                g_S_U_Pool_Reference    := { p_g_S_U_Pool_Reference }
            } // End of template m_multiple_Services_Credit_Control_Pool_Reference
            
            template (present) Granted_Service_Unit_AVP mdw_granted_Service_Unit_Time(
                                                                                      template (present) CC_Time_AVP p_cC_Time := ?
            ) modifies mw_granted_Service_Unit_dummy := {
@@ -5739,6 +5822,52 @@ module DiameterRfRo_Templates {
                aVP_Data    := p_aVP_Data
            } // End of template mw_credit_Control_Failure_Handling_AVP
            
            template (present) Direct_Debiting_Failure_Handling_AVP mw_direct_Debiting_Failure_Handling_AVP(
                                                                                                            template (present) Direct_Debi_Fail_Hand_Type p_aVP_Data := ?
            ) := {
                aVP_Header  := mw_aVP_HeaderVid_Mbit1(c_direct_Debiting_Failure_Handling_AVP_Code, 4, c_vendId3gpp),
                aVP_Data    := p_aVP_Data
            } // End of template mw_direct_Debiting_Failure_Handling_AVP
            
            template (present) CC_Session_Failover_AVP mw_cC_Session_Failover_AVP(
                                                                                  template (present) CC_Session_Failover_Type p_aVP_Data := ?
            ) := {
                aVP_Header  := mw_aVP_HeaderVid_Mbit1(c_cC_Session_Failover_AVP_Code, 4, c_vendId3gpp),
                aVP_Data    := p_aVP_Data
            } // End of template mw_cC_Session_Failover_AVP
            
            template (present) G_S_U_Pool_Reference_AVP mw_g_S_U_Pool_Reference_AVP(
                                                                                    template (present) G_S_U_Pool_Identifier_AVP    p_g_S_U_Pool_Identifier := ?,
                                                                                    template (present) CC_Unit_Type_AVP             p_cC_Unit_Type := ?,
                                                                                    template (present) Unit_Value_AVP               p_unit_Value := ?
            ) := {
                aVP_Header              := mw_aVP_HeaderVid_Mbit1(c_g_S_U_Pool_Reference_AVP_Code, 4, c_vendId3gpp),
                g_S_U_Pool_Identifier   := p_g_S_U_Pool_Identifier,
                cC_Unit_Type            := p_cC_Unit_Type,
                unit_Value              := p_unit_Value
            } // End of template mw_g_S_U_Pool_Reference_AVP
            
            template (present) G_S_U_Pool_Identifier_AVP mw_g_S_U_Pool_Identifier_AVP(
                                                                                      template (present) UInt32 p_aVP_Data := ?
            ) := {
                aVP_Header := mw_aVP_HeaderVid_Mbit1(c_g_S_U_Pool_Identifier_AVP_Code, 4, c_vendId3gpp),
                aVP_Data := p_aVP_Data
            } // End of template mw_g_S_U_Pool_Identifier_AVP
            
            template (present) CC_Unit_Type_AVP mw_cC_Unit_Type_AVP(
                                                                    template (present) CC_Unit_Ty_Type p_aVP_Data := ?
            ) := {
                aVP_Header := mw_aVP_HeaderVid_Mbit1(c_cC_Unit_Type_AVP_Code, 4, c_vendId3gpp),
                aVP_Data := p_aVP_Data
            } // End of template mw_cC_Unit_Type_AVP
            
            template (present) Multiple_Services_Indicator_AVP mw_multiple_Services_Indicator_AVP(
                                                                                                  template (present) Multiple_Serv_Indi_Type p_aVP_Data
            ) := {
                aVP_Header := mw_aVP_HeaderVid_Mbit1(c_multiple_Services_Indicator_AVP_Code, 4, ?),
                aVP_Data := p_aVP_Data
            } // End of template mw_multiple_Services_Indicator_AVP
            
        } // End of group Ro_avps_templates_receive 
        
    } // End of group Ro_avps_templates 
@@ -5763,7 +5892,7 @@ module DiameterRfRo_Templates {
            
            /**
             * @desc The Acct_Application_Id send template
             * @param p_avpData     UInt32
             * @param p_aVP_Data     UInt32
             */
            template (value) Acct_Application_Id_AVP m_acct_Application_Id(
                                                                           in template (value) UInt32 p_aVP_Data
@@ -5774,7 +5903,7 @@ module DiameterRfRo_Templates {
            
            /**
             * @desc The Auth_Application_Id send template
             * @param p_avpData     UInt32
             * @param p_aVP_Data     UInt32
             */
            template (value) Auth_Application_Id_AVP m_auth_Application_Id_AVP(
                                                                               in template (value) UInt32 p_aVP_Data
@@ -5803,7 +5932,7 @@ module DiameterRfRo_Templates {
            
            /**
             * @desc The Acct_Application_Id receive template
             * @param p_avpData     UInt32
             * @param p_aVP_Data     UInt32
             */
            template (present) Acct_Application_Id_AVP mw_acct_Application_Id(
                                                                              template (present) UInt32 p_aVP_Data := ?
@@ -5814,7 +5943,7 @@ module DiameterRfRo_Templates {
            
            /**
             * @desc The Auth_Application_Id receive template
             * @param p_avpData     UInt32
             * @param p_aVP_Data     UInt32
             */
            template (present) Auth_Application_Id_AVP mw_auth_Application_Id_AVP(
                                                                                  template (present) UInt32 p_aVP_Data := ?
+375 −0

File changed.

Preview size limit exceeded, changes collapsed.

+21 −0
Original line number Diff line number Diff line
@@ -86,7 +86,28 @@ module DiameterRfRo_TestControl {
            
            if (PICS_RO_OCF_IMMEDIATE_EVENT_CHARGING) {
                execute(TC_RO_OCF_FH_01());
                if (PICS_RO_OCF_DDFH_TERMINATE_OR_BUFFER) {
                    execute(TC_RO_OCF_FH_02());
                }
                if (PICS_RO_OCF_DDFH_CONTINUE) {
                    execute(TC_RO_OCF_FH_03());
                }
            }
            
            if (PICS_RO_OCF_EVENT_CHARGING_WITH_UNIT_RESERVATION) {
                execute(TC_RO_OCF_FA_01());
                if (PICS_RO_OCF_FAILOVER) {
                    execute(TC_RO_OCF_FA_02());
                }
            }
            
            if (PICS_RO_OCF_EVENT_CHARGING_WITH_UNIT_RESERVATION and PICS_RO_OCF_FAILOVER) {
                execute(TC_RO_OCF_CP_01());
            }
            if (PICS_RO_OCF_SESSION_CHARGING_WITH_UNIT_RESERVATION and PICS_RO_OCF_FAILOVER) {
                execute(TC_RO_OCF_CP_01());
            }
            
        }
        
    } // End of 'Control' statement