Commit 62f524b6 authored by rennoch's avatar rennoch
Browse files

Gx/PCEF IRS tests: use of GTPsupport

parent 27cfd88b

DiameterGx/ttcn/DiameterGx_Gx_TCFunctions.ttcn

+10 −10
Original line number Diff line number Diff line
@@ -2655,6 +2655,8 @@ module DiameterGx_Gx_TCFunctions { 


               f_preamble_PCRF();

                

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

               

               f_awaiting_CCR(mw_CCR_Request(vc_sessionId, 

                									vc_originHost, 

                									vc_originRealm,
@@ -2664,8 +2666,6 @@ module DiameterGx_Gx_TCFunctions { 


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

                

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

                

				f_send_RAR(DiameterGx_Templates.m_RAR_CharRuleInst // RAR in Rx-module has different header!

						   (vc_sessionId, vc_originHost, vc_originRealm,

							vc_destinationRealm, vc_destinationHost,
@@ -2702,6 +2702,8 @@ module DiameterGx_Gx_TCFunctions { 


               f_preamble_PCRF();

                

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

               

               f_awaiting_CCR(mw_CCR_Request(vc_sessionId, 

                									vc_originHost, 

                									vc_originRealm,
@@ -2722,8 +2724,6 @@ module DiameterGx_Gx_TCFunctions { 
                    

                f_awaiting_RAA(mw_RAA_basic(vc_sessionId,?,?)); 

                

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

                

				f_send_RAR(DiameterGx_Templates.m_RAR_CharRuleRemove // RAR in Rx-module has different header!

						   (vc_sessionId, vc_originHost, vc_originRealm,

							vc_destinationRealm, vc_destinationHost,
@@ -3088,6 +3088,8 @@ module DiameterGx_Gx_TCFunctions { 


               f_preamble_PCRF();

                                

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

               

               f_awaiting_CCR(mw_CCR_Request(vc_sessionId, 

                									vc_originHost, 

                									vc_originRealm,
@@ -3105,8 +3107,6 @@ module DiameterGx_Gx_TCFunctions { 
							m_usageMonitoringInformation(m_monitoringKey(PX_MONITORING_KEY2), omit)));                    

                f_awaiting_RAA(mw_RAA_basic(vc_sessionId,?,?)); 

                

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

                

				// trigger for usage report (explicit request)

				f_send_RAR(DiameterGx_Templates.m_RAR_UMI // RAR in Rx-module has different header!

						   (vc_sessionId, vc_originHost, vc_originRealm,
@@ -3150,6 +3150,8 @@ module DiameterGx_Gx_TCFunctions { 


               f_preamble_PCRF();

                                

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

               

               f_awaiting_CCR(mw_CCR_Request(vc_sessionId, 

                									vc_originHost, 

                									vc_originRealm,
@@ -3167,8 +3169,6 @@ module DiameterGx_Gx_TCFunctions { 
							m_usageMonitoringInformation(m_monitoringKey(PX_MONITORING_KEY2), omit)));                    

                f_awaiting_RAA(mw_RAA_basic(vc_sessionId,?,?)); 

                

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

                

				// trigger for usage report (explicit request)

				f_send_RAR(DiameterGx_Templates.m_RAR_UMI // RAR in Rx-module has different header!

						   (vc_sessionId, vc_originHost, vc_originRealm,

DiameterGx/ttcn/DiameterGx_TestCases.ttcn

+45 −33
Original line number Diff line number Diff line
@@ -1687,17 +1687,20 @@ module DiameterGx_TestCases 
            testcase TC_PCEF_RAU_06() 

            runs on ServerSyncComp

            system TestAdapter {

                //Variables

                

                // Initialize

                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

                v_diameterComponent_pcrf.start(f_TC_PCEF_RAU_06());

                

                // synchronize PTC on 3 sychronization points

                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});

		

                f_cf_1GxRDown(v_diameterComponent_pcrf);

				// Finish

				f_ConfigRun_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,

									v_gtpComponent_2);

            } // end TC_PCEF_RAU_06



            /*
@@ -1706,17 +1709,20 @@ module DiameterGx_TestCases 
            testcase TC_PCEF_RAU_07() 

            runs on ServerSyncComp

            system TestAdapter {

                //Variables

                

                // Initialize

                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

                v_diameterComponent_pcrf.start(f_TC_PCEF_RAU_07());

                

                // synchronize PTC on 3 sychronization points

                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});

		

                f_cf_1GxRDown(v_diameterComponent_pcrf);

				// Finish

				f_ConfigRun_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,

									v_gtpComponent_2);

            } // end TC_PCEF_RAU_07

        }//end group TP_PCEFRole_RAU
@@ -1727,17 +1733,20 @@ module DiameterGx_TestCases 
            testcase TC_PCEF_IRS_01() 

            runs on ServerSyncComp

            system TestAdapter {

                //Variables

                

                // Initialize

                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

                v_diameterComponent_pcrf.start(f_TC_PCEF_IRS_01());

                

                // synchronize PTC on 3 sychronization points

                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});

		

                f_cf_1GxRDown(v_diameterComponent_pcrf);

				// Finish

				f_ConfigRun_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,

									v_gtpComponent_2);

            } // end TC_PCEF_IRS_01



            /*
@@ -1746,17 +1755,20 @@ module DiameterGx_TestCases 
            testcase TC_PCEF_IRS_02() 

            runs on ServerSyncComp

            system TestAdapter {

                //Variables

                

                // Initialize

                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

                v_diameterComponent_pcrf.start(f_TC_PCEF_IRS_02());

                

                // synchronize PTC on 3 sychronization points

                f_serverSync1Client({c_prDone, c_tbDone, c_poDone});

		

                f_cf_1GxRDown(v_diameterComponent_pcrf);

 				// Finish

				f_ConfigRun_PCRF(v_diameterComponent_pcrf, v_gtpComponent_1,

									v_gtpComponent_2);

            } // end TC_PCEF_IRS_02

        }//end group TP_PCEFRole_IRS

    }//end group TP_PCEFRole