Commit 27cfd88b authored by rennoch's avatar rennoch
Browse files

Gx/PCEF RAU tests: use of GTPsupport

parent e92becfb

DiameterGx/ttcn/DiameterGx_Gx_TCFunctions.ttcn

+14 −15
Original line number Diff line number Diff line
@@ -2765,6 +2765,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,
@@ -2782,9 +2784,6 @@ module DiameterGx_Gx_TCFunctions { 
							m_usageMonitoringInformation(m_monitoringKey(PX_MONITORING_KEY), omit)));                    

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

                                

                

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

                

                action("Trigger for usage threshold reached");               



                f_awaiting_CCR(mw_CCR_Request_EvtTrig_UMI(vc_sessionId,
@@ -2824,6 +2823,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,
@@ -2841,8 +2842,6 @@ module DiameterGx_Gx_TCFunctions { 
							m_usageMonitoringInformation(m_monitoringKey(PX_MONITORING_KEY), omit)));                    

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

                

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

                

				// trigger for usage report (removal of PCC rule)

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

						   (vc_sessionId, vc_originHost, vc_originRealm,
@@ -2887,6 +2886,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,
@@ -2904,8 +2905,6 @@ module DiameterGx_Gx_TCFunctions { 
							m_usageMonitoringInformation(m_monitoringKey(PX_MONITORING_KEY), omit)));                    

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

                

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

                

                action("Trigger for CCR not related to predefined monitoring key");                         

                

                f_awaiting_CCR(mw_CCR_Request(vc_sessionId,
@@ -2955,6 +2954,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,
@@ -2972,8 +2973,6 @@ module DiameterGx_Gx_TCFunctions { 
							m_usageMonitoringInformation(m_monitoringKey(PX_MONITORING_KEY), omit)));                    

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

                

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

                

                action("Trigger for Session Termination");                									

                									

                // await termination including usage-monitoring-information
@@ -3012,6 +3011,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,
@@ -3035,8 +3036,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

+55 −40
Original line number Diff line number Diff line
@@ -1577,17 +1577,20 @@ module DiameterGx_TestCases 
            testcase TC_PCEF_RAU_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_RAU_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_RAU_01



            /*
@@ -1596,17 +1599,20 @@ module DiameterGx_TestCases 
            testcase TC_PCEF_RAU_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_RAU_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_RAU_02



            /*
@@ -1615,17 +1621,20 @@ module DiameterGx_TestCases 
            testcase TC_PCEF_RAU_03() 

            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_03());

                

                // 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_03



            /*
@@ -1634,17 +1643,20 @@ module DiameterGx_TestCases 
            testcase TC_PCEF_RAU_04() 

            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_04());

                

                // 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_04



            /*
@@ -1653,17 +1665,20 @@ module DiameterGx_TestCases 
            testcase TC_PCEF_RAU_05() 

            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_05());

                

                // 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_05



            /*