Commit 5f42ca19 authored by rennoch's avatar rennoch
Browse files

add sync1 for HSS/SLF synchronization 

add answer messages for HSS postamble steps
parent c0243a71

DiameterCxDx/ttcn/DiameterCxDx_Dx_TCFunctions.ttcn3

+23 −4
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ module DiameterCxDx_Dx_TCFunctions { 
                    m_UAA_Dx(vc_originHost, vc_originRealm,

                             m_resultCode(DIAMETER_REDIRECT_INDICATION_E), omit,

                             m_redirectHost(PX_DIAMETER_CX_ETS_HSS_IPADDR))));

                f_selfOrClientSyncAndVerdict( LibDiameter_TypesAndValues.c_sync1, f_getVerdict() ); // sync SLF/HSS

                

                f_selfOrClientSyncAndVerdict( c_tbDone, f_getVerdict()); // sync testbody done
@@ -219,8 +220,14 @@ module DiameterCxDx_Dx_TCFunctions { 
    

                f_selfOrClientSyncAndVerdict( c_prDone, f_getVerdict() ); // sync - preamble done



                f_selfOrClientSyncAndVerdict( LibDiameter_TypesAndValues.c_sync1, f_getVerdict() ); // sync SLF/HSS

    

                // wait for UAR

                f_awaiting_UAR( mw_UAR_Msg( ?, mw_UAR_Dx( m_destinationHost(PX_DIAMETER_CX_ETS_HSS_IPADDR), ?)));

                f_send_UAA(m_UAA_Msg(vc_sessionId, 

	                m_UAA_basic(vc_originHost, vc_originRealm,

	                             m_resultCode(DIAMETER_SUCCESS_E), omit

	                             )));

                             

                f_selfOrClientSyncAndVerdict( c_tbDone, f_getVerdict()); // sync testbody done
@@ -249,6 +256,7 @@ module DiameterCxDx_Dx_TCFunctions { 
                    m_SAA_Dx(vc_originHost, vc_originRealm,

                             m_resultCode(DIAMETER_REDIRECT_INDICATION_E), omit,

                             m_redirectHost(PX_DIAMETER_CX_ETS_HSS_IPADDR))));

                f_selfOrClientSyncAndVerdict( LibDiameter_TypesAndValues.c_sync1, f_getVerdict() ); // sync SLF/HSS

                

                f_selfOrClientSyncAndVerdict( c_tbDone, f_getVerdict()); // sync testbody done
@@ -265,10 +273,13 @@ module DiameterCxDx_Dx_TCFunctions { 
                f_preamble_HSS(); 

    

                f_selfOrClientSyncAndVerdict( c_prDone, f_getVerdict() ); // sync - preamble done

                f_selfOrClientSyncAndVerdict( LibDiameter_TypesAndValues.c_sync1, f_getVerdict() ); // sync SLF/HSS

    

                // wait for SAR

                f_awaiting_SAR( mw_SAR_Msg( ?, mw_SAR_Dx( m_destinationHost(PX_DIAMETER_CX_ETS_HSS_IPADDR), ?)));



                f_send_SAA(m_SAA_Msg(vc_sessionId, 

                    m_SAA_basic(vc_originHost, vc_originRealm,

                             m_resultCode(DIAMETER_SUCCESS_E), omit)));

                f_selfOrClientSyncAndVerdict( c_tbDone, f_getVerdict()); // sync testbody done



                f_postamble_HSS();
@@ -295,6 +306,7 @@ module DiameterCxDx_Dx_TCFunctions { 
                    m_LIA_Dx(vc_originHost, vc_originRealm,

                             m_resultCode(DIAMETER_REDIRECT_INDICATION_E), omit,

                             m_redirectHost(PX_DIAMETER_CX_ETS_HSS_IPADDR))));

                f_selfOrClientSyncAndVerdict( LibDiameter_TypesAndValues.c_sync1, f_getVerdict() ); // sync SLF/HSS

                

                f_selfOrClientSyncAndVerdict( c_tbDone, f_getVerdict()); // sync testbody done
@@ -311,10 +323,13 @@ module DiameterCxDx_Dx_TCFunctions { 
                f_preamble_HSS(); 

    

                f_selfOrClientSyncAndVerdict( c_prDone, f_getVerdict() ); // sync - preamble done

                f_selfOrClientSyncAndVerdict( LibDiameter_TypesAndValues.c_sync1, f_getVerdict() ); // sync SLF/HSS

    

                // wait for LIR

                f_awaiting_LIR( mw_LIR_Msg( ?, mw_LIR_Dx( m_destinationHost(PX_DIAMETER_CX_ETS_HSS_IPADDR), ?)));



                f_send_LIA(m_LIA_Msg(vc_sessionId, 

                    m_LIA_basic(vc_originHost, vc_originRealm,

                             m_resultCode(DIAMETER_SUCCESS_E), omit)));

                f_selfOrClientSyncAndVerdict( c_tbDone, f_getVerdict()); // sync testbody done



                f_postamble_HSS();
@@ -341,6 +356,7 @@ module DiameterCxDx_Dx_TCFunctions { 
                    m_MAA_Dx(vc_originHost, vc_originRealm,

                             m_resultCode(DIAMETER_REDIRECT_INDICATION_E), omit,

                             m_redirectHost(PX_DIAMETER_CX_ETS_HSS_IPADDR))));

                f_selfOrClientSyncAndVerdict( LibDiameter_TypesAndValues.c_sync1, f_getVerdict() ); // sync SLF/HSS

                

                f_selfOrClientSyncAndVerdict( c_tbDone, f_getVerdict()); // sync testbody done
