Commit adfdc95c authored by Yann Garcia's avatar Yann Garcia
Browse files

Create first TC for Sh/Dh

parent 8e070f76
Loading
Loading
Loading
Loading

LibDiameter @ 271ae9c5

Original line number Diff line number Diff line
Subproject commit 0a2c2794adaf00aa61ebda53e9b429a7ebd71b81
Subproject commit 271ae9c547a935110758b3182b7bb077901e7b71
+72 −72
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ module DiameterShDh_Steps {
            }
            
            f_DiameterSh_init();
            f_preambleDiameterBaseServer(c_applIdSh);
            f_preambleDiameterBaseServer(c_applId3GPPShDh);
            v_def_diameter_catchEvent := activate (a_diameter_event());
            
            //delay before preamble is done - SIP starts with MESSAGE, INVITE request later
@@ -93,7 +93,7 @@ module DiameterShDh_Steps {
            }
    
            f_DiameterSh_init();
			f_preambleDiameterBaseServer(c_applIdSh);
            f_preambleDiameterBaseServer(c_applId3GPPShDh);
            v_def_diameter_catchEvent := activate (a_diameter_event());
    
            //delay before preamble is done - SIP starts with MESSAGE, INVITE request later
@@ -109,7 +109,7 @@ module DiameterShDh_Steps {
            }
    
            f_DiameterSh_init();
			f_preambleDiameterBaseServer(c_applIdSh);
            f_preambleDiameterBaseServer(c_applId3GPPShDh);
            v_def_diameter_catchEvent := activate (a_diameter_event());
    
            //delay before preamble is done - SIP starts with MESSAGE, INVITE request later
@@ -125,7 +125,7 @@ module DiameterShDh_Steps {
            }

            f_DiameterSh_init();
			f_preambleDiameterBaseServer(c_applIdSh);
            f_preambleDiameterBaseServer(c_applId3GPPShDh);
            v_def_diameter_catchEvent := activate (a_diameter_event());

            //delay before preamble is done - SIP starts with MESSAGE, INVITE request later
+1185 −1177
Original line number Diff line number Diff line
@@ -48,10 +48,11 @@ module DiameterShDh_TCFunctions {
                               md_uDR(
                                      vc_sessionId,
                                      md_udrBodyAvps(
                                                     m_vendor_Specific_Appl_Id_Sh,
                                                     vc_originHost,                 // containing an Origin-Host AVP
                                                     vc_originRealm,                // containing an Origin-Realm AVP
                                                     vc_destinationRealm            // containing a Destination-Realm AVP
                                                                                    // not containing a User-Identity AVP
                                                                                    // Containing s Data-Reference AVP
                                                    )
                                     )
                    );
@@ -59,16 +60,22 @@ module DiameterShDh_TCFunctions {
                    f_awaiting_UDA(
                                   mdw_uDA( 
                                           vc_sessionId,                            // containing a Session-ID AVP
                                           mdw_udaBodyAvps(
                                           mw_UDA_ResulFaile(
                                                             mw_resultCode(
                                                                           DIAMETER_MISSING_AVP_E      // containing a Result-Code AVP
                                                                                                       //     indicating DIAMETER_MISSING_AVP
                                                                           ),
                                                             vc_originHost_IUT,       // containing an Origin-Host AVP
                                                           vc_originRealm_IUT
                        )))
                    );
                                                             vc_originRealm_IUT,
                                                             {
                                                              mw_failed(              // containing a Failed AVP
                                                                        {
                                                                          mw_avpType( //     indicating missing Visited-Network-Identifier AVP 
                                                                                     mw_aVP_Header_any_Code(
                                                                                                            c_user_Identity_AVP_Code
                                                              ))})
                                                             }
                    )));

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); 

@@ -94,11 +101,12 @@ module DiameterShDh_TCFunctions {
                               md_uDR(
                                      vc_sessionId,
                                      md_udrBodyAvps(
													 m_vendor_Specific_Appl_Id_Sh,
													 m_specific_user_Identity(m_public_user_identity),
                                                     vc_originHost,                 // containing an Origin-Host AVP
                                                     vc_originRealm,                // containing an Origin-Realm AVP
													 vc_destinationRealm            // containing a Destination-Realm AVP
                                                     vc_destinationRealm,           // containing a Destination-Realm AVP
                                                     m_specific_user_Identity(
                                                                              m_public_user_identity
                                                                             )
                                                    )
                                     )
                    );
+8 −9
Original line number Diff line number Diff line
@@ -78,21 +78,20 @@ module DiameterShDh_Templates {
                
                template Vendor_Specific_Appl_Id_AVP m_vendor_Specific_Appl_Id_Sh 
                  modifies m_vendor_Specific_Appl_Id_dummy := {
                    aVP_Header := m_aVP_Header_Mbit1(c_vendor_Specific_Appl_Id_AVP_Code, 12+12),
                    vendor_Id := {m_vendorId(c_vendId3gpp)},
                    auth_Application_Id := {m_authApplicationId(c_applIdSh)},
                    auth_Application_Id := {m_authApplicationId(c_applId3GPPShDh)},
                    acct_Application_Id := omit
                }
                
                template (value) Public_Identity_AVP m_public_user_identity := {
                    aVP_Header :=  m_aVP_Header_Mbit1(c_wildcarded_Public_Identity_AVP_Code),
					public_Identity_AVP := PX_public_user_identity
                    aVP_Data := PX_public_user_identity
                }
                
                template (value) User_Identity_AVP m_specific_user_Identity (
                	in template (value) Public_Identity_AVP p_Public_Identity_AVP
                                                                             in template (value) Public_Identity_AVP p_public_identity
                ) modifies m_user_Identity_dummy := {
					public_Identity_AVP := m_public_user_identity
                    public_Identity_AVP := p_public_identity
                }
            }
            
@@ -113,7 +112,7 @@ module DiameterShDh_Templates {
                                            in template (value) Session_Id_AVP  p_sessionId,
                                            in template (value) UDR_Body_AVP    p_udrBody
            ) modifies m_UDR_dummy := {
                header := m_diameterHeaderReq_dummy(UDR_E, c_applIdSh),
                header := m_diameterHeaderReq_dummy(UDR_E, c_applId3GPPShDh),
                session_Id  := p_sessionId,
                uDR_Body    := p_udrBody
            } // End of template md_uDR
@@ -162,7 +161,7 @@ module DiameterShDh_Templates {
                                               template (present) Session_Id_AVP  p_sessionId,
                                               template (present) UDR_Body_AVP    p_udrBody
            ) modifies mw_UDR_dummy := {
                header      := mw_diameterHeaderReq_dummy(UDR_E, c_applIdSh),
                header      := mw_diameterHeaderReq_dummy(UDR_E, c_applId3GPPShDh),
                session_Id  := p_sessionId,
                uDR_Body    := p_udrBody
            } // End of template mdw_uDR