Some AVP types were moved in related AVP modules due to the STF490 plan. Some... (4da55e47) · Commits · TTCN-3 Libraries / LibDiameter

ttcn/LibDiameter_Types_Base_AVPs.ttcn

+186 −46

Original line number	Diff line number	Diff line
		@@ -2558,7 +2558,66 @@ module LibDiameter_Types_Base_AVPs {
		variant (aVP_Data) "condition=CodecHelper.leaveScope()"
		}
		}//end of group RFC4006_AVPa
		group TS129_061_AVPs{

		group RFC5580_AVPS {

		/**
		* @desc The Operator-Name Attribute (AVP code 126)
		* @member aVP_Header Header AVP
		* @member namespace_Id Namespace ID
		* @member operator_Name Contains the operator namespace identifier AND an Access Network Operator Name
		*
		* @see RFC5580 Clause 4.1. Operator-Name Attribute
		* @see ETSI TS 132 299 V10.15.0 Table 7.2: 3GPP specific AVPs
		*/
		type record Operator_Name_AVP {
		AVP_Header aVP_Header,//<AVP header: 126...>
		UInt8 namespace_Id,
		UTF8String operator_Name
		} // End of type Operator_Name_AVP

		/**
		* @desc The Operator-Name Attribute (AVP code 127)
		* @member aVP_Header Header AVP
		* @member index Allows this attribute to provide information relating to the information included in the Location- Data Attribute to which it refers (via the Index)
		* @member code Indicates the content of the location profile carried in the Location-Data Attribute
		* @member entity Refers to as an unsigned 8-bit integer value
		* @member sighting_Time Indicates when the location information was accurate
		* @member time_to_Live Gives a hint regarding for how long location information should be considered current
		* @member method Describes the way that the location information was determined
		*
		* @see RFC5580 Clause 4.2. Location-Information Attribute
		* @see ETSI TS 132 299 V10.15.0 Table 7.2: 3GPP specific AVPs
		*/
		type record Location_Information_AVP {
		AVP_Header aVP_Header,//<AVP header: 127...>
		UInt16 index,
		UInt8 code,
		UInt8 entity,
		UInt64 sighting_Time,
		UInt64 time_to_Live,
		UTF8String method
		} // End of type Location_Information_AVP

		/**
		* @desc The Location-Data Attribute (AVP code 128)
		* @member aVP_Header Header AVP
		* @member index TODO
		* @member aVP_Data TODO
		*
		* @see RFC5580 Clause 4.3. Location-Data Attribute
		* @see ETSI TS 132 299 V10.15.0 Table 7.2: 3GPP specific AVPs
		*/
		type record Location_Data_AVP {
		AVP_Header aVP_Header,//<AVP header: 128...>
		UInt16 index,
		UTF8String aVP_Data
		} // End of type Location_Data_AVP

		} // End of group RFC5580_AVPS

		// FIXME Can be moved in TTCN-3 module LibDiameter_Types_GiSGi_AVPs if GiSGi interface will be ddeveloped
		group TS129_061_AVPSGiSGi{

		type record RAI_AVP{
		//Ref: ETSI TS 129 061 RAI_AVP
		@@ -2630,7 +2689,130 @@ module LibDiameter_Types_Base_AVPs {
		variant (aVP_Data) "condition=CodecHelper.leaveScope()"
		}

		}//end of group TS129_061_AVPs
		/**
		* @desc TODO
		* @member aVP_Header Header AVP
		* @member aVP_Data TODO
		*
		* @see ETSI TS 129 061 V10.12.0 Table 9a: Gi/SGi specific AVPs
		*/
		type record ThreeGPP_IMSI_AVP {
		AVP_Header aVP_Header,//<AVP header: 1...>
		UTF8String aVP_Data
		} // End of type ThreeGPP_IMSI_AVP

		/**
		* @desc TODO
		* @member aVP_Header Header AVP
		* @member aVP_Data TODO
		*
		* @see ETSI TS 129 061 V10.12.0 Table 9a: Gi/SGi specific AVPs
		*/
		type record ThreeGPP_Charging_Id_AVP {
		AVP_Header aVP_Header,//<AVP header: 2...>
		octetstring aVP_Data
		} // End of type ThreeGPP_Charging_Id_AVP

		/**
		* @desc TODO
		* @member aVP_Header Header AVP
		* @member aVP_Data TODO
		*
		* @see ETSI TS 129 061 V10.12.0 Table 9a: Gi/SGi specific AVPs
		*/
		type record ThreeGPP_PDP_Type_AVP {
		AVP_Header aVP_Header,//<AVP header: 3...>
		ThreeGPP_PDP_Type aVP_Data
		} // End of type ThreeGPP_PDP_Type_AVP

		/**
		* @desc PDP context ot type
		*
		* @see ETSI TS 129 061 V10.12.0 Table 7: List of the 3GPP Vendor-Specific sub-attributes
		*/
		type enumerated ThreeGPP_PDP_Type {
		IP (0),
		PPP (1),
		IPv4 (2),
		IPv6 (3),
		IPv4v6 (4)
		} with {
		variant "length=32"
		} // End of type ThreeGPP_PDP_Type

		/**
		* @desc TODO
		* @member aVP_Header Header AVP
		* @member aVP_Data TODO
		*
		* @see ETSI TS 129 061 V10.12.0 Table 9a: Gi/SGi specific AVPs
		*/
		type record ThreeGPP_IMSI_MCC_MNC_AVP {
		AVP_Header aVP_Header,//<AVP header: 8...>
		UTF8String aVP_Data
		} // End of type ThreeGPP_IMSI_MCC_MNC_AVP

		/**
		* @desc TODO
		* @member aVP_Header Header AVP
		* @member aVP_Data TODO
		*
		* @see ETSI TS 129 061 V10.12.0 Table 9a: Gi/SGi specific AVPs
		*/
		type record ThreeGPP_GGSN_MCC_MNC_AVP {
		AVP_Header aVP_Header,//<AVP header: 8...>
		UTF8String aVP_Data
		} // End of type ThreeGPP_GGSN_MCC_MNC_AVP

		/**
		* @desc TODO
		* @member aVP_Header Header AVP
		* @member aVP_Data TODO
		*
		* @see ETSI TS 129 061 V10.12.0 Table 9a: Gi/SGi specific AVPs
		*/
		type record ThreeGPP_NSAPI_AVP {
		AVP_Header aVP_Header,//<AVP header: 10...>
		UTF8String aVP_Data
		} // End of type ThreeGPP_NSAPI_AVP

		/**
		* @desc TODO
		* @member aVP_Header Header AVP
		* @member aVP_Data TODO
		*
		* @see ETSI TS 129 061 V10.12.0 Table 9a: Gi/SGi specific AVPs
		*/
		type record ThreeGPP_Session_Stop_Indicator_AVP {
		AVP_Header aVP_Header,//<AVP header: 11...>
		UTF8String aVP_Data
		} // End of type ThreeGPP_Session_Stop_Indicator_AVP

		/**
		* @desc TODO
		* @member aVP_Header Header AVP
		* @member aVP_Data TODO
		*
		* @see ETSI TS 129 061 V10.12.0 Table 9a: Gi/SGi specific AVPs
		*/
		type record ThreeGPP_Selection_Mode_AVP {
		AVP_Header aVP_Header,//<AVP header: 12...>
		UTF8String aVP_Data
		} // End of type ThreeGPP_Selection_Mode_AVP

		/**
		* @desc TODO
		* @member aVP_Header Header AVP
		* @member aVP_Data TODO
		*
		* @see ETSI TS 129 061 V10.12.0 Table 9a: Gi/SGi specific AVPs
		*/
		type record ThreeGPP_Charging_Characteristics_AVP {
		AVP_Header aVP_Header,//<AVP header: 13...>
		UTF8String aVP_Data
		} // End of type ThreeGPP_Charging_Characteristics_AVP

		}//end of group TS129_061_AVPSGiSGi

		group TS129_272_AVPs{

		@@ -2942,49 +3124,7 @@ module LibDiameter_Types_Base_AVPs {
		}//end of group TS129_299_AVPs

		group TS132_299_AVPs{

		type record User_CSG_Information_AVP{
		//Ref: ETSI TS 132 299 User_CSG_Information_AVP
		AVP_Header aVP_Header, //<AVP header: 2319 ....>
		CSG_Id_AVP cSG_Id,
		CSG_Access_Mode_AVP cSG_Access_Mode,
		CSG_Membership_Indication_AVP CSG_Membership_Indication_AVP optional
		}
		with {
		variant "present=bytes(4, 2319);use=com.testingtech.ttcn.tci.codec.CodecHelper"
		variant (CSG_Membership_Indication_AVP) "condition=CodecHelper.leaveScope()"
		}

		type record CSG_Id_AVP{
		//Ref: ETSI TS 132 299 & TS129 272 CSG_Id_AVP
		AVP_Header aVP_Header, //<AVP header: 1437 ....>
		UInt32 aVP_Data
		}
		with {
		variant "present=bytes(4, 1437);use=com.testingtech.ttcn.tci.codec.CodecHelper"
		variant (aVP_Data) "condition=CodecHelper.leaveScope()"
		}

		type record CSG_Access_Mode_AVP{
		//Ref: ETSI TS 132 299 CSG_Access_Mode_AVP
		AVP_Header aVP_Header, //<AVP header: 2317 ....>
		CSG_Access_Mode aVP_Data
		}
		with {
		variant "present=bytes(4, 2317);use=com.testingtech.ttcn.tci.codec.CodecHelper"
		variant (aVP_Data) "condition=CodecHelper.leaveScope()"
		}

		type record CSG_Membership_Indication_AVP{
		//Ref: ETSI TS 132 299 CSG_Membership_Indication_AVP
		AVP_Header aVP_Header, //<AVP header: 2318 ....>
		CSG_Membership_Indication aVP_Data
		}
		with {
		variant "present=bytes(4, 2318);use=com.testingtech.ttcn.tci.codec.CodecHelper"
		variant (aVP_Data) "condition=CodecHelper.leaveScope()"
		}

		//Types were moved to LibDiameter_Types_RfRo_AVPs
		}//end of group TS132_299_AVPs

		group X_S0057_1_AVPs{

ttcn/LibDiameter_Types_Gx_AVPs.ttcn

+3 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,9 @@ module LibDiameter_Types_Gx_AVPs {
		import from LibCommon_BasicTypesAndValues {type UInt32;};
		import from LibDiameter_Types_Base_AVPs all;
		import from LibDiameter_Types_Rx_AVPs all;
		import from LibDiameter_Types_RfRo_AVPs {
		type User_CSG_Information_AVP
		};

		group AVPTypes{
		group AVP_Gx_Types{

ttcn/LibDiameter_Types_RfRo_AVPs.ttcn3

+26 −185

Original line number	Diff line number	Diff line
		@@ -4218,192 +4218,33 @@ module LibDiameter_Types_RfRo_AVPs {
		UInt32 aVP_Data
		} // End of type PDP_Address_Prefix_Length_AVP

		} // End of group TS132_299Rf_Ro_AVPS

		group RFC5580_AVPS { // FIXME To be moved in TTCN-3 module LibDiameter_Types_GiSGi_AVPs

		/**
		* @desc The Operator-Name Attribute (AVP code 126)
		* @member aVP_Header Header AVP
		* @member namespace_Id Namespace ID
		* @member operator_Name Contains the operator namespace identifier AND an Access Network Operator Name
		*
		* @see RFC5580 Clause 4.1. Operator-Name Attribute
		* @see ETSI TS 132 299 V10.15.0 Table 7.2: 3GPP specific AVPs
		*/
		type record Operator_Name_AVP {
		AVP_Header aVP_Header,//<AVP header: 126...>
		UInt8 namespace_Id,
		UTF8String operator_Name
		} // End of type Operator_Name_AVP

		/**
		* @desc The Operator-Name Attribute (AVP code 127)
		* @member aVP_Header Header AVP
		* @member index Allows this attribute to provide information relating to the information included in the Location- Data Attribute to which it refers (via the Index)
		* @member code Indicates the content of the location profile carried in the Location-Data Attribute
		* @member entity Refers to as an unsigned 8-bit integer value
		* @member sighting_Time Indicates when the location information was accurate
		* @member time_to_Live Gives a hint regarding for how long location information should be considered current
		* @member method Describes the way that the location information was determined
		*
		* @see RFC5580 Clause 4.2. Location-Information Attribute
		* @see ETSI TS 132 299 V10.15.0 Table 7.2: 3GPP specific AVPs
		*/
		type record Location_Information_AVP {
		AVP_Header aVP_Header,//<AVP header: 127...>
		UInt16 index,
		UInt8 code,
		UInt8 entity,
		UInt64 sighting_Time,
		UInt64 time_to_Live,
		UTF8String method
		} // End of type Location_Information_AVP

		/**
		* @desc The Location-Data Attribute (AVP code 128)
		* @member aVP_Header Header AVP
		* @member index TODO
		* @member aVP_Data TODO
		*
		* @see RFC5580 Clause 4.3. Location-Data Attribute
		* @see ETSI TS 132 299 V10.15.0 Table 7.2: 3GPP specific AVPs
		*/
		type record Location_Data_AVP {
		AVP_Header aVP_Header,//<AVP header: 128...>
		UInt16 index,
		UTF8String aVP_Data
		} // End of type Location_Data_AVP

		} // End of group RFC5580_AVPS

		group TS129061_AVPSGiSGi { // FIXME To be moved in TTCN-3 module LibDiameter_Types_GiSGi_AVPs

		/**
		* @desc TODO
		* @member aVP_Header Header AVP
		* @member aVP_Data TODO
		*
		* @see ETSI TS 129 061 V10.12.0 Table 9a: Gi/SGi specific AVPs
		*/
		type record ThreeGPP_IMSI_AVP {
		AVP_Header aVP_Header,//<AVP header: 1...>
		UTF8String aVP_Data
		} // End of type ThreeGPP_IMSI_AVP

		/**
		* @desc TODO
		* @member aVP_Header Header AVP
		* @member aVP_Data TODO
		*
		* @see ETSI TS 129 061 V10.12.0 Table 9a: Gi/SGi specific AVPs
		*/
		type record ThreeGPP_Charging_Id_AVP {
		AVP_Header aVP_Header,//<AVP header: 2...>
		octetstring aVP_Data
		} // End of type ThreeGPP_Charging_Id_AVP

		/**
		* @desc TODO
		* @member aVP_Header Header AVP
		* @member aVP_Data TODO
		*
		* @see ETSI TS 129 061 V10.12.0 Table 9a: Gi/SGi specific AVPs
		*/
		type record ThreeGPP_PDP_Type_AVP {
		AVP_Header aVP_Header,//<AVP header: 3...>
		ThreeGPP_PDP_Type aVP_Data
		} // End of type ThreeGPP_PDP_Type_AVP

		/**
		* @desc PDP context ot type
		*
		* @see ETSI TS 129 061 V10.12.0 Table 7: List of the 3GPP Vendor-Specific sub-attributes
		*/
		type enumerated ThreeGPP_PDP_Type {
		IP (0),
		PPP (1),
		IPv4 (2),
		IPv6 (3),
		IPv4v6 (4)
		} with {
		variant "length=32"
		} // End of type ThreeGPP_PDP_Type

		/**
		* @desc TODO
		* @member aVP_Header Header AVP
		* @member aVP_Data TODO
		*
		* @see ETSI TS 129 061 V10.12.0 Table 9a: Gi/SGi specific AVPs
		*/
		type record ThreeGPP_IMSI_MCC_MNC_AVP {
		AVP_Header aVP_Header,//<AVP header: 8...>
		UTF8String aVP_Data
		} // End of type ThreeGPP_IMSI_MCC_MNC_AVP

		/**
		* @desc TODO
		* @member aVP_Header Header AVP
		* @member aVP_Data TODO
		*
		* @see ETSI TS 129 061 V10.12.0 Table 9a: Gi/SGi specific AVPs
		*/
		type record ThreeGPP_GGSN_MCC_MNC_AVP {
		AVP_Header aVP_Header,//<AVP header: 8...>
		UTF8String aVP_Data
		} // End of type ThreeGPP_GGSN_MCC_MNC_AVP

		/**
		* @desc TODO
		* @member aVP_Header Header AVP
		* @member aVP_Data TODO
		*
		* @see ETSI TS 129 061 V10.12.0 Table 9a: Gi/SGi specific AVPs
		*/
		type record ThreeGPP_NSAPI_AVP {
		AVP_Header aVP_Header,//<AVP header: 10...>
		UTF8String aVP_Data
		} // End of type ThreeGPP_NSAPI_AVP

		/**
		* @desc TODO
		* @member aVP_Header Header AVP
		* @member aVP_Data TODO
		*
		* @see ETSI TS 129 061 V10.12.0 Table 9a: Gi/SGi specific AVPs
		*/
		type record ThreeGPP_Session_Stop_Indicator_AVP {
		AVP_Header aVP_Header,//<AVP header: 11...>
		UTF8String aVP_Data
		} // End of type ThreeGPP_Session_Stop_Indicator_AVP
		type record User_CSG_Information_AVP{
		//Ref: ETSI TS 132 299 User_CSG_Information_AVP
		AVP_Header aVP_Header, //<AVP header: 2319 ....>
		CSG_Id_AVP cSG_Id,
		CSG_Access_Mode_AVP cSG_Access_Mode,
		CSG_Membership_Indication_AVP CSG_Membership_Indication_AVP optional
		}

		/**
		* @desc TODO
		* @member aVP_Header Header AVP
		* @member aVP_Data TODO
		*
		* @see ETSI TS 129 061 V10.12.0 Table 9a: Gi/SGi specific AVPs
		*/
		type record ThreeGPP_Selection_Mode_AVP {
		AVP_Header aVP_Header,//<AVP header: 12...>
		UTF8String aVP_Data
		} // End of type ThreeGPP_Selection_Mode_AVP
		type record CSG_Id_AVP{
		//Ref: ETSI TS 132 299 & TS129 272 CSG_Id_AVP
		AVP_Header aVP_Header, //<AVP header: 1437 ....>
		UInt32 aVP_Data
		}

		/**
		* @desc TODO
		* @member aVP_Header Header AVP
		* @member aVP_Data TODO
		*
		* @see ETSI TS 129 061 V10.12.0 Table 9a: Gi/SGi specific AVPs
		*/
		type record ThreeGPP_Charging_Characteristics_AVP {
		AVP_Header aVP_Header,//<AVP header: 13...>
		UTF8String aVP_Data
		} // End of type ThreeGPP_Charging_Characteristics_AVP
		type record CSG_Access_Mode_AVP{
		//Ref: ETSI TS 132 299 CSG_Access_Mode_AVP
		AVP_Header aVP_Header, //<AVP header: 2317 ....>
		CSG_Access_Mode aVP_Data
		}

		type record CSG_Membership_Indication_AVP{
		//Ref: ETSI TS 132 299 CSG_Membership_Indication_AVP
		AVP_Header aVP_Header, //<AVP header: 2318 ....>
		CSG_Membership_Indication aVP_Data
		}

		} // End of group TS129061_AVPSGiSGi
		} // End of group TS132_299Rf_Ro_AVPS

		} // End of group Avp_Rf_Ro_Types

ttcn/LibDiameter_Types_S6a_AVPs.ttcn3

+3 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,9 @@ module LibDiameter_Types_S6a_AVPs {
		import from LibDiameter_Types_Gx_AVPs {
		type RAT_Type_AVP
		};
		import from LibDiameter_Types_RfRo_AVPs {
		type User_CSG_Information_AVP, CSG_Id_AVP
		};

		group AVPs {

ttcn/LibDiameter_Types_S9_AVPs.ttcn

+3 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,9 @@ module LibDiameter_Types_S9_AVPs {
		import from LibDiameter_Types_Base_AVPs all;
		import from LibDiameter_Types_Gx_AVPs all;
		import from LibDiameter_Types_Rx_AVPs all;
		import from LibDiameter_Types_RfRo_AVPs {
		type User_CSG_Information_AVP
		};

		group AVPs{
		group TS129_215_AVPs {