@@ -357,10 +373,13 @@ module DiameterCxDx_Dx_TCFunctions { 
                f_preamble_HSS(); 

    

                f_selfOrClientSyncAndVerdict( c_prDone, f_getVerdict() ); // sync - preamble done

                f_selfOrClientSyncAndVerdict( LibDiameter_TypesAndValues.c_sync1, f_getVerdict() ); // sync SLF/HSS

    

                // wait for MAR

                f_awaiting_MAR( mw_MAR_Msg( ?, mw_MAR_Dx( m_destinationHost(PX_DIAMETER_CX_ETS_HSS_IPADDR), ?)));



                f_send_MAA(m_MAA_Msg(vc_sessionId, 

                    m_MAA_basic(vc_originHost, vc_originRealm,

                             m_resultCode(DIAMETER_SUCCESS_E), omit)));

                f_selfOrClientSyncAndVerdict( c_tbDone, f_getVerdict()); // sync testbody done



                f_postamble_HSS();

DiameterCxDx/ttcn/DiameterCxDx_SIP_TCFunctions.ttcn3

+4 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ module DiameterCxDx_SIP_TCFunctions { 
                f_preamble_UE_registration(p_cSeq_s);



                f_selfOrClientSyncAndVerdict( c_prDone, f_getVerdict() ); // sync - preamble done

                f_selfOrClientSyncAndVerdict( LibDiameter_TypesAndValues.c_sync1, f_getVerdict() ); // sync SLF/HSS

    

                f_selfOrClientSyncAndVerdict( c_tbDone, f_getVerdict()); // sync testbody done
@@ -136,6 +137,7 @@ module DiameterCxDx_SIP_TCFunctions { 
                f_preamble_UE_registration(p_cSeq_s);

                

                f_selfOrClientSyncAndVerdict( c_prDone, f_getVerdict() ); // sync - preamble done

                f_selfOrClientSyncAndVerdict( LibDiameter_TypesAndValues.c_sync1, f_getVerdict() ); // sync SLF/HSS

                

                f_selfOrClientSyncAndVerdict( c_tbDone, f_getVerdict()); // sync testbody done
@@ -196,6 +198,7 @@ module DiameterCxDx_SIP_TCFunctions { 
                f_preamble_UE_regInv(p_cSeq_s);

    

                f_selfOrClientSyncAndVerdict( c_prDone, f_getVerdict() ); // sync - preamble done

                f_selfOrClientSyncAndVerdict( LibDiameter_TypesAndValues.c_sync1, f_getVerdict() ); // sync SLF/HSS

                

                f_selfOrClientSyncAndVerdict( c_tbDone, f_getVerdict()); // sync testbody done
@@ -246,6 +249,7 @@ module DiameterCxDx_SIP_TCFunctions { 
                f_preamble_UE_registration(p_cSeq_s);

    

                f_selfOrClientSyncAndVerdict( c_prDone, f_getVerdict() ); // sync - preamble done

                f_selfOrClientSyncAndVerdict( LibDiameter_TypesAndValues.c_sync1, f_getVerdict() ); // sync SLF/HSS

                

                f_selfOrClientSyncAndVerdict( c_tbDone, f_getVerdict()); // sync testbody done

DiameterCxDx/ttcn/DiameterCxDx_TestCases.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -5948,7 +5948,7 @@ module DiameterCxDx_TestCases 
                    v_imsComponent_ue1.start(f_TC_DX_CSCF_UA_01_UE(p_cSeq_s));

    

                    // synchronize PTC on 3 sychronization points

                    f_serverSyncNClients(f_NrofCompsDx(),{c_initDone, c_prDone, c_tbDone, c_poDone});

                    f_serverSyncNClients(f_NrofCompsDx(),{c_initDone, c_prDone, LibDiameter_TypesAndValues.c_sync1, c_tbDone, c_poDone});

    

                    f_cf_1Dx1Cx1GmDown_CSCF(v_diameterComponent_slf, v_diameterComponent_hss, v_imsComponent_ue1);

                } // End of TC_DX_CSCF_UA_01