Commit d7c13b4a authored by garciay's avatar garciay
Browse files

STF500: Week #01

 - Bug fixed on f_s_SAR_SAA
 - LI validation with Spectra2
parent c1a9f723
Loading
Loading
Loading
Loading
+114 −75

File changed.

Preview size limit exceeded, changes collapsed.

+9 −1
Original line number Diff line number Diff line
@@ -484,6 +484,14 @@
        function f_s_SAR_SAA (in Session_Id_AVP p_sessionId,
                              in Srv_Assgmt_Type_Code p_serverAssignmentType := UNREGISTERED_USER_E
        ) runs on DiameterCx {
            var template (omit) Public_Identity_AVP v_publicIdentity;
            
            if (ispresent(vc_publicIdentity)) {
                v_publicIdentity := valueof(vc_publicIdentity);
            } else {
                v_publicIdentity := omit
            }
            
            f_send_SAR(m_SAR_Msg( 
                            p_sessionId, 
                            m_SAR_withUserNameAndPID(
@@ -494,7 +502,7 @@
                                m_serverAssignmentType(p_serverAssignmentType),
                                m_userDataAlreadyAvailable(USER_DATA_NOT_AVAILABLE_E),
                                omit,
                                valueof(vc_publicIdentity)
                                v_publicIdentity
                            )
            ));
            f_awaiting_SAA(mw_SAA_Msg(p_sessionId, mw_SAA_basic))
+1 −1
Original line number Diff line number Diff line
@@ -1473,7 +1473,7 @@ module DiameterCxDx_Templates {
                                                                        template (omit) Server_Assignment_Type_AVP      p_serverAssignmentType,
                                                                        template (omit) User_Data_Already_Available_AVP p_userDataAlreadyAvailable,
                                                                        template (omit) User_Name_AVP                   p_userName,
                                                                        template (value)Public_Identity_AVP             p_publicIdentity
                                                                        template (omit) Public_Identity_AVP             p_publicIdentity
                                                                      )
                modifies m_SAR_basic := {
                    user_Name := p_userName,
+14 −8
Original line number Diff line number Diff line
@@ -1965,7 +1965,8 @@ module DiameterCxDx_TestCases
                } // End of TC_CX_HSS_SA_07
                
                /**
                 * @desc    Verify that the IUT checks within received SA-Request if the Server-Assignment-Type AVP value is REGISTRATION or RE_REGISTRATION and if the requesting S CSCF is the same as the previously assigned S CSCFand if  User-Data-Already-Available AVP  is set to USER_DATA_NOT_AVAILABLE the IUT sets the appropriate result code and the user profile in the SA-Answer.
                 * @desc    Verify that the IUT checks within received SA-Request if the Server-Assignment-Type AVP value is REGISTRATION or RE_REGISTRATION and if the requesting S-CSCF is the same as the previously assigned S-CSCF and,
                 *          if User-Data-Already-Available AVP is set to USER_DATA_NOT_AVAILABLE the IUT sets the appropriate result code and the user profile in the SA-Answer.
                 * <pre>
                 * Pics Selection: PICS_HSS_IUT and PICS_HSS_IMS_RESTORATION_PROCS
                 * Initial conditions: 
@@ -2025,7 +2026,8 @@ module DiameterCxDx_TestCases
                } // End of TC_CX_HSS_SA_08
                
                /**
                 * @desc    Verify that the IUT checks within received SA-Request if the Server-Assignment-Type AVP value is REGISTRATION or RE_REGISTRATION and if the requesting S CSCF is the same as the previously assigned S CSCF and if  User-Data-Already-Available AVP  is set to USER_DATA_ALREADY_AVAILABLE the IUT sets the appropriate result code and may includes the user profile in the SA-Answer.
                 * @desc    Verify that the IUT checks within received SA-Request if the Server-Assignment-Type AVP value is REGISTRATION or RE_REGISTRATION and if the requesting S CSCF is the same as the previously assigned S-CSCF and,
                 *          if  User-Data-Already-Available AVP is set to USER_DATA_ALREADY_AVAILABLE the IUT sets the appropriate result code and may includes the user profile in the SA-Answer.
                 * <pre>
                 * Pics Selection: PICS_HSS_IUT and PICS_HSS_IMS_RESTORATION_PROCS
                 * Initial conditions: 
@@ -2085,7 +2087,9 @@ module DiameterCxDx_TestCases
                } // End of TC_CX_HSS_SA_09
                
                /**
                 * @desc    Verify that the IUT checks within received SA-Request if the Server-Assignment-Type AVP value is UNREGISTERED_USER and the requesting S CSCF is not the same as previously assigned and IMS restoration procedures are not supported and sets the appropriate experimental result code and includes the previously assigned S-CSCF in the SA-Answer.
                 * @desc    Verify that the IUT checks within received SA-Request if the Server-Assignment-Type AVP value is UNREGISTERED_USER and,
                 *          the requesting S CSCF is not the same as previously assigned and IMS restoration procedures are not supported and sets the appropriate experimental result code and,
                 *          includes the previously assigned S-CSCF in the SA-Answer.
                 * <pre>
                 * Pics Selection: PICS_HSS_IUT and not PICS_HSS_IMS_RESTORATION_PROCS
                 * Initial conditions: 
@@ -2145,7 +2149,8 @@ module DiameterCxDx_TestCases
                } // End of TC_CX_HSS_SA_10
                
                /**
                 * @desc    Verify that the IUT checks within received SA-Request if the Server-Assignment-Type AVP value is UNREGISTERED_USER and the registration state of the Public Identity is not registered the IUT sets the appropriate result code in the SA-Answer.
                 * @desc    Verify that the IUT checks within received SA-Request if the Server-Assignment-Type AVP value is UNREGISTERED_USER and,
                 *          the registration state of the Public Identity is not registered the IUT sets the appropriate result code in the SA-Answer.
                 * <pre>
                 * Pics Selection: PICS_HSS_IUT and PICS_HSS_IMS_RESTORATION_PROCS
                 * Initial conditions: 
@@ -2301,8 +2306,8 @@ module DiameterCxDx_TestCases
                    var DiameterCx v_diameterComponent_hss;
                    
                    // Test control
                    if (not PICS_HSS_IUT or PICS_HSS_IMS_RESTORATION_PROCS) {
                        log("*** " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT and not PICS_HSS_IMS_RESTORATION_PROCS' required for executing the TC. ***"); 
                    if (not PICS_HSS_IUT or not PICS_HSS_IMS_RESTORATION_PROCS) {
                        log("*** " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT and PICS_HSS_IMS_RESTORATION_PROCS' required for executing the TC. ***"); 
                        stop;
                    }
                    
@@ -3288,10 +3293,11 @@ module DiameterCxDx_TestCases
                 *                    indicating REGISTRATION_AND_CAPABILITIES
                 *            the IUT sends an LI-Answer
                 *                not containing a Server-Name AVP
                 *                may containing a Server-Capabilities AVP
                 *                (containing a Server-Capabilities AVP
                 *                    indicating Mandatory-Capability AVPs
                 *                    indicating zero or more Optional-Capability AVP
                 *                    indicating zero or more Server-Name AVP
                 *                    indicating zero or more Server-Name AVP) or 
                 *                (not containing a Server-Capabilities AVP)
                 *                not containing an Experimental-Result AVP
                 *                containing a Result-Code AVP
                 *                    indicating DIAMETER_SUCCESS