Commit d65d120f authored by ulrichst's avatar ulrichst
Browse files

Implementation of TC TC_DH_AS_SN_01 and TC_DH_SLF_SN_01 finalized

parent a01aad16
Loading
Loading
Loading
Loading
+56 −4
Original line number Diff line number Diff line
@@ -2490,7 +2490,7 @@ module DiameterShDh_TCFunctions {
                                                              ?,
                                                              vc_originHost_IUT,              // containing an Origin-Host AVP
                                                              vc_originRealm_IUT,             // containing an Origin-Realm AVP
                                                              vc_destinationRealm_IUT ,                      //     indicating RepositoryData (0)
                                                              vc_destinationRealm_IUT ,                      
                                                              ?,
                                                              ?,
                                                              ?
@@ -2661,7 +2661,32 @@ module DiameterShDh_TCFunctions {
                    f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict()); 
                    log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");

                    //TODO TestBody
                    //TestBody
                    f_send_SNR(
                               md_sNR(
                                      vc_sessionId,
                                      md_snrBodyAvps(
                                          vc_originHost,                 // containing an Origin-Host AVP
                                          vc_originRealm,                // containing an Origin-Realm AVP
                                          vc_destinationRealm,           // containing a Destination-Realm AVP
                                          m_specific_user_Identity (
                                                 m_public_user_identity(PX_PublicUserIdentity)
                                          ),
                                          -,
                                          -,
                                          m_userName(PX_Private_Identity)
                                      )
                    ));

                    f_awaiting_SNA(
                                   mdw_sNA(
                                           ?,                                  // containing a Session-ID AVP
                                           mdw_snaBodyAvps_redirect_Host(
                    													mw_redirect_host(PX_HSS_IDENTITY),
                                                                        mw_resultCode(DIAMETER_REDIRECT_INDICATION_E)
                     )));

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); 

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); 

@@ -2867,7 +2892,34 @@ module DiameterShDh_TCFunctions {
                    f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict()); 
                    log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");

                    //TODO TestBody
                    f_selfOrClientSyncAndVerdict(c_sync1, f_getVerdict());

                    f_awaiting_SNR(
                                    mdw_sNR(
                                            ?,                                  // containing a Session-ID AVP
                                            mdw_snrBodyAvps(
                                                              ?,
                                                              ?,
                                                              vc_originHost_IUT,              // containing an Origin-Host AVP
                                                              vc_originRealm_IUT,             // containing an Origin-Realm AVP
                                                              vc_destinationRealm_IUT ,                      
                                                              ?,
                                                              ?,
                                                              ?
                    )));

                    f_send_SNA(
                                          md_sNA(
                                                           vc_sessionId,                                          
                                                           md_snaBodyAvps_redirect(
                                                                        m_resultCode(DIAMETER_REDIRECT_INDICATION_E ),
                                                                        vc_originHost,
                                                                        vc_originRealm,
                                                                        m_redirect_host(               // containing a Redirect-Host AVP
                                                                            PX_HSS_IDENTITY//     indicating the HSS identity to be used
                                                                        )
                              ))); 

                 
                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); 

+23 −1
Original line number Diff line number Diff line
@@ -831,6 +831,20 @@ module DiameterShDh_Templates {
                    origin_Realm                   := p_originRealm
                } // End of template md_snaBodyAvps 

                template (omit) SNA_Body_AVP md_snaBodyAvps_redirect(
                                                            in template (value) Result_Code_AVP              p_resultCode,
                                                            in template (value) Origin_Host_AVP              p_originHost,
                                                            in template (value) Origin_Realm_AVP             p_originRealm,
                                                            in template (value) Redirect_Host_AVP            p_redirect_host
                ) modifies m_SNA_Body_dummy := {
                    vendor_Specific_Application_Id := m_vendor_Specific_Appl_Id_dummy,//required only in TS129 229
                    auth_Session_State             := m_auth_Session_State_dummy,
                    result_Code                    := p_resultCode,
                    origin_Host                    := p_originHost,
                    origin_Realm                   := p_originRealm,
                    redirect_Host               := p_redirect_host
                } // End of template md_puaBodyAvps 
                                
            } // End of group sna_msg 
                        
        } // End of group Sh_answer_message_templates_send
@@ -1048,6 +1062,14 @@ module DiameterShDh_Templates {
                    experimental_Result         := p_experimentalResult
                } // End of template mdw_snaBodyAvps_experimental_result    
                
                template (present) SNA_Body_AVP mdw_snaBodyAvps_redirect_Host(
                												template Redirect_Host_AVP p_redirect_Host,
                                                                template Result_Code_AVP p_resultCode
                ) modifies mw_SNA_Body_dummy := {
                    result_Code                 := p_resultCode,
                    redirect_Host               := p_redirect_Host
                } // End of template mdw_snaBodyAvps_experimental_result   
                
            } // End of group sna_msg
            
        } // End of group Sh_answer_message_templates_receive