Commit 81504ab4 authored by rennoch's avatar rennoch
Browse files

Gx/PCEF tests: PCC-01 completion

parent 7991de2f

DiameterGx/ttcn/DiameterGx_Gx_TCFunctions.ttcn

+3 −2
Original line number Diff line number Diff line
@@ -1516,9 +1516,10 @@ module DiameterGx_Gx_TCFunctions { 
                

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

                

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

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

							vc_destinationRealm, vc_destinationHost, 

							m_chrgRuleInstall_Name(m_charging_Rule_Name(PX_CHARGING_RULE_NAME_DATA))));

                    

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

DiameterGx/ttcn/DiameterGx_Templates.ttcn

+34 −1
Original line number Diff line number Diff line
@@ -90,6 +90,21 @@ module DiameterGx_Templates { 
                aVP_Type := *

            }

            

                            

            template Charging_Rule_Install_AVP m_chrgRuleInstall_dummy :=

            {

                aVP_Header := m_aVP_HeaderVid(c_vendIdCharging_Rule_Install_AVP, 0, omit),

                charging_Rule_Definition := omit,

                charging_Rule_Name := omit,

                charging_Rule_Base_Name := omit,

                bearer_Identifier := omit,

                rule_Activation_Time := omit,

                rule_DeActivation_Time := omit,

                resource_Allocation_Notification := omit,

                charging_Correlation_Indicator := omit,

                aVP_Type := omit

            }         

                

            template Charging_Rule_Install_AVP mw_chrgRuleInstall_dummy :=

            {

                aVP_Header := mw_aVP_Header_any,
@@ -454,6 +469,13 @@ module DiameterGx_Templates { 
                rule_Failure_Code := p_rfc

            }   

            

                        

            template Charging_Rule_Install_AVP m_chrgRuleInstall_Name(template Charging_Rule_Name_AVP p_chargingRuleName) modifies m_chrgRuleInstall_dummy:=

            {

                aVP_Header := m_aVP_HeaderVid(c_vendIdCharging_Rule_Install_AVP, lengthof(encvalue(p_chargingRuleName))+12/*PCC_Rule_Status_AVP length*/+12/*Rule_Failure_Code_AVP length*/, omit),

                charging_Rule_Name := {p_chargingRuleName}

            }

                

            template Charging_Rule_Name_AVP m_charging_Rule_Name(octetstring p_avpData) :=

            {

                aVP_Header := m_aVP_HeaderVid(c_vendIdCharging_Rule_Name_AVP, lengthof(p_avpData), omit),
@@ -1086,6 +1108,17 @@ module DiameterGx_Templates { 
                offline := m_offline(PX_OFFLINE_DATA)

            }

            

              template RAR_MSG m_RAR_CharRuleInst(template Session_Id_AVP p_sessionId,

                                           template Origin_Host_AVP p_originHost,

                                           template Origin_Realm_AVP p_originRealm,

                                           template Destination_Realm_AVP p_destinationRealm,

                                           template Destination_Host_AVP p_destinationHost,

                                           template Charging_Rule_Install_AVP p_chargingRuleInstall)

                  modifies m_RAR_dummy := 

              {

              	  charging_Rule_Install := {p_chargingRuleInstall}

              }                                     



          } //     end group Gxmodified_request_templates_send



		  group Gxmodified_request_templates_receive {