Commit efd94b94 authored by garciay's avatar garciay
Browse files

STF500: Week #0

 - Move mw_user_Data_dummy into DiameterCxDx_Templates
 - Bug fixed in template SCSCF_Restoration
parent d7c13b4a
Loading
Loading
Loading
Loading
+24 −25
Original line number Diff line number Diff line
@@ -2797,9 +2797,9 @@ module DiameterCxDx_Cx_TCFunctions {
                    // Preamble
                    // Clause 'Initial conditions'
                    f_preamble_ICSCF();
                    f_hssRegistrationCx(vc_sessionId,                                    // Registration does not include any public Identity associated to the user
                    f_hssRegistrationCx(vc_sessionId,
                                        PX_UserName,
                                        "",
                                        PX_PublicIdentity,
                                        m_uar_Flags_Cx
                    );
                    f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
@@ -2843,10 +2843,9 @@ module DiameterCxDx_Cx_TCFunctions {
                                                     m_resultCode
                                                     (DIAMETER_SUCCESS_E),
                                                     omit)));
                    
                    f_hssDeregistrationCx(vc_sessionId);
                    f_postamble_HSS();
                    f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict());
                    
                } // End of function f_TC_CX_HSS_RT_04_I_S
                
                /*
@@ -3876,7 +3875,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                        PX_PublicIdentity,
                                        m_uar_Flags_Cx
                    );
                    f_hssRegistrationCx(vc_sessionId,                    // A user with several private user identities is properly registered
                    f_hssRegistrationCx(vc_sessionId2,          // A user with several private user identities is properly registered
                                        PX_OtherUserName,
                                        PX_PublicIdentity,
                                        m_uar_Flags_Cx
@@ -3913,7 +3912,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                                     m_resultCode
                                                     (DIAMETER_SUCCESS_E),
                                                     omit)));
                    f_hssDeregistrationCx(vc_sessionId);
                    f_hssDeregistrationCx(vc_sessionId2);
                    vc_userName := m_userName(PX_OtherUserName);
                    f_hssDeregistrationCx(vc_sessionId);
                    f_postamble_HSS();
@@ -3945,7 +3944,7 @@ module DiameterCxDx_Cx_TCFunctions {
                    // Clause 'then': the IUT sends an RT-Request and receives an RT-Answer
                    f_awaiting_PPR(
                        mw_PPR_Msg(
                            vc_sessionId,                       // containing a Session-ID AVP
                            ?,                                  // containing a Session-ID AVP
                            mw_PPR(                             //   containing an Auth-Session-State AVP
                                                                //     indicating NO_STATE_MAINTAINED
                                vc_originHost,
@@ -3995,7 +3994,7 @@ module DiameterCxDx_Cx_TCFunctions {
                    // Clause 'then': the IUT sends an RT-Request and receives an RT-Answer
                    f_awaiting_PPR(
                        mw_PPR_Msg(
                            vc_sessionId,                       // containing a Session-ID AVP
                            ?,                                  // containing a Session-ID AVP
                            mw_PPR(                             //   containing an Auth-Session-State AVP
                                                                //     indicating NO_STATE_MAINTAINED
                                vc_originHost,
@@ -4048,7 +4047,7 @@ module DiameterCxDx_Cx_TCFunctions {
                    // Clause 'then': the IUT sends an RT-Request and receives an RT-Answer
                    f_awaiting_PPR(
                        mw_PPR_Msg(
                            vc_sessionId,                       // containing a Session-ID AVP
                            ?,                                  // containing a Session-ID AVP
                            mw_PPR(                             //   containing an Auth-Session-State AVP
                                                                //     indicating NO_STATE_MAINTAINED
                                vc_originHost,
@@ -4102,7 +4101,7 @@ module DiameterCxDx_Cx_TCFunctions {
                    // Clause 'then': the IUT sends an RT-Request and receives an RT-Answer
                    f_awaiting_PPR(
                        mw_PPR_Msg(
                            vc_sessionId,                       // containing a Session-ID AVP
                            ?,                                  // containing a Session-ID AVP
                            mw_PPR(                             //   containing an Auth-Session-State AVP
                                                                //     indicating NO_STATE_MAINTAINED
                                vc_originHost,
@@ -4177,7 +4176,7 @@ module DiameterCxDx_Cx_TCFunctions {
                    // Clause 'then': the IUT sends an RT-Request and receives an RT-Answer
                    f_awaiting_PPR(
                        mw_PPR_Msg(
                            vc_sessionId,                       // containing a Session-ID AVP
                            ?,                                  // containing a Session-ID AVP
                            mw_PPR(                             //   containing an Auth-Session-State AVP
                                                                //     indicating NO_STATE_MAINTAINED
                                vc_originHost,
@@ -4198,7 +4197,7 @@ module DiameterCxDx_Cx_TCFunctions {
                                                     )));
                    f_awaiting_PPR(
                    mw_PPR_Msg(
                        vc_sessionId,                       // containing a Session-ID AVP
                        ?,                                  // containing a Session-ID AVP
                        mw_PPR(                             //   containing an Auth-Session-State AVP
                                                            //     indicating NO_STATE_MAINTAINED
                            vc_originHost,
+11 −6
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ module DiameterCxDx_Templates {
                }
                
                template (present) SCSCF_Restoration_Info_AVP mw_sCSCF_Restoration_Info_AVP(
                                                                                            in template (present) Restoration_Info_AVP p_restoration_Info := ?
                                                                                            in template Restoration_Info_AVP p_restoration_Info := ?
                ) modifies mw_sCSCF_Restoration_Info_AVP_dummy := {
                    restoration_Info            := { p_restoration_Info }
                }
@@ -491,6 +491,11 @@ module DiameterCxDx_Templates {
                    aVP_Data   := ?
                }
                
                template User_Data_AVP mw_user_Data_dummy := {
                    aVP_Header := mw_aVP_HeaderVid_Mbit1(c_user_Data_AVP_Code, ?, c_vendId3gpp),
                    aVP_Data := ?
                }
                
                template SIP_Auth_Data_Item_AVP mw_sIPAuthDataItem_dummy := {
                    sIP_Auth_Data_Item_3GPP_AVP := {
                        aVP_Header := mw_aVP_HeaderVid_Mbit1(c_sIP_Auth_Data_Item_AVP_Code, ?, c_vendId3gpp),
@@ -1725,7 +1730,7 @@ module DiameterCxDx_Templates {
                modifies mw_SAA_ResulExpre := {
                    user_Data := p_userData,
                    charging_Information := p_chargingInformation,
                    sCSCF_Restoration_Info := superset(mw_sCSCF_Restoration_Info_AVP(valueof(p_restoration_Info_AVP)))
                    sCSCF_Restoration_Info := superset(mw_sCSCF_Restoration_Info_AVP(p_restoration_Info_AVP))
                }
                
                template RTA_Body_AVP mw_RTA_ResulExpre (template Result_Code_AVP p_resultCode, 
+4 −3
Original line number Diff line number Diff line
@@ -3610,9 +3610,10 @@ module DiameterCxDx_TestCases
                 *                containing an Originating-Request AVP
                 *            the IUT sends an LI-Answer
                 *                not containing a Server-Name AVP
                 *                containing a Result-Code AVP
                 *                not containing a Result-Code AVP
                 *                containing an Experimental-Result AVP
                 *                    containing an Experimental-Result-Code AVP
                 *                        indicating DIAMETER_UNREGISTERED_SERVICE
                 *                not containing an Experimental-Result AVP
                 *        }
                 *     }
                 * </pre>