Synchronized SVN conflicts (2f66deb1) · Commits · INT - Core Network and Interoperability Testing / DIAMETER / DiameterRfRo

DiameterRfRo/ttcn/DiameterRfRo_Steps.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -120,7 +120,7 @@
		f_send_ACR(
		md_aCR(
		vc_sessionId,
		md_acrBodyAvps_TypeOfCharging_Session(
		md_acrBodyAvps_TypeOfCharging(
		vc_originHost, // containing an Origin-Host AVP
		vc_originRealm, // containing an Origin-Realm AVP
		m_accounting_Record_Type( // containing an Accounting-Record-Type AVP

DiameterRfRo/ttcn/DiameterRfRo_TCFunctions.ttcn

+9 −8

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ module DiameterRfRo_TCFunctions {
		f_send_ACR(
		md_aCR(
		vc_sessionId,
		md_acrBodyAvps(
		md_acrBodyAvps_TypeOfCharging(
		vc_originHost, // containing an Origin-Host AVP
		vc_originRealm, // containing an Origin-Realm AVP
		m_accounting_Record_Type( // containing an Accounting-Record-Type AVP
		@@ -99,7 +99,7 @@ module DiameterRfRo_TCFunctions {
		f_send_ACR(
		md_aCR(
		vc_sessionId,
		md_acrBodyAvps(
		md_acrBodyAvps_TypeOfCharging(
		vc_originHost, // containing an Origin-Host AVP
		vc_originRealm, // containing an Origin-Realm AVP
		m_accounting_Record_Type( // containing an Accounting-Record-Type AVP
		@@ -143,7 +143,7 @@ module DiameterRfRo_TCFunctions {
		f_send_ACR(
		md_aCR(
		vc_sessionId,
		md_acrBodyAvps(
		md_acrBodyAvps_TypeOfCharging(
		vc_originHost, // containing an Origin-Host AVP
		vc_originRealm, // containing an Origin-Realm AVP
		m_accounting_Record_Type( // containing an Accounting-Record-Type AVP
		@@ -151,8 +151,9 @@ module DiameterRfRo_TCFunctions {
		),
		m_accounting_Record_Number( // containing an Accounting-Record-Number AVP
		3 // indicating the value 3
		)//,
		//m_service_Information_AVP_dummy // FIXME To be continue by creating a m_service_Information template modifying m_service_Information_AVP_dummy
		),
		m_event_timestamp(1),
		m_service_Information_AVP_dummy // FIXME To be continue by creating a m_service_Information template modifying m_service_Information_AVP_dummy
		)
		)
		);
		@@ -199,7 +200,7 @@ module DiameterRfRo_TCFunctions {
		f_send_ACR(
		md_aCR(
		vc_sessionId,
		md_acrBodyAvps_TypeOfCharging_Session(
		md_acrBodyAvps_TypeOfCharging(
		vc_originHost, // containing an Origin-Host AVP
		vc_originRealm, // containing an Origin-Realm AVP
		m_accounting_Record_Type( // containing an Accounting-Record-Type AVP
		@@ -260,7 +261,7 @@ module DiameterRfRo_TCFunctions {
		f_send_ACR(
		md_aCR(
		vc_sessionId,
		md_acrBodyAvps_TypeOfCharging_Session(
		md_acrBodyAvps_TypeOfCharging(
		vc_originHost, // containing an Origin-Host AVP
		vc_originRealm, // containing an Origin-Realm AVP
		m_accounting_Record_Type( // containing an Accounting-Record-Type AVP
		@@ -322,7 +323,7 @@ module DiameterRfRo_TCFunctions {
		f_send_ACR(
		md_aCR(
		vc_sessionId,
		md_acrBodyAvps_TypeOfCharging_Session(
		md_acrBodyAvps_TypeOfCharging(
		vc_originHost, // containing an Origin-Host AVP
		vc_originRealm, // containing an Origin-Realm AVP
		m_accounting_Record_Type( // containing an Accounting-Record-Type AVP

DiameterRfRo/ttcn/DiameterRfRo_Templates.ttcn

+162 −94

Original line number	Diff line number	Diff line
		@@ -110,60 +110,10 @@ module DiameterRfRo_Templates {
		aVP_Data := p_aVPData
		} // End of template m_subscription_Id_Data


		/** Message templates for ACR, ACA, CCR, CCA.... methods */
		group RfRoMessageTemplates {

		group RfRobase_templates {

		group RfRobasic_request_templates_send {

		} // Endgroup RfRobasic_request_templates_send
		group RfRobasic_request_templates_receive {

		} // End of group RfRobasic_request_templates_receive
		group RfRobasic_answer_templates_send {

		} // End of group RfRobasic_answer_templates_send
		group RfRobasic_answer_templates_receive {

		} // End of group RfRobasic_answer_templates_receive
		} // End of group RfRoMessageTemplates

		group RfRomodified_templates {

		group RfRomodified_request_templates_send {

		} // end group RfRomodified_request_templates_send

		group RfRomodified_request_templates_receive {

		} // end group RfRomodified_request_templates_receive
		group RfRomodified_answer_templates_send {

		} // end group RfRomodified_answer_templates_send
		group RfRomodified_answer_templates_receive {

		} // Endgroup RfRomodified_answer_templates_receive

		} // End of group RfRomodified_templates

		} // End of group RfRoMessageTemplates

		group Rf_message_templates {
		group Rf_modified_message_templates {

		group Rf_request_message_templates_send {

		/**
		* @desc Main receive message for CDF_Rf port
		* @param p_aCR_MSG AC-Request message
		*/
		template (value) DIAMETER_MSG m_ctfAccountingRequest(
		in template (value) ACR_MSG p_aCR_MSG
		) := {
		aCR_MSG := p_aCR_MSG
		} // End of template m_ctfAccountingRequest

		/**
		* @desc Send template for ACR
		* @param p_sessionId Session identifier
		@@ -178,16 +128,9 @@ module DiameterRfRo_Templates {
		} // End of template md_aCR

		/**
		* @desc Receive template for ACR message body
		* @param p_resultCode Indicates whether a particular request was completed successfully or an error occurred
		* @param p_originHost Identifies the endpoint that originated the Diameter message
		* @param p_originRealm Realm of the originator
		* @param p_event_Timestamp Event timestamp
		* @param p_accounting_Record_Type TODO
		* @param p_accounting_Record_Number TODO
		* @param p_service_Information TODO
		* @desc Send template for ACR message body
		*/
		template (omit) ACR_Body_AVP md_acrBodyAvps(
		template (omit) ACR_Body_AVP md_acrBodyAvps_TypeOfCharging(
		in template (value) Origin_Host_AVP p_originHost,
		in template (value) Origin_Realm_AVP p_originRealm,
		in template (value) Accounting_Record_Type_AVP p_accounting_Record_Type,
		@@ -199,29 +142,131 @@ module DiameterRfRo_Templates {
		origin_Realm := p_originRealm,
		accounting_Record_Type := p_accounting_Record_Type,
		accounting_Record_Number := p_accounting_Record_Number,
		event_Timestamp := p_event_Timestamp,
		service_Information := p_service_Information
		} // End of template md_acrBodyAvps
		} // End of template md_acrBodyAvps_TypeOfCharging_Session

		} // End of group Rf_request_message_templates_send

		group Rf_request_message_templates_receive {

		group ACR_MSG_{
		/**
		* @desc Send template for ACR message body
		* @desc Main receive message for CDF_Rf port
		* @param p_aCA_MSG AC-Answer message
		* @desc Main receive message for CDF_Rf port
		* @param p_aCA_MSG AC-Answer message
		*/
		template (omit) ACR_Body_AVP md_acrBodyAvps_TypeOfCharging_Session(
		in template (value) Origin_Host_AVP p_originHost,
		in template (value) Origin_Realm_AVP p_originRealm,
		in template (value) Accounting_Record_Type_AVP p_accounting_Record_Type,
		in template (value) Accounting_Record_Number_AVP p_accounting_Record_Number,
		in template (omit) Event_Timestamp_AVP p_event_Timestamp := omit,
		in template (omit) Service_Information_AVP p_service_Information := omit
		template (present) ACR_MSG mdw_aCR(
		in template (present) Session_Id_AVP p_sessionId,
		in template (present) ACR_Body_AVP p_acrBody
		) modifies mw_ACR_dummy := {
		session_Id := p_sessionId,
		aCR_Body := p_acrBody
		} // End of template mdw_aCR

		/**
		* @desc Receive template for ACR message body
		* @param p_resultCode Indicates whether a particular request was completed successfully or an error occurred
		* @param p_originHost Identifies the endpoint that originated the Diameter message
		* @param p_originRealm Realm of the originator
		* @param p_destinationRealm Destination realm
		* @param p_accounting_Record_Type TODO
		* @param p_accounting_Record_Number TODO
		* @param p_acct_application_id TODO
		*/
		template (present) ACR_Body_AVP mdw_acrBodyAvps(
		in template (present) Origin_Host_AVP p_originHost,
		in template (present) Origin_Realm_AVP p_originRealm,
		in template (present) Destination_Realm_AVP p_destinationRealm,
		in template (present) Accounting_Record_Type_AVP p_accounting_Record_Type,
		in template (present) Accounting_Record_Number_AVP p_accounting_Record_Number
		) modifies m_ACR_Body_dummy := {
		origin_Host := p_originHost,
		origin_Realm := p_originRealm,
		destination_Realm := p_destinationRealm,
		accounting_Record_Type := p_accounting_Record_Type,
		accounting_Record_Number := p_accounting_Record_Number,
		event_Timestamp := p_event_Timestamp,
		service_Information := p_service_Information
		} // End of template md_acrBodyAvps_TypeOfCharging_Session
		acct_Application_Id := mw_acct_Application_Id(3)
		} // End of template mdw_acrBodyAvps

		} // End of group Rf_request_message_templates_send
		}//End group ACR_MSG

		group ASR_MSG_{
		/**

		* @desc Receive template for ACR
		* @param p_sessionId Session identifier
		* @param p_asrBody ASR message body
		*/
		template (present) ASR_MSG mdw_aSR(
		in template (present) Session_Id_AVP p_sessionId,
		in template (present) ACR_Body_AVP p_asrBody
		) modifies mw_ASR_dummy := {
		session_Id := p_sessionId,
		aSR_Body := p_asrBody
		} // End of template mdw_aSR

		/**
		* @desc Receive template for ASR message body
		* @param p_resultCode Indicates whether a particular request was completed successfully or an error occurred
		* @param p_originHost Identifies the endpoint that originated the Diameter message
		* @param p_originRealm Realm of the originator
		* @param p_destinationRealm Destination realm
		* @param p_accounting_Record_Type TODO
		* @param p_accounting_Record_Number TODO
		* @param p_acct_application_id TODO
		*/
		template (present) ASR_Body_AVP mdw_asrBodyAvps(
		in template (present) Origin_Host_AVP p_originHost,
		in template (present) Origin_Realm_AVP p_originRealm,
		in template (present) Destination_Realm_AVP p_destinationRealm,
		in template (present) Destination_Host_AVP p_destinationHost
		) modifies m_ASR_Body_dummy := {
		origin_Host := p_originHost,
		origin_Realm := p_originRealm,
		destination_Realm := p_destinationRealm,
		destination_Host := p_destinationHost,
		auth_Application_Id := mw_auth_Application_Id(3)
		} // End of template mdw_asrBodyAvps

		}//End group ASR_MSG

		} // End of group Rf_request_message_templates_receive



		group Rf_answer_message_templates_send {

		/**
		* @desc Send template for ACA
		* @param p_sessionId Session identifier
		* @param p_acaBody ACA message body
		*/
		template (value) ACA_MSG md_aCA(
		template (value) Session_Id_AVP p_sessionId,
		template (value) ACA_Body_AVP p_acaBody
		) modifies m_ACA_dummy := {
		session_Id := p_sessionId,
		aCA_Body := p_acaBody
		} // End of template md_aCA

		template (value) ACA_Body_AVP md_acaBodyAvps(
		template (value) Result_Code_AVP p_resultCode,
		template (value) Origin_Host_AVP p_originHost,
		template (value) Origin_Realm_AVP p_originRealm,
		template (value) Accounting_Record_Type_AVP p_accounting_Record_Type,
		template (value) Accounting_Record_Number_AVP p_accounting_Record_Number
		) modifies m_ACA_Body_dummy := {
		result_Code := p_resultCode,
		origin_Host := p_originHost,
		origin_Realm := p_originRealm,
		accounting_Record_Type := p_accounting_Record_Type,
		accounting_Record_Number := p_accounting_Record_Number,
		acct_Application_Id := m_acct_Application_Id(3)
		} // End of template md_acaBodyAvps

		} // End of group Rf_answer_message_templates_send

		group Rf_answer_message_templates_receive {

		@@ -231,16 +276,6 @@ module DiameterRfRo_Templates {
		aCA_Body := mw_ACA_Body_dummy
		}

		/**
		* @desc Main receive message for CDF_Rf port
		* @param p_aCA_MSG AC-Answer message
		*/
		template (value) DIAMETER_MSG mw_cdfAccountingResponse(
		in template (value) ACA_MSG p_aCA_MSG
		) := {
		aCA_MSG := p_aCA_MSG
		} // End of template mw_cdfAccountingResponse

		/**
		* @desc Send template for ACA
		* @param p_sessionId Session identifier
		@@ -4392,36 +4427,69 @@ module DiameterRfRo_Templates {

		/**
		* @desc The Event_Timestamp Attribute send template
		* @param p_aVP_Data The aVP_Data that the reported event occurred, in seconds (since January 1, 1900 00:00 UTC)
		* @param p_time The time that the reported event occurred, in seconds (since January 1, 1900 00:00 UTC)
		*
		* @see RFC3588 Clause 8.21. Event-Timestamp AVP
		* @see ETSI TS 132 299 V10.15.0 Table 7.2: 3GPP specific AVPs
		*/
		template (value) Event_Timestamp_AVP m_event_Timestamp(
		in template (value) Time p_aVP_Data
		in template (value) Time p_time
		) := {
		aVP_Header := m_aVP_HeaderVid_Mbit1(c_event_Timestamp_AVP_Code, 4, c_vendId3gpp),
		aVP_Data := p_aVP_Data
		aVP_Header := m_aVP_HeaderVid_Mbit1(c_event_Timestamp_AVP_Code, 4, omit),
		aVP_Data := p_time
		} // End of template m_event_Timestamp

		/**
		* @desc The Acct_Application_Id send template
		* @param p_avpData UInt32
		*/
		template (value) Acct_Application_Id_AVP m_acct_Application_Id(
		template (value) UInt32 p_aVP_Data
		) := {
		aVP_Header := m_aVP_HeaderVid_Mbit1(c_acct_Application_Id_AVP_Code, 4, omit),
		aVP_Data := p_aVP_Data
		} // End of template m_acct_Application_Id

		} // End of group RFC3588_message_templates_send

		group RFC3588_message_templates_receive {

		/**
		* @desc The Event_Timestamp Attribute receive template
		* @param p_aVP_Data The aVP_Data that the reported event occurred, in seconds (since January 1, 1900 00:00 UTC)
		* @param p_time The time that the reported event occurred, in seconds (since January 1, 1900 00:00 UTC)
		*
		* @see RFC3588 Clause 8.21. Event-Timestamp AVP
		* @see ETSI TS 132 299 V10.15.0 Table 7.2: 3GPP specific AVPs
		*/
		template (present) Event_Timestamp_AVP mw_event_Timestamp(
		template (present) Time p_aVP_Data := ?
		template (present) Time p_time := ?
		) := {
		aVP_Header := mw_aVP_HeaderVid_Mbit1(c_event_Timestamp_AVP_Code, 4, c_vendId3gpp),
		aVP_Data := p_aVP_Data
		aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_event_Timestamp_AVP_Code),
		aVP_Data := p_time
		} // End of template mw_event_Timestamp

		/**
		* @desc The Acct_Application_Id receive template
		* @param p_avpData UInt32
		*/
		template (present) Acct_Application_Id_AVP mw_acct_Application_Id(
		template (present) UInt32 p_aVP_Data := ?
		) := {
		aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_acct_Application_Id_AVP_Code),
		aVP_Data := p_aVP_Data
		} // End of template mw_acct_Application_Id

		/**
		* @desc The Auth_Application_Id receive template
		* @param p_avpData UInt32
		*/
		template (present) Auth_Application_Id_AVP mw_auth_Application_Id(
		template (present) UInt32 p_aVP_Data := ?
		) := {
		aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_auth_Application_Id_AVP_Code),
		aVP_Data := p_aVP_Data
		} // End of template mw_acct_Application_Id

		} // End of group RFC3588_message_templates_receive

		} // End of group RFC3588_AVPS
		@@ -4509,7 +4577,7 @@ module DiameterRfRo_Templates {
		template (present) UInt8 p_namespace_Id := ?,
		template (present) UTF8String p_operator_Name := ?
		) := {
		aVP_Header := mw_aVP_HeaderVid_Mbit0(c_operator_Name_AVP_Code),
		aVP_Header := mw_aVP_HeaderVid_Mbit1(c_location_Information_AVP_Code, ?, c_vendId3gpp),//FIXME mw_aVP_HeaderVid_Mbit0(c_operator_Name_AVP_Code),
		namespace_Id := p_namespace_Id,
		operator_Name := p_operator_Name
		} // End of template mw_operator_Name_AVP

Admin message