Changes done due to first week validation (c4dc7c1e) · Commits · TTCN-3 Libraries / LibDiameter

ttcn/LibDiameter_TypesAndValues.ttcn

+36 −103

Original line number	Diff line number	Diff line
		@@ -14,7 +14,6 @@ module LibDiameter_TypesAndValues {

		import from LibCommon_BasicTypesAndValues all;
		import from LibCommon_DataStrings all;
		import from LibSip_SIPTypesAndValues all;

		group BasicTypesAndConstants{

		@@ -51,7 +50,7 @@ group BasicTypesAndConstants{
		const integer c_vendIdAuth_Application_Id_AVP := 258; //Ref: RFC3588 6.8. Auth-Application-Id AVP
		const integer c_vendIdClass_AVP := 25; //Ref: RFC3588 8.20. Class AVP
		const integer c_vendIdDestination_Host_AVP := 293; //Ref: RFC3588 6.5. Destination-Host AVP
		const integer c_vendIdDestination_Realm_AVP := 328; //Ref: RFC3588 6.6. Destination-Realm AVP
		const integer c_vendIdDestination_Realm_AVP := 283; //Ref: RFC3588 6.6. Destination-Realm AVP
		const integer c_vendIdDisconnect_Cause_AVP := 273; //Ref: RFC3588 5.4.3. Disconnect-Cause AVP
		const integer c_vendIdError_Message_AVP := 281; //Ref: RFC3588 7.3. Error-Message AVP
		const integer c_vendIdError_Reporting_Host_AVP := 294; //Ref: RFC3588 7.4. Error-Reporting-Host AVP
		@@ -434,8 +433,6 @@ group BasicTypesAndConstants{

		group AVPTypes{
		group AVP_Base_Types{
		//AVP Data Union(Integer,String,Record of and Grouped).
		type integer AVP_Vendor_Id;

		type record GROUPED{
		AVP_Header aVP_Header,
		@@ -479,6 +476,25 @@ group BasicTypesAndConstants{
		* host
		*/
		type charstring Diameter_Identity;

		group ReusedFromLibSipGroup{//NOTE!!!:import of mixed Lib protocols is not right solution

		type record HostPort
		{
		charstring host optional, // hostname, IPv4 or IPv6
		integer portField optional // represented as an integer
		}

		type record GenericParam
		{
		charstring id,
		charstring paramValue optional
		}

		type set of GenericParam SemicolonParam_List;

		}//end group reusedFromLibSip

		type record DiameterURI{
		/* The DiameterURI MUST follow the Uniform Resource Identifiers (URI)
		* syntax [URI] rules specified below:
		@@ -1341,9 +1357,6 @@ group BasicTypesAndConstants{
		AVP_Header aVP_Header,//<AVP header: 259 ....>
		UInt32 aVP_Data
		};
		type set of Vendor_Id_AVP set_of_Vendor_Id_AVP;
		type set of Auth_Application_Id_AVP set_of_Auth_Application_Id_AVP;
		type set of Acct_Application_Id_AVP set_of_Acct_Application_Id_AVP;

		type record Vendor_Specific_Appl_Id_AVP{
		//Ref: RFC3588 6.11. Vendor-Specific-Application-Id AVP
		@@ -1370,8 +1383,6 @@ group BasicTypesAndConstants{
		AVP_Header aVP_Header,//<AVP header: 281 ....>
		UTF8String aVP_Data
		};

		type set of AVP_Type set_of_AVP_Type;
		type record Failed_AVP{
		//Ref: RFC3588 7.5. Failed-AVP AVP
		AVP_Header aVP_Header,//<AVP header: 279 ....>
		@@ -1548,11 +1559,6 @@ group BasicTypesAndConstants{
		AVP_Header aVP_Header,//<AVP header: 374 ....>
		UInt32 aVP_Data
		};

		type set of SIP_MandatoryCapability_AVP set_of_SIP_MandatoryCapability_AVP;
		type set of SIP_OptionalCapability_AVP set_of_SIP_OptionalCapability_AVP;
		type set of SIP_Server_URI_AVP set_of_SIP_Server_URI_AVP;

		type record SIP_Server_Capabilities_AVP{
		//Ref: RFC4740 9.3. SIP-Server-Capabilities AVP
		AVP_Header aVP_Header,//<AVP header: 372 ....>
		@@ -1613,9 +1619,6 @@ group BasicTypesAndConstants{
		SIP_User_Data_Contents_AVP sIP_User_Data_Contents,//req.
		set of AVP_Type aVP_Type optional
		};

		type set of SIP_Accounting_Server_URI_AVP set_of_SIP_Accounting_Server_URI_AVP;
		type set of SIP_Credit_Control_Server_URI_AVP set_of_SIP_Credit_Control_Server_URI_AVP;
		type set SIP_Accounting_Information_AVP{
		//Ref: RFC4740 9.1. SIP-Accounting-Information AVP
		AVP_Header aVP_Header,//<AVP header: 368 ....>
		@@ -1665,8 +1668,6 @@ group BasicTypesAndConstants{
		AVP_Header aVP_Header,//<AVP header: 378 ....>
		UInt32 aVP_Data
		};

		type set of Digest_Auth_Param_AVP set_of_Digest_Auth_Param_AVP;
		type set SIP_Authenticate_AVP{
		//Ref: RFC4740 9.5.3. SIP-Authenticate AVP
		AVP_Header aVP_Header,//SIP-Authenticate ::= < AVP Header: 379 >
		@@ -2266,8 +2267,6 @@ group BasicTypesAndConstants{
		Redirect_Address_Type_AVP redirect_Address_Type,
		Redirect_Server_Address_AVP redirect_Server_Address
		};
		type set of Restriction_Filter_Rule_AVP set_of_Restriction_Filter_Rule_AVP;
		type set of Filter_Id_AVP set_of_Filter_Id_AVP;
		type set Final_Unit_Indication_AVP{
		// Ref: RFC4006 8.34. Final-Unit-Indication AVP
		AVP_Header aVP_Header,//< AVP Header: 430 >
		@@ -2276,10 +2275,6 @@ group BasicTypesAndConstants{
		set of Filter_Id_AVP filter_Id optional,
		Redirect_Server_AVP redirect_Server optional
		};
		type set of Used_Service_Unit_AVP set_of_Used_Service_Unit_AVP;
		type set of Service_Identifier_AVP set_of_Service_Identifier_AVP;
		type set of G_S_U_Pool_Reference_AVP set_of_G_S_U_Pool_Reference_AVP;

		type set Multiple_Services_Credit_Control_AVP{
		// Ref: RFC4006 8.16. Multiple-Services-Credit-Control AVP
		AVP_Header aVP_Header,//< AVP Header: 456 >
		@@ -2379,7 +2374,6 @@ group BasicTypesAndConstants{
		AVP_Header aVP_Header,//<AVP header: 501 ....>
		Address aVP_Data
		};
		type set of Flows_AVP set_of_Flows_AVP;
		type record Access_Network_Charging_Identifier_AVP{
		//Ref: ETSI TS 129 214 Access_Network_Charging_Identifier AVP
		AVP_Header aVP_Header, //<AVP header: 502 ....>
		@@ -2393,7 +2387,6 @@ group BasicTypesAndConstants{
		octetstring aVP_Data
		};

		type set of Media_Component_Description_AVP set_of_Media_Component_Description_AVP;
		type record Acceptable_Service_Info_AVP{
		//Ref: ETSI TS 129 214 Acceptable_Service_Info_AVP
		AVP_Header aVP_Header,//<AVP header: 526 ....>
		@@ -2438,7 +2431,6 @@ group BasicTypesAndConstants{
		AVP_Header aVP_Header,//<AVP header: 509 ....>
		UInt32 aVP_Data
		};
		type set of Flow_Number_AVP set_of_Flow_Number_AVP;
		type record Flows_AVP{
		//Ref: ETSI TS 129 214 Flows_AVP
		AVP_Header aVP_Header,//<AVP header: 510 ....>
		@@ -2484,8 +2476,6 @@ group BasicTypesAndConstants{
		AVP_Header aVP_Header,//<AVP header: 516 ....>
		UInt32 aVP_Data
		};
		type set of Media_Sub_Component_AVP set_of_Media_Sub_Component_AVP;
		type set of Codec_Data_AVP set_of_Codec_Data_AVP;
		type record Media_Component_Description_AVP{
		//Ref: ETSI TS 129 214 Media_Component_Decription_AVP
		AVP_Header aVP_Header,//<AVP header: 517 ....>
		@@ -2507,7 +2497,6 @@ group BasicTypesAndConstants{
		AVP_Header aVP_Header,//<AVP header: 518 ....>
		UInt32 aVP_Data
		};
		type record length (0..2) of Flow_Description_AVP record_of_Flow_Description_AVP;
		type record Media_Sub_Component_AVP{
		//Ref: ETSI TS 129 214 Media_Sub_Component_AVP
		AVP_Header aVP_Header,//<AVP header: 519 ....>
		@@ -2928,8 +2917,6 @@ group BasicTypesAndConstants{
		AVP_Header aVP_Header,//<AVP header: 1044 ....>
		Time aVP_Data
		};
		type set of Charging_Rule_Base_Name_AVP set_of_Charging_Rule_Base_Name_AVP;
		type set of Charging_Rule_Name_AVP set_of_Charging_Rule_Name_AVP;

		type record Access_Network_Charging_Identifier_Gx_AVP{
		//Ref: ETSI TS 129 212 Access_Network_Charging_Identifier_Gx_AVP
		@@ -2946,7 +2933,6 @@ group BasicTypesAndConstants{
		Pre_emption_Capability_AVP pre_emption_Capability optional,
		Pre_emption_Vulnerability_AVP pre_emption_Vulnerability optional
		};
		type set of Charging_Rule_Definition_AVP set_of_Charging_Rule_Definition_AVP;
		type record Charging_Rule_Install_AVP{
		//Ref: ETSI TS 129 212 Charging_Rule_Install_AVP
		AVP_Header aVP_Header, //<AVP header: 1001 ....>
		@@ -2969,7 +2955,7 @@ group BasicTypesAndConstants{
		set of Charging_Rule_Base_Name_AVP charging_Rule_Base_Name optional,
		set of AVP_Type aVP_Type optional
		};
		type set of Flow_Information_AVP set_of_Flow_Information_AVP;

		type record Charging_Rule_Definition_AVP{
		//Ref: ETSI TS 129 212 Charging_Rule_Definition_AVP
		AVP_Header aVP_Header, //<AVP header: 1003 ....>
		@@ -3100,7 +3086,6 @@ group BasicTypesAndConstants{
		set of AVP_Type aVP_Type optional
		};

		type set of Routing_Filter_AVP set_of_Routing_Filter_AVP;
		type record Routing_Rule_Definition_AVP{
		//Ref: ETSI TS 129 212 Routing_Rule_Definition_AVP
		AVP_Header aVP_Header, //<AVP header: 1076 ....>
		@@ -3110,14 +3095,14 @@ group BasicTypesAndConstants{
		Routing_IP_Address_AVP routing_IP_Address optional,
		set of AVP_Type aVP_Type optional
		};
		type set of Routing_Rule_Definition_AVP set_of_Routing_Rule_Definition_AVP;

		type record Routing_Rule_Install_AVP{
		//Ref: ETSI TS 129 212 Routing_Rule_Install_AVP
		AVP_Header aVP_Header, //<AVP header: 1081 ....>
		set of Routing_Rule_Definition_AVP routing_Rule_Definition optional,
		set of AVP_Type aVP_Type optional
		};
		type set of Routing_Rule_Identifier_AVP set_of_Routing_Rule_Identifier_AVP;

		type record Routing_Rule_Remove_AVP{
		//Ref: ETSI TS 129 212 Routing_Rule_Remove_AVP
		AVP_Header aVP_Header, //<AVP header: 1075 ....>
		@@ -3137,7 +3122,6 @@ group BasicTypesAndConstants{
		set of AVP_Type aVP_Type optional
		};

		type record length (0..2) of Tunnel_Header_Filter_AVP record_of_Tunnel_Header_Filter_AVP;
		type record Tunnel_Information_AVP{
		//Ref: ETSI TS 129 212 Tunnel_Information_AVP
		AVP_Header aVP_Header, //<AVP header: 1038 ....>
		@@ -3286,12 +3270,6 @@ group BasicTypesAndConstants{
		Job_Type aVP_Data
		};

		type set of Cell_Global_Identity_AVP set_of_Cell_Global_Identity_AVP;
		type set of E_UTRAN_Cell_Global_Identity_AVP set_of_E_UTRAN_Cell_Global_Identity_AVP;
		type set of Routing_Area_Identity_AVP set_of_Routing_Area_Identity_AVP;
		type set of Location_Area_Identity_AVP set_of_Location_Area_Identity_AVP;
		type set of Tracking_Area_Identity_AVP set_of_Tracking_Area_Identity_AVP;

		type record Area_Scope_AVP{
		//Ref: ETSI TS129 272 Area_Scope_AVP
		AVP_Header aVP_Header, //<AVP header: 1624 ....>
		@@ -3597,12 +3575,6 @@ group BasicTypesAndConstants{
		set of AVP_Type aVP_Type optional
		}

		type set length (1..infinity) of Host_IP_Address_AVP set_of_Host_IP_Address_AVP;
		type set of Origin_State_Id_AVP set_of_Origin_State_Id_AVP;
		type set of Supported_Vendor_Id_AVP set_of_Supported_Vendor_Id_AVP;
		type set of Inband_Security_Id_AVP set_of_Inband_Security_Id_AVP;
		type set of Vendor_Specific_Appl_Id_AVP set_of_Vendor_Specific_Appl_Id_AVP;

		type record CER_MSG{
		//Ref: RFC3588 5.3.1. Capabilities-Exchange-Request
		DiameterHeader header,//<CER> ::= < Diameter Header: 257, REQ >
		@@ -3621,8 +3593,6 @@ group BasicTypesAndConstants{
		set of AVP_Type aVP_Type optional
		}

		type set of Failed_AVP set_of_Failed_AVP;

		type record CEA_MSG{
		//Ref: RFC3588 5.3.2. Capabilities-Exchange-Answer
		DiameterHeader header,//<CEA> ::= < Diameter Header: 257 >
		@@ -3643,16 +3613,6 @@ group BasicTypesAndConstants{
		Firmware_Revision_AVP firmware_Revision optional,
		set of AVP_Type aVP_Type optional
		}
		type set of Access_Network_Charging_Identifier_AVP set_of_Access_Network_Charging_Identifier_AVP;
		type set of Subscription_Id_AVP set_of_Subscription_Id_AVP;
		type set of Class_AVP set_of_Class_AVP;
		type set of Event_Trigger_AVP set_of_Event_Trigger_AVP;
		type set of Charging_Rule_Remove_AVP set_of_Charging_Rule_Remove_AVP;
		type set of Charging_Rule_Install_AVP set_of_Charging_Rule_Install_AVP;
		type set of QoS_Information_AVP set_of_QoS_Information_AVP;
		type set of Usage_Monitoring_Information_AVP set_of_Usage_Monitoring_Information_AVP;
		type set of Proxy_Info_AVP set_of_Proxy_Info_AVP;
		type set of Route_Record_AVP set_of_Route_Record_AVP;

		type record RAR_MSG{
		//Ref: RFC3588 8.3.1. Re-Auth-Request
		@@ -3690,10 +3650,6 @@ group BasicTypesAndConstants{
		set of AVP_Type aVP_Type optional //RFC3588 & TS 129 214 & TS 129 212
		}

		type set of Charging_Rule_Report_AVP set_of_Charging_Rule_Report_AVP;
		type set of Redirect_Host_AVP set_of_Redirect_Host_AVP;
		type record length (0..2) of AN_GW_Address_AVP record_of_AN_GW_Address_AVP;

		type record RAA_MSG{
		//Ref: RFC3588 8.3.2. Re-Auth-Answer
		DiameterHeader header,//<RAA> ::= < Diameter Header: 258, PXY >
		@@ -3727,8 +3683,6 @@ group BasicTypesAndConstants{
		set of AVP_Type aVP_Type optional //RFC3588 & TS 129 214 & TS 129 212
		}

		type set of Supported_Features_AVP set_of_Supported_Features_AVP;

		type record ACR_MSG{
		//Ref: RFC3588 9.7.1. Accounting-Request
		DiameterHeader header,//<ACR> ::= < Diameter Header: 271, REQ, PXY >
		@@ -3939,9 +3893,6 @@ group BasicTypesAndConstants{
		set of AVP_Type aVP_Type optional
		}

		type set of SIP_Supported_User_Data_Type_AVP set_of_SIP_Supported_User_Data_Type_AVP;
		type set of SIP_AOR_AVP set_of_SIP_AOR_AVP;

		type record SAR_MSG{
		//Ref: RFC4740 8.3. Server-Assignment-Request (SAR) Command
		DiameterHeader header,//<SAR> ::= < Diameter Header: 284, PXY >
		@@ -3963,8 +3914,6 @@ group BasicTypesAndConstants{
		set of AVP_Type aVP_Type optional
		}

		type set of SIP_User_Data_AVP set_of_SIP_User_Data_AVP;

		type record SAA_MSG{
		// Ref: RFC4740 8.4. Server-Assignment-Answer (SAA) Command
		DiameterHeader header ,//<SAA> ::= < Diameter Header: 284, PXY >
		@@ -4046,8 +3995,6 @@ group BasicTypesAndConstants{
		set of AVP_Type aVP_Type optional
		}

		type set of SIP_Auth_Data_Item_AVP set_of_SIP_Auth_Data_Item_AVP;

		type record MAA_MSG{
		//Ref: RFC4740 8.8. Multimedia-Auth-Answer (MAA) Command
		DiameterHeader header ,//<MAA> ::= < Diameter Header: 286, PXY >
		@@ -4148,12 +4095,6 @@ group BasicTypesAndConstants{
		}//end og group RFC4740

		group Sh_Intf{

		type set of Service_Indication_AVP set_of_Service_Indication_AVP;
		type set of Data_Reference_AVP set_of_Data_Reference_AVP;
		type set of Identity_Set_AVP set_of_Identity_Set_AVP;
		type set of DSAI_Tag_AVP set_of_DSAI_Tag_AVP;

		/* Codes on Sh */
		type record UDR_MSG{
		// Ref: 3GPP TS 29.329 6.1.1 User-Data-Request (UDR) Command
		@@ -4332,12 +4273,6 @@ group BasicTypesAndConstants{
		/* Codes on Ro and Rf interface */
		//ACR ACA message is defined in RFC3588 group

		type set of Multiple_Services_Credit_Control_AVP set_of_Multiple_Services_Credit_Control_AVP;
		type set of Service_Parameter_Info_AVP set_of_Service_Parameter_Info_AVP;
		type set of Packet_Filter_Information_AVP set_of_Packet_Filter_Information_AVP;
		type set of TFT_Packet_Filter_Information_AVP set_of_TFT_Packet_Filter_Information_AVP;
		type set of Access_Network_Charging_Identifier_Gx_AVP set_of_Access_Network_Charging_Identifier_Gx_AVP;
		type set of CoA_Information_AVP set_of_CoA_Information_AVP;

		type record CCR_MSG{
		// Ref: RFC4006 3.1. Credit-Control-Request (CCR) Command
		@@ -4412,8 +4347,6 @@ group BasicTypesAndConstants{
		set of AVP_Type aVP_Type optional //RFC4006 & TS129 212
		}

		type set of CSG_Information_Reporting_AVP set_of_CSG_Information_Reporting_AVP;

		type record CCA_MSG{
		// Ref: RFC4006 3.2. Credit-Control-Answer (CCA) Command
		DiameterHeader header ,//< Diameter Header: 272, PXY>