STF450: End of Spectra=PCEF Gx validation (bcc60b9f) · Commits · INT - Core Network and Interoperability Testing / DIAMETER / DiameterGx

DiameterGx/ttcn/DiameterGx_Gx_TCFunctions.ttcn

+55 −32

Original line number	Diff line number	Diff line
		@@ -2768,7 +2768,11 @@ module DiameterGx_Gx_TCFunctions {
		(vc_sessionId, vc_originHost, vc_originRealm,
		vc_destinationRealm, vc_destinationHost,
		m_event_Trigger(USAGE_REPORT_E),
		m_usageMonitoringInformation(m_monitoringKey(PX_MONITORING_KEY), omit)));
		m_usageMonitoringInformation(m_monitoringKey(PX_MONITORING_KEY),
		m_grantedServiceUnit_cCs(m_cC_Total_Octets(1024000),
		m_cC_Input_Octets(512000),
		m_cC_Output_Octets(512000)))));

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

		action("Trigger for usage threshold reached");
		@@ -2830,7 +2834,10 @@ module DiameterGx_Gx_TCFunctions {
		(vc_sessionId, vc_originHost, vc_originRealm,
		vc_destinationRealm, vc_destinationHost,
		m_event_Trigger(USAGE_REPORT_E),
		m_usageMonitoringInformation(m_monitoringKey(PX_MONITORING_KEY), omit)));
		m_usageMonitoringInformation(m_monitoringKey(PX_MONITORING_KEY),
		m_grantedServiceUnit_cCs(m_cC_Total_Octets(1024000),
		m_cC_Input_Octets(512000),
		m_cC_Output_Octets(512000)))));
		f_awaiting_RAA(mw_RAA_basic(vc_sessionId,?,?));

		// trigger for usage report (removal of PCC rule)
		@@ -2897,7 +2904,10 @@ module DiameterGx_Gx_TCFunctions {
		(vc_sessionId, vc_originHost, vc_originRealm,
		vc_destinationRealm, vc_destinationHost,
		m_event_Trigger(USAGE_REPORT_E),
		m_usageMonitoringInformation(m_monitoringKey(PX_MONITORING_KEY), omit)));
		m_usageMonitoringInformation(m_monitoringKey(PX_MONITORING_KEY),
		m_grantedServiceUnit_cCs(m_cC_Total_Octets(1024000),
		m_cC_Input_Octets(512000),
		m_cC_Output_Octets(512000)))));
		f_awaiting_RAA(mw_RAA_basic(vc_sessionId,?,?));

		action("Trigger for CCR not related to predefined monitoring key");
		@@ -2972,7 +2982,10 @@ module DiameterGx_Gx_TCFunctions {
		(vc_sessionId, vc_originHost, vc_originRealm,
		vc_destinationRealm, vc_destinationHost,
		m_event_Trigger(USAGE_REPORT_E),
		m_usageMonitoringInformation(m_monitoringKey(PX_MONITORING_KEY), omit)));
		m_usageMonitoringInformation(m_monitoringKey(PX_MONITORING_KEY),
		m_grantedServiceUnit_cCs(m_cC_Total_Octets(1024000),
		m_cC_Input_Octets(512000),
		m_cC_Output_Octets(512000)))));
		f_awaiting_RAA(mw_RAA_basic(vc_sessionId,?,?));

		action("Trigger for Session Termination");
		@@ -3000,8 +3013,6 @@ module DiameterGx_Gx_TCFunctions {

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

		f_terminate_session(); // postamble

		f_postamble_PCRF();

		f_selfOrClientSyncAndVerdict(c_poDone, f_getVerdict()); // sync
		@@ -3033,13 +3044,19 @@ module DiameterGx_Gx_TCFunctions {
		(vc_sessionId, vc_originHost, vc_originRealm,
		vc_destinationRealm, vc_destinationHost,
		m_event_Trigger(USAGE_REPORT_E),
		m_usageMonitoringInformation(m_monitoringKey(PX_MONITORING_KEY), omit)));
		m_usageMonitoringInformation(m_monitoringKey(PX_MONITORING_KEY),
		m_grantedServiceUnit_cCs(m_cC_Total_Octets(1024000),
		m_cC_Input_Octets(512000),
		m_cC_Output_Octets(512000)))));
		f_awaiting_RAA(mw_RAA_basic(vc_sessionId,?,?));
		f_send_RAR(DiameterGx_Templates.m_RAR_EvTrigger_UMI // RAR in Rx-module has different header!
		(vc_sessionId, vc_originHost, vc_originRealm,
		vc_destinationRealm, vc_destinationHost,
		m_event_Trigger(USAGE_REPORT_E),
		m_usageMonitoringInformation(m_monitoringKey(PX_MONITORING_KEY2), omit)));
		m_usageMonitoringInformation(m_monitoringKey(PX_MONITORING_KEY2),
		m_grantedServiceUnit_cCs(m_cC_Total_Octets(1024000),
		m_cC_Input_Octets(512000),
		m_cC_Output_Octets(512000)))));
		f_awaiting_RAA(mw_RAA_basic(vc_sessionId,?,?));

		// trigger for usage report (explicit request)
		@@ -3116,7 +3133,10 @@ module DiameterGx_Gx_TCFunctions {
		(vc_sessionId, vc_originHost, vc_originRealm,
		vc_destinationRealm, vc_destinationHost,
		m_event_Trigger(USAGE_REPORT_E),
		m_usageMonitoringInformation(m_monitoringKey(PX_MONITORING_KEY2), omit)));
		m_usageMonitoringInformation(m_monitoringKey(PX_MONITORING_KEY2),
		m_grantedServiceUnit_cCs(m_cC_Total_Octets(1024000),
		m_cC_Input_Octets(512000),
		m_cC_Output_Octets(512000)))));
		f_awaiting_RAA(mw_RAA_basic(vc_sessionId,?,?));

		// trigger for usage report (explicit request)
		@@ -3182,7 +3202,10 @@ module DiameterGx_Gx_TCFunctions {
		(vc_sessionId, vc_originHost, vc_originRealm,
		vc_destinationRealm, vc_destinationHost,
		m_event_Trigger(USAGE_REPORT_E),
		m_usageMonitoringInformation(m_monitoringKey(PX_MONITORING_KEY2), omit)));
		m_usageMonitoringInformation(m_monitoringKey(PX_MONITORING_KEY),
		m_grantedServiceUnit_cCs(m_cC_Total_Octets(1024000),
		m_cC_Input_Octets(512000),
		m_cC_Output_Octets(512000)))));
		f_awaiting_RAA(mw_RAA_basic(vc_sessionId,?,?));

		// trigger for usage report (explicit request)

DiameterGx/ttcn/DiameterGx_Templates.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -1265,7 +1265,7 @@ module DiameterGx_Templates {

		template Used_Service_Unit_AVP mw_usedServiceUnit(template CC_Input_Octets_AVP p_CCInputOctets, template CC_Output_Octets_AVP p_CCOutputOctets) :=
		{
		aVP_Header := mw_aVP_Header(c_called_Station_Id_AVP_Code),
		aVP_Header := mw_aVP_Header(c_used_Service_Unit_AVP_Code),
		tariff_Change_Usage := *,
		cC_Time := *,
		cC_Money := *,

Admin message