Commit 3c03d3a7 authored by rennoch's avatar rennoch
Browse files

Gx/PCEF ST tests: use of GTPsupport

parent 43f8d41a

DiameterGx/ttcn/DiameterGx_Gx_TCFunctions.ttcn

+4 −4
Original line number Original line Diff line number Diff line
@@ -1532,6 +1532,8 @@ module DiameterGx_Gx_TCFunctions { 




               f_preamble_PCRF();

               f_preamble_PCRF();

                

                

               f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict()); // sync 

                              

               f_awaiting_CCR(mw_CCR_Request(vc_sessionId, 

               f_awaiting_CCR(mw_CCR_Request(vc_sessionId, 

                									vc_originHost, 

                									vc_originHost, 

                									vc_originRealm, 

                									vc_originRealm,
@@ -1541,8 +1543,6 @@ module DiameterGx_Gx_TCFunctions { 




                f_send_CCA(m_CCA_basic(vc_sessionId, vc_originHost, vc_originRealm));

                f_send_CCA(m_CCA_basic(vc_sessionId, vc_originHost, vc_originRealm));

                

                

                f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict()); // sync

                

                action("Trigger for Session Termination");

                action("Trigger for Session Termination");





                f_awaiting_CCR(mw_CCR_basic(vc_sessionId, 

                f_awaiting_CCR(mw_CCR_basic(vc_sessionId,
@@ -1571,6 +1571,8 @@ module DiameterGx_Gx_TCFunctions { 




               f_preamble_PCRF();

               f_preamble_PCRF();

                

                

               f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict()); // sync  

                             

               f_awaiting_CCR(mw_CCR_Request(vc_sessionId, 

               f_awaiting_CCR(mw_CCR_Request(vc_sessionId, 

                									vc_originHost, 

                									vc_originHost, 

                									vc_originRealm, 

                									vc_originRealm,
@@ -1580,8 +1582,6 @@ module DiameterGx_Gx_TCFunctions { 




                f_send_CCA(m_CCA_basic(vc_sessionId, vc_originHost, vc_originRealm));

                f_send_CCA(m_CCA_basic(vc_sessionId, vc_originHost, vc_originRealm));

                

                

                f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict()); // sync

                

				f_send_RAR(m_RAR_SessionRelease

				f_send_RAR(m_RAR_SessionRelease

						   (vc_sessionId, vc_originHost, vc_originRealm,

						   (vc_sessionId, vc_originHost, vc_originRealm,

							vc_destinationRealm, vc_destinationHost,

							vc_destinationRealm, vc_destinationHost,

DiameterGx/ttcn/DiameterGx_TestCases.ttcn

+20 −14
Original line number Original line Diff line number Diff line
@@ -1037,17 +1037,20 @@ module DiameterGx_TestCases 
            testcase TC_PCEF_ST_01() 

            testcase TC_PCEF_ST_01() 

            runs on ServerSyncComp

            runs on ServerSyncComp

            system TestAdapter {

            system TestAdapter {

                //Variables

                

                // Initialize

                var DiameterComponent v_diameterComponent_pcrf;

                var DiameterComponent v_diameterComponent_pcrf;

                f_cf_1GxRUp(v_diameterComponent_pcrf);

                var GtpComponent v_gtpComponent_1;

				var GtpComponent v_gtpComponent_2;

				

				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,

									v_gtpComponent_2);

		

		

                //Start

                //Start

                v_diameterComponent_pcrf.start(f_TC_PCEF_ST_01());

                v_diameterComponent_pcrf.start(f_TC_PCEF_ST_01());

                

				// Finish

                // synchronize PTC on 3 sychronization points

				f_ConfigRun_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,

                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});

									v_gtpComponent_2);

		

                f_cf_1GxRDown(v_diameterComponent_pcrf);

            } // end TC_PCEF_ST_01

            } // end TC_PCEF_ST_01

        

        

            /*

            /*
@@ -1057,17 +1060,20 @@ module DiameterGx_TestCases 
            testcase TC_PCEF_ST_02() 

            testcase TC_PCEF_ST_02() 

            runs on ServerSyncComp

            runs on ServerSyncComp

            system TestAdapter {

            system TestAdapter {

                //Variables

                

                // Initialize

                var DiameterComponent v_diameterComponent_pcrf;

                var DiameterComponent v_diameterComponent_pcrf;

                f_cf_1GxRUp(v_diameterComponent_pcrf);

                var GtpComponent v_gtpComponent_1;

				var GtpComponent v_gtpComponent_2;

				

				f_ConfigUp_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,

									v_gtpComponent_2);

		

		

                //Start

                //Start

                v_diameterComponent_pcrf.start(f_TC_PCEF_ST_02());

                v_diameterComponent_pcrf.start(f_TC_PCEF_ST_02());

                

				// Finish

                // synchronize PTC on 3 sychronization points

				f_ConfigRun_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,

                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});

									v_gtpComponent_2);

		

                f_cf_1GxRDown(v_diameterComponent_pcrf);

            } // end TC_PCEF_ST_02

            } // end TC_PCEF_ST_02

        }//end group  TP_PCEFRole_ST

        }//end group  TP_PCEFRole_ST