STF512 Week #19: (62df5e32) · Commits · TTCN-3 Libraries / LibDiameter

ttcn/LibDiameter_Steps.ttcn

+13 −2

Original line number	Diff line number	Diff line
		@@ -1609,8 +1609,9 @@ group Preambles {
		group preamble_Diameter{


		function f_preambleDiameterBaseClient(UInt32 p_authApplicationId)runs on DiameterComponent
		{
		function f_preambleDiameterBaseClient(
		in UInt32 p_authApplicationId
		) runs on DiameterComponent {

		f_send_CER(m_CER_AppId(vc_originHost, vc_originRealm, vc_hostIPAddress, p_authApplicationId));
		f_awaiting_CEA(mw_CEA_dummy);
		@@ -1618,6 +1619,16 @@ group Preambles {
		f_awaiting_DWA(mw_DWA_dummy);
		}

		function f_preambleDiameterBaseClient_acct_Application_Id_AVP(
		in UInt32 p_acctApplicationId
		) runs on DiameterComponent {

		f_send_CER(m_CER_AppId_acct_Application_Id(vc_originHost, vc_originRealm, vc_hostIPAddress, p_acctApplicationId));
		f_awaiting_CEA(mw_CEA_dummy);
		f_send_DWR(m_DWR_basic(vc_originHost, vc_originRealm));
		f_awaiting_DWA(mw_DWA_dummy);
		}

		function f_preambleDiameterBaseServer(UInt32 p_authApplicationId)runs on DiameterComponent
		{

ttcn/LibDiameter_Templates.ttcn

+42 −5

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ module LibDiameter_Templates {
		import from LibDiameter_Types_CxDx_AVPs all;
		import from LibDiameter_TypesAndValues all;
		import from LibDiameter_PIXITS all;
		import from LibDiameter_TypesAndValues all;

		group LowerLayerPrimitives {

		@@ -700,6 +701,12 @@ module LibDiameter_Templates {
		aVP_Data := p_avpData
		}

		template Acct_Application_Id_AVP m_acctApplicationId(UInt32 p_avpData):=
		{
		aVP_Header := m_aVP_HeaderVid_Mbit1(c_acct_Application_Id_AVP_Code, 4, omit),
		aVP_Data := p_avpData
		}

		template Disconnect_Cause_AVP m_disconnectCause(Disconnect_Cause_Type p_aVP_Data) := {
		aVP_Header := m_aVP_HeaderVid_Mbit1(c_disconnect_Cause_AVP_Code, 4, omit ),
		aVP_Data := p_aVP_Data
		@@ -761,11 +768,23 @@ module LibDiameter_Templates {
		acct_Application_Id := omit
		}

		template Vendor_Specific_Appl_Id_AVP m_vendor_Specific_Acct_Id(UInt32 p_acctApplicationId) := {
		aVP_Header := m_aVP_Header_Mbit1(c_vendor_Specific_Appl_Id_AVP_Code, 24),
		vendor_Id := {m_vendorId(c_vendId3gpp)},
		auth_Application_Id := omit,
		acct_Application_Id := {m_acctApplicationId(p_acctApplicationId)}
		}

		template Auth_Application_Id_AVP mw_authApplicationId(UInt32 p_avpData) := {
		aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_auth_Application_Id_AVP_Code),
		aVP_Data := p_avpData
		}

		template Acct_Application_Id_AVP mw_acctApplicationId(UInt32 p_avpData) := {
		aVP_Header := mw_aVP_Header_Vbit0Mbit1(c_acct_Application_Id_AVP_Code),
		aVP_Data := p_avpData
		}

		template QoS_Information_AVP mw_qosInformation_QosInfo_ARP := {
		aVP_Header := mw_aVP_Header_VMbit1(c_qoS_Information_AVP_Code), //<AVP header: 1016 ....>
		qoS_Class_Identifier :=?,
		@@ -3125,11 +3144,11 @@ module LibDiameter_Templates {

		group modified_request_templates_send {
		template (value) CER_MSG m_CER_AppId(
		template Origin_Host_AVP p_originHost,
		template Origin_Realm_AVP p_originRealm,
		Address p_address,
		UInt32 p_authApplicationId)
		modifies m_CER_basic := {
		in template (value) Origin_Host_AVP p_originHost,
		in template (value) Origin_Realm_AVP p_originRealm,
		in Address p_address,
		in UInt32 p_authApplicationId
		) modifies m_CER_basic := {
		cER_Body := {
		origin_Host := p_originHost,
		origin_Realm := p_originRealm,
		@@ -3142,6 +3161,24 @@ module LibDiameter_Templates {
		}
		}

		template (value) CER_MSG m_CER_AppId_acct_Application_Id(
		in template (value) Origin_Host_AVP p_originHost,
		in template (value) Origin_Realm_AVP p_originRealm,
		in Address p_address,
		in UInt32 p_acctApplicationId
		) modifies m_CER_basic := {
		cER_Body := {
		origin_Host := p_originHost,
		origin_Realm := p_originRealm,
		host_IP_Address := {m_hostIPAddress(p_address)},
		vendor_Id := m_vendorId(c_vendId3gpp),
		product_Name := m_productName("ETSI"),
		supported_Vendor_Id := {m_supportedVendorId(c_vendId3gpp)},
		vendor_Specific_Application_Id := {m_vendor_Specific_Acct_Id(p_acctApplicationId)},
		acct_Application_Id := {m_acctApplicationId(p_acctApplicationId)}
		}
		}

		} //end group modified_request_templates_send

		group modified_request_templates_receive {

ttcn/LibDiameter_TypesAndValues.ttcn

+2862 −2861

Original line number	Diff line number	Diff line
		@@ -59,7 +59,8 @@ group BasicTypesAndConstants{
		const UInt32 c_applIdS9:= 16777267; //For S9 messages
		const UInt32 c_applIdCx:= 16777216; //For Cx messages
		const UInt32 c_applIdDx:= 16777224; //For Dx messages
		const UInt32 c_applIdRfRo:= 16777218; //For Rf/Ro messages
		const UInt32 c_applIdRf:= 3;//16777218; //For Rf/Ro messages
		const UInt32 c_applIdRo:= 4;//16777218; //For Rf/Ro messages


		} // End of group ApplicationIdConstants
		@@ -616,7 +617,7 @@ group BasicTypesAndConstants{

		const integer c_application_Server_ID_AVP_Code := 2101; //Ref ETSI TS 132 299 Application_Server_ID_AVP
		const integer c_application_Service_Type_AVP_Code := 2102; //Ref ETSI TS 132 299 Application_Service_Type_AVP
		const integer c_spplication_Session_ID_AVP_Code := 2103; //Ref ETSI TS 132 299 Application_Session_ID_AVP
		const integer c_application_Session_ID_AVP_Code := 2103; //Ref ETSI TS 132 299 Application_Session_ID_AVP
		const integer c_delivery_Status_AVP_Code := 2104; //Ref ETSI TS 132 299 Delivery_Status_AVP

		const integer c_sip_Request_Timestamp_Fraction_AVP_Code := 2301;//Ref: ETSI TS 132 299 SIP_Request_Timestamp_Fraction_AVP

ttcn/LibDiameter_Types_Base_AVPs.ttcn

+1 −1

Original line number	Diff line number	Diff line
		@@ -2408,7 +2408,7 @@ module LibDiameter_Types_Base_AVPs {
		Rating_Group_AVP rating_Group optional,
		set of G_S_U_Pool_Reference_AVP g_S_U_Pool_Reference optional,
		Validity_Time_AVP validity_Time optional,
		Result_Code_AVP result_Codeoptional optional,
		Result_Code_AVP result_Code optional,
		Final_Unit_Indication_AVP final_Unit_Indication optional,
		Time_Quota_Threshold_AVP time_Quota_Threshold optional, // TS 132 299
		Volume_Quota_Threshold_AVP volume_Quota_Threshold optional, // TS 132 299

ttcn/LibDiameter_Types_RfRo_AVPs.ttcn3

+1 −1

Original line number	Diff line number	Diff line
		@@ -1675,7 +1675,7 @@ module LibDiameter_Types_RfRo_AVPs {
		set of Associated_URI_AVP associated_URI optional,
		Time_Stamps_AVP time_Stamps optional,
		set of Application_Server_Information_AVP application_Server_Information optional,
		set of Inter_Operator_Identifier_AVP inter_Operator_Identifie optional,
		set of Inter_Operator_Identifier_AVP inter_Operator_Identifier optional,
		IMS_Charging_Identifier_AVP ims_Charging_Identifier optional,
		set of SDP_Session_Description_AVP sdp_Session_Description optional,
		set of SDP_Media_Component_AVP sdp_Media_Component optional,