DIAMETER_Types: Move RFC ddf files earlier in the dependency list of files to generate

A ddf file for TS 29.273 will be added soon to the list, which depends on several RFCs. Move RFCs earlier in the list since this is a more generic file than a 3GPP one. Change-Id: Idcbdfd97332195af05928c81068f6a4779ac306e
author: Pau Espin Pedrol <pespin@sysmocom.de> 2024-03-05 12:14:08 +0100
committer: Pau Espin Pedrol <pespin@sysmocom.de> 2024-03-05 12:50:54 +0100
commit: 5b28c96469e5e9468f368bcf7b3313db20f112ce (patch)
tree: 4335dbe17a54ce0d34bc6824deb0550b860c731e /library
parent: b0b5e0ad12ce555b98da3a75ea9d9a3b342cdc90 (diff)
2 files changed, 1620 insertions, 1620 deletions
diff --git a/library/DIAMETER_Types.ttcn b/library/DIAMETER_Types.ttcn
index 3a7b3b67..384e34fc 100644
--- a/library/DIAMETER_Types.ttcn
+++ b/library/DIAMETER_Types.ttcn
@@ -4,7 +4,7 @@
 //                                               //
 ///////////////////////////////////////////////////
 // Generated with command:
-// AVP.sh Base_IETF_RFC3588.ddf BaseTypes_IETF_RFC3588.ddf AAAInterface_3GPP_TS29272_f10.ddf GxInterface_PCC_3GPP_TS29212_f10.ddf S6Interfaces_3GPP_TS29336_f00.ddf MobileIPv6_HA_IETF_RFC5778.ddf RxInterface_PCC_3GPP_TS29214_f20.ddf NetworkAccessServer_IETF_RFC4005.ddf CreditControl_IETF_RFC4006.ddf CxDxInterface_3GPP_TS29229_c30.ddf GiSGiInterface_3GPP_TS29061_d70.ddf ChargingApplications_3GPP_TS32299_d90.ddf MobileIPv6_NAS_IETF_RFC5447.ddf
+// AVP.sh Base_IETF_RFC3588.ddf BaseTypes_IETF_RFC3588.ddf NetworkAccessServer_IETF_RFC4005.ddf CreditControl_IETF_RFC4006.ddf MobileIPv6_NAS_IETF_RFC5447.ddf MobileIPv6_HA_IETF_RFC5778.ddf AAAInterface_3GPP_TS29272_f10.ddf GxInterface_PCC_3GPP_TS29212_f10.ddf S6Interfaces_3GPP_TS29336_f00.ddf RxInterface_PCC_3GPP_TS29214_f20.ddf CxDxInterface_3GPP_TS29229_c30.ddf GiSGiInterface_3GPP_TS29061_d70.ddf ChargingApplications_3GPP_TS32299_d90.ddf
 module DIAMETER_Types {
 /******************************************************************************
 * Copyright (c) 2000-2019 Ericsson Telecom AB
@@ -640,6 +640,1182 @@ command_code, application_id, hop_by_hop_id, end_to_end_id, avps)";
 * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
+*   Roland Gecse - initial implementation and initial documentation
+*   Akos Pernek
+*   Antal Wuh.Hen.Chang
+*   Attila Fulop
+*   Balazs Barcsik
+*   Bence Molnar
+*   Csaba Koppany
+*   David Juhasz
+*   Eduard Czimbalmos
+*   Elemer Lelik
+*   Endre Kiss
+*   Endre Kulcsar
+*   Gabor Szalai
+*   Gabor Tatarka
+*   Gergely Futo
+*   Istvan Sandor
+*   Krisztian Pandi
+*   Kulcsár Endre
+*   Laszlo Tamas Zeke
+*   Norbert Pinter
+*   Roland Gecse
+*   Tibor Bende
+*   Tibor Szabo
+*   Timea Moder
+*   Zoltan Medve
+*   Zsolt Nandor Torok
+*   Zsolt Szalai
+******************************************************************************/
+//
+//  File:               NetworkAccessServer_IETF_RFC4005.ddf
+//  Description:        DDF for NAS according to RFC 4005
+//  Rev:                R55A
+//  Prodnr:             CNL113462
+///////////////////////////////////////////////
+
+// APPLICATION-NAME: DNAS
+// APPLICATION-REVISION: RFC4005
+
+// AVP implementations according to:
+// RFC 4005 - Diameter Network Access Server Application
+//
+
+// RFC 4005 3
+// WARNING: Enumeration item with code (258) exists in type Command_Code
+// WARNING: Enumeration item with code (275) exists in type Command_Code
+// WARNING: Enumeration item with code (274) exists in type Command_Code
+// WARNING: Enumeration item with code (271) exists in type Command_Code
+
+
+// RFC 4005
+// AVP: NAS-Port (5)
+// 4.2
+type AVP_Unsigned32 DNAS_NONE_NAS_Port 
+
+// RFC 4005
+// AVP: NAS-Port-Id (87)
+// 4.3
+type AVP_UTF8String DNAS_NONE_NAS_Port_Id 
+
+// RFC 4005
+// AVP: NAS-Port-Type (61)
+// 4.4
+type AVP_Unsigned32 DNAS_NONE_NAS_Port_Type 
+
+// RFC 4005
+// AVP: Called-Station-Id (30)
+// 4.5
+type AVP_UTF8String DNAS_NONE_Called_Station_Id 
+
+// RFC 4005
+// AVP: Calling-Station-Id (31)
+// 4.6
+type AVP_UTF8String DNAS_NONE_Calling_Station_Id 
+
+// RFC 4005
+// AVP: Connect-Info (77)
+// 4.7
+type AVP_UTF8String DNAS_NONE_Connect_Info 
+
+// RFC 4005
+// AVP: Originating-Line-Info (94)
+// 4.8
+type AVP_OctetString DNAS_NONE_Originating_Line_Info 
+
+// RFC 4005
+// AVP: Reply-Message (18)
+// 4.9
+type AVP_UTF8String DNAS_NONE_Reply_Message 
+
+
+
+// RFC 4005
+// AVP: User-Password (2)
+// 5.1
+type AVP_OctetString DNAS_NONE_User_Password 
+
+// RFC 4005
+// AVP: Password-Retry (75)
+// 5.2
+type AVP_Unsigned32 DNAS_NONE_Password_Retry 
+
+// RFC 4005
+// AVP: Prompt (76)
+// 5.3
+type enumerated DNAS_NONE_Prompt {
+ NO_ECHO (0),
+ ECHO (1)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// RFC 4005
+// AVP: CHAP-Auth (402)
+// 5.4
+type AVP_Grouped DNAS_NONE_CHAP_Auth 
+
+// RFC 4005
+// AVP: CHAP-Algorithm (403)
+// 5.5
+type enumerated DNAS_NONE_CHAP_Algorithm {
+ CHAP_with_MD5 (5)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// RFC 4005
+// AVP: CHAP-Ident (404)
+// 5.6
+type AVP_OctetString DNAS_NONE_CHAP_Ident 
+
+// RFC 4005
+// AVP: CHAP-Response (405)
+// 5.7
+type AVP_OctetString DNAS_NONE_CHAP_Response 
+
+// RFC 4005
+// AVP: CHAP-Challenge (60)
+// 5.8
+type AVP_OctetString DNAS_NONE_CHAP_Challenge 
+
+// RFC 4005
+// AVP: ARAP-Password (70)
+// 5.9
+type AVP_OctetString DNAS_NONE_ARAP_Password 
+
+// RFC 4005
+// AVP: ARAP-Challenge-Response (84)
+// 5.10
+type AVP_OctetString DNAS_NONE_ARAP_Challenge_Response 
+
+// RFC 4005
+// AVP: ARAP-Security (73)
+// 5.11
+type AVP_Unsigned32 DNAS_NONE_ARAP_Security 
+
+// RFC 4005
+// AVP: ARAP-Security-Data (74)
+// 5.12
+type AVP_OctetString DNAS_NONE_ARAP_Security_Data 
+
+
+
+// RFC 4005
+// AVP: Service-Type (6)
+// 6.1
+type AVP_Unsigned32 DNAS_NONE_Service_Type 
+
+// RFC 4005
+// AVP: Callback-Number (19)
+// 6.2
+type AVP_UTF8String DNAS_NONE_Callback_Number 
+
+// RFC 4005
+// AVP: Callback-Id (20)
+// 6.3
+type AVP_UTF8String DNAS_NONE_Callback_Id 
+
+// RFC 4005
+// AVP: Idle-Timeout (28)
+// 6.4
+type AVP_Unsigned32 DNAS_NONE_Idle_Timeout 
+
+// RFC 4005
+// AVP: Port-Limit (62)
+// 6.5
+type AVP_Unsigned32 DNAS_NONE_Port_Limit 
+
+// RFC 4005
+// AVP: NAS-Filter-Rule (400)
+// 6.6
+type AVP_IPFilterRule DNAS_NONE_NAS_Filter_Rule 
+
+// RFC 4005
+// AVP: Filter-Id (11)
+// 6.7
+type AVP_UTF8String DNAS_NONE_Filter_Id 
+
+// RFC 4005
+// AVP: Configuration-Token (78)
+// 6.8
+type AVP_OctetString DNAS_NONE_Configuration_Token 
+
+// RFC 4005
+// AVP: QoS-Filter-Rule (407)
+// 6.9
+type AVP_QoSFilterRule DNAS_NONE_QoS_Filter_Rule 
+
+// RFC 4005
+// AVP: Framed-Protocol (7)
+// 6.10.1
+type enumerated DNAS_NONE_Framed_Protocol {
+ PPP (1),
+ SLIP (2),
+ ARAP (3),
+ GANDALF (4),
+ XYLOGICS (5),
+ X_75_SYNCHRONOUS (6),
+ GPRS_PDP_CONTEXT (7)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// RFC 4005
+// AVP: Framed-Routing (10)
+// 6.10.2
+type enumerated DNAS_NONE_Framed_Routing {
+ NONE (0),
+ SEND_ROUTING_PACKETS (1),
+ LISTEN_FOR_ROUTING_PACKETS (2),
+ SEND_AND_LISTEN (3)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// RFC 4005
+// AVP: Framed-MTU (12)
+// 6.10.3
+type AVP_Unsigned32 DNAS_NONE_Framed_MTU 
+
+// RFC 4005
+// AVP: Framed-Compression (13)
+// 6.10.4
+type enumerated DNAS_NONE_Framed_Compression {
+ NONE (0),
+ VJ_TCP_IP_HEADER_COMPRESSION (1),
+ IPX_HEADER_COMPRESSION (2),
+ STAC_LZS_COMPRESSION (3)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// RFC 4005
+// AVP: Framed-IP-Address (8)
+// 6.11.1
+type AVP_OctetString DNAS_NONE_Framed_IP_Address 
+
+// RFC 4005
+// AVP: Framed-IP-Netmask (9)
+// 6.11.2
+type AVP_OctetString DNAS_NONE_Framed_IP_Netmask 
+
+// RFC 4005
+// AVP: Framed-Route (22)
+// 6.11.3
+type AVP_UTF8String DNAS_NONE_Framed_Route 
+
+// RFC 4005
+// AVP: Framed-Pool (88)
+// 6.11.4
+type AVP_OctetString DNAS_NONE_Framed_Pool 
+
+// RFC 4005
+// AVP: Framed-Interface-Id (96)
+// 6.11.5
+type AVP_Unsigned64 DNAS_NONE_Framed_Interface_Id 
+
+// RFC 4005
+// AVP: Framed-IPv6-Prefix (97)
+// 6.11.6
+type AVP_OctetString DNAS_NONE_Framed_IPv6_Prefix 
+
+// RFC 4005
+// AVP: Framed-IPv6-Route (99)
+// 6.11.7
+type AVP_UTF8String DNAS_NONE_Framed_IPv6_Route 
+
+// RFC 4005
+// AVP: Framed-IPv6-Pool (100)
+// 6.11.8
+type AVP_OctetString DNAS_NONE_Framed_IPv6_Pool 
+
+// RFC 4005
+// AVP: Framed-IPX-Network (23)
+// 6.12.1
+type AVP_UTF8String DNAS_NONE_Framed_IPX_Network 
+
+// RFC 4005
+// AVP: Framed-Appletalk-Link (37)
+// 6.13.1
+type AVP_Unsigned32 DNAS_NONE_Framed_Appletalk_Link 
+
+// RFC 4005
+// AVP: Framed-Appletalk-Network (38)
+// 6.13.2
+type AVP_Unsigned32 DNAS_NONE_Framed_Appletalk_Network 
+
+// RFC 4005
+// AVP: Framed-Appletalk-Zone (39)
+// 6.13.3
+type AVP_OctetString DNAS_NONE_Framed_Appletalk_Zone 
+
+// RFC 4005
+// AVP: ARAP-Features (71)
+// 6.14.1
+type AVP_OctetString DNAS_NONE_ARAP_Features 
+
+// RFC 4005
+// AVP: ARAP-Zone-Access (72)
+// 6.14.2
+type enumerated DNAS_NONE_ARAP_Zone_Access {
+ ONLY_ALLOW_ACCESS_TO_DEFAULT_ZONE (1),
+ USE_ZONE_FILTER_INCLUSIVELY (2),
+ USE_ZONE_FILTER_EXCLUSIVELY (4)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// RFC 4005
+// AVP: Login-IP-Host (14)
+// 6.15.1
+type AVP_OctetString DNAS_NONE_Login_IP_Host 
+
+// RFC 4005
+// AVP: Login-IPv6-Host (98)
+// 6.15.2
+type AVP_OctetString DNAS_NONE_Login_IPv6_Host 
+
+// RFC 4005
+// AVP: Login-Service (15)
+// 6.15.3
+type enumerated DNAS_NONE_Login_Service {
+ TELNET (0),
+ RLOGIN (1),
+ TCP_CLEAR (2),
+ PORTMASTER (3),
+ LAT (4),
+ X25_PAD (5),
+ X25_T3POS (6),
+ TCP_CLEAR_QUIET (8)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// RFC 4005
+// AVP: Login-TCP-Port (16)
+// 6.16.1
+type AVP_Unsigned32 DNAS_NONE_Login_TCP_Port 
+
+// RFC 4005
+// AVP: Login-LAT-Service (34)
+// 6.17.1
+type AVP_OctetString DNAS_NONE_Login_LAT_Service 
+
+// RFC 4005
+// AVP: Login-LAT-Node (35)
+// 6.17.2
+type AVP_OctetString DNAS_NONE_Login_LAT_Node 
+
+// RFC 4005
+// AVP: Login-LAT-Group (36)
+// 6.17.3
+type AVP_OctetString DNAS_NONE_Login_LAT_Group 
+
+// RFC 4005
+// AVP: Login-LAT-Port (63)
+// 6.17.4
+type AVP_OctetString DNAS_NONE_Login_LAT_Port 
+
+
+
+// RFC 4005
+// AVP: Tunneling (401)
+// 7.1
+type AVP_Grouped DNAS_NONE_Tunneling 
+
+// RFC 4005
+// AVP: Tunnel-Type (64)
+// 7.2
+type AVP_Unsigned32 DNAS_NONE_Tunnel_Type 
+
+// RFC 4005
+// AVP: Tunnel-Medium-Type (65)
+// 7.3
+type AVP_Unsigned32 DNAS_NONE_Tunnel_Medium_Type 
+
+// RFC 4005
+// AVP: Tunnel-Client-Endpoint (66)
+// 7.4
+type AVP_UTF8String DNAS_NONE_Tunnel_Client_Endpoint 
+
+// RFC 4005
+// AVP: Tunnel-Server-Endpoint (67)
+// 7.5
+type AVP_UTF8String DNAS_NONE_Tunnel_Server_Endpoint 
+
+// RFC 4005
+// AVP: Tunnel-Password (69)
+// 7.6
+type AVP_OctetString DNAS_NONE_Tunnel_Password 
+
+// RFC 4005
+// AVP: Tunnel-Private-Group-Id (81)
+// 7.7
+type AVP_OctetString DNAS_NONE_Tunnel_Private_Group_Id 
+
+// RFC 4005
+// AVP: Tunnel-Assignment-Id (82)
+// 7.8
+type AVP_OctetString DNAS_NONE_Tunnel_Assignment_Id 
+
+// RFC 4005
+// AVP: Tunnel-Preference (83)
+// 7.9
+type AVP_Unsigned32 DNAS_NONE_Tunnel_Preference 
+
+// RFC 4005
+// AVP: Tunnel-Client-Auth-Id (90)
+// 7.10
+type AVP_UTF8String DNAS_NONE_Tunnel_Client_Auth_Id 
+
+// RFC 4005
+// AVP: Tunnel-Server-Auth-Id (91)
+// 7.11
+type AVP_UTF8String DNAS_NONE_Tunnel_Server_Auth_Id 
+
+
+
+// RFC 4005
+// AVP: Accounting-Input-Octets (363)
+// 8.1
+type AVP_Unsigned64 DNAS_NONE_Accounting_Input_Octets 
+
+// RFC 4005
+// AVP: Accounting-Output-Octets (364)
+// 8.2
+type AVP_Unsigned64 DNAS_NONE_Accounting_Output_Octets 
+
+// RFC 4005
+// AVP: Accounting-Input-Packets (365)
+// 8.3
+type AVP_Unsigned64 DNAS_NONE_Accounting_Input_Packets 
+
+// RFC 4005
+// AVP: Accounting-Output-Packets (366)
+// 8.4
+type AVP_Unsigned64 DNAS_NONE_Accounting_Output_Packets 
+
+// RFC 4005
+// AVP: Acct-Session-Time (46)
+// 8.5
+type AVP_Unsigned32 DNAS_NONE_Acct_Session_Time 
+
+// RFC 4005
+// AVP: Acct-Authentic (45)
+// 8.6
+type enumerated DNAS_NONE_Acct_Authentic {
+ RADIUS (1),
+ LOCAL (2),
+ REMOTE (3),
+ DIAMETER (4)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// RFC 4005
+// AVP: Accounting-Auth-Method (406)
+// 8.7
+type enumerated DNAS_NONE_Accounting_Auth_Method {
+ PAP (1),
+ CHAP (2),
+ MS_CHAP_1 (3),
+ MS_CHAP_2 (4),
+ EAP (5),
+ None (7) 
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// RFC 4005
+// AVP: Acct-Delay-Time (41)
+// 8.8
+type AVP_Unsigned32 DNAS_NONE_Acct_Delay_Time 
+
+// RFC 4005
+// AVP: Acct-Link-Count (51)
+// 8.9
+type AVP_Unsigned32 DNAS_NONE_Acct_Link_Count 
+
+// RFC 4005
+// AVP: Acct-Tunnel-Connection (68)
+// 8.10
+type AVP_OctetString DNAS_NONE_Acct_Tunnel_Connection 
+
+// RFC 4005
+// AVP: Acct-Tunnel-Packets-Lost (86)
+// 8.11
+type AVP_Unsigned32 DNAS_NONE_Acct_Tunnel_Packets_Lost 
+
+
+
+// RFC 4005
+// AVP: NAS-Identifier (32)
+// 9.3.1
+type AVP_UTF8String DNAS_NONE_NAS_Identifier 
+
+// RFC 4005
+// AVP: NAS-IP-Address (4)
+// 9.3.2
+type AVP_OctetString DNAS_NONE_NAS_IP_Address 
+
+// RFC 4005
+// AVP: NAS-IPv6-Address (95)
+// 9.3.3
+type AVP_OctetString DNAS_NONE_NAS_IPv6_Address 
+
+// RFC 4005
+// AVP: State (24)
+// 9.3.4
+type AVP_OctetString DNAS_NONE_State 
+
+// RFC 4005
+// AVP: Origin-AAA-Protocol (408)
+// 9.3.6
+type enumerated DNAS_NONE_Origin_AAA_Protocol {
+ RADIUS (1)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+/******************************************************************************
+* Copyright (c) 2000-2019 Ericsson Telecom AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v2.0
+* which accompanies this distribution, and is available at
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
+*
+* Contributors:
+*   Roland Gecse - initial implementation and initial documentation
+*   Akos Pernek
+*   Antal Wuh.Hen.Chang
+*   Attila Fulop
+*   Balazs Barcsik
+*   Bence Molnar
+*   Csaba Koppany
+*   David Juhasz
+*   Eduard Czimbalmos
+*   Elemer Lelik
+*   Endre Kiss
+*   Endre Kulcsar
+*   Gabor Szalai
+*   Gabor Tatarka
+*   Gergely Futo
+*   Istvan Sandor
+*   Krisztian Pandi
+*   Kulcsár Endre
+*   Laszlo Tamas Zeke
+*   Norbert Pinter
+*   Roland Gecse
+*   Tibor Bende
+*   Tibor Szabo
+*   Timea Moder
+*   Zoltan Medve
+*   Zsolt Nandor Torok
+*   Zsolt Szalai
+******************************************************************************/
+//
+//  File:               CreditControl_IETF_RFC4006.ddf
+//  Description:        DDF for DCC according to RFC 4006
+//  Rev:                R55A
+//  Prodnr:             CNL 1134 62
+///////////////////////////////////////////////
+
+// APPLICATION-NAME: DCC
+// APPLICATION-REVISION: RFC4006
+
+// AVP implementations according to:
+// RFC 4006 - Diameter Credit Control Application
+// IS for Additional Billing for Verizon in MTAS 125/1594-FCP 101 8664 Uen PA8
+
+// RFC 4006 12.2
+
+
+// RFC 4006
+// AVP: CC-Correlation-Id (411)
+// 8.1
+type AVP_OctetString DCC_NONE_CC_Correlation_Id 
+
+// RFC 4006
+// AVP: CC-Input-Octets (412)
+// 8.24
+type AVP_Unsigned64 DCC_NONE_CC_Input_Octets 
+
+// RFC 4006
+// AVP: CC-Money (413)
+// 8.22
+type AVP_Grouped DCC_NONE_CC_Money 
+
+// RFC 4006
+// AVP: CC-Output-Octets (414)
+// 8.25
+type AVP_Unsigned64 DCC_NONE_CC_Output_Octets 
+
+// RFC 4006
+// AVP: CC-Request-Number (415)
+// 8.2
+type AVP_Unsigned32 DCC_NONE_CC_Request_Number 
+
+// RFC 4006
+// AVP: CC-Request-Type (416)
+// 8.3
+type enumerated DCC_NONE_CC_Request_Type {
+ INITIAL_REQUEST (1),
+ UPDATE_REQUEST (2),
+ TERMINATION_REQUEST (3),
+ EVENT_REQUEST (4)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// RFC 4006
+// AVP: CC-Service-Specific-Units (417)
+// 8.26
+type AVP_Unsigned64 DCC_NONE_CC_Service_Specific_Units 
+
+// RFC 4006
+// AVP: CC-Session-Failover (418)
+// 8.4
+type enumerated DCC_NONE_CC_Session_Failover {
+ FAILOVER_NOT_SUPPORTED (0),
+ FAILOVER_SUPPORTED (1)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// RFC 4006
+// AVP: CC-Sub-Session-Id (419)
+// 8.5
+type AVP_Unsigned64 DCC_NONE_CC_Sub_Session_Id 
+
+// RFC 4006
+// AVP: CC-Time (420)
+// 8.21
+type AVP_Unsigned32 DCC_NONE_CC_Time 
+
+// RFC 4006
+// AVP: CC-Total-Octets (421)
+// 8.23
+type AVP_Unsigned64 DCC_NONE_CC_Total_Octets 
+
+// RFC 4006
+// AVP: CC-Unit-Type (454)
+// 8.32
+type enumerated DCC_NONE_CC_Unit_Type {
+ TIME (0),
+ MONEY (1),
+ TOTAL_OCTETS (2),
+ INPUT_OCTETS (3),
+ OUTPUT_OCTETS (4),
+ SERVICE_SPECIFIC_UNITS (5)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// RFC 4006
+// AVP: Check-Balance-Result (422)
+// 8.6
+type enumerated DCC_NONE_Check_Balance_Result {
+ ENOUGH_CREDIT (0),
+ NO_CREDIT (1)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// RFC 4006
+// AVP: Cost-Information (423)
+// 8.7
+type AVP_Grouped DCC_NONE_Cost_Information 
+
+// RFC 4006
+// AVP: Cost-Unit (424)
+// 8.12
+type AVP_UTF8String DCC_NONE_Cost_Unit 
+
+// RFC 4006
+// AVP: Credit-Control (426)
+// 8.13
+type enumerated DCC_NONE_Credit_Control {
+ CREDIT_AUTHORIZATION (0),
+ RE_AUTHORIZATION (1)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// RFC 4006
+// AVP: Credit-Control-Failure-Handling (427)
+// 8.14
+type enumerated DCC_NONE_Credit_Control_Failure_Handling {
+ TERMINATE (0),
+ CONTINUE (1),
+ RETRY_AND_TERMINATE (2)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// RFC 4006
+// AVP: Currency-Code (425)
+// 8.11
+type AVP_Unsigned32 DCC_NONE_Currency_Code 
+
+// RFC 4006
+// AVP: Direct-Debiting-Failure-Handling (428)
+// 8.15
+type enumerated DCC_NONE_Direct_Debiting_Failure_Handling {
+ TERMINATE_OR_BUFFER (0),
+ CONTINUE (1)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// RFC 4006
+// AVP: Exponent (429)
+// 8.9
+type AVP_Integer32 DCC_NONE_Exponent 
+
+// RFC 4006
+// AVP: Final-Unit-Action (449)
+// 8.35
+type enumerated DCC_NONE_Final_Unit_Action {
+ TERMINATE (0),
+ REDIRECT (1),
+ RESTRICT_ACCESS (2)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// RFC 4006
+// AVP: Final-Unit-Indication (430)
+// 8.34
+type AVP_Grouped DCC_NONE_Final_Unit_Indication 
+
+// RFC 4006
+// AVP: Granted-Service-Unit (431)
+// 8.17
+type AVP_Grouped DCC_NONE_Granted_Service_Unit 
+
+// RFC 4006
+// AVP: G-S-U-Pool-Identifier (453)
+// 8.31
+type AVP_Unsigned32 DCC_NONE_G_S_U_Pool_Identifier 
+
+// RFC 4006
+// AVP: G-S-U-Pool-Reference (457)
+// 8.30
+type AVP_Grouped DCC_NONE_G_S_U_Pool_Reference 
+
+// RFC 4006
+// AVP: Multiple-Services-Credit-Control (456)
+// 8.16
+type AVP_Grouped DCC_NONE_Multiple_Services_Credit_Control 
+
+// RFC 4006
+// AVP: Multiple-Services-Indicator (455)
+// 8.40
+type enumerated DCC_NONE_Multiple_Services_Indicator {
+ MULTIPLE_SERVICES_NOT_SUPPORTED (0),
+ MULTIPLE_SERVICES_SUPPORTED (1)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// RFC 4006
+// AVP: Rating-Group (432)
+// 8.29
+type AVP_Unsigned32 DCC_NONE_Rating_Group
+
+// RFC 4006
+// AVP: Redirect-Address-Type (433)
+// 8.38
+type enumerated DCC_NONE_Redirect_Address_Type {
+ IPV4_ADDRESS (0),
+ IPV6_ADDRESS (1),
+ URL (2),
+ SIP_URI (3)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// RFC 4006
+// AVP: Redirect-Server (434)
+type AVP_Grouped DCC_NONE_Redirect_Server 
+
+// RFC 4006
+// AVP: Redirect-Server-Address (435)
+// 8.37
+type AVP_UTF8String DCC_NONE_Redirect_Server_Address
+
+// RFC 4006
+// AVP: Requested-Action (436)
+// 8.41
+type enumerated DCC_NONE_Requested_Action {
+ DIRECT_DEBITING (0),
+ REFUND_ACCOUNT (1),
+ CHECK_BALANCE (2),
+ PRICE_ENQUIRY (3) 
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// RFC 4006
+// AVP: Requested-Service-Unit (437)
+// 8.18
+type AVP_Grouped DCC_NONE_Requested_Service_Unit
+
+// RFC 4006
+// AVP: Restriction-Filter-Rule (438)
+// 8.36
+type AVP_IPFilterRule DCC_NONE_Restriction_Filter_Rule
+
+// RFC 4006
+// AVP: Service-Context-Id (461)
+// 8.42
+type AVP_UTF8String DCC_NONE_Service_Context_Id
+
+// RFC 4006
+// AVP: Service-Identifier (439)
+// 8.28
+type AVP_Unsigned32 DCC_NONE_Service_Identifier
+
+// RFC 4006
+// AVP: Service-Parameter-Info (440)
+// 8.43
+type AVP_Grouped DCC_NONE_Service_Parameter_Info
+
+// RFC 4006
+// AVP: Service-Parameter-Type (441)
+// 8.44
+type AVP_Unsigned32 DCC_NONE_Service_Parameter_Type
+
+// RFC 4006
+// AVP: Service-Parameter-Value (442)
+// 8.45
+type AVP_OctetString DCC_NONE_Service_Parameter_Value
+
+// RFC 4006
+// AVP: Subscription-Id (443)
+// 8.46
+type AVP_Grouped DCC_NONE_Subscription_Id 
+
+// RFC 4006
+// AVP: Subscription-Id-Data (444)
+// 8.48
+type AVP_UTF8String DCC_NONE_Subscription_Id_Data
+
+// RFC 4006
+// AVP: Subscription-Id-Type (450)
+// 8.47
+type enumerated DCC_NONE_Subscription_Id_Type {
+ END_USER_E164 (0),
+ END_USER_IMSI (1),
+ END_USER_SIP_URI (2),
+ END_USER_NAI (3),
+ END_USER_PRIVATE (4)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// RFC 4006
+// AVP: Tariff-Change-Usage (452)
+// 8.27
+type enumerated DCC_NONE_Tariff_Change_Usage {
+ UNIT_BEFORE_TARIFF_CHANGE (0),
+ UNIT_AFTER_TARIFF_CHANGE (1),
+ UNIT_INDETERMINATE (2)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// RFC 4006
+// AVP: Tariff-Time-Change (451)
+// 8.20
+type AVP_Time DCC_NONE_Tariff_Time_Change
+
+// RFC 4006
+// AVP: Unit-Value (445)
+// 8.8
+type AVP_Grouped DCC_NONE_Unit_Value
+
+// RFC 4006
+// AVP: Used-Service-Unit (446)
+// 8.19
+type AVP_Grouped DCC_NONE_Used_Service_Unit
+
+// RFC 4006
+// AVP: User-Equipment-Info (458)
+// 8.49
+type AVP_Grouped DCC_NONE_User_Equipment_Info
+
+// RFC 4006, 125/1594-FCP 101 8664
+// AVP: User-Equipment-Info-Type (459)
+// RFC 4006 section 8.50, 125/1594-FCP 101 8664 section 3.3.12
+type enumerated DCC_NONE_User_Equipment_Info_Type {
+ IMEISV (0),
+ MAC (1),
+ EUI64 (2),
+ MODIFIED_EUI64 (3),
+ ESN (4),
+ MEID (5)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// RFC 4006
+// AVP: User-Equipment-Info-Value (460)
+// 8.51
+type AVP_OctetString DCC_NONE_User_Equipment_Info_Value
+
+// RFC 4006
+// AVP: Value-Digits (447)
+// 8.10
+type AVP_Integer64 DCC_NONE_Value_Digits
+
+// RFC 4006
+// AVP: Validity-Time (448)
+// 8.33
+type AVP_Unsigned32 DCC_NONE_Validity_Time
+
+/******************************************************************************
+* Copyright (c) 2000-2019 Ericsson Telecom AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v2.0
+* which accompanies this distribution, and is available at
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
+*
+* Contributors:
+*   Roland Gecse - initial implementation and initial documentation
+*   Akos Pernek
+*   Antal Wuh.Hen.Chang
+*   Attila Fulop
+*   Balazs Barcsik
+*   Bence Molnar
+*   Csaba Koppany
+*   David Juhasz
+*   Eduard Czimbalmos
+*   Elemer Lelik
+*   Endre Kiss
+*   Endre Kulcsar
+*   Gabor Szalai
+*   Gabor Tatarka
+*   Gergely Futo
+*   Istvan Sandor
+*   Krisztian Pandi
+*   Kulcsár Endre
+*   Laszlo Tamas Zeke
+*   Norbert Pinter
+*   Roland Gecse
+*   Tibor Bende
+*   Tibor Szabo
+*   Timea Moder
+*   Zoltan Medve
+*   Zsolt Nandor Torok
+*   Zsolt Szalai
+******************************************************************************/
+//
+//  File:               MobileIPv6_NAS_IETF_RFC5447.ddf
+//  Description:        DDF for Mobile IPv6 according to RFC 5447
+//  Rev:                R55A
+//  Prodnr:             CNL113462
+///////////////////////////////////////////////
+
+// APPLICATION-NAME: MIPv6
+// APPLICATION-REVISION: RFC5447
+
+// RFC 5447 4.2.1
+// AVP: MIP6-Agent-Info (486)
+type AVP_Grouped MIPv6_NONE_MIP6_Agent_Info
+
+// RFC 5447 4.2.2
+// AVP: MIP6-Home-Agent-Address (334)
+type AVP_Address MIPv6_NONE_MIP6_Home_Agent_Address
+
+// RFC 5447 4.2.3
+// AVP: MIP6-Home-Agent-Host (348)
+type AVP_Grouped MIPv6_NONE_MIP6_Home_Agent_Host
+
+// RFC 5447 4.2.4
+// AVP: MIP6-Home-Link-Prefix (125)
+type AVP_OctetString MIPv6_NONE_MIP6_Home_Link_Prefix
+
+// RFC 5447 4.2.5
+// AVP: MIP6-Feature-Vector (124)
+type AVP_Unsigned64 MIPv6_NONE_MIP6_Feature_Vector
+/******************************************************************************
+* Copyright (c) 2000-2019 Ericsson Telecom AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v2.0
+* which accompanies this distribution, and is available at
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
+*
+* Contributors:
+*   Roland Gecse - initial implementation and initial documentation
+*   Akos Pernek
+*   Antal Wuh.Hen.Chang
+*   Attila Fulop
+*   Balazs Barcsik
+*   Bence Molnar
+*   Csaba Koppany
+*   David Juhasz
+*   Eduard Czimbalmos
+*   Elemer Lelik
+*   Endre Kiss
+*   Endre Kulcsar
+*   Gabor Szalai
+*   Gabor Tatarka
+*   Gergely Futo
+*   Istvan Sandor
+*   Krisztian Pandi
+*   Kulcsár Endre
+*   Laszlo Tamas Zeke
+*   Norbert Pinter
+*   Roland Gecse
+*   Tibor Bende
+*   Tibor Szabo
+*   Timea Moder
+*   Zoltan Medve
+*   Zsolt Nandor Torok
+*   Zsolt Szalai
+******************************************************************************/
+//
+//  File:               MobileIPv6_HA_IETF_RFC5778.ddf
+//  Description:        DDF for Mobile IPv6 according to RFC 5778
+//  Rev:                R55A
+//  Prodnr:             CNL113462
+///////////////////////////////////////////////
+
+// APPLICATION-NAME: MIPv6
+// APPLICATION-REVISION: RFC5778
+
+// RFC 5778 6.2
+// AVP: Service-Selection (493)
+type AVP_UTF8String MIPv6_NONE_Service_Selection
+
+// RFC 5778 6.3
+// AVP: MIP-MN-AAA-SPI (341)
+type AVP_Unsigned32 MIPv6_NONE_MIP_MN_AAA_SPI
+
+// RFC 5778 6.4
+// AVP: MIP-MN-HA-SPI (491)
+type AVP_Unsigned32 MIPv6_NONE_MIP_MN_HA_SPI
+
+// RFC 5778 6.5
+// AVP: MIP-Mobile-Node-Address (333)
+type AVP_Address MIPv6_NONE_MIP_Mobile_Node_Address
+
+// RFC 5778 6.7
+// AVP: MIP-Careof-Address (487)
+type AVP_Address MIPv6_NONE_MIP_Careof_Address
+
+// RFC 5778 6.8
+// AVP: MIP-Authenticator (488)
+type AVP_OctetString MIPv6_NONE_MIP_Authenticator
+
+// RFC 5778 6.9
+// AVP: MIP-MAC-Mobility-Data (489)
+type AVP_OctetString MIPv6_NONE_MIP_MAC_Mobility_Data
+
+// RFC 5778 6.10
+// AVP: MIP-Session-Key (343)
+type AVP_OctetString MIPv6_NONE_MIP_Session_Key
+
+// RFC 5778 6.11
+// AVP: MIP-MSA-Lifetime (367)
+type AVP_Unsigned32 MIPv6_NONE_MIP_MSA_Lifetime
+
+// RFC 5778 6.12
+// AVP: MIP-MN-HA-MSA (492)
+type AVP_Grouped MIPv6_NONE_MIP_MN_HA_MSA
+
+// RFC 5778 6.13
+// AVP: MIP-Algorithm-Type (345)
+type AVP_Unsigned32 MIPv6_NONE_MIP_Algorithm_Type
+
+// RFC 5778 6.14
+// AVP: MIP-Replay-Mode (346)
+type enumerated MIPv6_NONE_MIP_Replay_Mode {
+ None (1),
+ Timestamp (2)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// RFC 5778 6.16
+// AVP: MIP-Timestamp (490)
+type AVP_OctetString MIPv6_NONE_MIP_Timestamp
+
+// RFC 5778 6.17
+// AVP: QoS-Capability (578)
+type AVP_Grouped MIPv6_NONE_QoS_Capability
+
+// RFC 5778 6.18
+// AVP: QoS-Resources (508)
+type AVP_Grouped MIPv6_NONE_QoS_Resources
+
+// RFC 5778 6.19
+// AVP: Chargable-User-Identity (89)
+type AVP_OctetString MIPv6_NONE_Chargable_User_Identity
+
+// RFC 5778 6.20
+// AVP: MIP6-Auth-Mode (494)
+type AVP_Unsigned32 MIPv6_NONE_MIP6_Auth_Mode
+/******************************************************************************
+* Copyright (c) 2000-2019 Ericsson Telecom AB
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v2.0
+* which accompanies this distribution, and is available at
+* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
+*
+* Contributors:
 *   Timea Moder - initial implementation and initial documentation
 ******************************************************************************/
 //
@@ -1838,6 +3014,7 @@ type enumerated AAA_3GPP_RDS_Indicator {
 
 // 3GPP TS 29.212 V15.1.0
 // 5.6, 5b.6, 5c.6
+// WARNING: Enumeration item with code (272) exists in type Command_Code
 // WARNING: Enumeration item with code (258) exists in type Command_Code
 
 
@@ -3368,126 +4545,6 @@ type AVP_Grouped S6_3GPP_APN_Validity_Time
 * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
-*   Roland Gecse - initial implementation and initial documentation
-*   Akos Pernek
-*   Antal Wuh.Hen.Chang
-*   Attila Fulop
-*   Balazs Barcsik
-*   Bence Molnar
-*   Csaba Koppany
-*   David Juhasz
-*   Eduard Czimbalmos
-*   Elemer Lelik
-*   Endre Kiss
-*   Endre Kulcsar
-*   Gabor Szalai
-*   Gabor Tatarka
-*   Gergely Futo
-*   Istvan Sandor
-*   Krisztian Pandi
-*   Kulcsár Endre
-*   Laszlo Tamas Zeke
-*   Norbert Pinter
-*   Roland Gecse
-*   Tibor Bende
-*   Tibor Szabo
-*   Timea Moder
-*   Zoltan Medve
-*   Zsolt Nandor Torok
-*   Zsolt Szalai
-******************************************************************************/
-//
-//  File:               MobileIPv6_HA_IETF_RFC5778.ddf
-//  Description:        DDF for Mobile IPv6 according to RFC 5778
-//  Rev:                R55A
-//  Prodnr:             CNL113462
-///////////////////////////////////////////////
-
-// APPLICATION-NAME: MIPv6
-// APPLICATION-REVISION: RFC5778
-
-// RFC 5778 6.2
-// AVP: Service-Selection (493)
-type AVP_UTF8String MIPv6_NONE_Service_Selection
-
-// RFC 5778 6.3
-// AVP: MIP-MN-AAA-SPI (341)
-type AVP_Unsigned32 MIPv6_NONE_MIP_MN_AAA_SPI
-
-// RFC 5778 6.4
-// AVP: MIP-MN-HA-SPI (491)
-type AVP_Unsigned32 MIPv6_NONE_MIP_MN_HA_SPI
-
-// RFC 5778 6.5
-// AVP: MIP-Mobile-Node-Address (333)
-type AVP_Address MIPv6_NONE_MIP_Mobile_Node_Address
-
-// RFC 5778 6.7
-// AVP: MIP-Careof-Address (487)
-type AVP_Address MIPv6_NONE_MIP_Careof_Address
-
-// RFC 5778 6.8
-// AVP: MIP-Authenticator (488)
-type AVP_OctetString MIPv6_NONE_MIP_Authenticator
-
-// RFC 5778 6.9
-// AVP: MIP-MAC-Mobility-Data (489)
-type AVP_OctetString MIPv6_NONE_MIP_MAC_Mobility_Data
-
-// RFC 5778 6.10
-// AVP: MIP-Session-Key (343)
-type AVP_OctetString MIPv6_NONE_MIP_Session_Key
-
-// RFC 5778 6.11
-// AVP: MIP-MSA-Lifetime (367)
-type AVP_Unsigned32 MIPv6_NONE_MIP_MSA_Lifetime
-
-// RFC 5778 6.12
-// AVP: MIP-MN-HA-MSA (492)
-type AVP_Grouped MIPv6_NONE_MIP_MN_HA_MSA
-
-// RFC 5778 6.13
-// AVP: MIP-Algorithm-Type (345)
-type AVP_Unsigned32 MIPv6_NONE_MIP_Algorithm_Type
-
-// RFC 5778 6.14
-// AVP: MIP-Replay-Mode (346)
-type enumerated MIPv6_NONE_MIP_Replay_Mode {
- None (1),
- Timestamp (2)
-} with {
-	variant "FIELDLENGTH(32)"
-	variant "BYTEORDER(last)"
-	variant "COMP(2scompl)"
-}
-
-// RFC 5778 6.16
-// AVP: MIP-Timestamp (490)
-type AVP_OctetString MIPv6_NONE_MIP_Timestamp
-
-// RFC 5778 6.17
-// AVP: QoS-Capability (578)
-type AVP_Grouped MIPv6_NONE_QoS_Capability
-
-// RFC 5778 6.18
-// AVP: QoS-Resources (508)
-type AVP_Grouped MIPv6_NONE_QoS_Resources
-
-// RFC 5778 6.19
-// AVP: Chargable-User-Identity (89)
-type AVP_OctetString MIPv6_NONE_Chargable_User_Identity
-
-// RFC 5778 6.20
-// AVP: MIP6-Auth-Mode (494)
-type AVP_Unsigned32 MIPv6_NONE_MIP6_Auth_Mode
-/******************************************************************************
-* Copyright (c) 2000-2019 Ericsson Telecom AB
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v2.0
-* which accompanies this distribution, and is available at
-* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
-*
-* Contributors:
 *   Gabor Szalai - initial implementation
 ******************************************************************************/
 //
@@ -3521,6 +4578,7 @@ type AVP_Unsigned32 MIPv6_NONE_MIP6_Auth_Mode
 //
 
 // 3GPP TS 29.214 15.2.0 5.6
+// WARNING: Enumeration item with code (265) exists in type Command_Code
 // WARNING: Enumeration item with code (258) exists in type Command_Code
 // WARNING: Enumeration item with code (275) exists in type Command_Code
 // WARNING: Enumeration item with code (274) exists in type Command_Code
@@ -3955,999 +5013,6 @@ type AVP_Unsigned32 RX_3GPP_Extended_Min_Requested_BW_UL
 * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 *
 * Contributors:
-*   Roland Gecse - initial implementation and initial documentation
-*   Akos Pernek
-*   Antal Wuh.Hen.Chang
-*   Attila Fulop
-*   Balazs Barcsik
-*   Bence Molnar
-*   Csaba Koppany
-*   David Juhasz
-*   Eduard Czimbalmos
-*   Elemer Lelik
-*   Endre Kiss
-*   Endre Kulcsar
-*   Gabor Szalai
-*   Gabor Tatarka
-*   Gergely Futo
-*   Istvan Sandor
-*   Krisztian Pandi
-*   Kulcsár Endre
-*   Laszlo Tamas Zeke
-*   Norbert Pinter
-*   Roland Gecse
-*   Tibor Bende
-*   Tibor Szabo
-*   Timea Moder
-*   Zoltan Medve
-*   Zsolt Nandor Torok
-*   Zsolt Szalai
-******************************************************************************/
-//
-//  File:               NetworkAccessServer_IETF_RFC4005.ddf
-//  Description:        DDF for NAS according to RFC 4005
-//  Rev:                R55A
-//  Prodnr:             CNL113462
-///////////////////////////////////////////////
-
-// APPLICATION-NAME: DNAS
-// APPLICATION-REVISION: RFC4005
-
-// AVP implementations according to:
-// RFC 4005 - Diameter Network Access Server Application
-//
-
-// RFC 4005 3
-// WARNING: Enumeration item with code (265) exists in type Command_Code
-// WARNING: Enumeration item with code (258) exists in type Command_Code
-// WARNING: Enumeration item with code (275) exists in type Command_Code
-// WARNING: Enumeration item with code (274) exists in type Command_Code
-// WARNING: Enumeration item with code (271) exists in type Command_Code
-
-
-// RFC 4005
-// AVP: NAS-Port (5)
-// 4.2
-type AVP_Unsigned32 DNAS_NONE_NAS_Port 
-
-// RFC 4005
-// AVP: NAS-Port-Id (87)
-// 4.3
-type AVP_UTF8String DNAS_NONE_NAS_Port_Id 
-
-// RFC 4005
-// AVP: NAS-Port-Type (61)
-// 4.4
-type AVP_Unsigned32 DNAS_NONE_NAS_Port_Type 
-
-// RFC 4005
-// AVP: Called-Station-Id (30)
-// 4.5
-type AVP_UTF8String DNAS_NONE_Called_Station_Id 
-
-// RFC 4005
-// AVP: Calling-Station-Id (31)
-// 4.6
-type AVP_UTF8String DNAS_NONE_Calling_Station_Id 
-
-// RFC 4005
-// AVP: Connect-Info (77)
-// 4.7
-type AVP_UTF8String DNAS_NONE_Connect_Info 
-
-// RFC 4005
-// AVP: Originating-Line-Info (94)
-// 4.8
-type AVP_OctetString DNAS_NONE_Originating_Line_Info 
-
-// RFC 4005
-// AVP: Reply-Message (18)
-// 4.9
-type AVP_UTF8String DNAS_NONE_Reply_Message 
-
-
-
-// RFC 4005
-// AVP: User-Password (2)
-// 5.1
-type AVP_OctetString DNAS_NONE_User_Password 
-
-// RFC 4005
-// AVP: Password-Retry (75)
-// 5.2
-type AVP_Unsigned32 DNAS_NONE_Password_Retry 
-
-// RFC 4005
-// AVP: Prompt (76)
-// 5.3
-type enumerated DNAS_NONE_Prompt {
- NO_ECHO (0),
- ECHO (1)
-} with {
-	variant "FIELDLENGTH(32)"
-	variant "BYTEORDER(last)"
-	variant "COMP(2scompl)"
-}
-
-// RFC 4005
-// AVP: CHAP-Auth (402)
-// 5.4
-type AVP_Grouped DNAS_NONE_CHAP_Auth 
-
-// RFC 4005
-// AVP: CHAP-Algorithm (403)
-// 5.5
-type enumerated DNAS_NONE_CHAP_Algorithm {
- CHAP_with_MD5 (5)
-} with {
-	variant "FIELDLENGTH(32)"
-	variant "BYTEORDER(last)"
-	variant "COMP(2scompl)"
-}
-
-// RFC 4005
-// AVP: CHAP-Ident (404)
-// 5.6
-type AVP_OctetString DNAS_NONE_CHAP_Ident 
-
-// RFC 4005
-// AVP: CHAP-Response (405)
-// 5.7
-type AVP_OctetString DNAS_NONE_CHAP_Response 
-
-// RFC 4005
-// AVP: CHAP-Challenge (60)
-// 5.8
-type AVP_OctetString DNAS_NONE_CHAP_Challenge 
-
-// RFC 4005
-// AVP: ARAP-Password (70)
-// 5.9
-type AVP_OctetString DNAS_NONE_ARAP_Password 
-
-// RFC 4005
-// AVP: ARAP-Challenge-Response (84)
-// 5.10
-type AVP_OctetString DNAS_NONE_ARAP_Challenge_Response 
-
-// RFC 4005
-// AVP: ARAP-Security (73)
-// 5.11
-type AVP_Unsigned32 DNAS_NONE_ARAP_Security 
-
-// RFC 4005
-// AVP: ARAP-Security-Data (74)
-// 5.12
-type AVP_OctetString DNAS_NONE_ARAP_Security_Data 
-
-
-
-// RFC 4005
-// AVP: Service-Type (6)
-// 6.1
-type AVP_Unsigned32 DNAS_NONE_Service_Type 
-
-// RFC 4005
-// AVP: Callback-Number (19)
-// 6.2
-type AVP_UTF8String DNAS_NONE_Callback_Number 
-
-// RFC 4005
-// AVP: Callback-Id (20)
-// 6.3
-type AVP_UTF8String DNAS_NONE_Callback_Id 
-
-// RFC 4005
-// AVP: Idle-Timeout (28)
-// 6.4
-type AVP_Unsigned32 DNAS_NONE_Idle_Timeout 
-
-// RFC 4005
-// AVP: Port-Limit (62)
-// 6.5
-type AVP_Unsigned32 DNAS_NONE_Port_Limit 
-
-// RFC 4005
-// AVP: NAS-Filter-Rule (400)
-// 6.6
-type AVP_IPFilterRule DNAS_NONE_NAS_Filter_Rule 
-
-// RFC 4005
-// AVP: Filter-Id (11)
-// 6.7
-type AVP_UTF8String DNAS_NONE_Filter_Id 
-
-// RFC 4005
-// AVP: Configuration-Token (78)
-// 6.8
-type AVP_OctetString DNAS_NONE_Configuration_Token 
-
-// RFC 4005
-// AVP: QoS-Filter-Rule (407)
-// 6.9
-type AVP_QoSFilterRule DNAS_NONE_QoS_Filter_Rule 
-
-// RFC 4005
-// AVP: Framed-Protocol (7)
-// 6.10.1
-type enumerated DNAS_NONE_Framed_Protocol {
- PPP (1),
- SLIP (2),
- ARAP (3),
- GANDALF (4),
- XYLOGICS (5),
- X_75_SYNCHRONOUS (6),
- GPRS_PDP_CONTEXT (7)
-} with {
-	variant "FIELDLENGTH(32)"
-	variant "BYTEORDER(last)"
-	variant "COMP(2scompl)"
-}
-
-// RFC 4005
-// AVP: Framed-Routing (10)
-// 6.10.2
-type enumerated DNAS_NONE_Framed_Routing {
- NONE (0),
- SEND_ROUTING_PACKETS (1),
- LISTEN_FOR_ROUTING_PACKETS (2),
- SEND_AND_LISTEN (3)
-} with {
-	variant "FIELDLENGTH(32)"
-	variant "BYTEORDER(last)"
-	variant "COMP(2scompl)"
-}
-
-// RFC 4005
-// AVP: Framed-MTU (12)
-// 6.10.3
-type AVP_Unsigned32 DNAS_NONE_Framed_MTU 
-
-// RFC 4005
-// AVP: Framed-Compression (13)
-// 6.10.4
-type enumerated DNAS_NONE_Framed_Compression {
- NONE (0),
- VJ_TCP_IP_HEADER_COMPRESSION (1),
- IPX_HEADER_COMPRESSION (2),
- STAC_LZS_COMPRESSION (3)
-} with {
-	variant "FIELDLENGTH(32)"
-	variant "BYTEORDER(last)"
-	variant "COMP(2scompl)"
-}
-
-// RFC 4005
-// AVP: Framed-IP-Address (8)
-// 6.11.1
-type AVP_OctetString DNAS_NONE_Framed_IP_Address 
-
-// RFC 4005
-// AVP: Framed-IP-Netmask (9)
-// 6.11.2
-type AVP_OctetString DNAS_NONE_Framed_IP_Netmask 
-
-// RFC 4005
-// AVP: Framed-Route (22)
-// 6.11.3
-type AVP_UTF8String DNAS_NONE_Framed_Route 
-
-// RFC 4005
-// AVP: Framed-Pool (88)
-// 6.11.4
-type AVP_OctetString DNAS_NONE_Framed_Pool 
-
-// RFC 4005
-// AVP: Framed-Interface-Id (96)
-// 6.11.5
-type AVP_Unsigned64 DNAS_NONE_Framed_Interface_Id 
-
-// RFC 4005
-// AVP: Framed-IPv6-Prefix (97)
-// 6.11.6
-type AVP_OctetString DNAS_NONE_Framed_IPv6_Prefix 
-
-// RFC 4005
-// AVP: Framed-IPv6-Route (99)
-// 6.11.7
-type AVP_UTF8String DNAS_NONE_Framed_IPv6_Route 
-
-// RFC 4005
-// AVP: Framed-IPv6-Pool (100)
-// 6.11.8
-type AVP_OctetString DNAS_NONE_Framed_IPv6_Pool 
-
-// RFC 4005
-// AVP: Framed-IPX-Network (23)
-// 6.12.1
-type AVP_UTF8String DNAS_NONE_Framed_IPX_Network 
-
-// RFC 4005
-// AVP: Framed-Appletalk-Link (37)
-// 6.13.1
-type AVP_Unsigned32 DNAS_NONE_Framed_Appletalk_Link 
-
-// RFC 4005
-// AVP: Framed-Appletalk-Network (38)
-// 6.13.2
-type AVP_Unsigned32 DNAS_NONE_Framed_Appletalk_Network 
-
-// RFC 4005
-// AVP: Framed-Appletalk-Zone (39)
-// 6.13.3
-type AVP_OctetString DNAS_NONE_Framed_Appletalk_Zone 
-
-// RFC 4005
-// AVP: ARAP-Features (71)
-// 6.14.1
-type AVP_OctetString DNAS_NONE_ARAP_Features 
-
-// RFC 4005
-// AVP: ARAP-Zone-Access (72)
-// 6.14.2
-type enumerated DNAS_NONE_ARAP_Zone_Access {
- ONLY_ALLOW_ACCESS_TO_DEFAULT_ZONE (1),
- USE_ZONE_FILTER_INCLUSIVELY (2),
- USE_ZONE_FILTER_EXCLUSIVELY (4)
-} with {
-	variant "FIELDLENGTH(32)"
-	variant "BYTEORDER(last)"
-	variant "COMP(2scompl)"
-}
-
-// RFC 4005
-// AVP: Login-IP-Host (14)
-// 6.15.1
-type AVP_OctetString DNAS_NONE_Login_IP_Host 
-
-// RFC 4005
-// AVP: Login-IPv6-Host (98)
-// 6.15.2
-type AVP_OctetString DNAS_NONE_Login_IPv6_Host 
-
-// RFC 4005
-// AVP: Login-Service (15)
-// 6.15.3
-type enumerated DNAS_NONE_Login_Service {
- TELNET (0),
- RLOGIN (1),
- TCP_CLEAR (2),
- PORTMASTER (3),
- LAT (4),
- X25_PAD (5),
- X25_T3POS (6),
- TCP_CLEAR_QUIET (8)
-} with {
-	variant "FIELDLENGTH(32)"
-	variant "BYTEORDER(last)"
-	variant "COMP(2scompl)"
-}
-
-// RFC 4005
-// AVP: Login-TCP-Port (16)
-// 6.16.1
-type AVP_Unsigned32 DNAS_NONE_Login_TCP_Port 
-
-// RFC 4005
-// AVP: Login-LAT-Service (34)
-// 6.17.1
-type AVP_OctetString DNAS_NONE_Login_LAT_Service 
-
-// RFC 4005
-// AVP: Login-LAT-Node (35)
-// 6.17.2
-type AVP_OctetString DNAS_NONE_Login_LAT_Node 
-
-// RFC 4005
-// AVP: Login-LAT-Group (36)
-// 6.17.3
-type AVP_OctetString DNAS_NONE_Login_LAT_Group 
-
-// RFC 4005
-// AVP: Login-LAT-Port (63)
-// 6.17.4
-type AVP_OctetString DNAS_NONE_Login_LAT_Port 
-
-
-
-// RFC 4005
-// AVP: Tunneling (401)
-// 7.1
-type AVP_Grouped DNAS_NONE_Tunneling 
-
-// RFC 4005
-// AVP: Tunnel-Type (64)
-// 7.2
-type AVP_Unsigned32 DNAS_NONE_Tunnel_Type 
-
-// RFC 4005
-// AVP: Tunnel-Medium-Type (65)
-// 7.3
-type AVP_Unsigned32 DNAS_NONE_Tunnel_Medium_Type 
-
-// RFC 4005
-// AVP: Tunnel-Client-Endpoint (66)
-// 7.4
-type AVP_UTF8String DNAS_NONE_Tunnel_Client_Endpoint 
-
-// RFC 4005
-// AVP: Tunnel-Server-Endpoint (67)
-// 7.5
-type AVP_UTF8String DNAS_NONE_Tunnel_Server_Endpoint 
-
-// RFC 4005
-// AVP: Tunnel-Password (69)
-// 7.6
-type AVP_OctetString DNAS_NONE_Tunnel_Password 
-
-// RFC 4005
-// AVP: Tunnel-Private-Group-Id (81)
-// 7.7
-type AVP_OctetString DNAS_NONE_Tunnel_Private_Group_Id 
-
-// RFC 4005
-// AVP: Tunnel-Assignment-Id (82)
-// 7.8
-type AVP_OctetString DNAS_NONE_Tunnel_Assignment_Id 
-
-// RFC 4005
-// AVP: Tunnel-Preference (83)
-// 7.9
-type AVP_Unsigned32 DNAS_NONE_Tunnel_Preference 
-
-// RFC 4005
-// AVP: Tunnel-Client-Auth-Id (90)
-// 7.10
-type AVP_UTF8String DNAS_NONE_Tunnel_Client_Auth_Id 
-
-// RFC 4005
-// AVP: Tunnel-Server-Auth-Id (91)
-// 7.11
-type AVP_UTF8String DNAS_NONE_Tunnel_Server_Auth_Id 
-
-
-
-// RFC 4005
-// AVP: Accounting-Input-Octets (363)
-// 8.1
-type AVP_Unsigned64 DNAS_NONE_Accounting_Input_Octets 
-
-// RFC 4005
-// AVP: Accounting-Output-Octets (364)
-// 8.2
-type AVP_Unsigned64 DNAS_NONE_Accounting_Output_Octets 
-
-// RFC 4005
-// AVP: Accounting-Input-Packets (365)
-// 8.3
-type AVP_Unsigned64 DNAS_NONE_Accounting_Input_Packets 
-
-// RFC 4005
-// AVP: Accounting-Output-Packets (366)
-// 8.4
-type AVP_Unsigned64 DNAS_NONE_Accounting_Output_Packets 
-
-// RFC 4005
-// AVP: Acct-Session-Time (46)
-// 8.5
-type AVP_Unsigned32 DNAS_NONE_Acct_Session_Time 
-
-// RFC 4005
-// AVP: Acct-Authentic (45)
-// 8.6
-type enumerated DNAS_NONE_Acct_Authentic {
- RADIUS (1),
- LOCAL (2),
- REMOTE (3),
- DIAMETER (4)
-} with {
-	variant "FIELDLENGTH(32)"
-	variant "BYTEORDER(last)"
-	variant "COMP(2scompl)"
-}
-
-// RFC 4005
-// AVP: Accounting-Auth-Method (406)
-// 8.7
-type enumerated DNAS_NONE_Accounting_Auth_Method {
- PAP (1),
- CHAP (2),
- MS_CHAP_1 (3),
- MS_CHAP_2 (4),
- EAP (5),
- None (7) 
-} with {
-	variant "FIELDLENGTH(32)"
-	variant "BYTEORDER(last)"
-	variant "COMP(2scompl)"
-}
-
-// RFC 4005
-// AVP: Acct-Delay-Time (41)
-// 8.8
-type AVP_Unsigned32 DNAS_NONE_Acct_Delay_Time 
-
-// RFC 4005
-// AVP: Acct-Link-Count (51)
-// 8.9
-type AVP_Unsigned32 DNAS_NONE_Acct_Link_Count 
-
-// RFC 4005
-// AVP: Acct-Tunnel-Connection (68)
-// 8.10
-type AVP_OctetString DNAS_NONE_Acct_Tunnel_Connection 
-
-// RFC 4005
-// AVP: Acct-Tunnel-Packets-Lost (86)
-// 8.11
-type AVP_Unsigned32 DNAS_NONE_Acct_Tunnel_Packets_Lost 
-
-
-
-// RFC 4005
-// AVP: NAS-Identifier (32)
-// 9.3.1
-type AVP_UTF8String DNAS_NONE_NAS_Identifier 
-
-// RFC 4005
-// AVP: NAS-IP-Address (4)
-// 9.3.2
-type AVP_OctetString DNAS_NONE_NAS_IP_Address 
-
-// RFC 4005
-// AVP: NAS-IPv6-Address (95)
-// 9.3.3
-type AVP_OctetString DNAS_NONE_NAS_IPv6_Address 
-
-// RFC 4005
-// AVP: State (24)
-// 9.3.4
-type AVP_OctetString DNAS_NONE_State 
-
-// RFC 4005
-// AVP: Origin-AAA-Protocol (408)
-// 9.3.6
-type enumerated DNAS_NONE_Origin_AAA_Protocol {
- RADIUS (1)
-} with {
-	variant "FIELDLENGTH(32)"
-	variant "BYTEORDER(last)"
-	variant "COMP(2scompl)"
-}
-/******************************************************************************
-* Copyright (c) 2000-2019 Ericsson Telecom AB
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v2.0
-* which accompanies this distribution, and is available at
-* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
-*
-* Contributors:
-*   Roland Gecse - initial implementation and initial documentation
-*   Akos Pernek
-*   Antal Wuh.Hen.Chang
-*   Attila Fulop
-*   Balazs Barcsik
-*   Bence Molnar
-*   Csaba Koppany
-*   David Juhasz
-*   Eduard Czimbalmos
-*   Elemer Lelik
-*   Endre Kiss
-*   Endre Kulcsar
-*   Gabor Szalai
-*   Gabor Tatarka
-*   Gergely Futo
-*   Istvan Sandor
-*   Krisztian Pandi
-*   Kulcsár Endre
-*   Laszlo Tamas Zeke
-*   Norbert Pinter
-*   Roland Gecse
-*   Tibor Bende
-*   Tibor Szabo
-*   Timea Moder
-*   Zoltan Medve
-*   Zsolt Nandor Torok
-*   Zsolt Szalai
-******************************************************************************/
-//
-//  File:               CreditControl_IETF_RFC4006.ddf
-//  Description:        DDF for DCC according to RFC 4006
-//  Rev:                R55A
-//  Prodnr:             CNL 1134 62
-///////////////////////////////////////////////
-
-// APPLICATION-NAME: DCC
-// APPLICATION-REVISION: RFC4006
-
-// AVP implementations according to:
-// RFC 4006 - Diameter Credit Control Application
-// IS for Additional Billing for Verizon in MTAS 125/1594-FCP 101 8664 Uen PA8
-
-// RFC 4006 12.2
-// WARNING: Enumeration item with code (272) exists in type Command_Code
-
-
-// RFC 4006
-// AVP: CC-Correlation-Id (411)
-// 8.1
-type AVP_OctetString DCC_NONE_CC_Correlation_Id 
-
-// RFC 4006
-// AVP: CC-Input-Octets (412)
-// 8.24
-type AVP_Unsigned64 DCC_NONE_CC_Input_Octets 
-
-// RFC 4006
-// AVP: CC-Money (413)
-// 8.22
-type AVP_Grouped DCC_NONE_CC_Money 
-
-// RFC 4006
-// AVP: CC-Output-Octets (414)
-// 8.25
-type AVP_Unsigned64 DCC_NONE_CC_Output_Octets 
-
-// RFC 4006
-// AVP: CC-Request-Number (415)
-// 8.2
-type AVP_Unsigned32 DCC_NONE_CC_Request_Number 
-
-// RFC 4006
-// AVP: CC-Request-Type (416)
-// 8.3
-type enumerated DCC_NONE_CC_Request_Type {
- INITIAL_REQUEST (1),
- UPDATE_REQUEST (2),
- TERMINATION_REQUEST (3),
- EVENT_REQUEST (4)
-} with {
-	variant "FIELDLENGTH(32)"
-	variant "BYTEORDER(last)"
-	variant "COMP(2scompl)"
-}
-
-// RFC 4006
-// AVP: CC-Service-Specific-Units (417)
-// 8.26
-type AVP_Unsigned64 DCC_NONE_CC_Service_Specific_Units 
-
-// RFC 4006
-// AVP: CC-Session-Failover (418)
-// 8.4
-type enumerated DCC_NONE_CC_Session_Failover {
- FAILOVER_NOT_SUPPORTED (0),
- FAILOVER_SUPPORTED (1)
-} with {
-	variant "FIELDLENGTH(32)"
-	variant "BYTEORDER(last)"
-	variant "COMP(2scompl)"
-}
-
-// RFC 4006
-// AVP: CC-Sub-Session-Id (419)
-// 8.5
-type AVP_Unsigned64 DCC_NONE_CC_Sub_Session_Id 
-
-// RFC 4006
-// AVP: CC-Time (420)
-// 8.21
-type AVP_Unsigned32 DCC_NONE_CC_Time 
-
-// RFC 4006
-// AVP: CC-Total-Octets (421)
-// 8.23
-type AVP_Unsigned64 DCC_NONE_CC_Total_Octets 
-
-// RFC 4006
-// AVP: CC-Unit-Type (454)
-// 8.32
-type enumerated DCC_NONE_CC_Unit_Type {
- TIME (0),
- MONEY (1),
- TOTAL_OCTETS (2),
- INPUT_OCTETS (3),
- OUTPUT_OCTETS (4),
- SERVICE_SPECIFIC_UNITS (5)
-} with {
-	variant "FIELDLENGTH(32)"
-	variant "BYTEORDER(last)"
-	variant "COMP(2scompl)"
-}
-
-// RFC 4006
-// AVP: Check-Balance-Result (422)
-// 8.6
-type enumerated DCC_NONE_Check_Balance_Result {
- ENOUGH_CREDIT (0),
- NO_CREDIT (1)
-} with {
-	variant "FIELDLENGTH(32)"
-	variant "BYTEORDER(last)"
-	variant "COMP(2scompl)"
-}
-
-// RFC 4006
-// AVP: Cost-Information (423)
-// 8.7
-type AVP_Grouped DCC_NONE_Cost_Information 
-
-// RFC 4006
-// AVP: Cost-Unit (424)
-// 8.12
-type AVP_UTF8String DCC_NONE_Cost_Unit 
-
-// RFC 4006
-// AVP: Credit-Control (426)
-// 8.13
-type enumerated DCC_NONE_Credit_Control {
- CREDIT_AUTHORIZATION (0),
- RE_AUTHORIZATION (1)
-} with {
-	variant "FIELDLENGTH(32)"
-	variant "BYTEORDER(last)"
-	variant "COMP(2scompl)"
-}
-
-// RFC 4006
-// AVP: Credit-Control-Failure-Handling (427)
-// 8.14
-type enumerated DCC_NONE_Credit_Control_Failure_Handling {
- TERMINATE (0),
- CONTINUE (1),
- RETRY_AND_TERMINATE (2)
-} with {
-	variant "FIELDLENGTH(32)"
-	variant "BYTEORDER(last)"
-	variant "COMP(2scompl)"
-}
-
-// RFC 4006
-// AVP: Currency-Code (425)
-// 8.11
-type AVP_Unsigned32 DCC_NONE_Currency_Code 
-
-// RFC 4006
-// AVP: Direct-Debiting-Failure-Handling (428)
-// 8.15
-type enumerated DCC_NONE_Direct_Debiting_Failure_Handling {
- TERMINATE_OR_BUFFER (0),
- CONTINUE (1)
-} with {
-	variant "FIELDLENGTH(32)"
-	variant "BYTEORDER(last)"
-	variant "COMP(2scompl)"
-}
-
-// RFC 4006
-// AVP: Exponent (429)
-// 8.9
-type AVP_Integer32 DCC_NONE_Exponent 
-
-// RFC 4006
-// AVP: Final-Unit-Action (449)
-// 8.35
-type enumerated DCC_NONE_Final_Unit_Action {
- TERMINATE (0),
- REDIRECT (1),
- RESTRICT_ACCESS (2)
-} with {
-	variant "FIELDLENGTH(32)"
-	variant "BYTEORDER(last)"
-	variant "COMP(2scompl)"
-}
-
-// RFC 4006
-// AVP: Final-Unit-Indication (430)
-// 8.34
-type AVP_Grouped DCC_NONE_Final_Unit_Indication 
-
-// RFC 4006
-// AVP: Granted-Service-Unit (431)
-// 8.17
-type AVP_Grouped DCC_NONE_Granted_Service_Unit 
-
-// RFC 4006
-// AVP: G-S-U-Pool-Identifier (453)
-// 8.31
-type AVP_Unsigned32 DCC_NONE_G_S_U_Pool_Identifier 
-
-// RFC 4006
-// AVP: G-S-U-Pool-Reference (457)
-// 8.30
-type AVP_Grouped DCC_NONE_G_S_U_Pool_Reference 
-
-// RFC 4006
-// AVP: Multiple-Services-Credit-Control (456)
-// 8.16
-type AVP_Grouped DCC_NONE_Multiple_Services_Credit_Control 
-
-// RFC 4006
-// AVP: Multiple-Services-Indicator (455)
-// 8.40
-type enumerated DCC_NONE_Multiple_Services_Indicator {
- MULTIPLE_SERVICES_NOT_SUPPORTED (0),
- MULTIPLE_SERVICES_SUPPORTED (1)
-} with {
-	variant "FIELDLENGTH(32)"
-	variant "BYTEORDER(last)"
-	variant "COMP(2scompl)"
-}
-
-// RFC 4006
-// AVP: Rating-Group (432)
-// 8.29
-type AVP_Unsigned32 DCC_NONE_Rating_Group
-
-// RFC 4006
-// AVP: Redirect-Address-Type (433)
-// 8.38
-type enumerated DCC_NONE_Redirect_Address_Type {
- IPV4_ADDRESS (0),
- IPV6_ADDRESS (1),
- URL (2),
- SIP_URI (3)
-} with {
-	variant "FIELDLENGTH(32)"
-	variant "BYTEORDER(last)"
-	variant "COMP(2scompl)"
-}
-
-// RFC 4006
-// AVP: Redirect-Server (434)
-type AVP_Grouped DCC_NONE_Redirect_Server 
-
-// RFC 4006
-// AVP: Redirect-Server-Address (435)
-// 8.37
-type AVP_UTF8String DCC_NONE_Redirect_Server_Address
-
-// RFC 4006
-// AVP: Requested-Action (436)
-// 8.41
-type enumerated DCC_NONE_Requested_Action {
- DIRECT_DEBITING (0),
- REFUND_ACCOUNT (1),
- CHECK_BALANCE (2),
- PRICE_ENQUIRY (3) 
-} with {
-	variant "FIELDLENGTH(32)"
-	variant "BYTEORDER(last)"
-	variant "COMP(2scompl)"
-}
-
-// RFC 4006
-// AVP: Requested-Service-Unit (437)
-// 8.18
-type AVP_Grouped DCC_NONE_Requested_Service_Unit
-
-// RFC 4006
-// AVP: Restriction-Filter-Rule (438)
-// 8.36
-type AVP_IPFilterRule DCC_NONE_Restriction_Filter_Rule
-
-// RFC 4006
-// AVP: Service-Context-Id (461)
-// 8.42
-type AVP_UTF8String DCC_NONE_Service_Context_Id
-
-// RFC 4006
-// AVP: Service-Identifier (439)
-// 8.28
-type AVP_Unsigned32 DCC_NONE_Service_Identifier
-
-// RFC 4006
-// AVP: Service-Parameter-Info (440)
-// 8.43
-type AVP_Grouped DCC_NONE_Service_Parameter_Info
-
-// RFC 4006
-// AVP: Service-Parameter-Type (441)
-// 8.44
-type AVP_Unsigned32 DCC_NONE_Service_Parameter_Type
-
-// RFC 4006
-// AVP: Service-Parameter-Value (442)
-// 8.45
-type AVP_OctetString DCC_NONE_Service_Parameter_Value
-
-// RFC 4006
-// AVP: Subscription-Id (443)
-// 8.46
-type AVP_Grouped DCC_NONE_Subscription_Id 
-
-// RFC 4006
-// AVP: Subscription-Id-Data (444)
-// 8.48
-type AVP_UTF8String DCC_NONE_Subscription_Id_Data
-
-// RFC 4006
-// AVP: Subscription-Id-Type (450)
-// 8.47
-type enumerated DCC_NONE_Subscription_Id_Type {
- END_USER_E164 (0),
- END_USER_IMSI (1),
- END_USER_SIP_URI (2),
- END_USER_NAI (3),
- END_USER_PRIVATE (4)
-} with {
-	variant "FIELDLENGTH(32)"
-	variant "BYTEORDER(last)"
-	variant "COMP(2scompl)"
-}
-
-// RFC 4006
-// AVP: Tariff-Change-Usage (452)
-// 8.27
-type enumerated DCC_NONE_Tariff_Change_Usage {
- UNIT_BEFORE_TARIFF_CHANGE (0),
- UNIT_AFTER_TARIFF_CHANGE (1),
- UNIT_INDETERMINATE (2)
-} with {
-	variant "FIELDLENGTH(32)"
-	variant "BYTEORDER(last)"
-	variant "COMP(2scompl)"
-}
-
-// RFC 4006
-// AVP: Tariff-Time-Change (451)
-// 8.20
-type AVP_Time DCC_NONE_Tariff_Time_Change
-
-// RFC 4006
-// AVP: Unit-Value (445)
-// 8.8
-type AVP_Grouped DCC_NONE_Unit_Value
-
-// RFC 4006
-// AVP: Used-Service-Unit (446)
-// 8.19
-type AVP_Grouped DCC_NONE_Used_Service_Unit
-
-// RFC 4006
-// AVP: User-Equipment-Info (458)
-// 8.49
-type AVP_Grouped DCC_NONE_User_Equipment_Info
-
-// RFC 4006, 125/1594-FCP 101 8664
-// AVP: User-Equipment-Info-Type (459)
-// RFC 4006 section 8.50, 125/1594-FCP 101 8664 section 3.3.12
-type enumerated DCC_NONE_User_Equipment_Info_Type {
- IMEISV (0),
- MAC (1),
- EUI64 (2),
- MODIFIED_EUI64 (3),
- ESN (4),
- MEID (5)
-} with {
-	variant "FIELDLENGTH(32)"
-	variant "BYTEORDER(last)"
-	variant "COMP(2scompl)"
-}
-
-// RFC 4006
-// AVP: User-Equipment-Info-Value (460)
-// 8.51
-type AVP_OctetString DCC_NONE_User_Equipment_Info_Value
-
-// RFC 4006
-// AVP: Value-Digits (447)
-// 8.10
-type AVP_Integer64 DCC_NONE_Value_Digits
-
-// RFC 4006
-// AVP: Validity-Time (448)
-// 8.33
-type AVP_Unsigned32 DCC_NONE_Validity_Time
-
-/******************************************************************************
-* Copyright (c) 2000-2019 Ericsson Telecom AB
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v2.0
-* which accompanies this distribution, and is available at
-* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
-*
-* Contributors:
 *   Gabor Szalai - initial implementation and initial documentation
 ******************************************************************************/
 //
@@ -8294,76 +8359,11 @@ type AVP_OctetString DCA_3GPP_VLR_Number
 type AVP_Unsigned32 DCA_3GPP_Volume_Quota_Threshold 
 
 
-/******************************************************************************
-* Copyright (c) 2000-2019 Ericsson Telecom AB
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v2.0
-* which accompanies this distribution, and is available at
-* https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
-*
-* Contributors:
-*   Roland Gecse - initial implementation and initial documentation
-*   Akos Pernek
-*   Antal Wuh.Hen.Chang
-*   Attila Fulop
-*   Balazs Barcsik
-*   Bence Molnar
-*   Csaba Koppany
-*   David Juhasz
-*   Eduard Czimbalmos
-*   Elemer Lelik
-*   Endre Kiss
-*   Endre Kulcsar
-*   Gabor Szalai
-*   Gabor Tatarka
-*   Gergely Futo
-*   Istvan Sandor
-*   Krisztian Pandi
-*   Kulcsár Endre
-*   Laszlo Tamas Zeke
-*   Norbert Pinter
-*   Roland Gecse
-*   Tibor Bende
-*   Tibor Szabo
-*   Timea Moder
-*   Zoltan Medve
-*   Zsolt Nandor Torok
-*   Zsolt Szalai
-******************************************************************************/
-//
-//  File:               MobileIPv6_NAS_IETF_RFC5447.ddf
-//  Description:        DDF for Mobile IPv6 according to RFC 5447
-//  Rev:                R55A
-//  Prodnr:             CNL113462
-///////////////////////////////////////////////
-
-// APPLICATION-NAME: MIPv6
-// APPLICATION-REVISION: RFC5447
-
-// RFC 5447 4.2.1
-// AVP: MIP6-Agent-Info (486)
-type AVP_Grouped MIPv6_NONE_MIP6_Agent_Info
-
-// RFC 5447 4.2.2
-// AVP: MIP6-Home-Agent-Address (334)
-type AVP_Address MIPv6_NONE_MIP6_Home_Agent_Address
-
-// RFC 5447 4.2.3
-// AVP: MIP6-Home-Agent-Host (348)
-type AVP_Grouped MIPv6_NONE_MIP6_Home_Agent_Host
-
-// RFC 5447 4.2.4
-// AVP: MIP6-Home-Link-Prefix (125)
-type AVP_OctetString MIPv6_NONE_MIP6_Home_Link_Prefix
-
-// RFC 5447 4.2.5
-// AVP: MIP6-Feature-Vector (124)
-type AVP_Unsigned64 MIPv6_NONE_MIP6_Feature_Vector
 // STATISTICS: 1126 AVP descriptors found
 // STATISTICS: 1126 AVP type definitions matching AVP descriptors found
 // STATISTICS:  duplicate AVP definitions deleted
 type enumerated Command_Code {
- Abort_Session (274), Accounting (271), Capabilities_Exchange (257), Device_Watchdog (280), Disconnect_Peer (282), Re_Auth (258), Session_Termination (275), Experimental1 (16777214), Experimental2 (16777215) , Update_Location (316), Cancel_Location (317), Authentication_Information (318), Insert_Subscriber_Data (319), Delete_Subscriber_Data (320), Purge_UE (321), Reset (322), Notify (323), ME_Identity_Check (324), Update_VCSG_Location (8388638), Cancel_VCSG_Location (8388642), Credit_Control (272), TDF_Session (8388637), Subscriber_Information (8388641), Configuration_Information (8388718), Reporting_Information (8388719), NIDD_Information (8388726), Authorize_Authenticate (265), User_Authorization (300), Server_Assignment (301), Location_Info (302), Multimedia_Auth (303), Registration_Termination (304), Push_Profile (305)
+ Abort_Session (274), Accounting (271), Capabilities_Exchange (257), Device_Watchdog (280), Disconnect_Peer (282), Re_Auth (258), Session_Termination (275), Experimental1 (16777214), Experimental2 (16777215) , Authorize_Authenticate (265), Credit_Control (272), Update_Location (316), Cancel_Location (317), Authentication_Information (318), Insert_Subscriber_Data (319), Delete_Subscriber_Data (320), Purge_UE (321), Reset (322), Notify (323), ME_Identity_Check (324), Update_VCSG_Location (8388638), Cancel_VCSG_Location (8388642), TDF_Session (8388637), Subscriber_Information (8388641), Configuration_Information (8388718), Reporting_Information (8388719), NIDD_Information (8388726), User_Authorization (300), Server_Assignment (301), Location_Info (302), Multimedia_Auth (303), Registration_Termination (304), Push_Profile (305)
 } with {
 	variant "FIELDLENGTH(24)"
 	variant "BYTEORDER(last)"
@@ -8410,12 +8410,12 @@ type enumerated AVP_Code_NONE {
 	avp_code_MIPv6_NONE_MIP_Session_Key (343),
 	avp_code_DCC_NONE_Tariff_Time_Change (451),
 	avp_code_DNAS_NONE_Tunnel_Password (69),
-	avp_code_DCC_NONE_User_Equipment_Info_Value (460),
 	avp_code_DNAS_NONE_Tunneling (401),
+	avp_code_DCC_NONE_User_Equipment_Info_Value (460),
 	avp_code_BASE_NONE_Multi_Round_Time_Out (272),
 	avp_code_BASE_NONE_Experimental_Result_Code (298),
-	avp_code_DNAS_NONE_Configuration_Token (78),
 	avp_code_DNAS_NONE_Callback_Number (19),
+	avp_code_DNAS_NONE_Configuration_Token (78),
 	avp_code_BASE_NONE_Error_Message (281),
 	avp_code_DNAS_NONE_NAS_Port_Type (61),
 	avp_code_DCC_NONE_Multiple_Services_Indicator (455),
@@ -8434,8 +8434,8 @@ type enumerated AVP_Code_NONE {
 	avp_code_DNAS_NONE_Tunnel_Preference (83),
 	avp_code_DCC_NONE_CC_Session_Failover (418),
 	avp_code_BASE_NONE_Proxy_State (33),
-	avp_code_MIPv6_NONE_MIP6_Agent_Info (486),
 	avp_code_DCC_NONE_Credit_Control_Failure_Handling (427),
+	avp_code_MIPv6_NONE_MIP6_Agent_Info (486),
 	avp_code_BASE_NONE_Redirect_Max_Cache_Time (262),
 	avp_code_DCC_NONE_Requested_Action (436),
 	avp_code_DNAS_NONE_Idle_Timeout (28),
@@ -8479,8 +8479,8 @@ type enumerated AVP_Code_NONE {
 	avp_code_DNAS_NONE_Login_IP_Host (14),
 	avp_code_DNAS_NONE_ARAP_Security (73),
 	avp_code_DNAS_NONE_Origin_AAA_Protocol (408),
-	avp_code_DNAS_NONE_Tunnel_Assignment_Id (82),
 	avp_code_DNAS_NONE_Framed_IPX_Network (23),
+	avp_code_DNAS_NONE_Tunnel_Assignment_Id (82),
 	avp_code_DCC_NONE_CC_Service_Specific_Units (417),
 	avp_code_DNAS_NONE_NAS_Identifier (32),
 	avp_code_DNAS_NONE_Tunnel_Server_Auth_Id (91),
@@ -8489,10 +8489,10 @@ type enumerated AVP_Code_NONE {
 	avp_code_BASE_NONE_Redirect_Host_Usage (261),
 	avp_code_DCC_NONE_Redirect_Server_Address (435),
 	avp_code_MIPv6_NONE_MIP6_Auth_Mode (494),
-	avp_code_DNAS_NONE_Acct_Tunnel_Packets_Lost (86),
 	avp_code_BASE_NONE_Session_Timeout (27),
-	avp_code_DNAS_NONE_NAS_IPv6_Address (95),
+	avp_code_DNAS_NONE_Acct_Tunnel_Packets_Lost (86),
 	avp_code_DNAS_NONE_Login_LAT_Group (36),
+	avp_code_DNAS_NONE_NAS_IPv6_Address (95),
 	avp_code_MIPv6_NONE_MIP_MAC_Mobility_Data (489),
 	avp_code_DNAS_NONE_Accounting_Output_Octets (364),
 	avp_code_BASE_NONE_Supported_Vendor_Id (265),
@@ -8526,16 +8526,16 @@ type enumerated AVP_Code_NONE {
 	avp_code_DCC_NONE_G_S_U_Pool_Reference (457),
 	avp_code_MIPv6_NONE_Chargable_User_Identity (89),
 	avp_code_BASE_NONE_Redirect_Host (292),
-	avp_code_DNAS_NONE_ARAP_Zone_Access (72),
 	avp_code_DNAS_NONE_Framed_Compression (13),
+	avp_code_DNAS_NONE_ARAP_Zone_Access (72),
 	avp_code_DNAS_NONE_QoS_Filter_Rule (407),
 	avp_code_MIPv6_NONE_MIP_MN_AAA_SPI (341),
 	avp_code_MIPv6_NONE_MIP_MSA_Lifetime (367),
-	avp_code_DNAS_NONE_Tunnel_Private_Group_Id (81),
 	avp_code_DNAS_NONE_Framed_Route (22),
+	avp_code_DNAS_NONE_Tunnel_Private_Group_Id (81),
 	avp_code_DCC_NONE_CC_Request_Type (416),
-	avp_code_DNAS_NONE_Tunnel_Client_Auth_Id (90),
 	avp_code_DNAS_NONE_Calling_Station_Id (31),
+	avp_code_DNAS_NONE_Tunnel_Client_Auth_Id (90),
 	avp_code_DCC_NONE_Currency_Code (425),
 	avp_code_BASE_NONE_E2E_Sequence (300),
 	avp_code_BASE_NONE_Origin_Realm (296),
@@ -8555,8 +8555,8 @@ type enumerated AVP_Code_NONE {
 	avp_code_BASE_NONE_Accounting_Record_Type (480),
 	avp_code_DCC_NONE_Value_Digits (447),
 	avp_code_BASE_NONE_Acct_Application_Id (259),
-	avp_code_DNAS_NONE_Login_IPv6_Host (98),
 	avp_code_DNAS_NONE_Framed_Appletalk_Zone (39),
+	avp_code_DNAS_NONE_Login_IPv6_Host (98),
 	avp_code_DCC_NONE_Final_Unit_Indication (430),
 	avp_code_BASE_NONE_Result_Code (268),
 	avp_code_DNAS_NONE_Framed_IP_Address (8),
@@ -8567,14 +8567,14 @@ type enumerated AVP_Code_NONE {
 	avp_code_DCC_NONE_Subscription_Id (443),
 	avp_code_DCC_NONE_Tariff_Change_Usage (452),
 	avp_code_DNAS_NONE_NAS_IP_Address (4),
-	avp_code_DCC_NONE_Service_Context_Id (461),
 	avp_code_DNAS_NONE_CHAP_Auth (402),
+	avp_code_DCC_NONE_Service_Context_Id (461),
 	avp_code_BASE_NONE_Inband_Security_Id (299),
-	avp_code_MIPv6_NONE_MIP6_Home_Agent_Host (348),
 	avp_code_DCC_NONE_CC_Correlation_Id (411),
+	avp_code_MIPv6_NONE_MIP6_Home_Agent_Host (348),
 	avp_code_BASE_NONE_Route_Record (282),
-	avp_code_MIPv6_NONE_MIP6_Feature_Vector (124),
 	avp_code_DNAS_NONE_Port_Limit (62),
+	avp_code_MIPv6_NONE_MIP6_Feature_Vector (124),
 	avp_code_DCC_NONE_Multiple_Services_Credit_Control (456),
 	avp_code_BASE_NONE_Authorization_Lifetime (291),
 	avp_code_DNAS_NONE_ARAP_Features (71),
@@ -8588,8 +8588,8 @@ type enumerated AVP_Code_NONE {
 	avp_code_BASE_NONE_Termination_Cause (295),
 	avp_code_DNAS_NONE_Login_TCP_Port (16),
 	avp_code_DNAS_NONE_Password_Retry (75),
-	avp_code_DNAS_NONE_ARAP_Challenge_Response (84),
 	avp_code_BASE_NONE_Class (25),
+	avp_code_DNAS_NONE_ARAP_Challenge_Response (84),
 	avp_code_DCC_NONE_CC_Sub_Session_Id (419)
 } with {
 	variant "FIELDLENGTH(32)"
@@ -8621,8 +8621,8 @@ type enumerated AVP_Code_3GPP {
 	avp_code_AAA_3GPP_UVA_Flags (1640),
 	avp_code_DCA_3GPP_Expires (888),
 	avp_code_CxDx_3GPP_SAR_Flags (655),
-	avp_code_AAA_3GPP_Group_Service_Id (1676),
 	avp_code_PCC_3GPP_TDF_Information (1087),
+	avp_code_AAA_3GPP_Group_Service_Id (1676),
 	avp_code_DCA_3GPP_Recipient_SCCP_Address (2010),
 	avp_code_DCA_3GPP_Preferred_AoC_Currency (2315),
 	avp_code_DCA_3GPP_Traffic_Data_Volumes (2046),
@@ -8644,16 +8644,16 @@ type enumerated AVP_Code_3GPP {
 	avp_code_RX_3GPP_Media_Type (520),
 	avp_code_PCC_3GPP_Conditional_Policy_Information (2840),
 	avp_code_DCA_3GPP_ProSe_Event_Type (3443),
-	avp_code_AAA_3GPP_SIPTO_Permission (1613),
 	avp_code_PCC_3GPP_Network_Request_Support (1024),
+	avp_code_AAA_3GPP_SIPTO_Permission (1613),
 	avp_code_DCA_3GPP_Terminating_IOI (840),
 	avp_code_RX_3GPP_Extended_Max_Supported_BW_DL (556),
 	avp_code_PCC_3GPP_UE_Local_IP_Address (2805),
 	avp_code_DCA_3GPP_SM_Sequence_Number (3408),
 	avp_code_DCA_3GPP_IMS_Information (876),
 	avp_code_PCC_3GPP_Presence_Reporting_Area_Elements_List (2820),
-	avp_code_AAA_3GPP_SGs_MME_Identity (1664),
 	avp_code_PCC_3GPP_Routing_Rule_Remove (1075),
+	avp_code_AAA_3GPP_SGs_MME_Identity (1664),
 	avp_code_S6_3GPP_Roaming_Information (3139),
 	avp_code_DCA_3GPP_Number_Of_Diversions (2034),
 	avp_code_DCA_3GPP_Coverage_Info (3459),
@@ -8686,14 +8686,14 @@ type enumerated AVP_Code_3GPP {
 	avp_code_DCA_3GPP_Role_Of_Node (829),
 	avp_code_PCC_3GPP_Default_Bearer_Indication (2844),
 	avp_code_DCA_3GPP_ProSe_Information (3447),
-	avp_code_AAA_3GPP_VPLMN_LIPA_Allowed (1617),
 	avp_code_PCC_3GPP_QoS_Class_Identifier (1028),
+	avp_code_AAA_3GPP_VPLMN_LIPA_Allowed (1617),
 	avp_code_PCC_3GPP_Mute_Notification (2809),
 	avp_code_CxDx_3GPP_SIP_Authentication_Context (611),
 	avp_code_AAA_3GPP_Logging_Duration (1632),
 	avp_code_CxDx_3GPP_Associated_Registered_Identities (647),
-	avp_code_AAA_3GPP_WLAN_offloadability_EUTRAN (1668),
 	avp_code_PCC_3GPP_Routing_IP_Address (1079),
+	avp_code_AAA_3GPP_WLAN_offloadability_EUTRAN (1668),
 	avp_code_DCA_3GPP_MBMS_GW_Address (2307),
 	avp_code_DCA_3GPP_Destination_Interface (2002),
 	avp_code_DCA_3GPP_IMS_Emergency_Indicator (2322),
@@ -8720,18 +8720,18 @@ type enumerated AVP_Code_3GPP {
 	avp_code_PCC_3GPP_RAN_Rule_Support (2832),
 	avp_code_DCA_3GPP_PC3_EPC_Control_Protocol_Cause (3435),
 	avp_code_S6_3GPP_Monitoring_Duration (3130),
-	avp_code_AAA_3GPP_Routing_Area_Identity (1605),
 	avp_code_PCC_3GPP_QoS_Information (1016),
+	avp_code_AAA_3GPP_Routing_Area_Identity (1605),
 	avp_code_DCA_3GPP_Called_Party_Address (832),
 	avp_code_RX_3GPP_Service_Authorization_Info (548),
 	avp_code_AAA_3GPP_eDRX_Cycle_Length (1691),
 	avp_code_S6_3GPP_Group_Monitoring_Event_Report_Item (3166),
-	avp_code_AAA_3GPP_Ext_PDP_Type (1620),
 	avp_code_PCC_3GPP_Rule_Failure_Code (1031),
+	avp_code_AAA_3GPP_Ext_PDP_Type (1620),
 	avp_code_DCA_3GPP_Time_Quota_Threshold (868),
 	avp_code_PCC_3GPP_User_Location_Info_Time (2812),
-	avp_code_AAA_3GPP_Measurement_Period_LTE (1656),
 	avp_code_PCC_3GPP_Usage_Monitoring_Information (1067),
+	avp_code_AAA_3GPP_Measurement_Period_LTE (1656),
 	avp_code_PCC_3GPP_Extended_APN_AMBR_DL (2848),
 	avp_code_CxDx_3GPP_Session_Priority (650),
 	avp_code_DCA_3GPP_Recipient_Info (2026),
@@ -8798,14 +8798,14 @@ type enumerated AVP_Code_3GPP {
 	avp_code_S6_3GPP_Monitoring_Event_Configuration (3122),
 	avp_code_PCC_3GPP_Offline (1008),
 	avp_code_DCA_3GPP_SIP_Method (824),
-	avp_code_AAA_3GPP_Additional_Context_ID (1683),
 	avp_code_PCC_3GPP_ADC_Rule_Definition (1094),
+	avp_code_AAA_3GPP_Additional_Context_ID (1683),
 	avp_code_S6_3GPP_Allowed_PLMN_List (3158),
-	avp_code_AAA_3GPP_Active_APN (1612),
 	avp_code_PCC_3GPP_Bearer_Control_Mode (1023),
+	avp_code_AAA_3GPP_Active_APN (1612),
 	avp_code_PCC_3GPP_HeNB_Local_IP_Address (2804),
-	avp_code_AAA_3GPP_SMS_Register_Request (1648),
 	avp_code_PCC_3GPP_Packet_Filter_Content (1059),
+	avp_code_AAA_3GPP_SMS_Register_Request (1648),
 	avp_code_CxDx_3GPP_Subscription_Info (642),
 	avp_code_DCA_3GPP_SIP_Response_Timestamp_Fraction (2302),
 	avp_code_DCA_3GPP_Client_Address (2018),
@@ -8827,17 +8827,17 @@ type enumerated AVP_Code_3GPP {
 	avp_code_DCA_3GPP_Forwarding_Pending (3415),
 	avp_code_S6_3GPP_SIR_Flags (3110),
 	avp_code_RX_3GPP_MPS_Identifier (528),
-	avp_code_AAA_3GPP_MDT_Allowed_PLMN_Id (1671),
 	avp_code_PCC_3GPP_Credit_Management_Status (1082),
+	avp_code_AAA_3GPP_MDT_Allowed_PLMN_Id (1671),
 	avp_code_DCA_3GPP_Monitored_PLMN_Identifier (3430),
 	avp_code_S6_3GPP_Service_Result (3146),
-	avp_code_AAA_3GPP_MME_Location_Information (1600),
 	avp_code_PCC_3GPP_Reporting_Level (1011),
+	avp_code_AAA_3GPP_MME_Location_Information (1600),
 	avp_code_DCA_3GPP_Served_Party_IP_Address (848),
 	avp_code_RX_3GPP_Max_Supported_Bandwidth_DL (543),
 	avp_code_DCA_3GPP_Time_First_Reception (3466),
-	avp_code_AAA_3GPP_Subscribed_VSRVCC (1636),
 	avp_code_PCC_3GPP_Pre_emption_Capability (1047),
+	avp_code_AAA_3GPP_Subscribed_VSRVCC (1636),
 	avp_code_PCC_3GPP_Monitoring_Flags (2828),
 	avp_code_CxDx_3GPP_Feature_List (630),
 	avp_code_DCA_3GPP_Address_Type (899),
@@ -8904,8 +8904,8 @@ type enumerated AVP_Code_3GPP {
 	avp_code_PCC_3GPP_Charging_Rule_Definition (1003),
 	avp_code_RX_3GPP_Min_Requested_Bandwidth_UL (535),
 	avp_code_DCA_3GPP_Application_Specific_Data (3458),
-	avp_code_AAA_3GPP_Report_Amount (1628),
 	avp_code_PCC_3GPP_CoA_Information (1039),
+	avp_code_AAA_3GPP_Report_Amount (1628),
 	avp_code_CxDx_3GPP_Secondary_Charging_Collection_Function_Name (622),
 	avp_code_AAA_3GPP_A_MSISDN (1643),
 	avp_code_PCC_3GPP_Routing_Rule_Report (2835),
@@ -8945,8 +8945,8 @@ type enumerated AVP_Code_3GPP {
 	avp_code_AAA_3GPP_Logging_Interval (1631),
 	avp_code_DCA_3GPP_PoC_Information (879),
 	avp_code_PCC_3GPP_Presence_Reporting_Area_Status (2823),
-	avp_code_AAA_3GPP_WLAN_offloadability (1667),
 	avp_code_PCC_3GPP_Routing_Filter (1078),
+	avp_code_AAA_3GPP_WLAN_offloadability (1667),
 	avp_code_DCA_3GPP_Data_Coding_Scheme (2001),
 	avp_code_PCC_3GPP_Metering_Method (1007),
 	avp_code_AAA_3GPP_Non_IP_Data_Delivery_Mechanism (1682),
@@ -8973,13 +8973,13 @@ type enumerated AVP_Code_3GPP {
 	avp_code_PCC_3GPP_QoS_Upgrade (1030),
 	avp_code_DCA_3GPP_PS_Append_Free_Format_Data (867),
 	avp_code_PCC_3GPP_AN_GW_Status (2811),
-	avp_code_AAA_3GPP_Measurement_Period_UMTS (1655),
 	avp_code_PCC_3GPP_Monitoring_Key (1066),
+	avp_code_AAA_3GPP_Measurement_Period_UMTS (1655),
 	avp_code_DCA_3GPP_Media_Initiator_Flag (882),
 	avp_code_DCA_3GPP_ISUP_Location_Number (3414),
 	avp_code_PCC_3GPP_3GPP_PS_Data_Off_Status (2847),
-	avp_code_AAA_3GPP_Reset_ID (1670),
 	avp_code_PCC_3GPP_Routing_Rule_Install (1081),
+	avp_code_AAA_3GPP_Reset_ID (1670),
 	avp_code_DCA_3GPP_Service_Data_Container (2040),
 	avp_code_CxDx_3GPP_Server_Assignment_Type (614),
 	avp_code_AAA_3GPP_PUR_Flags (1635),
@@ -9015,8 +9015,8 @@ type enumerated AVP_Code_3GPP {
 	avp_code_DCA_3GPP_ProSe_UE_ID (3453),
 	avp_code_CxDx_3GPP_Server_Name (602),
 	avp_code_S6_3GPP_APN_Validity_Time (3169),
-	avp_code_AAA_3GPP_Job_Type (1623),
 	avp_code_PCC_3GPP_Allocation_Retention_Priority (1034),
+	avp_code_AAA_3GPP_Job_Type (1623),
 	avp_code_AAA_3GPP_Positioning_Method (1659),
 	avp_code_CxDx_3GPP_LIA_Flags (653),
 	avp_code_AAA_3GPP_DL_Buffering_Suggested_Packet_Count (1674),
@@ -9041,8 +9041,8 @@ type enumerated AVP_Code_3GPP {
 	avp_code_PCC_3GPP_ADC_Rule_Remove (1093),
 	avp_code_DCA_3GPP_ProSe_Direct_Communication_Transmission_Data_Container (3441),
 	avp_code_S6_3GPP_Restricted_PLMN_List (3157),
-	avp_code_AAA_3GPP_Age_Of_Location_Information (1611),
 	avp_code_PCC_3GPP_Access_Network_Charging_Identifier_Gx (1022),
+	avp_code_AAA_3GPP_Age_Of_Location_Information (1611),
 	avp_code_DCA_3GPP_PoC_Group_Name (859),
 	avp_code_RX_3GPP_Extended_Max_Requested_BW_DL (554),
 	avp_code_PCC_3GPP_Flow_Information (1058),
@@ -9050,8 +9050,8 @@ type enumerated AVP_Code_3GPP {
 	avp_code_DCA_3GPP_MTC_IWF_Address (3406),
 	avp_code_PCC_3GPP_Execution_Time (2839),
 	avp_code_CxDx_3GPP_Contact (641),
-	avp_code_AAA_3GPP_Event_Threshold_Event_1I (1662),
 	avp_code_PCC_3GPP_Charging_Correlation_Indicator (1073),
+	avp_code_AAA_3GPP_Event_Threshold_Event_1I (1662),
 	avp_code_DCA_3GPP_SIP_Request_Timestamp_Fraction (2301),
 	avp_code_DCA_3GPP_Service_Mode (2032),
 	avp_code_CxDx_3GPP_User_Data (606),
@@ -9080,18 +9080,18 @@ type enumerated AVP_Code_3GPP {
 	avp_code_PCC_3GPP_Priority_Level (1046),
 	avp_code_DCA_3GPP_Node_Functionality (862),
 	avp_code_RX_3GPP_Flow_Description (507),
-	avp_code_AAA_3GPP_Daylight_Saving_Time (1650),
 	avp_code_PCC_3GPP_Packet_Filter_Information (1061),
+	avp_code_AAA_3GPP_Daylight_Saving_Time (1650),
 	avp_code_DCA_3GPP_Address_Domain (898),
 	avp_code_S6_3GPP_SCEF_ID (3125),
 	avp_code_DCA_3GPP_Content_Length (827),
 	avp_code_PCC_3GPP_Removal_Of_Access (2842),
-	avp_code_AAA_3GPP_Preferred_Data_Mode (1686),
 	avp_code_PCC_3GPP_ADC_Rule_Report (1097),
+	avp_code_AAA_3GPP_Preferred_Data_Mode (1686),
 	avp_code_DCA_3GPP_ProSe_Functionality (3445),
 	avp_code_DCA_3GPP_Low_Balance_Indication (2020),
-	avp_code_AAA_3GPP_UE_SRVCC_Capability (1615),
 	avp_code_PCC_3GPP_Guaranteed_Bitrate_UL (1026),
+	avp_code_AAA_3GPP_UE_SRVCC_Capability (1615),
 	avp_code_CxDx_3GPP_To_SIP_Header (645),
 	avp_code_AAA_3GPP_Coupled_Node_Diameter_ID (1666),
 	avp_code_DCA_3GPP_Real_Time_Tariff_Information (2305),
@@ -9114,16 +9114,16 @@ type enumerated AVP_Code_3GPP {
 	avp_code_PCC_3GPP_Redirect_Information (1085),
 	avp_code_DCA_3GPP_Monitoring_UE_VPLMN_Identifier (3433),
 	avp_code_S6_3GPP_Event_Handling (3149),
-	avp_code_AAA_3GPP_Tracking_Area_Identity (1603),
 	avp_code_PCC_3GPP_ToS_Traffic_Class (1014),
+	avp_code_AAA_3GPP_Tracking_Area_Identity (1603),
 	avp_code_RX_3GPP_Min_Desired_Bandwidth_UL (546),
 	avp_code_AAA_3GPP_UVR_Flags (1639),
 	avp_code_DCA_3GPP_PS_Free_Format_Data (866),
 	avp_code_CxDx_3GPP_Originating_Request (633),
-	avp_code_AAA_3GPP_Subscription_Data_Flags (1654),
 	avp_code_PCC_3GPP_PDN_Connection_ID (1065),
-	avp_code_AAA_3GPP_DSR_Flags (1421),
+	avp_code_AAA_3GPP_Subscription_Data_Flags (1654),
 	avp_code_PCC_3GPP_PRA_Remove (2846),
+	avp_code_AAA_3GPP_DSR_Flags (1421),
 	avp_code_DCA_3GPP_Number_Portability_Routing_Information (2024),
 	avp_code_AAA_3GPP_Subscribed_Periodic_RAU_TAU_Timer (1619),
 	avp_code_AAA_3GPP_Specific_APN_Info (1472),
@@ -9150,8 +9150,8 @@ type enumerated AVP_Code_3GPP {
 	avp_code_PCC_3GPP_Tunnel_Information (1038),
 	avp_code_DCA_3GPP_Bearer_Service (854),
 	avp_code_CxDx_3GPP_Primary_Charging_Collection_Function_Name (621),
-	avp_code_AAA_3GPP_Time_Zone (1642),
 	avp_code_PCC_3GPP_QoS_Rule_Definition (1053),
+	avp_code_AAA_3GPP_Time_Zone (1642),
 	avp_code_S6_3GPP_Periodic_Time (3117),
 	avp_code_PCC_3GPP_Routing_Rule_Failure_Code (2834),
 	avp_code_PCC_3GPP_TDF_Destination_Host (1089),
@@ -9159,8 +9159,8 @@ type enumerated AVP_Code_3GPP {
 	avp_code_DCA_3GPP_SM_Discharge_Time (2012),
 	avp_code_DCA_3GPP_Requestor_PLMN_Identifier (3437),
 	avp_code_DCA_3GPP_IMS_Application_Reference_Identifier (2601),
-	avp_code_AAA_3GPP_Service_Area_Identity (1607),
 	avp_code_PCC_3GPP_Charging_Rule_Report (1018),
+	avp_code_AAA_3GPP_Service_Area_Identity (1607),
 	avp_code_AAA_3GPP_UE_PC5_AMBR (1693),
 	avp_code_CxDx_3GPP_Public_Identity (601),
 	avp_code_DCA_3GPP_Local_Sequence_Number (2063),
@@ -9181,8 +9181,8 @@ type enumerated AVP_Code_3GPP {
 	avp_code_DCA_3GPP_SDP_Session_Description (842),
 	avp_code_RX_3GPP_Extended_Min_Desired_BW_DL (558),
 	avp_code_DCA_3GPP_Location_Info (3460),
-	avp_code_AAA_3GPP_Event_Threshold_RSRQ (1630),
 	avp_code_PCC_3GPP_APN_Aggregate_Max_Bitrate_UL (1041),
+	avp_code_AAA_3GPP_Event_Threshold_RSRQ (1630),
 	avp_code_DCA_3GPP_LCS_Information (878),
 	avp_code_S6_3GPP_Service_Parameters (3105),
 	avp_code_PCC_3GPP_Presence_Reporting_Area_Information (2822),
@@ -9191,8 +9191,8 @@ type enumerated AVP_Code_3GPP {
 	avp_code_DCA_3GPP_ePDG_Address (3425),
 	avp_code_PCC_3GPP_Event_Trigger (1006),
 	avp_code_RX_3GPP_GCS_Identifier (538),
-	avp_code_AAA_3GPP_Non_IP_PDN_Type_Indicator (1681),
 	avp_code_PCC_3GPP_ADC_Rule_Install (1092),
+	avp_code_AAA_3GPP_Non_IP_PDN_Type_Indicator (1681),
 	avp_code_DCA_3GPP_Outgoing_Session_Id (2320),
 	avp_code_DCA_3GPP_PoC_Controlling_Address (858),
 	avp_code_DCA_3GPP_Dynamic_Address_Flag (2051),
@@ -9266,8 +9266,8 @@ type enumerated AVP_Code_3GPP {
 	avp_code_AAA_3GPP_RAT_Frequency_Selection_Priority_ID (1440),
 	avp_code_DCA_3GPP_Time_First_Usage (2043),
 	avp_code_CxDx_3GPP_Reason_Info (617),
-	avp_code_AAA_3GPP_CLR_Flags (1638),
 	avp_code_PCC_3GPP_Default_EPS_Bearer_QoS (1049),
+	avp_code_AAA_3GPP_CLR_Flags (1638),
 	avp_code_AAA_3GPP_ULR_Flags (1405),
 	avp_code_DCA_3GPP_Originating_SCCP_Address (2008),
 	avp_code_AAA_3GPP_ICS_Indicator (1491),
@@ -9295,16 +9295,16 @@ type enumerated AVP_Code_3GPP {
 	avp_code_DCA_3GPP_Service_Information (873),
 	avp_code_RX_3GPP_Media_Component_Number (518),
 	avp_code_CxDx_3GPP_Path (640),
-	avp_code_AAA_3GPP_Event_Threshold_Event_1F (1661),
 	avp_code_PCC_3GPP_Packet_Filter_Usage (1072),
+	avp_code_AAA_3GPP_Event_Threshold_Event_1F (1661),
 	avp_code_S6_3GPP_MONTE_Location_Type (3136),
 	avp_code_DCA_3GPP_Inter_Operator_Identifier (838),
 	avp_code_AAA_3GPP_RDS_Indicator (1697),
 	avp_code_DCA_3GPP_Proximity_Cancellation_Timestamp (3456),
 	avp_code_DCA_3GPP_MMTel_SService_Type (2031),
 	avp_code_CxDx_3GPP_Optional_Capability (605),
-	avp_code_AAA_3GPP_Reporting_Trigger (1626),
 	avp_code_PCC_3GPP_Tunnel_Header_Length (1037),
+	avp_code_AAA_3GPP_Reporting_Trigger (1626),
 	avp_code_PCC_3GPP_Conditional_APN_Aggregate_Max_Bitrate (2818),
 	avp_code_CxDx_3GPP_Secondary_Event_Charging_Function_Name (620),
 	avp_code_AAA_3GPP_Group_PLMN_Id (1677),
@@ -9328,15 +9328,15 @@ type enumerated AVP_Code_3GPP {
 	avp_code_PCC_3GPP_Resource_Release_Notification (2841),
 	avp_code_PCC_3GPP_ADC_Rule_Name (1096),
 	avp_code_DCA_3GPP_ProSe_Function_IP_Address (3444),
-	avp_code_AAA_3GPP_Error_Diagnostic (1614),
 	avp_code_PCC_3GPP_Guaranteed_Bitrate_DL (1025),
+	avp_code_AAA_3GPP_Error_Diagnostic (1614),
 	avp_code_RX_3GPP_Extended_Max_Supported_BW_UL (557),
 	avp_code_PCC_3GPP_UDP_Source_Port (2806),
 	avp_code_DCA_3GPP_SMS_Result (3409),
 	avp_code_DCA_3GPP_MMS_Information (877),
 	avp_code_CxDx_3GPP_From_SIP_Header (644),
-	avp_code_AAA_3GPP_SIPTO_Local_Network_Permission (1665),
 	avp_code_PCC_3GPP_Routing_Rule_Definition (1076),
+	avp_code_AAA_3GPP_SIPTO_Local_Network_Permission (1665),
 	avp_code_DCA_3GPP_CUG_Information (2304),
 	avp_code_AAA_3GPP_VPLMN_Dynamic_Address_Allowed (1432),
 	avp_code_DCA_3GPP_Associated_Party_Address (2035),
@@ -9356,8 +9356,8 @@ type enumerated AVP_Code_3GPP {
 	avp_code_S6_3GPP_IP_SM_GW_Realm (3112),
 	avp_code_DCA_3GPP_Monitoring_UE_Identifier (3432),
 	avp_code_S6_3GPP_Reference_ID_Validity_Time (3148),
-	avp_code_AAA_3GPP_E_UTRAN_Cell_Global_Identity (1602),
 	avp_code_PCC_3GPP_TFT_Packet_Filter_Information (1013),
+	avp_code_AAA_3GPP_E_UTRAN_Cell_Global_Identity (1602),
 	avp_code_RX_3GPP_Min_Desired_Bandwidth_DL (545),
 	avp_code_DCA_3GPP_Transmitter_Info (3468),
 	avp_code_S6_3GPP_Group_Reporting_Guard_Timer (3163),
@@ -9369,8 +9369,8 @@ type enumerated AVP_Code_3GPP {
 	avp_code_AAA_3GPP_V2X_Permission (1689),
 	avp_code_DCA_3GPP_ProSe_Range_Class (3448),
 	avp_code_DCA_3GPP_Carrier_Select_Routing_Information (2023),
-	avp_code_AAA_3GPP_LIPA_Permission (1618),
 	avp_code_PCC_3GPP_QoS_Negotiation (1029),
+	avp_code_AAA_3GPP_LIPA_Permission (1618),
 	avp_code_CxDx_3GPP_SIP_Auth_Data_Item (612),
 	avp_code_AAA_3GPP_3GPP2_MEID (1471),
 	avp_code_AAA_3GPP_Subscription_Data (1400),
@@ -9390,8 +9390,8 @@ type enumerated AVP_Code_3GPP {
 	avp_code_RX_3GPP_Rx_Request_Type (533),
 	avp_code_S6_3GPP_NIDD_Authorization_Response (3151),
 	avp_code_DCA_3GPP_Outgoing_Trunk_Group_Id (853),
-	avp_code_AAA_3GPP_VPLMN_CSG_Subscription_Data (1641),
 	avp_code_PCC_3GPP_QoS_Rule_Remove (1052),
+	avp_code_AAA_3GPP_VPLMN_CSG_Subscription_Data (1641),
 	avp_code_DCA_3GPP_Message_Body (889),
 	avp_code_S6_3GPP_Communication_Duration_Time (3116),
 	avp_code_PCC_3GPP_Access_Availability_Change_Reason (2833),
@@ -9404,10 +9404,10 @@ type enumerated AVP_Code_3GPP {
 	avp_code_S6_3GPP_RIR_Flags (3167),
 	avp_code_DCA_3GPP_Volume_Quota_Threshold (869),
 	avp_code_DCA_3GPP_Incremental_Cost (2062),
-	avp_code_AAA_3GPP_Collection_Period_RRM_LTE (1657),
 	avp_code_PCC_3GPP_Usage_Monitoring_Level (1068),
-	avp_code_AAA_3GPP_Subscriber_Status (1424),
+	avp_code_AAA_3GPP_Collection_Period_RRM_LTE (1657),
 	avp_code_PCC_3GPP_Extended_APN_AMBR_UL (2849),
+	avp_code_AAA_3GPP_Subscriber_Status (1424),
 	avp_code_CxDx_3GPP_Identity_with_Emergency_Registration (651),
 	avp_code_DCA_3GPP_Originator_Received_Address (2027),
 	avp_code_DCA_3GPP_AoC_Service (2311),
@@ -9428,14 +9428,14 @@ type enumerated AVP_Code_3GPP {
 	avp_code_DCA_3GPP_ISUP_Cause_Value (3424),
 	avp_code_PCC_3GPP_Charging_Rule_Name (1005),
 	avp_code_RX_3GPP_Ip_Domain_Id (537),
-	avp_code_AAA_3GPP_UE_Usage_Type (1680),
 	avp_code_PCC_3GPP_TDF_IP_Address (1091),
+	avp_code_AAA_3GPP_UE_Usage_Type (1680),
 	avp_code_S6_3GPP_Enhanced_Coverage_Restriction (3155),
 	avp_code_DCA_3GPP_Charged_Party (857),
 	avp_code_DCA_3GPP_PDN_Connection_Charging_ID (2050),
 	avp_code_CxDx_3GPP_User_Data_Already_Available (624),
-	avp_code_AAA_3GPP_MME_Number_for_MT_SMS (1645),
 	avp_code_PCC_3GPP_Security_Parameter_Index (1056),
+	avp_code_AAA_3GPP_MME_Number_for_MT_SMS (1645),
 	avp_code_PCC_3GPP_Traffic_Steering_Policy_Identifier_UL (2837),
 	avp_code_DCA_3GPP_SM_User_Data_Header (2015),
 	avp_code_AAA_3GPP_Carrier_Frequency (1696),
@@ -9459,8 +9459,8 @@ type enumerated AVP_Code_3GPP {
 	avp_code_S6_3GPP_Supported_Services (3143),
 	avp_code_DCA_3GPP_SDP_Media_Description (845),
 	avp_code_DCA_3GPP_Radio_Parameter_Set_Info (3463),
-	avp_code_AAA_3GPP_Relay_Node_Indicator (1633),
 	avp_code_PCC_3GPP_Rule_DeActivation_Time (1044),
+	avp_code_AAA_3GPP_Relay_Node_Indicator (1633),
 	avp_code_S6_3GPP_T4_Data (3108),
 	avp_code_PCC_3GPP_Fixed_User_Location_Info (2825),
 	avp_code_DCA_3GPP_Coverage_Status (3428),
@@ -9492,8 +9492,8 @@ type enumerated AVP_Code_3GPP {
 	avp_code_DCA_3GPP_Base_Time_Interval (1265),
 	avp_code_DCA_3GPP_UWAN_User_Location_Info (3918),
 	avp_code_DCA_3GPP_ProSe_Role_Of_UE (3451),
-	avp_code_AAA_3GPP_Ext_PDP_Address (1621),
 	avp_code_PCC_3GPP_RAT_Type (1032),
+	avp_code_AAA_3GPP_Ext_PDP_Address (1621),
 	avp_code_DCA_3GPP_PoC_Session_Type (884),
 	avp_code_DCA_3GPP_ISUP_Cause (3416),
 	avp_code_RX_3GPP_AF_Signalling_Protocol (529),
@@ -9510,8 +9510,8 @@ type enumerated AVP_Code_3GPP {
 	avp_code_CxDx_3GPP_Supported_Applications (631),
 	avp_code_DCA_3GPP_SM_Message_Type (2007),
 	avp_code_AAA_3GPP_IDR_Flags (1490),
-	avp_code_AAA_3GPP_V2X_Subscription_Data (1688),
 	avp_code_PCC_3GPP_PS_to_CS_Session_Continuity (1099),
+	avp_code_AAA_3GPP_V2X_Subscription_Data (1688),
 	avp_code_DCA_3GPP_Refund_Information (2022),
 	avp_code_DCA_3GPP_Rate_Element (2058),
 	avp_code_AAA_3GPP_PDP_Type (1470),
@@ -9576,8 +9576,8 @@ type union AVP_Data {
 	AAA_3GPP_UVA_Flags avp_AAA_3GPP_UVA_Flags,
 	DCA_3GPP_Expires avp_DCA_3GPP_Expires,
 	CxDx_3GPP_SAR_Flags avp_CxDx_3GPP_SAR_Flags,
-	AAA_3GPP_Group_Service_Id avp_AAA_3GPP_Group_Service_Id,
 	PCC_3GPP_TDF_Information avp_PCC_3GPP_TDF_Information,
+	AAA_3GPP_Group_Service_Id avp_AAA_3GPP_Group_Service_Id,
 	DCA_3GPP_Recipient_SCCP_Address avp_DCA_3GPP_Recipient_SCCP_Address,
 	DCA_3GPP_Preferred_AoC_Currency avp_DCA_3GPP_Preferred_AoC_Currency,
 	DNAS_NONE_Framed_Pool avp_DNAS_NONE_Framed_Pool,
@@ -9606,16 +9606,16 @@ type union AVP_Data {
 	PCC_3GPP_Conditional_Policy_Information avp_PCC_3GPP_Conditional_Policy_Information,
 	BASE_NONE_Firmware_Revision avp_BASE_NONE_Firmware_Revision,
 	DCA_3GPP_ProSe_Event_Type avp_DCA_3GPP_ProSe_Event_Type,
-	AAA_3GPP_SIPTO_Permission avp_AAA_3GPP_SIPTO_Permission,
 	PCC_3GPP_Network_Request_Support avp_PCC_3GPP_Network_Request_Support,
+	AAA_3GPP_SIPTO_Permission avp_AAA_3GPP_SIPTO_Permission,
 	DCA_3GPP_Terminating_IOI avp_DCA_3GPP_Terminating_IOI,
 	RX_3GPP_Extended_Max_Supported_BW_DL avp_RX_3GPP_Extended_Max_Supported_BW_DL,
 	PCC_3GPP_UE_Local_IP_Address avp_PCC_3GPP_UE_Local_IP_Address,
 	DCA_3GPP_SM_Sequence_Number avp_DCA_3GPP_SM_Sequence_Number,
 	DCA_3GPP_IMS_Information avp_DCA_3GPP_IMS_Information,
 	PCC_3GPP_Presence_Reporting_Area_Elements_List avp_PCC_3GPP_Presence_Reporting_Area_Elements_List,
-	AAA_3GPP_SGs_MME_Identity avp_AAA_3GPP_SGs_MME_Identity,
 	PCC_3GPP_Routing_Rule_Remove avp_PCC_3GPP_Routing_Rule_Remove,
+	AAA_3GPP_SGs_MME_Identity avp_AAA_3GPP_SGs_MME_Identity,
 	S6_3GPP_Roaming_Information avp_S6_3GPP_Roaming_Information,
 	DCA_3GPP_Number_Of_Diversions avp_DCA_3GPP_Number_Of_Diversions,
 	DCA_3GPP_Coverage_Info avp_DCA_3GPP_Coverage_Info,
@@ -9643,34 +9643,34 @@ type union AVP_Data {
 	DCA_3GPP_Monitoring_UE_HPLMN_Identifier avp_DCA_3GPP_Monitoring_UE_HPLMN_Identifier,
 	PCC_3GPP_TFT_Filter avp_PCC_3GPP_TFT_Filter,
 	RX_3GPP_Max_Supported_Bandwidth_UL avp_RX_3GPP_Max_Supported_Bandwidth_UL,
-	DNAS_NONE_Tunnel_Medium_Type avp_DNAS_NONE_Tunnel_Medium_Type,
 	S6_3GPP_Loss_Of_Connectivity_Reason avp_S6_3GPP_Loss_Of_Connectivity_Reason,
+	DNAS_NONE_Tunnel_Medium_Type avp_DNAS_NONE_Tunnel_Medium_Type,
 	DCA_3GPP_Originator avp_DCA_3GPP_Originator,
 	DCC_NONE_User_Equipment_Info_Type avp_DCC_NONE_User_Equipment_Info_Type,
-	MIPv6_NONE_MIP6_Home_Agent_Address avp_MIPv6_NONE_MIP6_Home_Agent_Address,
 	RX_3GPP_Flow_Number avp_RX_3GPP_Flow_Number,
+	MIPv6_NONE_MIP6_Home_Agent_Address avp_MIPv6_NONE_MIP6_Home_Agent_Address,
 	PCC_3GPP_Resource_Allocation_Notification avp_PCC_3GPP_Resource_Allocation_Notification,
 	DCA_3GPP_Basic_Service_Code avp_DCA_3GPP_Basic_Service_Code,
 	S6_3GPP_Monitoring_Type avp_S6_3GPP_Monitoring_Type,
 	DCA_3GPP_Role_Of_Node avp_DCA_3GPP_Role_Of_Node,
 	PCC_3GPP_Default_Bearer_Indication avp_PCC_3GPP_Default_Bearer_Indication,
 	DCA_3GPP_ProSe_Information avp_DCA_3GPP_ProSe_Information,
-	AAA_3GPP_VPLMN_LIPA_Allowed avp_AAA_3GPP_VPLMN_LIPA_Allowed,
 	PCC_3GPP_QoS_Class_Identifier avp_PCC_3GPP_QoS_Class_Identifier,
+	AAA_3GPP_VPLMN_LIPA_Allowed avp_AAA_3GPP_VPLMN_LIPA_Allowed,
 	PCC_3GPP_Mute_Notification avp_PCC_3GPP_Mute_Notification,
 	CxDx_3GPP_SIP_Authentication_Context avp_CxDx_3GPP_SIP_Authentication_Context,
 	MIPv6_NONE_QoS_Resources avp_MIPv6_NONE_QoS_Resources,
 	AAA_3GPP_Logging_Duration avp_AAA_3GPP_Logging_Duration,
 	DCC_NONE_Service_Parameter_Value avp_DCC_NONE_Service_Parameter_Value,
 	CxDx_3GPP_Associated_Registered_Identities avp_CxDx_3GPP_Associated_Registered_Identities,
-	AAA_3GPP_WLAN_offloadability_EUTRAN avp_AAA_3GPP_WLAN_offloadability_EUTRAN,
 	PCC_3GPP_Routing_IP_Address avp_PCC_3GPP_Routing_IP_Address,
+	AAA_3GPP_WLAN_offloadability_EUTRAN avp_AAA_3GPP_WLAN_offloadability_EUTRAN,
 	DCA_3GPP_MBMS_GW_Address avp_DCA_3GPP_MBMS_GW_Address,
 	DCA_3GPP_Destination_Interface avp_DCA_3GPP_Destination_Interface,
 	DCA_3GPP_IMS_Emergency_Indicator avp_DCA_3GPP_IMS_Emergency_Indicator,
 	DCA_3GPP_Change_Time avp_DCA_3GPP_Change_Time,
-	MIPv6_NONE_MIP_Session_Key avp_MIPv6_NONE_MIP_Session_Key,
 	AAA_3GPP_KASME avp_AAA_3GPP_KASME,
+	MIPv6_NONE_MIP_Session_Key avp_MIPv6_NONE_MIP_Session_Key,
 	DCA_3GPP_AoC_Cost_Information avp_DCA_3GPP_AoC_Cost_Information,
 	GI_3GPP_3GPP_User_Location_Info_Time avp_GI_3GPP_3GPP_User_Location_Info_Time,
 	AAA_3GPP_Teleservice_List avp_AAA_3GPP_Teleservice_List,
@@ -9694,39 +9694,39 @@ type union AVP_Data {
 	DNAS_NONE_Tunnel_Password avp_DNAS_NONE_Tunnel_Password,
 	DCA_3GPP_PC3_EPC_Control_Protocol_Cause avp_DCA_3GPP_PC3_EPC_Control_Protocol_Cause,
 	S6_3GPP_Monitoring_Duration avp_S6_3GPP_Monitoring_Duration,
-	AAA_3GPP_Routing_Area_Identity avp_AAA_3GPP_Routing_Area_Identity,
 	PCC_3GPP_QoS_Information avp_PCC_3GPP_QoS_Information,
+	AAA_3GPP_Routing_Area_Identity avp_AAA_3GPP_Routing_Area_Identity,
 	DCA_3GPP_Called_Party_Address avp_DCA_3GPP_Called_Party_Address,
-	DCC_NONE_User_Equipment_Info_Value avp_DCC_NONE_User_Equipment_Info_Value,
-	DNAS_NONE_Tunneling avp_DNAS_NONE_Tunneling,
 	RX_3GPP_Service_Authorization_Info avp_RX_3GPP_Service_Authorization_Info,
-	BASE_NONE_Multi_Round_Time_Out avp_BASE_NONE_Multi_Round_Time_Out,
+	DNAS_NONE_Tunneling avp_DNAS_NONE_Tunneling,
+	DCC_NONE_User_Equipment_Info_Value avp_DCC_NONE_User_Equipment_Info_Value,
 	AAA_3GPP_eDRX_Cycle_Length avp_AAA_3GPP_eDRX_Cycle_Length,
+	BASE_NONE_Multi_Round_Time_Out avp_BASE_NONE_Multi_Round_Time_Out,
 	S6_3GPP_Group_Monitoring_Event_Report_Item avp_S6_3GPP_Group_Monitoring_Event_Report_Item,
-	AAA_3GPP_Ext_PDP_Type avp_AAA_3GPP_Ext_PDP_Type,
 	PCC_3GPP_Rule_Failure_Code avp_PCC_3GPP_Rule_Failure_Code,
+	AAA_3GPP_Ext_PDP_Type avp_AAA_3GPP_Ext_PDP_Type,
 	DCA_3GPP_Time_Quota_Threshold avp_DCA_3GPP_Time_Quota_Threshold,
 	PCC_3GPP_User_Location_Info_Time avp_PCC_3GPP_User_Location_Info_Time,
-	AAA_3GPP_Measurement_Period_LTE avp_AAA_3GPP_Measurement_Period_LTE,
 	PCC_3GPP_Usage_Monitoring_Information avp_PCC_3GPP_Usage_Monitoring_Information,
-	BASE_NONE_Experimental_Result_Code avp_BASE_NONE_Experimental_Result_Code,
+	AAA_3GPP_Measurement_Period_LTE avp_AAA_3GPP_Measurement_Period_LTE,
 	PCC_3GPP_Extended_APN_AMBR_DL avp_PCC_3GPP_Extended_APN_AMBR_DL,
+	BASE_NONE_Experimental_Result_Code avp_BASE_NONE_Experimental_Result_Code,
 	CxDx_3GPP_Session_Priority avp_CxDx_3GPP_Session_Priority,
 	DCA_3GPP_Recipient_Info avp_DCA_3GPP_Recipient_Info,
 	DCA_3GPP_AoC_Format avp_DCA_3GPP_AoC_Format,
 	DCA_3GPP_Start_Time avp_DCA_3GPP_Start_Time,
 	CxDx_3GPP_Deregistration_Reason avp_CxDx_3GPP_Deregistration_Reason,
 	AAA_3GPP_GMLC_Number avp_AAA_3GPP_GMLC_Number,
-	DNAS_NONE_Configuration_Token avp_DNAS_NONE_Configuration_Token,
-	DNAS_NONE_Callback_Number avp_DNAS_NONE_Callback_Number,
 	AAA_3GPP_Software_Version avp_AAA_3GPP_Software_Version,
+	DNAS_NONE_Callback_Number avp_DNAS_NONE_Callback_Number,
+	DNAS_NONE_Configuration_Token avp_DNAS_NONE_Configuration_Token,
 	DCA_3GPP_Interface_Type avp_DCA_3GPP_Interface_Type,
 	AAA_3GPP_Expiration_Date avp_AAA_3GPP_Expiration_Date,
 	BASE_NONE_Error_Message avp_BASE_NONE_Error_Message,
 	AAA_3GPP_SRES avp_AAA_3GPP_SRES,
 	DCA_3GPP_DRM_Content avp_DCA_3GPP_DRM_Content,
-	DNAS_NONE_NAS_Port_Type avp_DNAS_NONE_NAS_Port_Type,
 	AAA_3GPP_Item_Number avp_AAA_3GPP_Item_Number,
+	DNAS_NONE_NAS_Port_Type avp_DNAS_NONE_NAS_Port_Type,
 	DCC_NONE_Multiple_Services_Indicator avp_DCC_NONE_Multiple_Services_Indicator,
 	DCA_3GPP_Early_Media_Description avp_DCA_3GPP_Early_Media_Description,
 	DCA_3GPP_Related_Change_Condition_Information avp_DCA_3GPP_Related_Change_Condition_Information,
@@ -9743,12 +9743,12 @@ type union AVP_Data {
 	DCA_3GPP_Media_Initiator_Party avp_DCA_3GPP_Media_Initiator_Party,
 	DCA_3GPP_Associated_URI avp_DCA_3GPP_Associated_URI,
 	RX_3GPP_AF_Requested_Data avp_RX_3GPP_AF_Requested_Data,
+	PCC_3GPP_QoS_Rule_Report avp_PCC_3GPP_QoS_Rule_Report,
 	DNAS_NONE_Filter_Id avp_DNAS_NONE_Filter_Id,
 	DNAS_NONE_ARAP_Password avp_DNAS_NONE_ARAP_Password,
-	PCC_3GPP_QoS_Rule_Report avp_PCC_3GPP_QoS_Rule_Report,
 	DCA_3GPP_Route_Header_Received avp_DCA_3GPP_Route_Header_Received,
-	DNAS_NONE_CHAP_Response avp_DNAS_NONE_CHAP_Response,
 	S6_3GPP_Stationary_Indication avp_S6_3GPP_Stationary_Indication,
+	DNAS_NONE_CHAP_Response avp_DNAS_NONE_CHAP_Response,
 	PCC_3GPP_Traffic_Steering_Policy_Identifier_DL avp_PCC_3GPP_Traffic_Steering_Policy_Identifier_DL,
 	DCA_3GPP_Usage_Information_Report_Sequence_Number avp_DCA_3GPP_Usage_Information_Report_Sequence_Number,
 	AAA_3GPP_Geodetic_Information avp_AAA_3GPP_Geodetic_Information,
@@ -9790,16 +9790,16 @@ type union AVP_Data {
 	S6_3GPP_Monitoring_Event_Configuration avp_S6_3GPP_Monitoring_Event_Configuration,
 	PCC_3GPP_Offline avp_PCC_3GPP_Offline,
 	DCA_3GPP_SIP_Method avp_DCA_3GPP_SIP_Method,
+	PCC_3GPP_ADC_Rule_Definition avp_PCC_3GPP_ADC_Rule_Definition,
+	AAA_3GPP_Additional_Context_ID avp_AAA_3GPP_Additional_Context_ID,
 	DNAS_NONE_Login_Service avp_DNAS_NONE_Login_Service,
 	DNAS_NONE_ARAP_Security_Data avp_DNAS_NONE_ARAP_Security_Data,
-	AAA_3GPP_Additional_Context_ID avp_AAA_3GPP_Additional_Context_ID,
-	PCC_3GPP_ADC_Rule_Definition avp_PCC_3GPP_ADC_Rule_Definition,
 	S6_3GPP_Allowed_PLMN_List avp_S6_3GPP_Allowed_PLMN_List,
-	AAA_3GPP_Active_APN avp_AAA_3GPP_Active_APN,
 	PCC_3GPP_Bearer_Control_Mode avp_PCC_3GPP_Bearer_Control_Mode,
+	AAA_3GPP_Active_APN avp_AAA_3GPP_Active_APN,
 	PCC_3GPP_HeNB_Local_IP_Address avp_PCC_3GPP_HeNB_Local_IP_Address,
-	AAA_3GPP_SMS_Register_Request avp_AAA_3GPP_SMS_Register_Request,
 	PCC_3GPP_Packet_Filter_Content avp_PCC_3GPP_Packet_Filter_Content,
+	AAA_3GPP_SMS_Register_Request avp_AAA_3GPP_SMS_Register_Request,
 	CxDx_3GPP_Subscription_Info avp_CxDx_3GPP_Subscription_Info,
 	DCA_3GPP_SIP_Response_Timestamp_Fraction avp_DCA_3GPP_SIP_Response_Timestamp_Fraction,
 	DCA_3GPP_Client_Address avp_DCA_3GPP_Client_Address,
@@ -9821,23 +9821,23 @@ type union AVP_Data {
 	DCA_3GPP_ProSe_Request_Timestamp avp_DCA_3GPP_ProSe_Request_Timestamp,
 	DCA_3GPP_PoC_Session_Id avp_DCA_3GPP_PoC_Session_Id,
 	BASE_NONE_Proxy_State avp_BASE_NONE_Proxy_State,
-	MIPv6_NONE_MIP6_Agent_Info avp_MIPv6_NONE_MIP6_Agent_Info,
 	DCA_3GPP_PoC_Server_Role avp_DCA_3GPP_PoC_Server_Role,
 	DCA_3GPP_Forwarding_Pending avp_DCA_3GPP_Forwarding_Pending,
-	DCC_NONE_Credit_Control_Failure_Handling avp_DCC_NONE_Credit_Control_Failure_Handling,
 	S6_3GPP_SIR_Flags avp_S6_3GPP_SIR_Flags,
+	DCC_NONE_Credit_Control_Failure_Handling avp_DCC_NONE_Credit_Control_Failure_Handling,
+	MIPv6_NONE_MIP6_Agent_Info avp_MIPv6_NONE_MIP6_Agent_Info,
 	RX_3GPP_MPS_Identifier avp_RX_3GPP_MPS_Identifier,
-	AAA_3GPP_MDT_Allowed_PLMN_Id avp_AAA_3GPP_MDT_Allowed_PLMN_Id,
 	PCC_3GPP_Credit_Management_Status avp_PCC_3GPP_Credit_Management_Status,
+	AAA_3GPP_MDT_Allowed_PLMN_Id avp_AAA_3GPP_MDT_Allowed_PLMN_Id,
 	DCA_3GPP_Monitored_PLMN_Identifier avp_DCA_3GPP_Monitored_PLMN_Identifier,
 	S6_3GPP_Service_Result avp_S6_3GPP_Service_Result,
-	AAA_3GPP_MME_Location_Information avp_AAA_3GPP_MME_Location_Information,
 	PCC_3GPP_Reporting_Level avp_PCC_3GPP_Reporting_Level,
+	AAA_3GPP_MME_Location_Information avp_AAA_3GPP_MME_Location_Information,
 	DCA_3GPP_Served_Party_IP_Address avp_DCA_3GPP_Served_Party_IP_Address,
 	RX_3GPP_Max_Supported_Bandwidth_DL avp_RX_3GPP_Max_Supported_Bandwidth_DL,
 	DCA_3GPP_Time_First_Reception avp_DCA_3GPP_Time_First_Reception,
-	AAA_3GPP_Subscribed_VSRVCC avp_AAA_3GPP_Subscribed_VSRVCC,
 	PCC_3GPP_Pre_emption_Capability avp_PCC_3GPP_Pre_emption_Capability,
+	AAA_3GPP_Subscribed_VSRVCC avp_AAA_3GPP_Subscribed_VSRVCC,
 	PCC_3GPP_Monitoring_Flags avp_PCC_3GPP_Monitoring_Flags,
 	BASE_NONE_Redirect_Max_Cache_Time avp_BASE_NONE_Redirect_Max_Cache_Time,
 	CxDx_3GPP_Feature_List avp_CxDx_3GPP_Feature_List,
@@ -9908,18 +9908,18 @@ type union AVP_Data {
 	RX_3GPP_Extended_Max_Requested_BW_UL avp_RX_3GPP_Extended_Max_Requested_BW_UL,
 	DCA_3GPP_SM_Device_Trigger_Indicator avp_DCA_3GPP_SM_Device_Trigger_Indicator,
 	S6_3GPP_User_Identifier avp_S6_3GPP_User_Identifier,
-	DNAS_NONE_Framed_IPv6_Pool avp_DNAS_NONE_Framed_IPv6_Pool,
 	PCC_3GPP_QoS_Rule_Base_Name avp_PCC_3GPP_QoS_Rule_Base_Name,
+	DNAS_NONE_Framed_IPv6_Pool avp_DNAS_NONE_Framed_IPv6_Pool,
 	AAA_3GPP_Restoration_Priority avp_AAA_3GPP_Restoration_Priority,
 	DCA_3GPP_ISUP_Cause_Diagnostics avp_DCA_3GPP_ISUP_Cause_Diagnostics,
-	DCC_NONE_Rating_Group avp_DCC_NONE_Rating_Group,
-	MIPv6_NONE_MIP_MN_HA_SPI avp_MIPv6_NONE_MIP_MN_HA_SPI,
 	S6_3GPP_Association_Type avp_S6_3GPP_Association_Type,
 	PCC_3GPP_Charging_Rule_Definition avp_PCC_3GPP_Charging_Rule_Definition,
+	DCC_NONE_Rating_Group avp_DCC_NONE_Rating_Group,
+	MIPv6_NONE_MIP_MN_HA_SPI avp_MIPv6_NONE_MIP_MN_HA_SPI,
 	RX_3GPP_Min_Requested_Bandwidth_UL avp_RX_3GPP_Min_Requested_Bandwidth_UL,
 	DCA_3GPP_Application_Specific_Data avp_DCA_3GPP_Application_Specific_Data,
-	AAA_3GPP_Report_Amount avp_AAA_3GPP_Report_Amount,
 	PCC_3GPP_CoA_Information avp_PCC_3GPP_CoA_Information,
+	AAA_3GPP_Report_Amount avp_AAA_3GPP_Report_Amount,
 	CxDx_3GPP_Secondary_Charging_Collection_Function_Name avp_CxDx_3GPP_Secondary_Charging_Collection_Function_Name,
 	DCC_NONE_User_Equipment_Info avp_DCC_NONE_User_Equipment_Info,
 	AAA_3GPP_A_MSISDN avp_AAA_3GPP_A_MSISDN,
@@ -9965,8 +9965,8 @@ type union AVP_Data {
 	AAA_3GPP_Logging_Interval avp_AAA_3GPP_Logging_Interval,
 	DCA_3GPP_PoC_Information avp_DCA_3GPP_PoC_Information,
 	PCC_3GPP_Presence_Reporting_Area_Status avp_PCC_3GPP_Presence_Reporting_Area_Status,
-	AAA_3GPP_WLAN_offloadability avp_AAA_3GPP_WLAN_offloadability,
 	PCC_3GPP_Routing_Filter avp_PCC_3GPP_Routing_Filter,
+	AAA_3GPP_WLAN_offloadability avp_AAA_3GPP_WLAN_offloadability,
 	DCA_3GPP_Data_Coding_Scheme avp_DCA_3GPP_Data_Coding_Scheme,
 	PCC_3GPP_Metering_Method avp_PCC_3GPP_Metering_Method,
 	DNAS_NONE_Acct_Tunnel_Connection avp_DNAS_NONE_Acct_Tunnel_Connection,
@@ -10004,20 +10004,20 @@ type union AVP_Data {
 	S6_3GPP_Group_Monitoring_Event_Report avp_S6_3GPP_Group_Monitoring_Event_Report,
 	PCC_3GPP_QoS_Upgrade avp_PCC_3GPP_QoS_Upgrade,
 	DCA_3GPP_PS_Append_Free_Format_Data avp_DCA_3GPP_PS_Append_Free_Format_Data,
-	DNAS_NONE_Service_Type avp_DNAS_NONE_Service_Type,
 	PCC_3GPP_AN_GW_Status avp_PCC_3GPP_AN_GW_Status,
-	AAA_3GPP_Measurement_Period_UMTS avp_AAA_3GPP_Measurement_Period_UMTS,
+	DNAS_NONE_Service_Type avp_DNAS_NONE_Service_Type,
 	PCC_3GPP_Monitoring_Key avp_PCC_3GPP_Monitoring_Key,
+	AAA_3GPP_Measurement_Period_UMTS avp_AAA_3GPP_Measurement_Period_UMTS,
 	DCA_3GPP_Media_Initiator_Flag avp_DCA_3GPP_Media_Initiator_Flag,
 	DCA_3GPP_ISUP_Location_Number avp_DCA_3GPP_ISUP_Location_Number,
 	PCC_3GPP_3GPP_PS_Data_Off_Status avp_PCC_3GPP_3GPP_PS_Data_Off_Status,
-	AAA_3GPP_Reset_ID avp_AAA_3GPP_Reset_ID,
 	PCC_3GPP_Routing_Rule_Install avp_PCC_3GPP_Routing_Rule_Install,
+	AAA_3GPP_Reset_ID avp_AAA_3GPP_Reset_ID,
 	DCA_3GPP_Service_Data_Container avp_DCA_3GPP_Service_Data_Container,
 	CxDx_3GPP_Server_Assignment_Type avp_CxDx_3GPP_Server_Assignment_Type,
 	AAA_3GPP_PUR_Flags avp_AAA_3GPP_PUR_Flags,
-	DNAS_NONE_Framed_Routing avp_DNAS_NONE_Framed_Routing,
 	PCC_3GPP_IP_CAN_Session_Charging_Scope avp_PCC_3GPP_IP_CAN_Session_Charging_Scope,
+	DNAS_NONE_Framed_Routing avp_DNAS_NONE_Framed_Routing,
 	AAA_3GPP_IMEI avp_AAA_3GPP_IMEI,
 	DNAS_NONE_CHAP_Ident avp_DNAS_NONE_CHAP_Ident,
 	DCA_3GPP_Interface_Text avp_DCA_3GPP_Interface_Text,
@@ -10052,18 +10052,18 @@ type union AVP_Data {
 	AAA_3GPP_MBSFN_Area avp_AAA_3GPP_MBSFN_Area,
 	DCA_3GPP_ProSe_UE_ID avp_DCA_3GPP_ProSe_UE_ID,
 	CxDx_3GPP_Server_Name avp_CxDx_3GPP_Server_Name,
-	DCC_NONE_Check_Balance_Result avp_DCC_NONE_Check_Balance_Result,
 	S6_3GPP_APN_Validity_Time avp_S6_3GPP_APN_Validity_Time,
-	AAA_3GPP_Job_Type avp_AAA_3GPP_Job_Type,
 	PCC_3GPP_Allocation_Retention_Priority avp_PCC_3GPP_Allocation_Retention_Priority,
+	DCC_NONE_Check_Balance_Result avp_DCC_NONE_Check_Balance_Result,
+	AAA_3GPP_Job_Type avp_AAA_3GPP_Job_Type,
 	BASE_NONE_Destination_Host avp_BASE_NONE_Destination_Host,
 	AAA_3GPP_Positioning_Method avp_AAA_3GPP_Positioning_Method,
 	CxDx_3GPP_LIA_Flags avp_CxDx_3GPP_LIA_Flags,
 	AAA_3GPP_DL_Buffering_Suggested_Packet_Count avp_AAA_3GPP_DL_Buffering_Suggested_Packet_Count,
 	DCA_3GPP_AoC_Service_Type avp_DCA_3GPP_AoC_Service_Type,
 	DNAS_NONE_Login_IP_Host avp_DNAS_NONE_Login_IP_Host,
-	DNAS_NONE_ARAP_Security avp_DNAS_NONE_ARAP_Security,
 	AAA_3GPP_IDA_Flags avp_AAA_3GPP_IDA_Flags,
+	DNAS_NONE_ARAP_Security avp_DNAS_NONE_ARAP_Security,
 	DNAS_NONE_Origin_AAA_Protocol avp_DNAS_NONE_Origin_AAA_Protocol,
 	DCA_3GPP_Time_Last_Usage avp_DCA_3GPP_Time_Last_Usage,
 	CxDx_3GPP_Charging_Information avp_CxDx_3GPP_Charging_Information,
@@ -10072,8 +10072,8 @@ type union AVP_Data {
 	AAA_3GPP_IMS_Voice_Over_PS_Sessions_Supported avp_AAA_3GPP_IMS_Voice_Over_PS_Sessions_Supported,
 	AAA_3GPP_Roaming_Restricted_Due_To_Unsupported_Feature avp_AAA_3GPP_Roaming_Restricted_Due_To_Unsupported_Feature,
 	DCA_3GPP_File_Repair_Supported avp_DCA_3GPP_File_Repair_Supported,
-	DNAS_NONE_Tunnel_Assignment_Id avp_DNAS_NONE_Tunnel_Assignment_Id,
 	DNAS_NONE_Framed_IPX_Network avp_DNAS_NONE_Framed_IPX_Network,
+	DNAS_NONE_Tunnel_Assignment_Id avp_DNAS_NONE_Tunnel_Assignment_Id,
 	DCC_NONE_CC_Service_Specific_Units avp_DCC_NONE_CC_Service_Specific_Units,
 	DCA_3GPP_SDP_Answer_Timestamp avp_DCA_3GPP_SDP_Answer_Timestamp,
 	DCA_3GPP_Type_Number avp_DCA_3GPP_Type_Number,
@@ -10087,21 +10087,21 @@ type union AVP_Data {
 	PCC_3GPP_ADC_Rule_Remove avp_PCC_3GPP_ADC_Rule_Remove,
 	DCA_3GPP_ProSe_Direct_Communication_Transmission_Data_Container avp_DCA_3GPP_ProSe_Direct_Communication_Transmission_Data_Container,
 	S6_3GPP_Restricted_PLMN_List avp_S6_3GPP_Restricted_PLMN_List,
-	AAA_3GPP_Age_Of_Location_Information avp_AAA_3GPP_Age_Of_Location_Information,
 	PCC_3GPP_Access_Network_Charging_Identifier_Gx avp_PCC_3GPP_Access_Network_Charging_Identifier_Gx,
+	AAA_3GPP_Age_Of_Location_Information avp_AAA_3GPP_Age_Of_Location_Information,
 	DCA_3GPP_PoC_Group_Name avp_DCA_3GPP_PoC_Group_Name,
 	RX_3GPP_Extended_Max_Requested_BW_DL avp_RX_3GPP_Extended_Max_Requested_BW_DL,
 	PCC_3GPP_Flow_Information avp_PCC_3GPP_Flow_Information,
 	DCA_3GPP_PS_Information avp_DCA_3GPP_PS_Information,
 	DCA_3GPP_MTC_IWF_Address avp_DCA_3GPP_MTC_IWF_Address,
+	PCC_3GPP_Execution_Time avp_PCC_3GPP_Execution_Time,
 	DNAS_NONE_NAS_Identifier avp_DNAS_NONE_NAS_Identifier,
 	DNAS_NONE_Tunnel_Server_Auth_Id avp_DNAS_NONE_Tunnel_Server_Auth_Id,
-	PCC_3GPP_Execution_Time avp_PCC_3GPP_Execution_Time,
 	CxDx_3GPP_Contact avp_CxDx_3GPP_Contact,
+	PCC_3GPP_Charging_Correlation_Indicator avp_PCC_3GPP_Charging_Correlation_Indicator,
 	DCC_NONE_Credit_Control avp_DCC_NONE_Credit_Control,
 	BASE_NONE_Accounting_Record_Number avp_BASE_NONE_Accounting_Record_Number,
 	AAA_3GPP_Event_Threshold_Event_1I avp_AAA_3GPP_Event_Threshold_Event_1I,
-	PCC_3GPP_Charging_Correlation_Indicator avp_PCC_3GPP_Charging_Correlation_Indicator,
 	DCA_3GPP_SIP_Request_Timestamp_Fraction avp_DCA_3GPP_SIP_Request_Timestamp_Fraction,
 	DCA_3GPP_Service_Mode avp_DCA_3GPP_Service_Mode,
 	CxDx_3GPP_User_Data avp_CxDx_3GPP_User_Data,
@@ -10121,8 +10121,8 @@ type union AVP_Data {
 	DCA_3GPP_Called_Identity avp_DCA_3GPP_Called_Identity,
 	DCA_3GPP_SGSN_Address avp_DCA_3GPP_SGSN_Address,
 	DCA_3GPP_SGi_PtP_Tunnelling_Method avp_DCA_3GPP_SGi_PtP_Tunnelling_Method,
-	DNAS_NONE_Acct_Tunnel_Packets_Lost avp_DNAS_NONE_Acct_Tunnel_Packets_Lost,
 	BASE_NONE_Session_Timeout avp_BASE_NONE_Session_Timeout,
+	DNAS_NONE_Acct_Tunnel_Packets_Lost avp_DNAS_NONE_Acct_Tunnel_Packets_Lost,
 	DCA_3GPP_NNI_Type avp_DCA_3GPP_NNI_Type,
 	RX_3GPP_Service_Info_Status avp_RX_3GPP_Service_Info_Status,
 	S6_3GPP_CIR_Flags avp_S6_3GPP_CIR_Flags,
@@ -10135,20 +10135,20 @@ type union AVP_Data {
 	PCC_3GPP_Priority_Level avp_PCC_3GPP_Priority_Level,
 	DCA_3GPP_Node_Functionality avp_DCA_3GPP_Node_Functionality,
 	RX_3GPP_Flow_Description avp_RX_3GPP_Flow_Description,
-	AAA_3GPP_Daylight_Saving_Time avp_AAA_3GPP_Daylight_Saving_Time,
 	PCC_3GPP_Packet_Filter_Information avp_PCC_3GPP_Packet_Filter_Information,
+	AAA_3GPP_Daylight_Saving_Time avp_AAA_3GPP_Daylight_Saving_Time,
 	DCA_3GPP_Address_Domain avp_DCA_3GPP_Address_Domain,
 	S6_3GPP_SCEF_ID avp_S6_3GPP_SCEF_ID,
 	DCA_3GPP_Content_Length avp_DCA_3GPP_Content_Length,
 	PCC_3GPP_Removal_Of_Access avp_PCC_3GPP_Removal_Of_Access,
-	AAA_3GPP_Preferred_Data_Mode avp_AAA_3GPP_Preferred_Data_Mode,
 	PCC_3GPP_ADC_Rule_Report avp_PCC_3GPP_ADC_Rule_Report,
+	AAA_3GPP_Preferred_Data_Mode avp_AAA_3GPP_Preferred_Data_Mode,
 	DCA_3GPP_ProSe_Functionality avp_DCA_3GPP_ProSe_Functionality,
 	DCA_3GPP_Low_Balance_Indication avp_DCA_3GPP_Low_Balance_Indication,
-	AAA_3GPP_UE_SRVCC_Capability avp_AAA_3GPP_UE_SRVCC_Capability,
 	PCC_3GPP_Guaranteed_Bitrate_UL avp_PCC_3GPP_Guaranteed_Bitrate_UL,
-	DNAS_NONE_NAS_IPv6_Address avp_DNAS_NONE_NAS_IPv6_Address,
+	AAA_3GPP_UE_SRVCC_Capability avp_AAA_3GPP_UE_SRVCC_Capability,
 	DNAS_NONE_Login_LAT_Group avp_DNAS_NONE_Login_LAT_Group,
+	DNAS_NONE_NAS_IPv6_Address avp_DNAS_NONE_NAS_IPv6_Address,
 	MIPv6_NONE_MIP_MAC_Mobility_Data avp_MIPv6_NONE_MIP_MAC_Mobility_Data,
 	DNAS_NONE_Accounting_Output_Octets avp_DNAS_NONE_Accounting_Output_Octets,
 	CxDx_3GPP_To_SIP_Header avp_CxDx_3GPP_To_SIP_Header,
@@ -10174,21 +10174,21 @@ type union AVP_Data {
 	DCA_3GPP_Network_Call_Reference_Number avp_DCA_3GPP_Network_Call_Reference_Number,
 	S6_3GPP_AESE_Communication_Pattern avp_S6_3GPP_AESE_Communication_Pattern,
 	PCC_3GPP_NBIFOM_Mode avp_PCC_3GPP_NBIFOM_Mode,
-	DCC_NONE_Validity_Time avp_DCC_NONE_Validity_Time,
 	PCC_3GPP_Redirect_Information avp_PCC_3GPP_Redirect_Information,
+	DCC_NONE_Validity_Time avp_DCC_NONE_Validity_Time,
 	DCA_3GPP_Monitoring_UE_VPLMN_Identifier avp_DCA_3GPP_Monitoring_UE_VPLMN_Identifier,
 	S6_3GPP_Event_Handling avp_S6_3GPP_Event_Handling,
-	AAA_3GPP_Tracking_Area_Identity avp_AAA_3GPP_Tracking_Area_Identity,
 	PCC_3GPP_ToS_Traffic_Class avp_PCC_3GPP_ToS_Traffic_Class,
+	AAA_3GPP_Tracking_Area_Identity avp_AAA_3GPP_Tracking_Area_Identity,
 	RX_3GPP_Min_Desired_Bandwidth_UL avp_RX_3GPP_Min_Desired_Bandwidth_UL,
 	AAA_3GPP_UVR_Flags avp_AAA_3GPP_UVR_Flags,
 	DCA_3GPP_PS_Free_Format_Data avp_DCA_3GPP_PS_Free_Format_Data,
 	CxDx_3GPP_Originating_Request avp_CxDx_3GPP_Originating_Request,
-	AAA_3GPP_Subscription_Data_Flags avp_AAA_3GPP_Subscription_Data_Flags,
 	PCC_3GPP_PDN_Connection_ID avp_PCC_3GPP_PDN_Connection_ID,
+	AAA_3GPP_Subscription_Data_Flags avp_AAA_3GPP_Subscription_Data_Flags,
 	DNAS_NONE_Framed_IPv6_Route avp_DNAS_NONE_Framed_IPv6_Route,
-	AAA_3GPP_DSR_Flags avp_AAA_3GPP_DSR_Flags,
 	PCC_3GPP_PRA_Remove avp_PCC_3GPP_PRA_Remove,
+	AAA_3GPP_DSR_Flags avp_AAA_3GPP_DSR_Flags,
 	DCC_NONE_Granted_Service_Unit avp_DCC_NONE_Granted_Service_Unit,
 	MIPv6_NONE_MIP_Timestamp avp_MIPv6_NONE_MIP_Timestamp,
 	DCA_3GPP_Number_Portability_Routing_Information avp_DCA_3GPP_Number_Portability_Routing_Information,
@@ -10208,8 +10208,8 @@ type union AVP_Data {
 	DCA_3GPP_Variable_Part_Order avp_DCA_3GPP_Variable_Part_Order,
 	DCA_3GPP_Time_Quota_Mechanism avp_DCA_3GPP_Time_Quota_Mechanism,
 	DCA_3GPP_Monitoring_Event_Report_Number avp_DCA_3GPP_Monitoring_Event_Report_Number,
-	BASE_NONE_Origin_State_Id avp_BASE_NONE_Origin_State_Id,
 	S6_3GPP_IP_SM_GW_Name avp_S6_3GPP_IP_SM_GW_Name,
+	BASE_NONE_Origin_State_Id avp_BASE_NONE_Origin_State_Id,
 	RX_3GPP_Media_Sub_Component avp_RX_3GPP_Media_Sub_Component,
 	DCA_3GPP_CN_Operator_Selection_Entity avp_DCA_3GPP_CN_Operator_Selection_Entity,
 	S6_3GPP_Accuracy avp_S6_3GPP_Accuracy,
@@ -10221,8 +10221,8 @@ type union AVP_Data {
 	PCC_3GPP_Tunnel_Information avp_PCC_3GPP_Tunnel_Information,
 	DCA_3GPP_Bearer_Service avp_DCA_3GPP_Bearer_Service,
 	CxDx_3GPP_Primary_Charging_Collection_Function_Name avp_CxDx_3GPP_Primary_Charging_Collection_Function_Name,
-	AAA_3GPP_Time_Zone avp_AAA_3GPP_Time_Zone,
 	PCC_3GPP_QoS_Rule_Definition avp_PCC_3GPP_QoS_Rule_Definition,
+	AAA_3GPP_Time_Zone avp_AAA_3GPP_Time_Zone,
 	S6_3GPP_Periodic_Time avp_S6_3GPP_Periodic_Time,
 	PCC_3GPP_Routing_Rule_Failure_Code avp_PCC_3GPP_Routing_Rule_Failure_Code,
 	PCC_3GPP_TDF_Destination_Host avp_PCC_3GPP_TDF_Destination_Host,
@@ -10230,8 +10230,8 @@ type union AVP_Data {
 	DCA_3GPP_SM_Discharge_Time avp_DCA_3GPP_SM_Discharge_Time,
 	DCA_3GPP_Requestor_PLMN_Identifier avp_DCA_3GPP_Requestor_PLMN_Identifier,
 	DCA_3GPP_IMS_Application_Reference_Identifier avp_DCA_3GPP_IMS_Application_Reference_Identifier,
-	AAA_3GPP_Service_Area_Identity avp_AAA_3GPP_Service_Area_Identity,
 	PCC_3GPP_Charging_Rule_Report avp_PCC_3GPP_Charging_Rule_Report,
+	AAA_3GPP_Service_Area_Identity avp_AAA_3GPP_Service_Area_Identity,
 	BASE_NONE_User_Name avp_BASE_NONE_User_Name,
 	AAA_3GPP_UE_PC5_AMBR avp_AAA_3GPP_UE_PC5_AMBR,
 	CxDx_3GPP_Public_Identity avp_CxDx_3GPP_Public_Identity,
@@ -10255,13 +10255,13 @@ type union AVP_Data {
 	DCA_3GPP_Reply_Applic_ID avp_DCA_3GPP_Reply_Applic_ID,
 	DCA_3GPP_Participant_Access_Priority avp_DCA_3GPP_Participant_Access_Priority,
 	RX_3GPP_RS_Bandwidth avp_RX_3GPP_RS_Bandwidth,
-	MIPv6_NONE_MIP_Algorithm_Type avp_MIPv6_NONE_MIP_Algorithm_Type,
 	S6_3GPP_Reachability_Information avp_S6_3GPP_Reachability_Information,
+	MIPv6_NONE_MIP_Algorithm_Type avp_MIPv6_NONE_MIP_Algorithm_Type,
 	DCA_3GPP_SDP_Session_Description avp_DCA_3GPP_SDP_Session_Description,
 	RX_3GPP_Extended_Min_Desired_BW_DL avp_RX_3GPP_Extended_Min_Desired_BW_DL,
 	DCA_3GPP_Location_Info avp_DCA_3GPP_Location_Info,
-	AAA_3GPP_Event_Threshold_RSRQ avp_AAA_3GPP_Event_Threshold_RSRQ,
 	PCC_3GPP_APN_Aggregate_Max_Bitrate_UL avp_PCC_3GPP_APN_Aggregate_Max_Bitrate_UL,
+	AAA_3GPP_Event_Threshold_RSRQ avp_AAA_3GPP_Event_Threshold_RSRQ,
 	DCA_3GPP_LCS_Information avp_DCA_3GPP_LCS_Information,
 	S6_3GPP_Service_Parameters avp_S6_3GPP_Service_Parameters,
 	PCC_3GPP_Presence_Reporting_Area_Information avp_PCC_3GPP_Presence_Reporting_Area_Information,
@@ -10271,9 +10271,9 @@ type union AVP_Data {
 	PCC_3GPP_Event_Trigger avp_PCC_3GPP_Event_Trigger,
 	RX_3GPP_GCS_Identifier avp_RX_3GPP_GCS_Identifier,
 	MIPv6_NONE_QoS_Capability avp_MIPv6_NONE_QoS_Capability,
+	PCC_3GPP_ADC_Rule_Install avp_PCC_3GPP_ADC_Rule_Install,
 	DCC_NONE_G_S_U_Pool_Identifier avp_DCC_NONE_G_S_U_Pool_Identifier,
 	AAA_3GPP_Non_IP_PDN_Type_Indicator avp_AAA_3GPP_Non_IP_PDN_Type_Indicator,
-	PCC_3GPP_ADC_Rule_Install avp_PCC_3GPP_ADC_Rule_Install,
 	DCA_3GPP_Outgoing_Session_Id avp_DCA_3GPP_Outgoing_Session_Id,
 	DCA_3GPP_PoC_Controlling_Address avp_DCA_3GPP_PoC_Controlling_Address,
 	DCA_3GPP_Dynamic_Address_Flag avp_DCA_3GPP_Dynamic_Address_Flag,
@@ -10315,11 +10315,11 @@ type union AVP_Data {
 	CxDx_3GPP_SIP_Item_Number avp_CxDx_3GPP_SIP_Item_Number,
 	PCC_3GPP_Session_Release_Cause avp_PCC_3GPP_Session_Release_Cause,
 	AAA_3GPP_MDT_User_Consent avp_AAA_3GPP_MDT_User_Consent,
+	S6_3GPP_HSS_Cause avp_S6_3GPP_HSS_Cause,
 	MIPv6_NONE_MIP6_Home_Link_Prefix avp_MIPv6_NONE_MIP6_Home_Link_Prefix,
 	DNAS_NONE_Login_LAT_Port avp_DNAS_NONE_Login_LAT_Port,
-	S6_3GPP_HSS_Cause avp_S6_3GPP_HSS_Cause,
-	DCC_NONE_G_S_U_Pool_Reference avp_DCC_NONE_G_S_U_Pool_Reference,
 	PCC_3GPP_PCSCF_Restoration_Indication avp_PCC_3GPP_PCSCF_Restoration_Indication,
+	DCC_NONE_G_S_U_Pool_Reference avp_DCC_NONE_G_S_U_Pool_Reference,
 	DCA_3GPP_Layer_2_Group_ID avp_DCA_3GPP_Layer_2_Group_ID,
 	DCA_3GPP_Interface_Port avp_DCA_3GPP_Interface_Port,
 	AAA_3GPP_Subscription_Data_Deletion avp_AAA_3GPP_Subscription_Data_Deletion,
@@ -10329,8 +10329,8 @@ type union AVP_Data {
 	CxDx_3GPP_Feature_List_ID avp_CxDx_3GPP_Feature_List_ID,
 	BASE_NONE_Redirect_Host avp_BASE_NONE_Redirect_Host,
 	AAA_3GPP_Network_Access_Mode avp_AAA_3GPP_Network_Access_Mode,
-	DNAS_NONE_ARAP_Zone_Access avp_DNAS_NONE_ARAP_Zone_Access,
 	DNAS_NONE_Framed_Compression avp_DNAS_NONE_Framed_Compression,
+	DNAS_NONE_ARAP_Zone_Access avp_DNAS_NONE_ARAP_Zone_Access,
 	GI_3GPP_3GPP_Selection_Mode avp_GI_3GPP_3GPP_Selection_Mode,
 	DNAS_NONE_QoS_Filter_Rule avp_DNAS_NONE_QoS_Filter_Rule,
 	AAA_3GPP_Complete_Data_List_Included_Indicator avp_AAA_3GPP_Complete_Data_List_Included_Indicator,
@@ -10348,8 +10348,8 @@ type union AVP_Data {
 	DCA_3GPP_Reason_Header avp_DCA_3GPP_Reason_Header,
 	S6_3GPP_Reachability_Type avp_S6_3GPP_Reachability_Type,
 	DCA_3GPP_SIP_Request_Timestamp avp_DCA_3GPP_SIP_Request_Timestamp,
-	DNAS_NONE_Tunnel_Private_Group_Id avp_DNAS_NONE_Tunnel_Private_Group_Id,
 	DNAS_NONE_Framed_Route avp_DNAS_NONE_Framed_Route,
+	DNAS_NONE_Tunnel_Private_Group_Id avp_DNAS_NONE_Tunnel_Private_Group_Id,
 	DCC_NONE_CC_Request_Type avp_DCC_NONE_CC_Request_Type,
 	DCA_3GPP_ProSe_Source_IP_Address avp_DCA_3GPP_ProSe_Source_IP_Address,
 	S6_3GPP_Type_Of_External_Identifier avp_S6_3GPP_Type_Of_External_Identifier,
@@ -10364,13 +10364,13 @@ type union AVP_Data {
 	AAA_3GPP_RAT_Frequency_Selection_Priority_ID avp_AAA_3GPP_RAT_Frequency_Selection_Priority_ID,
 	DCA_3GPP_Time_First_Usage avp_DCA_3GPP_Time_First_Usage,
 	CxDx_3GPP_Reason_Info avp_CxDx_3GPP_Reason_Info,
-	AAA_3GPP_CLR_Flags avp_AAA_3GPP_CLR_Flags,
 	PCC_3GPP_Default_EPS_Bearer_QoS avp_PCC_3GPP_Default_EPS_Bearer_QoS,
+	AAA_3GPP_CLR_Flags avp_AAA_3GPP_CLR_Flags,
 	AAA_3GPP_ULR_Flags avp_AAA_3GPP_ULR_Flags,
 	DCA_3GPP_Originating_SCCP_Address avp_DCA_3GPP_Originating_SCCP_Address,
-	DNAS_NONE_Tunnel_Client_Auth_Id avp_DNAS_NONE_Tunnel_Client_Auth_Id,
-	DNAS_NONE_Calling_Station_Id avp_DNAS_NONE_Calling_Station_Id,
 	AAA_3GPP_ICS_Indicator avp_AAA_3GPP_ICS_Indicator,
+	DNAS_NONE_Calling_Station_Id avp_DNAS_NONE_Calling_Station_Id,
+	DNAS_NONE_Tunnel_Client_Auth_Id avp_DNAS_NONE_Tunnel_Client_Auth_Id,
 	DCC_NONE_Currency_Code avp_DCC_NONE_Currency_Code,
 	AAA_3GPP_Cancellation_Type avp_AAA_3GPP_Cancellation_Type,
 	BASE_NONE_E2E_Sequence avp_BASE_NONE_E2E_Sequence,
@@ -10401,16 +10401,16 @@ type union AVP_Data {
 	BASE_NONE_Acct_Interim_Interval avp_BASE_NONE_Acct_Interim_Interval,
 	RX_3GPP_Media_Component_Number avp_RX_3GPP_Media_Component_Number,
 	CxDx_3GPP_Path avp_CxDx_3GPP_Path,
-	AAA_3GPP_Event_Threshold_Event_1F avp_AAA_3GPP_Event_Threshold_Event_1F,
 	PCC_3GPP_Packet_Filter_Usage avp_PCC_3GPP_Packet_Filter_Usage,
+	AAA_3GPP_Event_Threshold_Event_1F avp_AAA_3GPP_Event_Threshold_Event_1F,
 	S6_3GPP_MONTE_Location_Type avp_S6_3GPP_MONTE_Location_Type,
 	DCA_3GPP_Inter_Operator_Identifier avp_DCA_3GPP_Inter_Operator_Identifier,
 	AAA_3GPP_RDS_Indicator avp_AAA_3GPP_RDS_Indicator,
 	DCA_3GPP_Proximity_Cancellation_Timestamp avp_DCA_3GPP_Proximity_Cancellation_Timestamp,
 	DCA_3GPP_MMTel_SService_Type avp_DCA_3GPP_MMTel_SService_Type,
 	CxDx_3GPP_Optional_Capability avp_CxDx_3GPP_Optional_Capability,
-	AAA_3GPP_Reporting_Trigger avp_AAA_3GPP_Reporting_Trigger,
 	PCC_3GPP_Tunnel_Header_Length avp_PCC_3GPP_Tunnel_Header_Length,
+	AAA_3GPP_Reporting_Trigger avp_AAA_3GPP_Reporting_Trigger,
 	PCC_3GPP_Conditional_APN_Aggregate_Max_Bitrate avp_PCC_3GPP_Conditional_APN_Aggregate_Max_Bitrate,
 	CxDx_3GPP_Secondary_Event_Charging_Function_Name avp_CxDx_3GPP_Secondary_Event_Charging_Function_Name,
 	AAA_3GPP_Group_PLMN_Id avp_AAA_3GPP_Group_PLMN_Id,
@@ -10421,8 +10421,8 @@ type union AVP_Data {
 	DNAS_NONE_Originating_Line_Info avp_DNAS_NONE_Originating_Line_Info,
 	DCC_NONE_Exponent avp_DCC_NONE_Exponent,
 	MIPv6_NONE_MIP_Authenticator avp_MIPv6_NONE_MIP_Authenticator,
-	DNAS_NONE_Accounting_Input_Octets avp_DNAS_NONE_Accounting_Input_Octets,
 	AAA_3GPP_Requested_UTRAN_GERAN_Authentication_Info avp_AAA_3GPP_Requested_UTRAN_GERAN_Authentication_Info,
+	DNAS_NONE_Accounting_Input_Octets avp_DNAS_NONE_Accounting_Input_Octets,
 	AAA_3GPP_EPS_User_State avp_AAA_3GPP_EPS_User_State,
 	BASE_NONE_Origin_Host avp_BASE_NONE_Origin_Host,
 	DCA_3GPP_PDP_Address avp_DCA_3GPP_PDP_Address,
@@ -10442,31 +10442,31 @@ type union AVP_Data {
 	PCC_3GPP_Resource_Release_Notification avp_PCC_3GPP_Resource_Release_Notification,
 	PCC_3GPP_ADC_Rule_Name avp_PCC_3GPP_ADC_Rule_Name,
 	DCA_3GPP_ProSe_Function_IP_Address avp_DCA_3GPP_ProSe_Function_IP_Address,
+	PCC_3GPP_Guaranteed_Bitrate_DL avp_PCC_3GPP_Guaranteed_Bitrate_DL,
 	BASE_NONE_Disconnect_Cause avp_BASE_NONE_Disconnect_Cause,
 	AAA_3GPP_Error_Diagnostic avp_AAA_3GPP_Error_Diagnostic,
-	PCC_3GPP_Guaranteed_Bitrate_DL avp_PCC_3GPP_Guaranteed_Bitrate_DL,
 	RX_3GPP_Extended_Max_Supported_BW_UL avp_RX_3GPP_Extended_Max_Supported_BW_UL,
-	DCC_NONE_CC_Total_Octets avp_DCC_NONE_CC_Total_Octets,
 	PCC_3GPP_UDP_Source_Port avp_PCC_3GPP_UDP_Source_Port,
+	DCC_NONE_CC_Total_Octets avp_DCC_NONE_CC_Total_Octets,
 	BASE_NONE_Accounting_Record_Type avp_BASE_NONE_Accounting_Record_Type,
 	DCA_3GPP_SMS_Result avp_DCA_3GPP_SMS_Result,
 	DCA_3GPP_MMS_Information avp_DCA_3GPP_MMS_Information,
 	CxDx_3GPP_From_SIP_Header avp_CxDx_3GPP_From_SIP_Header,
-	AAA_3GPP_SIPTO_Local_Network_Permission avp_AAA_3GPP_SIPTO_Local_Network_Permission,
 	PCC_3GPP_Routing_Rule_Definition avp_PCC_3GPP_Routing_Rule_Definition,
+	AAA_3GPP_SIPTO_Local_Network_Permission avp_AAA_3GPP_SIPTO_Local_Network_Permission,
 	DCA_3GPP_CUG_Information avp_DCA_3GPP_CUG_Information,
-	DCC_NONE_Value_Digits avp_DCC_NONE_Value_Digits,
 	AAA_3GPP_VPLMN_Dynamic_Address_Allowed avp_AAA_3GPP_VPLMN_Dynamic_Address_Allowed,
+	DCC_NONE_Value_Digits avp_DCC_NONE_Value_Digits,
 	BASE_NONE_Acct_Application_Id avp_BASE_NONE_Acct_Application_Id,
 	DCA_3GPP_Associated_Party_Address avp_DCA_3GPP_Associated_Party_Address,
 	CxDx_3GPP_SIP_Authenticate avp_CxDx_3GPP_SIP_Authenticate,
 	AAA_3GPP_Service_Type avp_AAA_3GPP_Service_Type,
 	AAA_3GPP_Immediate_Response_Preferred avp_AAA_3GPP_Immediate_Response_Preferred,
-	DNAS_NONE_Login_IPv6_Host avp_DNAS_NONE_Login_IPv6_Host,
 	DNAS_NONE_Framed_Appletalk_Zone avp_DNAS_NONE_Framed_Appletalk_Zone,
+	DNAS_NONE_Login_IPv6_Host avp_DNAS_NONE_Login_IPv6_Host,
 	DCA_3GPP_Local_GW_Inserted_Indication avp_DCA_3GPP_Local_GW_Inserted_Indication,
-	DCC_NONE_Final_Unit_Indication avp_DCC_NONE_Final_Unit_Indication,
 	AAA_3GPP_XRES avp_AAA_3GPP_XRES,
+	DCC_NONE_Final_Unit_Indication avp_DCC_NONE_Final_Unit_Indication,
 	DCA_3GPP_Deferred_Location_Event_Type avp_DCA_3GPP_Deferred_Location_Event_Type,
 	GI_3GPP_3GPP_IMSI avp_GI_3GPP_3GPP_IMSI,
 	AAA_3GPP_User_State avp_AAA_3GPP_User_State,
@@ -10480,22 +10480,22 @@ type union AVP_Data {
 	S6_3GPP_IP_SM_GW_Realm avp_S6_3GPP_IP_SM_GW_Realm,
 	DCA_3GPP_Monitoring_UE_Identifier avp_DCA_3GPP_Monitoring_UE_Identifier,
 	S6_3GPP_Reference_ID_Validity_Time avp_S6_3GPP_Reference_ID_Validity_Time,
-	AAA_3GPP_E_UTRAN_Cell_Global_Identity avp_AAA_3GPP_E_UTRAN_Cell_Global_Identity,
 	PCC_3GPP_TFT_Packet_Filter_Information avp_PCC_3GPP_TFT_Packet_Filter_Information,
+	AAA_3GPP_E_UTRAN_Cell_Global_Identity avp_AAA_3GPP_E_UTRAN_Cell_Global_Identity,
 	RX_3GPP_Min_Desired_Bandwidth_DL avp_RX_3GPP_Min_Desired_Bandwidth_DL,
 	DCA_3GPP_Transmitter_Info avp_DCA_3GPP_Transmitter_Info,
 	S6_3GPP_Group_Reporting_Guard_Timer avp_S6_3GPP_Group_Reporting_Guard_Timer,
 	DCA_3GPP_PS_Furnish_Charging_Information avp_DCA_3GPP_PS_Furnish_Charging_Information,
 	CxDx_3GPP_Associated_Identities avp_CxDx_3GPP_Associated_Identities,
-	BASE_NONE_Auth_Session_State avp_BASE_NONE_Auth_Session_State,
 	PCC_3GPP_Session_Linking_Indicator avp_PCC_3GPP_Session_Linking_Indicator,
+	BASE_NONE_Auth_Session_State avp_BASE_NONE_Auth_Session_State,
 	S6_3GPP_Maximum_Number_of_Reports avp_S6_3GPP_Maximum_Number_of_Reports,
 	PCC_3GPP_PRA_Install avp_PCC_3GPP_PRA_Install,
 	AAA_3GPP_V2X_Permission avp_AAA_3GPP_V2X_Permission,
 	DCA_3GPP_ProSe_Range_Class avp_DCA_3GPP_ProSe_Range_Class,
 	DCA_3GPP_Carrier_Select_Routing_Information avp_DCA_3GPP_Carrier_Select_Routing_Information,
-	AAA_3GPP_LIPA_Permission avp_AAA_3GPP_LIPA_Permission,
 	PCC_3GPP_QoS_Negotiation avp_PCC_3GPP_QoS_Negotiation,
+	AAA_3GPP_LIPA_Permission avp_AAA_3GPP_LIPA_Permission,
 	CxDx_3GPP_SIP_Auth_Data_Item avp_CxDx_3GPP_SIP_Auth_Data_Item,
 	AAA_3GPP_3GPP2_MEID avp_AAA_3GPP_3GPP2_MEID,
 	AAA_3GPP_Subscription_Data avp_AAA_3GPP_Subscription_Data,
@@ -10519,8 +10519,8 @@ type union AVP_Data {
 	S6_3GPP_NIDD_Authorization_Response avp_S6_3GPP_NIDD_Authorization_Response,
 	DCA_3GPP_Outgoing_Trunk_Group_Id avp_DCA_3GPP_Outgoing_Trunk_Group_Id,
 	DCC_NONE_Subscription_Id avp_DCC_NONE_Subscription_Id,
-	AAA_3GPP_VPLMN_CSG_Subscription_Data avp_AAA_3GPP_VPLMN_CSG_Subscription_Data,
 	PCC_3GPP_QoS_Rule_Remove avp_PCC_3GPP_QoS_Rule_Remove,
+	AAA_3GPP_VPLMN_CSG_Subscription_Data avp_AAA_3GPP_VPLMN_CSG_Subscription_Data,
 	DCA_3GPP_Message_Body avp_DCA_3GPP_Message_Body,
 	S6_3GPP_Communication_Duration_Time avp_S6_3GPP_Communication_Duration_Time,
 	PCC_3GPP_Access_Availability_Change_Reason avp_PCC_3GPP_Access_Availability_Change_Reason,
@@ -10533,10 +10533,10 @@ type union AVP_Data {
 	S6_3GPP_RIR_Flags avp_S6_3GPP_RIR_Flags,
 	DCA_3GPP_Volume_Quota_Threshold avp_DCA_3GPP_Volume_Quota_Threshold,
 	DCA_3GPP_Incremental_Cost avp_DCA_3GPP_Incremental_Cost,
-	AAA_3GPP_Collection_Period_RRM_LTE avp_AAA_3GPP_Collection_Period_RRM_LTE,
 	PCC_3GPP_Usage_Monitoring_Level avp_PCC_3GPP_Usage_Monitoring_Level,
-	AAA_3GPP_Subscriber_Status avp_AAA_3GPP_Subscriber_Status,
+	AAA_3GPP_Collection_Period_RRM_LTE avp_AAA_3GPP_Collection_Period_RRM_LTE,
 	PCC_3GPP_Extended_APN_AMBR_UL avp_PCC_3GPP_Extended_APN_AMBR_UL,
+	AAA_3GPP_Subscriber_Status avp_AAA_3GPP_Subscriber_Status,
 	CxDx_3GPP_Identity_with_Emergency_Registration avp_CxDx_3GPP_Identity_with_Emergency_Registration,
 	DCA_3GPP_Originator_Received_Address avp_DCA_3GPP_Originator_Received_Address,
 	DCA_3GPP_AoC_Service avp_DCA_3GPP_AoC_Service,
@@ -10548,8 +10548,8 @@ type union AVP_Data {
 	DCA_3GPP_Read_Reply_Report_Requested avp_DCA_3GPP_Read_Reply_Report_Requested,
 	DCA_3GPP_Event_Charging_TimeStamp avp_DCA_3GPP_Event_Charging_TimeStamp,
 	RX_3GPP_RR_Bandwidth avp_RX_3GPP_RR_Bandwidth,
-	DCC_NONE_Service_Context_Id avp_DCC_NONE_Service_Context_Id,
 	DNAS_NONE_CHAP_Auth avp_DNAS_NONE_CHAP_Auth,
+	DCC_NONE_Service_Context_Id avp_DCC_NONE_Service_Context_Id,
 	DCA_3GPP_SDP_TimeStamps avp_DCA_3GPP_SDP_TimeStamps,
 	DCA_3GPP_IMS_Charging_Identifier avp_DCA_3GPP_IMS_Charging_Identifier,
 	DCA_3GPP_Related_Trigger avp_DCA_3GPP_Related_Trigger,
@@ -10562,26 +10562,26 @@ type union AVP_Data {
 	DCA_3GPP_ISUP_Cause_Value avp_DCA_3GPP_ISUP_Cause_Value,
 	PCC_3GPP_Charging_Rule_Name avp_PCC_3GPP_Charging_Rule_Name,
 	RX_3GPP_Ip_Domain_Id avp_RX_3GPP_Ip_Domain_Id,
-	AAA_3GPP_UE_Usage_Type avp_AAA_3GPP_UE_Usage_Type,
 	PCC_3GPP_TDF_IP_Address avp_PCC_3GPP_TDF_IP_Address,
+	AAA_3GPP_UE_Usage_Type avp_AAA_3GPP_UE_Usage_Type,
 	S6_3GPP_Enhanced_Coverage_Restriction avp_S6_3GPP_Enhanced_Coverage_Restriction,
 	DCA_3GPP_Charged_Party avp_DCA_3GPP_Charged_Party,
 	DCA_3GPP_PDN_Connection_Charging_ID avp_DCA_3GPP_PDN_Connection_Charging_ID,
 	CxDx_3GPP_User_Data_Already_Available avp_CxDx_3GPP_User_Data_Already_Available,
-	AAA_3GPP_MME_Number_for_MT_SMS avp_AAA_3GPP_MME_Number_for_MT_SMS,
 	PCC_3GPP_Security_Parameter_Index avp_PCC_3GPP_Security_Parameter_Index,
-	MIPv6_NONE_MIP6_Home_Agent_Host avp_MIPv6_NONE_MIP6_Home_Agent_Host,
-	DCC_NONE_CC_Correlation_Id avp_DCC_NONE_CC_Correlation_Id,
+	AAA_3GPP_MME_Number_for_MT_SMS avp_AAA_3GPP_MME_Number_for_MT_SMS,
 	PCC_3GPP_Traffic_Steering_Policy_Identifier_UL avp_PCC_3GPP_Traffic_Steering_Policy_Identifier_UL,
+	DCC_NONE_CC_Correlation_Id avp_DCC_NONE_CC_Correlation_Id,
+	MIPv6_NONE_MIP6_Home_Agent_Host avp_MIPv6_NONE_MIP6_Home_Agent_Host,
 	BASE_NONE_Route_Record avp_BASE_NONE_Route_Record,
 	DCA_3GPP_SM_User_Data_Header avp_DCA_3GPP_SM_User_Data_Header,
 	AAA_3GPP_Carrier_Frequency avp_AAA_3GPP_Carrier_Frequency,
 	DCA_3GPP_MMTel_Information avp_DCA_3GPP_MMTel_Information,
 	CxDx_3GPP_Mandatory_Capability avp_CxDx_3GPP_Mandatory_Capability,
 	AAA_3GPP_Trace_NE_Type_List avp_AAA_3GPP_Trace_NE_Type_List,
-	MIPv6_NONE_MIP6_Feature_Vector avp_MIPv6_NONE_MIP6_Feature_Vector,
 	DCA_3GPP_Charging_Characteristics_Selection_Mode avp_DCA_3GPP_Charging_Characteristics_Selection_Mode,
 	DNAS_NONE_Port_Limit avp_DNAS_NONE_Port_Limit,
+	MIPv6_NONE_MIP6_Feature_Vector avp_MIPv6_NONE_MIP6_Feature_Vector,
 	DCC_NONE_Multiple_Services_Credit_Control avp_DCC_NONE_Multiple_Services_Credit_Control,
 	AAA_3GPP_All_APN_Configurations_Included_Indicator avp_AAA_3GPP_All_APN_Configurations_Included_Indicator,
 	AAA_3GPP_NOR_Flags avp_AAA_3GPP_NOR_Flags,
@@ -10592,9 +10592,9 @@ type union AVP_Data {
 	BASE_NONE_Authorization_Lifetime avp_BASE_NONE_Authorization_Lifetime,
 	DCA_3GPP_PoC_Change_Conditions avp_DCA_3GPP_PoC_Change_Conditions,
 	DCA_3GPP_Language avp_DCA_3GPP_Language,
+	RX_3GPP_Extended_Min_Requested_BW_DL avp_RX_3GPP_Extended_Min_Requested_BW_DL,
 	DNAS_NONE_ARAP_Features avp_DNAS_NONE_ARAP_Features,
 	DNAS_NONE_Framed_MTU avp_DNAS_NONE_Framed_MTU,
-	RX_3GPP_Extended_Min_Requested_BW_DL avp_RX_3GPP_Extended_Min_Requested_BW_DL,
 	DCA_3GPP_Unit_Quota_Threshold avp_DCA_3GPP_Unit_Quota_Threshold,
 	DNAS_NONE_Accounting_Auth_Method avp_DNAS_NONE_Accounting_Auth_Method,
 	DCA_3GPP_MBMS_Information avp_DCA_3GPP_MBMS_Information,
@@ -10604,8 +10604,8 @@ type union AVP_Data {
 	DCA_3GPP_SDP_Media_Description avp_DCA_3GPP_SDP_Media_Description,
 	DNAS_NONE_Accounting_Output_Packets avp_DNAS_NONE_Accounting_Output_Packets,
 	DCA_3GPP_Radio_Parameter_Set_Info avp_DCA_3GPP_Radio_Parameter_Set_Info,
-	AAA_3GPP_Relay_Node_Indicator avp_AAA_3GPP_Relay_Node_Indicator,
 	PCC_3GPP_Rule_DeActivation_Time avp_PCC_3GPP_Rule_DeActivation_Time,
+	AAA_3GPP_Relay_Node_Indicator avp_AAA_3GPP_Relay_Node_Indicator,
 	S6_3GPP_T4_Data avp_S6_3GPP_T4_Data,
 	PCC_3GPP_Fixed_User_Location_Info avp_PCC_3GPP_Fixed_User_Location_Info,
 	DCA_3GPP_Coverage_Status avp_DCA_3GPP_Coverage_Status,
@@ -10637,15 +10637,15 @@ type union AVP_Data {
 	DCA_3GPP_Class_Identifier avp_DCA_3GPP_Class_Identifier,
 	GI_3GPP_3GPP_Allocate_IP_Type avp_GI_3GPP_3GPP_Allocate_IP_Type,
 	RX_3GPP_Specific_Action avp_RX_3GPP_Specific_Action,
+	S6_3GPP_Maximum_Detection_Time avp_S6_3GPP_Maximum_Detection_Time,
 	DNAS_NONE_Login_TCP_Port avp_DNAS_NONE_Login_TCP_Port,
 	DNAS_NONE_Password_Retry avp_DNAS_NONE_Password_Retry,
-	S6_3GPP_Maximum_Detection_Time avp_S6_3GPP_Maximum_Detection_Time,
 	DCA_3GPP_Time_Stamps avp_DCA_3GPP_Time_Stamps,
 	DCA_3GPP_Base_Time_Interval avp_DCA_3GPP_Base_Time_Interval,
 	DCA_3GPP_UWAN_User_Location_Info avp_DCA_3GPP_UWAN_User_Location_Info,
 	DCA_3GPP_ProSe_Role_Of_UE avp_DCA_3GPP_ProSe_Role_Of_UE,
-	AAA_3GPP_Ext_PDP_Address avp_AAA_3GPP_Ext_PDP_Address,
 	PCC_3GPP_RAT_Type avp_PCC_3GPP_RAT_Type,
+	AAA_3GPP_Ext_PDP_Address avp_AAA_3GPP_Ext_PDP_Address,
 	DCA_3GPP_PoC_Session_Type avp_DCA_3GPP_PoC_Session_Type,
 	DCA_3GPP_ISUP_Cause avp_DCA_3GPP_ISUP_Cause,
 	RX_3GPP_AF_Signalling_Protocol avp_RX_3GPP_AF_Signalling_Protocol,
@@ -10660,13 +10660,13 @@ type union AVP_Data {
 	AAA_3GPP_Equivalent_PLMN_List avp_AAA_3GPP_Equivalent_PLMN_List,
 	PCC_3GPP_Default_Access avp_PCC_3GPP_Default_Access,
 	CxDx_3GPP_Supported_Applications avp_CxDx_3GPP_Supported_Applications,
-	DNAS_NONE_ARAP_Challenge_Response avp_DNAS_NONE_ARAP_Challenge_Response,
 	BASE_NONE_Class avp_BASE_NONE_Class,
+	DNAS_NONE_ARAP_Challenge_Response avp_DNAS_NONE_ARAP_Challenge_Response,
 	DCA_3GPP_SM_Message_Type avp_DCA_3GPP_SM_Message_Type,
 	DCC_NONE_CC_Sub_Session_Id avp_DCC_NONE_CC_Sub_Session_Id,
 	AAA_3GPP_IDR_Flags avp_AAA_3GPP_IDR_Flags,
-	AAA_3GPP_V2X_Subscription_Data avp_AAA_3GPP_V2X_Subscription_Data,
 	PCC_3GPP_PS_to_CS_Session_Continuity avp_PCC_3GPP_PS_to_CS_Session_Continuity,
+	AAA_3GPP_V2X_Subscription_Data avp_AAA_3GPP_V2X_Subscription_Data,
 	DCA_3GPP_Refund_Information avp_DCA_3GPP_Refund_Information,
 	DCA_3GPP_Rate_Element avp_DCA_3GPP_Rate_Element,
 	AAA_3GPP_PDP_Type avp_AAA_3GPP_PDP_Type,
@@ -10733,8 +10733,8 @@ type record AVP {
 		avp_AAA_3GPP_UVA_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_UVA_Flags;
 		avp_DCA_3GPP_Expires, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Expires;
 		avp_CxDx_3GPP_SAR_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_SAR_Flags;
-		avp_AAA_3GPP_Group_Service_Id, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Group_Service_Id;
 		avp_PCC_3GPP_TDF_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_TDF_Information;
+		avp_AAA_3GPP_Group_Service_Id, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Group_Service_Id;
 		avp_DCA_3GPP_Recipient_SCCP_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Recipient_SCCP_Address;
 		avp_DCA_3GPP_Preferred_AoC_Currency, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Preferred_AoC_Currency;
 		avp_DNAS_NONE_Framed_Pool, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Framed_Pool;
@@ -10763,16 +10763,16 @@ type record AVP {
 		avp_PCC_3GPP_Conditional_Policy_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Conditional_Policy_Information;
 		avp_BASE_NONE_Firmware_Revision, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Firmware_Revision;
 		avp_DCA_3GPP_ProSe_Event_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_ProSe_Event_Type;
-		avp_AAA_3GPP_SIPTO_Permission, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_SIPTO_Permission;
 		avp_PCC_3GPP_Network_Request_Support, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Network_Request_Support;
+		avp_AAA_3GPP_SIPTO_Permission, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_SIPTO_Permission;
 		avp_DCA_3GPP_Terminating_IOI, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Terminating_IOI;
 		avp_RX_3GPP_Extended_Max_Supported_BW_DL, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Extended_Max_Supported_BW_DL;
 		avp_PCC_3GPP_UE_Local_IP_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_UE_Local_IP_Address;
 		avp_DCA_3GPP_SM_Sequence_Number, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SM_Sequence_Number;
 		avp_DCA_3GPP_IMS_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_IMS_Information;
 		avp_PCC_3GPP_Presence_Reporting_Area_Elements_List, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Presence_Reporting_Area_Elements_List;
-		avp_AAA_3GPP_SGs_MME_Identity, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_SGs_MME_Identity;
 		avp_PCC_3GPP_Routing_Rule_Remove, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Routing_Rule_Remove;
+		avp_AAA_3GPP_SGs_MME_Identity, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_SGs_MME_Identity;
 		avp_S6_3GPP_Roaming_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Roaming_Information;
 		avp_DCA_3GPP_Number_Of_Diversions, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Number_Of_Diversions;
 		avp_DCA_3GPP_Coverage_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Coverage_Info;
@@ -10800,34 +10800,34 @@ type record AVP {
 		avp_DCA_3GPP_Monitoring_UE_HPLMN_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Monitoring_UE_HPLMN_Identifier;
 		avp_PCC_3GPP_TFT_Filter, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_TFT_Filter;
 		avp_RX_3GPP_Max_Supported_Bandwidth_UL, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Max_Supported_Bandwidth_UL;
-		avp_DNAS_NONE_Tunnel_Medium_Type, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Tunnel_Medium_Type;
 		avp_S6_3GPP_Loss_Of_Connectivity_Reason, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Loss_Of_Connectivity_Reason;
+		avp_DNAS_NONE_Tunnel_Medium_Type, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Tunnel_Medium_Type;
 		avp_DCA_3GPP_Originator, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Originator;
 		avp_DCC_NONE_User_Equipment_Info_Type, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_User_Equipment_Info_Type;
-		avp_MIPv6_NONE_MIP6_Home_Agent_Address, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP6_Home_Agent_Address;
 		avp_RX_3GPP_Flow_Number, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Flow_Number;
+		avp_MIPv6_NONE_MIP6_Home_Agent_Address, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP6_Home_Agent_Address;
 		avp_PCC_3GPP_Resource_Allocation_Notification, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Resource_Allocation_Notification;
 		avp_DCA_3GPP_Basic_Service_Code, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Basic_Service_Code;
 		avp_S6_3GPP_Monitoring_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Monitoring_Type;
 		avp_DCA_3GPP_Role_Of_Node, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Role_Of_Node;
 		avp_PCC_3GPP_Default_Bearer_Indication, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Default_Bearer_Indication;
 		avp_DCA_3GPP_ProSe_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_ProSe_Information;
-		avp_AAA_3GPP_VPLMN_LIPA_Allowed, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_VPLMN_LIPA_Allowed;
 		avp_PCC_3GPP_QoS_Class_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_QoS_Class_Identifier;
+		avp_AAA_3GPP_VPLMN_LIPA_Allowed, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_VPLMN_LIPA_Allowed;
 		avp_PCC_3GPP_Mute_Notification, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Mute_Notification;
 		avp_CxDx_3GPP_SIP_Authentication_Context, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_SIP_Authentication_Context;
 		avp_MIPv6_NONE_QoS_Resources, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_QoS_Resources;
 		avp_AAA_3GPP_Logging_Duration, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Logging_Duration;
 		avp_DCC_NONE_Service_Parameter_Value, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Service_Parameter_Value;
 		avp_CxDx_3GPP_Associated_Registered_Identities, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Associated_Registered_Identities;
-		avp_AAA_3GPP_WLAN_offloadability_EUTRAN, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_WLAN_offloadability_EUTRAN;
 		avp_PCC_3GPP_Routing_IP_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Routing_IP_Address;
+		avp_AAA_3GPP_WLAN_offloadability_EUTRAN, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_WLAN_offloadability_EUTRAN;
 		avp_DCA_3GPP_MBMS_GW_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_MBMS_GW_Address;
 		avp_DCA_3GPP_Destination_Interface, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Destination_Interface;
 		avp_DCA_3GPP_IMS_Emergency_Indicator, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_IMS_Emergency_Indicator;
 		avp_DCA_3GPP_Change_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Change_Time;
-		avp_MIPv6_NONE_MIP_Session_Key, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP_Session_Key;
 		avp_AAA_3GPP_KASME, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_KASME;
+		avp_MIPv6_NONE_MIP_Session_Key, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP_Session_Key;
 		avp_DCA_3GPP_AoC_Cost_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_AoC_Cost_Information;
 		avp_GI_3GPP_3GPP_User_Location_Info_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_User_Location_Info_Time;
 		avp_AAA_3GPP_Teleservice_List, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Teleservice_List;
@@ -10851,39 +10851,39 @@ type record AVP {
 		avp_DNAS_NONE_Tunnel_Password, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Tunnel_Password;
 		avp_DCA_3GPP_PC3_EPC_Control_Protocol_Cause, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_PC3_EPC_Control_Protocol_Cause;
 		avp_S6_3GPP_Monitoring_Duration, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Monitoring_Duration;
-		avp_AAA_3GPP_Routing_Area_Identity, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Routing_Area_Identity;
 		avp_PCC_3GPP_QoS_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_QoS_Information;
+		avp_AAA_3GPP_Routing_Area_Identity, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Routing_Area_Identity;
 		avp_DCA_3GPP_Called_Party_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Called_Party_Address;
-		avp_DCC_NONE_User_Equipment_Info_Value, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_User_Equipment_Info_Value;
-		avp_DNAS_NONE_Tunneling, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Tunneling;
 		avp_RX_3GPP_Service_Authorization_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Service_Authorization_Info;
-		avp_BASE_NONE_Multi_Round_Time_Out, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Multi_Round_Time_Out;
+		avp_DNAS_NONE_Tunneling, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Tunneling;
+		avp_DCC_NONE_User_Equipment_Info_Value, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_User_Equipment_Info_Value;
 		avp_AAA_3GPP_eDRX_Cycle_Length, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_eDRX_Cycle_Length;
+		avp_BASE_NONE_Multi_Round_Time_Out, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Multi_Round_Time_Out;
 		avp_S6_3GPP_Group_Monitoring_Event_Report_Item, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Group_Monitoring_Event_Report_Item;
-		avp_AAA_3GPP_Ext_PDP_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Ext_PDP_Type;
 		avp_PCC_3GPP_Rule_Failure_Code, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Rule_Failure_Code;
+		avp_AAA_3GPP_Ext_PDP_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Ext_PDP_Type;
 		avp_DCA_3GPP_Time_Quota_Threshold, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Time_Quota_Threshold;
 		avp_PCC_3GPP_User_Location_Info_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_User_Location_Info_Time;
-		avp_AAA_3GPP_Measurement_Period_LTE, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Measurement_Period_LTE;
 		avp_PCC_3GPP_Usage_Monitoring_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Usage_Monitoring_Information;
-		avp_BASE_NONE_Experimental_Result_Code, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Experimental_Result_Code;
+		avp_AAA_3GPP_Measurement_Period_LTE, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Measurement_Period_LTE;
 		avp_PCC_3GPP_Extended_APN_AMBR_DL, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Extended_APN_AMBR_DL;
+		avp_BASE_NONE_Experimental_Result_Code, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Experimental_Result_Code;
 		avp_CxDx_3GPP_Session_Priority, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Session_Priority;
 		avp_DCA_3GPP_Recipient_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Recipient_Info;
 		avp_DCA_3GPP_AoC_Format, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_AoC_Format;
 		avp_DCA_3GPP_Start_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Start_Time;
 		avp_CxDx_3GPP_Deregistration_Reason, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Deregistration_Reason;
 		avp_AAA_3GPP_GMLC_Number, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_GMLC_Number;
-		avp_DNAS_NONE_Configuration_Token, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Configuration_Token;
-		avp_DNAS_NONE_Callback_Number, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Callback_Number;
 		avp_AAA_3GPP_Software_Version, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Software_Version;
+		avp_DNAS_NONE_Callback_Number, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Callback_Number;
+		avp_DNAS_NONE_Configuration_Token, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Configuration_Token;
 		avp_DCA_3GPP_Interface_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Interface_Type;
 		avp_AAA_3GPP_Expiration_Date, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Expiration_Date;
 		avp_BASE_NONE_Error_Message, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Error_Message;
 		avp_AAA_3GPP_SRES, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_SRES;
 		avp_DCA_3GPP_DRM_Content, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_DRM_Content;
-		avp_DNAS_NONE_NAS_Port_Type, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_NAS_Port_Type;
 		avp_AAA_3GPP_Item_Number, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Item_Number;
+		avp_DNAS_NONE_NAS_Port_Type, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_NAS_Port_Type;
 		avp_DCC_NONE_Multiple_Services_Indicator, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Multiple_Services_Indicator;
 		avp_DCA_3GPP_Early_Media_Description, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Early_Media_Description;
 		avp_DCA_3GPP_Related_Change_Condition_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Related_Change_Condition_Information;
@@ -10900,12 +10900,12 @@ type record AVP {
 		avp_DCA_3GPP_Media_Initiator_Party, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Media_Initiator_Party;
 		avp_DCA_3GPP_Associated_URI, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Associated_URI;
 		avp_RX_3GPP_AF_Requested_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_AF_Requested_Data;
+		avp_PCC_3GPP_QoS_Rule_Report, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_QoS_Rule_Report;
 		avp_DNAS_NONE_Filter_Id, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Filter_Id;
 		avp_DNAS_NONE_ARAP_Password, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_ARAP_Password;
-		avp_PCC_3GPP_QoS_Rule_Report, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_QoS_Rule_Report;
 		avp_DCA_3GPP_Route_Header_Received, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Route_Header_Received;
-		avp_DNAS_NONE_CHAP_Response, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_CHAP_Response;
 		avp_S6_3GPP_Stationary_Indication, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Stationary_Indication;
+		avp_DNAS_NONE_CHAP_Response, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_CHAP_Response;
 		avp_PCC_3GPP_Traffic_Steering_Policy_Identifier_DL, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Traffic_Steering_Policy_Identifier_DL;
 		avp_DCA_3GPP_Usage_Information_Report_Sequence_Number, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Usage_Information_Report_Sequence_Number;
 		avp_AAA_3GPP_Geodetic_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Geodetic_Information;
@@ -10947,16 +10947,16 @@ type record AVP {
 		avp_S6_3GPP_Monitoring_Event_Configuration, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Monitoring_Event_Configuration;
 		avp_PCC_3GPP_Offline, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Offline;
 		avp_DCA_3GPP_SIP_Method, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SIP_Method;
+		avp_PCC_3GPP_ADC_Rule_Definition, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_ADC_Rule_Definition;
+		avp_AAA_3GPP_Additional_Context_ID, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Additional_Context_ID;
 		avp_DNAS_NONE_Login_Service, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Login_Service;
 		avp_DNAS_NONE_ARAP_Security_Data, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_ARAP_Security_Data;
-		avp_AAA_3GPP_Additional_Context_ID, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Additional_Context_ID;
-		avp_PCC_3GPP_ADC_Rule_Definition, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_ADC_Rule_Definition;
 		avp_S6_3GPP_Allowed_PLMN_List, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Allowed_PLMN_List;
-		avp_AAA_3GPP_Active_APN, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Active_APN;
 		avp_PCC_3GPP_Bearer_Control_Mode, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Bearer_Control_Mode;
+		avp_AAA_3GPP_Active_APN, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Active_APN;
 		avp_PCC_3GPP_HeNB_Local_IP_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_HeNB_Local_IP_Address;
-		avp_AAA_3GPP_SMS_Register_Request, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_SMS_Register_Request;
 		avp_PCC_3GPP_Packet_Filter_Content, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Packet_Filter_Content;
+		avp_AAA_3GPP_SMS_Register_Request, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_SMS_Register_Request;
 		avp_CxDx_3GPP_Subscription_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Subscription_Info;
 		avp_DCA_3GPP_SIP_Response_Timestamp_Fraction, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SIP_Response_Timestamp_Fraction;
 		avp_DCA_3GPP_Client_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Client_Address;
@@ -10978,23 +10978,23 @@ type record AVP {
 		avp_DCA_3GPP_ProSe_Request_Timestamp, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_ProSe_Request_Timestamp;
 		avp_DCA_3GPP_PoC_Session_Id, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_PoC_Session_Id;
 		avp_BASE_NONE_Proxy_State, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Proxy_State;
-		avp_MIPv6_NONE_MIP6_Agent_Info, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP6_Agent_Info;
 		avp_DCA_3GPP_PoC_Server_Role, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_PoC_Server_Role;
 		avp_DCA_3GPP_Forwarding_Pending, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Forwarding_Pending;
-		avp_DCC_NONE_Credit_Control_Failure_Handling, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Credit_Control_Failure_Handling;
 		avp_S6_3GPP_SIR_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_SIR_Flags;
+		avp_DCC_NONE_Credit_Control_Failure_Handling, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Credit_Control_Failure_Handling;
+		avp_MIPv6_NONE_MIP6_Agent_Info, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP6_Agent_Info;
 		avp_RX_3GPP_MPS_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_MPS_Identifier;
-		avp_AAA_3GPP_MDT_Allowed_PLMN_Id, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_MDT_Allowed_PLMN_Id;
 		avp_PCC_3GPP_Credit_Management_Status, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Credit_Management_Status;
+		avp_AAA_3GPP_MDT_Allowed_PLMN_Id, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_MDT_Allowed_PLMN_Id;
 		avp_DCA_3GPP_Monitored_PLMN_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Monitored_PLMN_Identifier;
 		avp_S6_3GPP_Service_Result, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Service_Result;
-		avp_AAA_3GPP_MME_Location_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_MME_Location_Information;
 		avp_PCC_3GPP_Reporting_Level, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Reporting_Level;
+		avp_AAA_3GPP_MME_Location_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_MME_Location_Information;
 		avp_DCA_3GPP_Served_Party_IP_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Served_Party_IP_Address;
 		avp_RX_3GPP_Max_Supported_Bandwidth_DL, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Max_Supported_Bandwidth_DL;
 		avp_DCA_3GPP_Time_First_Reception, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Time_First_Reception;
-		avp_AAA_3GPP_Subscribed_VSRVCC, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Subscribed_VSRVCC;
 		avp_PCC_3GPP_Pre_emption_Capability, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Pre_emption_Capability;
+		avp_AAA_3GPP_Subscribed_VSRVCC, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Subscribed_VSRVCC;
 		avp_PCC_3GPP_Monitoring_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Monitoring_Flags;
 		avp_BASE_NONE_Redirect_Max_Cache_Time, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Redirect_Max_Cache_Time;
 		avp_CxDx_3GPP_Feature_List, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Feature_List;
@@ -11065,18 +11065,18 @@ type record AVP {
 		avp_RX_3GPP_Extended_Max_Requested_BW_UL, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Extended_Max_Requested_BW_UL;
 		avp_DCA_3GPP_SM_Device_Trigger_Indicator, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SM_Device_Trigger_Indicator;
 		avp_S6_3GPP_User_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_User_Identifier;
-		avp_DNAS_NONE_Framed_IPv6_Pool, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Framed_IPv6_Pool;
 		avp_PCC_3GPP_QoS_Rule_Base_Name, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_QoS_Rule_Base_Name;
+		avp_DNAS_NONE_Framed_IPv6_Pool, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Framed_IPv6_Pool;
 		avp_AAA_3GPP_Restoration_Priority, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Restoration_Priority;
 		avp_DCA_3GPP_ISUP_Cause_Diagnostics, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_ISUP_Cause_Diagnostics;
-		avp_DCC_NONE_Rating_Group, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Rating_Group;
-		avp_MIPv6_NONE_MIP_MN_HA_SPI, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP_MN_HA_SPI;
 		avp_S6_3GPP_Association_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Association_Type;
 		avp_PCC_3GPP_Charging_Rule_Definition, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Charging_Rule_Definition;
+		avp_DCC_NONE_Rating_Group, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Rating_Group;
+		avp_MIPv6_NONE_MIP_MN_HA_SPI, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP_MN_HA_SPI;
 		avp_RX_3GPP_Min_Requested_Bandwidth_UL, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Min_Requested_Bandwidth_UL;
 		avp_DCA_3GPP_Application_Specific_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Application_Specific_Data;
-		avp_AAA_3GPP_Report_Amount, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Report_Amount;
 		avp_PCC_3GPP_CoA_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_CoA_Information;
+		avp_AAA_3GPP_Report_Amount, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Report_Amount;
 		avp_CxDx_3GPP_Secondary_Charging_Collection_Function_Name, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Secondary_Charging_Collection_Function_Name;
 		avp_DCC_NONE_User_Equipment_Info, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_User_Equipment_Info;
 		avp_AAA_3GPP_A_MSISDN, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_A_MSISDN;
@@ -11122,8 +11122,8 @@ type record AVP {
 		avp_AAA_3GPP_Logging_Interval, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Logging_Interval;
 		avp_DCA_3GPP_PoC_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_PoC_Information;
 		avp_PCC_3GPP_Presence_Reporting_Area_Status, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Presence_Reporting_Area_Status;
-		avp_AAA_3GPP_WLAN_offloadability, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_WLAN_offloadability;
 		avp_PCC_3GPP_Routing_Filter, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Routing_Filter;
+		avp_AAA_3GPP_WLAN_offloadability, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_WLAN_offloadability;
 		avp_DCA_3GPP_Data_Coding_Scheme, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Data_Coding_Scheme;
 		avp_PCC_3GPP_Metering_Method, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Metering_Method;
 		avp_DNAS_NONE_Acct_Tunnel_Connection, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Acct_Tunnel_Connection;
@@ -11161,20 +11161,20 @@ type record AVP {
 		avp_S6_3GPP_Group_Monitoring_Event_Report, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Group_Monitoring_Event_Report;
 		avp_PCC_3GPP_QoS_Upgrade, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_QoS_Upgrade;
 		avp_DCA_3GPP_PS_Append_Free_Format_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_PS_Append_Free_Format_Data;
-		avp_DNAS_NONE_Service_Type, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Service_Type;
 		avp_PCC_3GPP_AN_GW_Status, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_AN_GW_Status;
-		avp_AAA_3GPP_Measurement_Period_UMTS, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Measurement_Period_UMTS;
+		avp_DNAS_NONE_Service_Type, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Service_Type;
 		avp_PCC_3GPP_Monitoring_Key, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Monitoring_Key;
+		avp_AAA_3GPP_Measurement_Period_UMTS, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Measurement_Period_UMTS;
 		avp_DCA_3GPP_Media_Initiator_Flag, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Media_Initiator_Flag;
 		avp_DCA_3GPP_ISUP_Location_Number, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_ISUP_Location_Number;
 		avp_PCC_3GPP_3GPP_PS_Data_Off_Status, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_3GPP_PS_Data_Off_Status;
-		avp_AAA_3GPP_Reset_ID, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Reset_ID;
 		avp_PCC_3GPP_Routing_Rule_Install, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Routing_Rule_Install;
+		avp_AAA_3GPP_Reset_ID, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Reset_ID;
 		avp_DCA_3GPP_Service_Data_Container, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Service_Data_Container;
 		avp_CxDx_3GPP_Server_Assignment_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Server_Assignment_Type;
 		avp_AAA_3GPP_PUR_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_PUR_Flags;
-		avp_DNAS_NONE_Framed_Routing, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Framed_Routing;
 		avp_PCC_3GPP_IP_CAN_Session_Charging_Scope, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_IP_CAN_Session_Charging_Scope;
+		avp_DNAS_NONE_Framed_Routing, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Framed_Routing;
 		avp_AAA_3GPP_IMEI, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_IMEI;
 		avp_DNAS_NONE_CHAP_Ident, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_CHAP_Ident;
 		avp_DCA_3GPP_Interface_Text, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Interface_Text;
@@ -11209,18 +11209,18 @@ type record AVP {
 		avp_AAA_3GPP_MBSFN_Area, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_MBSFN_Area;
 		avp_DCA_3GPP_ProSe_UE_ID, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_ProSe_UE_ID;
 		avp_CxDx_3GPP_Server_Name, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Server_Name;
-		avp_DCC_NONE_Check_Balance_Result, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Check_Balance_Result;
 		avp_S6_3GPP_APN_Validity_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_APN_Validity_Time;
-		avp_AAA_3GPP_Job_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Job_Type;
 		avp_PCC_3GPP_Allocation_Retention_Priority, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Allocation_Retention_Priority;
+		avp_DCC_NONE_Check_Balance_Result, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Check_Balance_Result;
+		avp_AAA_3GPP_Job_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Job_Type;
 		avp_BASE_NONE_Destination_Host, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Destination_Host;
 		avp_AAA_3GPP_Positioning_Method, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Positioning_Method;
 		avp_CxDx_3GPP_LIA_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_LIA_Flags;
 		avp_AAA_3GPP_DL_Buffering_Suggested_Packet_Count, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_DL_Buffering_Suggested_Packet_Count;
 		avp_DCA_3GPP_AoC_Service_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_AoC_Service_Type;
 		avp_DNAS_NONE_Login_IP_Host, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Login_IP_Host;
-		avp_DNAS_NONE_ARAP_Security, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_ARAP_Security;
 		avp_AAA_3GPP_IDA_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_IDA_Flags;
+		avp_DNAS_NONE_ARAP_Security, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_ARAP_Security;
 		avp_DNAS_NONE_Origin_AAA_Protocol, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Origin_AAA_Protocol;
 		avp_DCA_3GPP_Time_Last_Usage, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Time_Last_Usage;
 		avp_CxDx_3GPP_Charging_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Charging_Information;
@@ -11229,8 +11229,8 @@ type record AVP {
 		avp_AAA_3GPP_IMS_Voice_Over_PS_Sessions_Supported, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_IMS_Voice_Over_PS_Sessions_Supported;
 		avp_AAA_3GPP_Roaming_Restricted_Due_To_Unsupported_Feature, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Roaming_Restricted_Due_To_Unsupported_Feature;
 		avp_DCA_3GPP_File_Repair_Supported, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_File_Repair_Supported;
-		avp_DNAS_NONE_Tunnel_Assignment_Id, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Tunnel_Assignment_Id;
 		avp_DNAS_NONE_Framed_IPX_Network, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Framed_IPX_Network;
+		avp_DNAS_NONE_Tunnel_Assignment_Id, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Tunnel_Assignment_Id;
 		avp_DCC_NONE_CC_Service_Specific_Units, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_CC_Service_Specific_Units;
 		avp_DCA_3GPP_SDP_Answer_Timestamp, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SDP_Answer_Timestamp;
 		avp_DCA_3GPP_Type_Number, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Type_Number;
@@ -11244,21 +11244,21 @@ type record AVP {
 		avp_PCC_3GPP_ADC_Rule_Remove, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_ADC_Rule_Remove;
 		avp_DCA_3GPP_ProSe_Direct_Communication_Transmission_Data_Container, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_ProSe_Direct_Communication_Transmission_Data_Container;
 		avp_S6_3GPP_Restricted_PLMN_List, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Restricted_PLMN_List;
-		avp_AAA_3GPP_Age_Of_Location_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Age_Of_Location_Information;
 		avp_PCC_3GPP_Access_Network_Charging_Identifier_Gx, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Access_Network_Charging_Identifier_Gx;
+		avp_AAA_3GPP_Age_Of_Location_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Age_Of_Location_Information;
 		avp_DCA_3GPP_PoC_Group_Name, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_PoC_Group_Name;
 		avp_RX_3GPP_Extended_Max_Requested_BW_DL, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Extended_Max_Requested_BW_DL;
 		avp_PCC_3GPP_Flow_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Flow_Information;
 		avp_DCA_3GPP_PS_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_PS_Information;
 		avp_DCA_3GPP_MTC_IWF_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_MTC_IWF_Address;
+		avp_PCC_3GPP_Execution_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Execution_Time;
 		avp_DNAS_NONE_NAS_Identifier, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_NAS_Identifier;
 		avp_DNAS_NONE_Tunnel_Server_Auth_Id, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Tunnel_Server_Auth_Id;
-		avp_PCC_3GPP_Execution_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Execution_Time;
 		avp_CxDx_3GPP_Contact, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Contact;
+		avp_PCC_3GPP_Charging_Correlation_Indicator, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Charging_Correlation_Indicator;
 		avp_DCC_NONE_Credit_Control, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Credit_Control;
 		avp_BASE_NONE_Accounting_Record_Number, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Accounting_Record_Number;
 		avp_AAA_3GPP_Event_Threshold_Event_1I, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Event_Threshold_Event_1I;
-		avp_PCC_3GPP_Charging_Correlation_Indicator, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Charging_Correlation_Indicator;
 		avp_DCA_3GPP_SIP_Request_Timestamp_Fraction, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SIP_Request_Timestamp_Fraction;
 		avp_DCA_3GPP_Service_Mode, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Service_Mode;
 		avp_CxDx_3GPP_User_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_User_Data;
@@ -11278,8 +11278,8 @@ type record AVP {
 		avp_DCA_3GPP_Called_Identity, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Called_Identity;
 		avp_DCA_3GPP_SGSN_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SGSN_Address;
 		avp_DCA_3GPP_SGi_PtP_Tunnelling_Method, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SGi_PtP_Tunnelling_Method;
-		avp_DNAS_NONE_Acct_Tunnel_Packets_Lost, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Acct_Tunnel_Packets_Lost;
 		avp_BASE_NONE_Session_Timeout, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Session_Timeout;
+		avp_DNAS_NONE_Acct_Tunnel_Packets_Lost, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Acct_Tunnel_Packets_Lost;
 		avp_DCA_3GPP_NNI_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_NNI_Type;
 		avp_RX_3GPP_Service_Info_Status, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Service_Info_Status;
 		avp_S6_3GPP_CIR_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_CIR_Flags;
@@ -11292,20 +11292,20 @@ type record AVP {
 		avp_PCC_3GPP_Priority_Level, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Priority_Level;
 		avp_DCA_3GPP_Node_Functionality, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Node_Functionality;
 		avp_RX_3GPP_Flow_Description, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Flow_Description;
-		avp_AAA_3GPP_Daylight_Saving_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Daylight_Saving_Time;
 		avp_PCC_3GPP_Packet_Filter_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Packet_Filter_Information;
+		avp_AAA_3GPP_Daylight_Saving_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Daylight_Saving_Time;
 		avp_DCA_3GPP_Address_Domain, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Address_Domain;
 		avp_S6_3GPP_SCEF_ID, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_SCEF_ID;
 		avp_DCA_3GPP_Content_Length, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Content_Length;
 		avp_PCC_3GPP_Removal_Of_Access, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Removal_Of_Access;
-		avp_AAA_3GPP_Preferred_Data_Mode, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Preferred_Data_Mode;
 		avp_PCC_3GPP_ADC_Rule_Report, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_ADC_Rule_Report;
+		avp_AAA_3GPP_Preferred_Data_Mode, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Preferred_Data_Mode;
 		avp_DCA_3GPP_ProSe_Functionality, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_ProSe_Functionality;
 		avp_DCA_3GPP_Low_Balance_Indication, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Low_Balance_Indication;
-		avp_AAA_3GPP_UE_SRVCC_Capability, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_UE_SRVCC_Capability;
 		avp_PCC_3GPP_Guaranteed_Bitrate_UL, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Guaranteed_Bitrate_UL;
-		avp_DNAS_NONE_NAS_IPv6_Address, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_NAS_IPv6_Address;
+		avp_AAA_3GPP_UE_SRVCC_Capability, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_UE_SRVCC_Capability;
 		avp_DNAS_NONE_Login_LAT_Group, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Login_LAT_Group;
+		avp_DNAS_NONE_NAS_IPv6_Address, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_NAS_IPv6_Address;
 		avp_MIPv6_NONE_MIP_MAC_Mobility_Data, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP_MAC_Mobility_Data;
 		avp_DNAS_NONE_Accounting_Output_Octets, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Accounting_Output_Octets;
 		avp_CxDx_3GPP_To_SIP_Header, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_To_SIP_Header;
@@ -11331,21 +11331,21 @@ type record AVP {
 		avp_DCA_3GPP_Network_Call_Reference_Number, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Network_Call_Reference_Number;
 		avp_S6_3GPP_AESE_Communication_Pattern, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_AESE_Communication_Pattern;
 		avp_PCC_3GPP_NBIFOM_Mode, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_NBIFOM_Mode;
-		avp_DCC_NONE_Validity_Time, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Validity_Time;
 		avp_PCC_3GPP_Redirect_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Redirect_Information;
+		avp_DCC_NONE_Validity_Time, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Validity_Time;
 		avp_DCA_3GPP_Monitoring_UE_VPLMN_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Monitoring_UE_VPLMN_Identifier;
 		avp_S6_3GPP_Event_Handling, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Event_Handling;
-		avp_AAA_3GPP_Tracking_Area_Identity, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Tracking_Area_Identity;
 		avp_PCC_3GPP_ToS_Traffic_Class, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_ToS_Traffic_Class;
+		avp_AAA_3GPP_Tracking_Area_Identity, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Tracking_Area_Identity;
 		avp_RX_3GPP_Min_Desired_Bandwidth_UL, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Min_Desired_Bandwidth_UL;
 		avp_AAA_3GPP_UVR_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_UVR_Flags;
 		avp_DCA_3GPP_PS_Free_Format_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_PS_Free_Format_Data;
 		avp_CxDx_3GPP_Originating_Request, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Originating_Request;
-		avp_AAA_3GPP_Subscription_Data_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Subscription_Data_Flags;
 		avp_PCC_3GPP_PDN_Connection_ID, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_PDN_Connection_ID;
+		avp_AAA_3GPP_Subscription_Data_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Subscription_Data_Flags;
 		avp_DNAS_NONE_Framed_IPv6_Route, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Framed_IPv6_Route;
-		avp_AAA_3GPP_DSR_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_DSR_Flags;
 		avp_PCC_3GPP_PRA_Remove, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_PRA_Remove;
+		avp_AAA_3GPP_DSR_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_DSR_Flags;
 		avp_DCC_NONE_Granted_Service_Unit, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Granted_Service_Unit;
 		avp_MIPv6_NONE_MIP_Timestamp, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP_Timestamp;
 		avp_DCA_3GPP_Number_Portability_Routing_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Number_Portability_Routing_Information;
@@ -11365,8 +11365,8 @@ type record AVP {
 		avp_DCA_3GPP_Variable_Part_Order, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Variable_Part_Order;
 		avp_DCA_3GPP_Time_Quota_Mechanism, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Time_Quota_Mechanism;
 		avp_DCA_3GPP_Monitoring_Event_Report_Number, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Monitoring_Event_Report_Number;
-		avp_BASE_NONE_Origin_State_Id, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Origin_State_Id;
 		avp_S6_3GPP_IP_SM_GW_Name, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_IP_SM_GW_Name;
+		avp_BASE_NONE_Origin_State_Id, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Origin_State_Id;
 		avp_RX_3GPP_Media_Sub_Component, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Media_Sub_Component;
 		avp_DCA_3GPP_CN_Operator_Selection_Entity, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_CN_Operator_Selection_Entity;
 		avp_S6_3GPP_Accuracy, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Accuracy;
@@ -11378,8 +11378,8 @@ type record AVP {
 		avp_PCC_3GPP_Tunnel_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Tunnel_Information;
 		avp_DCA_3GPP_Bearer_Service, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Bearer_Service;
 		avp_CxDx_3GPP_Primary_Charging_Collection_Function_Name, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Primary_Charging_Collection_Function_Name;
-		avp_AAA_3GPP_Time_Zone, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Time_Zone;
 		avp_PCC_3GPP_QoS_Rule_Definition, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_QoS_Rule_Definition;
+		avp_AAA_3GPP_Time_Zone, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Time_Zone;
 		avp_S6_3GPP_Periodic_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Periodic_Time;
 		avp_PCC_3GPP_Routing_Rule_Failure_Code, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Routing_Rule_Failure_Code;
 		avp_PCC_3GPP_TDF_Destination_Host, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_TDF_Destination_Host;
@@ -11387,8 +11387,8 @@ type record AVP {
 		avp_DCA_3GPP_SM_Discharge_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SM_Discharge_Time;
 		avp_DCA_3GPP_Requestor_PLMN_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Requestor_PLMN_Identifier;
 		avp_DCA_3GPP_IMS_Application_Reference_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_IMS_Application_Reference_Identifier;
-		avp_AAA_3GPP_Service_Area_Identity, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Service_Area_Identity;
 		avp_PCC_3GPP_Charging_Rule_Report, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Charging_Rule_Report;
+		avp_AAA_3GPP_Service_Area_Identity, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Service_Area_Identity;
 		avp_BASE_NONE_User_Name, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_User_Name;
 		avp_AAA_3GPP_UE_PC5_AMBR, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_UE_PC5_AMBR;
 		avp_CxDx_3GPP_Public_Identity, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Public_Identity;
@@ -11412,13 +11412,13 @@ type record AVP {
 		avp_DCA_3GPP_Reply_Applic_ID, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Reply_Applic_ID;
 		avp_DCA_3GPP_Participant_Access_Priority, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Participant_Access_Priority;
 		avp_RX_3GPP_RS_Bandwidth, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_RS_Bandwidth;
-		avp_MIPv6_NONE_MIP_Algorithm_Type, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP_Algorithm_Type;
 		avp_S6_3GPP_Reachability_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Reachability_Information;
+		avp_MIPv6_NONE_MIP_Algorithm_Type, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP_Algorithm_Type;
 		avp_DCA_3GPP_SDP_Session_Description, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SDP_Session_Description;
 		avp_RX_3GPP_Extended_Min_Desired_BW_DL, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Extended_Min_Desired_BW_DL;
 		avp_DCA_3GPP_Location_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Location_Info;
-		avp_AAA_3GPP_Event_Threshold_RSRQ, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Event_Threshold_RSRQ;
 		avp_PCC_3GPP_APN_Aggregate_Max_Bitrate_UL, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_APN_Aggregate_Max_Bitrate_UL;
+		avp_AAA_3GPP_Event_Threshold_RSRQ, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Event_Threshold_RSRQ;
 		avp_DCA_3GPP_LCS_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_LCS_Information;
 		avp_S6_3GPP_Service_Parameters, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Service_Parameters;
 		avp_PCC_3GPP_Presence_Reporting_Area_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Presence_Reporting_Area_Information;
@@ -11428,9 +11428,9 @@ type record AVP {
 		avp_PCC_3GPP_Event_Trigger, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Event_Trigger;
 		avp_RX_3GPP_GCS_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_GCS_Identifier;
 		avp_MIPv6_NONE_QoS_Capability, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_QoS_Capability;
+		avp_PCC_3GPP_ADC_Rule_Install, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_ADC_Rule_Install;
 		avp_DCC_NONE_G_S_U_Pool_Identifier, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_G_S_U_Pool_Identifier;
 		avp_AAA_3GPP_Non_IP_PDN_Type_Indicator, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Non_IP_PDN_Type_Indicator;
-		avp_PCC_3GPP_ADC_Rule_Install, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_ADC_Rule_Install;
 		avp_DCA_3GPP_Outgoing_Session_Id, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Outgoing_Session_Id;
 		avp_DCA_3GPP_PoC_Controlling_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_PoC_Controlling_Address;
 		avp_DCA_3GPP_Dynamic_Address_Flag, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Dynamic_Address_Flag;
@@ -11472,11 +11472,11 @@ type record AVP {
 		avp_CxDx_3GPP_SIP_Item_Number, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_SIP_Item_Number;
 		avp_PCC_3GPP_Session_Release_Cause, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Session_Release_Cause;
 		avp_AAA_3GPP_MDT_User_Consent, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_MDT_User_Consent;
+		avp_S6_3GPP_HSS_Cause, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_HSS_Cause;
 		avp_MIPv6_NONE_MIP6_Home_Link_Prefix, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP6_Home_Link_Prefix;
 		avp_DNAS_NONE_Login_LAT_Port, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Login_LAT_Port;
-		avp_S6_3GPP_HSS_Cause, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_HSS_Cause;
-		avp_DCC_NONE_G_S_U_Pool_Reference, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_G_S_U_Pool_Reference;
 		avp_PCC_3GPP_PCSCF_Restoration_Indication, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_PCSCF_Restoration_Indication;
+		avp_DCC_NONE_G_S_U_Pool_Reference, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_G_S_U_Pool_Reference;
 		avp_DCA_3GPP_Layer_2_Group_ID, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Layer_2_Group_ID;
 		avp_DCA_3GPP_Interface_Port, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Interface_Port;
 		avp_AAA_3GPP_Subscription_Data_Deletion, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Subscription_Data_Deletion;
@@ -11486,8 +11486,8 @@ type record AVP {
 		avp_CxDx_3GPP_Feature_List_ID, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Feature_List_ID;
 		avp_BASE_NONE_Redirect_Host, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Redirect_Host;
 		avp_AAA_3GPP_Network_Access_Mode, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Network_Access_Mode;
-		avp_DNAS_NONE_ARAP_Zone_Access, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_ARAP_Zone_Access;
 		avp_DNAS_NONE_Framed_Compression, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Framed_Compression;
+		avp_DNAS_NONE_ARAP_Zone_Access, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_ARAP_Zone_Access;
 		avp_GI_3GPP_3GPP_Selection_Mode, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_Selection_Mode;
 		avp_DNAS_NONE_QoS_Filter_Rule, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_QoS_Filter_Rule;
 		avp_AAA_3GPP_Complete_Data_List_Included_Indicator, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Complete_Data_List_Included_Indicator;
@@ -11505,8 +11505,8 @@ type record AVP {
 		avp_DCA_3GPP_Reason_Header, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Reason_Header;
 		avp_S6_3GPP_Reachability_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Reachability_Type;
 		avp_DCA_3GPP_SIP_Request_Timestamp, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SIP_Request_Timestamp;
-		avp_DNAS_NONE_Tunnel_Private_Group_Id, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Tunnel_Private_Group_Id;
 		avp_DNAS_NONE_Framed_Route, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Framed_Route;
+		avp_DNAS_NONE_Tunnel_Private_Group_Id, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Tunnel_Private_Group_Id;
 		avp_DCC_NONE_CC_Request_Type, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_CC_Request_Type;
 		avp_DCA_3GPP_ProSe_Source_IP_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_ProSe_Source_IP_Address;
 		avp_S6_3GPP_Type_Of_External_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Type_Of_External_Identifier;
@@ -11521,13 +11521,13 @@ type record AVP {
 		avp_AAA_3GPP_RAT_Frequency_Selection_Priority_ID, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_RAT_Frequency_Selection_Priority_ID;
 		avp_DCA_3GPP_Time_First_Usage, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Time_First_Usage;
 		avp_CxDx_3GPP_Reason_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Reason_Info;
-		avp_AAA_3GPP_CLR_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_CLR_Flags;
 		avp_PCC_3GPP_Default_EPS_Bearer_QoS, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Default_EPS_Bearer_QoS;
+		avp_AAA_3GPP_CLR_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_CLR_Flags;
 		avp_AAA_3GPP_ULR_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_ULR_Flags;
 		avp_DCA_3GPP_Originating_SCCP_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Originating_SCCP_Address;
-		avp_DNAS_NONE_Tunnel_Client_Auth_Id, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Tunnel_Client_Auth_Id;
-		avp_DNAS_NONE_Calling_Station_Id, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Calling_Station_Id;
 		avp_AAA_3GPP_ICS_Indicator, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_ICS_Indicator;
+		avp_DNAS_NONE_Calling_Station_Id, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Calling_Station_Id;
+		avp_DNAS_NONE_Tunnel_Client_Auth_Id, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Tunnel_Client_Auth_Id;
 		avp_DCC_NONE_Currency_Code, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Currency_Code;
 		avp_AAA_3GPP_Cancellation_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Cancellation_Type;
 		avp_BASE_NONE_E2E_Sequence, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_E2E_Sequence;
@@ -11558,16 +11558,16 @@ type record AVP {
 		avp_BASE_NONE_Acct_Interim_Interval, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Acct_Interim_Interval;
 		avp_RX_3GPP_Media_Component_Number, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Media_Component_Number;
 		avp_CxDx_3GPP_Path, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Path;
-		avp_AAA_3GPP_Event_Threshold_Event_1F, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Event_Threshold_Event_1F;
 		avp_PCC_3GPP_Packet_Filter_Usage, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Packet_Filter_Usage;
+		avp_AAA_3GPP_Event_Threshold_Event_1F, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Event_Threshold_Event_1F;
 		avp_S6_3GPP_MONTE_Location_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_MONTE_Location_Type;
 		avp_DCA_3GPP_Inter_Operator_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Inter_Operator_Identifier;
 		avp_AAA_3GPP_RDS_Indicator, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_RDS_Indicator;
 		avp_DCA_3GPP_Proximity_Cancellation_Timestamp, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Proximity_Cancellation_Timestamp;
 		avp_DCA_3GPP_MMTel_SService_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_MMTel_SService_Type;
 		avp_CxDx_3GPP_Optional_Capability, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Optional_Capability;
-		avp_AAA_3GPP_Reporting_Trigger, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Reporting_Trigger;
 		avp_PCC_3GPP_Tunnel_Header_Length, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Tunnel_Header_Length;
+		avp_AAA_3GPP_Reporting_Trigger, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Reporting_Trigger;
 		avp_PCC_3GPP_Conditional_APN_Aggregate_Max_Bitrate, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Conditional_APN_Aggregate_Max_Bitrate;
 		avp_CxDx_3GPP_Secondary_Event_Charging_Function_Name, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Secondary_Event_Charging_Function_Name;
 		avp_AAA_3GPP_Group_PLMN_Id, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Group_PLMN_Id;
@@ -11578,8 +11578,8 @@ type record AVP {
 		avp_DNAS_NONE_Originating_Line_Info, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Originating_Line_Info;
 		avp_DCC_NONE_Exponent, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Exponent;
 		avp_MIPv6_NONE_MIP_Authenticator, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP_Authenticator;
-		avp_DNAS_NONE_Accounting_Input_Octets, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Accounting_Input_Octets;
 		avp_AAA_3GPP_Requested_UTRAN_GERAN_Authentication_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Requested_UTRAN_GERAN_Authentication_Info;
+		avp_DNAS_NONE_Accounting_Input_Octets, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Accounting_Input_Octets;
 		avp_AAA_3GPP_EPS_User_State, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_EPS_User_State;
 		avp_BASE_NONE_Origin_Host, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Origin_Host;
 		avp_DCA_3GPP_PDP_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_PDP_Address;
@@ -11599,31 +11599,31 @@ type record AVP {
 		avp_PCC_3GPP_Resource_Release_Notification, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Resource_Release_Notification;
 		avp_PCC_3GPP_ADC_Rule_Name, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_ADC_Rule_Name;
 		avp_DCA_3GPP_ProSe_Function_IP_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_ProSe_Function_IP_Address;
+		avp_PCC_3GPP_Guaranteed_Bitrate_DL, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Guaranteed_Bitrate_DL;
 		avp_BASE_NONE_Disconnect_Cause, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Disconnect_Cause;
 		avp_AAA_3GPP_Error_Diagnostic, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Error_Diagnostic;
-		avp_PCC_3GPP_Guaranteed_Bitrate_DL, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Guaranteed_Bitrate_DL;
 		avp_RX_3GPP_Extended_Max_Supported_BW_UL, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Extended_Max_Supported_BW_UL;
-		avp_DCC_NONE_CC_Total_Octets, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_CC_Total_Octets;
 		avp_PCC_3GPP_UDP_Source_Port, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_UDP_Source_Port;
+		avp_DCC_NONE_CC_Total_Octets, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_CC_Total_Octets;
 		avp_BASE_NONE_Accounting_Record_Type, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Accounting_Record_Type;
 		avp_DCA_3GPP_SMS_Result, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SMS_Result;
 		avp_DCA_3GPP_MMS_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_MMS_Information;
 		avp_CxDx_3GPP_From_SIP_Header, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_From_SIP_Header;
-		avp_AAA_3GPP_SIPTO_Local_Network_Permission, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_SIPTO_Local_Network_Permission;
 		avp_PCC_3GPP_Routing_Rule_Definition, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Routing_Rule_Definition;
+		avp_AAA_3GPP_SIPTO_Local_Network_Permission, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_SIPTO_Local_Network_Permission;
 		avp_DCA_3GPP_CUG_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_CUG_Information;
-		avp_DCC_NONE_Value_Digits, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Value_Digits;
 		avp_AAA_3GPP_VPLMN_Dynamic_Address_Allowed, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_VPLMN_Dynamic_Address_Allowed;
+		avp_DCC_NONE_Value_Digits, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Value_Digits;
 		avp_BASE_NONE_Acct_Application_Id, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Acct_Application_Id;
 		avp_DCA_3GPP_Associated_Party_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Associated_Party_Address;
 		avp_CxDx_3GPP_SIP_Authenticate, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_SIP_Authenticate;
 		avp_AAA_3GPP_Service_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Service_Type;
 		avp_AAA_3GPP_Immediate_Response_Preferred, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Immediate_Response_Preferred;
-		avp_DNAS_NONE_Login_IPv6_Host, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Login_IPv6_Host;
 		avp_DNAS_NONE_Framed_Appletalk_Zone, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Framed_Appletalk_Zone;
+		avp_DNAS_NONE_Login_IPv6_Host, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Login_IPv6_Host;
 		avp_DCA_3GPP_Local_GW_Inserted_Indication, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Local_GW_Inserted_Indication;
-		avp_DCC_NONE_Final_Unit_Indication, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Final_Unit_Indication;
 		avp_AAA_3GPP_XRES, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_XRES;
+		avp_DCC_NONE_Final_Unit_Indication, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Final_Unit_Indication;
 		avp_DCA_3GPP_Deferred_Location_Event_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Deferred_Location_Event_Type;
 		avp_GI_3GPP_3GPP_IMSI, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_IMSI;
 		avp_AAA_3GPP_User_State, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_User_State;
@@ -11637,22 +11637,22 @@ type record AVP {
 		avp_S6_3GPP_IP_SM_GW_Realm, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_IP_SM_GW_Realm;
 		avp_DCA_3GPP_Monitoring_UE_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Monitoring_UE_Identifier;
 		avp_S6_3GPP_Reference_ID_Validity_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Reference_ID_Validity_Time;
-		avp_AAA_3GPP_E_UTRAN_Cell_Global_Identity, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_E_UTRAN_Cell_Global_Identity;
 		avp_PCC_3GPP_TFT_Packet_Filter_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_TFT_Packet_Filter_Information;
+		avp_AAA_3GPP_E_UTRAN_Cell_Global_Identity, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_E_UTRAN_Cell_Global_Identity;
 		avp_RX_3GPP_Min_Desired_Bandwidth_DL, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Min_Desired_Bandwidth_DL;
 		avp_DCA_3GPP_Transmitter_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Transmitter_Info;
 		avp_S6_3GPP_Group_Reporting_Guard_Timer, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Group_Reporting_Guard_Timer;
 		avp_DCA_3GPP_PS_Furnish_Charging_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_PS_Furnish_Charging_Information;
 		avp_CxDx_3GPP_Associated_Identities, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Associated_Identities;
-		avp_BASE_NONE_Auth_Session_State, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Auth_Session_State;
 		avp_PCC_3GPP_Session_Linking_Indicator, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Session_Linking_Indicator;
+		avp_BASE_NONE_Auth_Session_State, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Auth_Session_State;
 		avp_S6_3GPP_Maximum_Number_of_Reports, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Maximum_Number_of_Reports;
 		avp_PCC_3GPP_PRA_Install, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_PRA_Install;
 		avp_AAA_3GPP_V2X_Permission, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_V2X_Permission;
 		avp_DCA_3GPP_ProSe_Range_Class, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_ProSe_Range_Class;
 		avp_DCA_3GPP_Carrier_Select_Routing_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Carrier_Select_Routing_Information;
-		avp_AAA_3GPP_LIPA_Permission, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_LIPA_Permission;
 		avp_PCC_3GPP_QoS_Negotiation, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_QoS_Negotiation;
+		avp_AAA_3GPP_LIPA_Permission, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_LIPA_Permission;
 		avp_CxDx_3GPP_SIP_Auth_Data_Item, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_SIP_Auth_Data_Item;
 		avp_AAA_3GPP_3GPP2_MEID, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_3GPP2_MEID;
 		avp_AAA_3GPP_Subscription_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Subscription_Data;
@@ -11676,8 +11676,8 @@ type record AVP {
 		avp_S6_3GPP_NIDD_Authorization_Response, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_NIDD_Authorization_Response;
 		avp_DCA_3GPP_Outgoing_Trunk_Group_Id, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Outgoing_Trunk_Group_Id;
 		avp_DCC_NONE_Subscription_Id, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Subscription_Id;
-		avp_AAA_3GPP_VPLMN_CSG_Subscription_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_VPLMN_CSG_Subscription_Data;
 		avp_PCC_3GPP_QoS_Rule_Remove, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_QoS_Rule_Remove;
+		avp_AAA_3GPP_VPLMN_CSG_Subscription_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_VPLMN_CSG_Subscription_Data;
 		avp_DCA_3GPP_Message_Body, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Message_Body;
 		avp_S6_3GPP_Communication_Duration_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Communication_Duration_Time;
 		avp_PCC_3GPP_Access_Availability_Change_Reason, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Access_Availability_Change_Reason;
@@ -11690,10 +11690,10 @@ type record AVP {
 		avp_S6_3GPP_RIR_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_RIR_Flags;
 		avp_DCA_3GPP_Volume_Quota_Threshold, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Volume_Quota_Threshold;
 		avp_DCA_3GPP_Incremental_Cost, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Incremental_Cost;
-		avp_AAA_3GPP_Collection_Period_RRM_LTE, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Collection_Period_RRM_LTE;
 		avp_PCC_3GPP_Usage_Monitoring_Level, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Usage_Monitoring_Level;
-		avp_AAA_3GPP_Subscriber_Status, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Subscriber_Status;
+		avp_AAA_3GPP_Collection_Period_RRM_LTE, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Collection_Period_RRM_LTE;
 		avp_PCC_3GPP_Extended_APN_AMBR_UL, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Extended_APN_AMBR_UL;
+		avp_AAA_3GPP_Subscriber_Status, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Subscriber_Status;
 		avp_CxDx_3GPP_Identity_with_Emergency_Registration, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Identity_with_Emergency_Registration;
 		avp_DCA_3GPP_Originator_Received_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Originator_Received_Address;
 		avp_DCA_3GPP_AoC_Service, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_AoC_Service;
@@ -11705,8 +11705,8 @@ type record AVP {
 		avp_DCA_3GPP_Read_Reply_Report_Requested, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Read_Reply_Report_Requested;
 		avp_DCA_3GPP_Event_Charging_TimeStamp, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Event_Charging_TimeStamp;
 		avp_RX_3GPP_RR_Bandwidth, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_RR_Bandwidth;
-		avp_DCC_NONE_Service_Context_Id, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Service_Context_Id;
 		avp_DNAS_NONE_CHAP_Auth, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_CHAP_Auth;
+		avp_DCC_NONE_Service_Context_Id, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Service_Context_Id;
 		avp_DCA_3GPP_SDP_TimeStamps, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SDP_TimeStamps;
 		avp_DCA_3GPP_IMS_Charging_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_IMS_Charging_Identifier;
 		avp_DCA_3GPP_Related_Trigger, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Related_Trigger;
@@ -11719,26 +11719,26 @@ type record AVP {
 		avp_DCA_3GPP_ISUP_Cause_Value, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_ISUP_Cause_Value;
 		avp_PCC_3GPP_Charging_Rule_Name, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Charging_Rule_Name;
 		avp_RX_3GPP_Ip_Domain_Id, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Ip_Domain_Id;
-		avp_AAA_3GPP_UE_Usage_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_UE_Usage_Type;
 		avp_PCC_3GPP_TDF_IP_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_TDF_IP_Address;
+		avp_AAA_3GPP_UE_Usage_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_UE_Usage_Type;
 		avp_S6_3GPP_Enhanced_Coverage_Restriction, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Enhanced_Coverage_Restriction;
 		avp_DCA_3GPP_Charged_Party, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Charged_Party;
 		avp_DCA_3GPP_PDN_Connection_Charging_ID, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_PDN_Connection_Charging_ID;
 		avp_CxDx_3GPP_User_Data_Already_Available, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_User_Data_Already_Available;
-		avp_AAA_3GPP_MME_Number_for_MT_SMS, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_MME_Number_for_MT_SMS;
 		avp_PCC_3GPP_Security_Parameter_Index, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Security_Parameter_Index;
-		avp_MIPv6_NONE_MIP6_Home_Agent_Host, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP6_Home_Agent_Host;
-		avp_DCC_NONE_CC_Correlation_Id, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_CC_Correlation_Id;
+		avp_AAA_3GPP_MME_Number_for_MT_SMS, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_MME_Number_for_MT_SMS;
 		avp_PCC_3GPP_Traffic_Steering_Policy_Identifier_UL, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Traffic_Steering_Policy_Identifier_UL;
+		avp_DCC_NONE_CC_Correlation_Id, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_CC_Correlation_Id;
+		avp_MIPv6_NONE_MIP6_Home_Agent_Host, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP6_Home_Agent_Host;
 		avp_BASE_NONE_Route_Record, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Route_Record;
 		avp_DCA_3GPP_SM_User_Data_Header, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SM_User_Data_Header;
 		avp_AAA_3GPP_Carrier_Frequency, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Carrier_Frequency;
 		avp_DCA_3GPP_MMTel_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_MMTel_Information;
 		avp_CxDx_3GPP_Mandatory_Capability, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Mandatory_Capability;
 		avp_AAA_3GPP_Trace_NE_Type_List, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Trace_NE_Type_List;
-		avp_MIPv6_NONE_MIP6_Feature_Vector, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP6_Feature_Vector;
 		avp_DCA_3GPP_Charging_Characteristics_Selection_Mode, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Charging_Characteristics_Selection_Mode;
 		avp_DNAS_NONE_Port_Limit, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Port_Limit;
+		avp_MIPv6_NONE_MIP6_Feature_Vector, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP6_Feature_Vector;
 		avp_DCC_NONE_Multiple_Services_Credit_Control, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Multiple_Services_Credit_Control;
 		avp_AAA_3GPP_All_APN_Configurations_Included_Indicator, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_All_APN_Configurations_Included_Indicator;
 		avp_AAA_3GPP_NOR_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_NOR_Flags;
@@ -11749,9 +11749,9 @@ type record AVP {
 		avp_BASE_NONE_Authorization_Lifetime, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Authorization_Lifetime;
 		avp_DCA_3GPP_PoC_Change_Conditions, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_PoC_Change_Conditions;
 		avp_DCA_3GPP_Language, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Language;
+		avp_RX_3GPP_Extended_Min_Requested_BW_DL, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Extended_Min_Requested_BW_DL;
 		avp_DNAS_NONE_ARAP_Features, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_ARAP_Features;
 		avp_DNAS_NONE_Framed_MTU, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Framed_MTU;
-		avp_RX_3GPP_Extended_Min_Requested_BW_DL, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Extended_Min_Requested_BW_DL;
 		avp_DCA_3GPP_Unit_Quota_Threshold, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Unit_Quota_Threshold;
 		avp_DNAS_NONE_Accounting_Auth_Method, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Accounting_Auth_Method;
 		avp_DCA_3GPP_MBMS_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_MBMS_Information;
@@ -11761,8 +11761,8 @@ type record AVP {
 		avp_DCA_3GPP_SDP_Media_Description, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SDP_Media_Description;
 		avp_DNAS_NONE_Accounting_Output_Packets, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Accounting_Output_Packets;
 		avp_DCA_3GPP_Radio_Parameter_Set_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Radio_Parameter_Set_Info;
-		avp_AAA_3GPP_Relay_Node_Indicator, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Relay_Node_Indicator;
 		avp_PCC_3GPP_Rule_DeActivation_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Rule_DeActivation_Time;
+		avp_AAA_3GPP_Relay_Node_Indicator, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Relay_Node_Indicator;
 		avp_S6_3GPP_T4_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_T4_Data;
 		avp_PCC_3GPP_Fixed_User_Location_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Fixed_User_Location_Info;
 		avp_DCA_3GPP_Coverage_Status, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Coverage_Status;
@@ -11794,15 +11794,15 @@ type record AVP {
 		avp_DCA_3GPP_Class_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Class_Identifier;
 		avp_GI_3GPP_3GPP_Allocate_IP_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_Allocate_IP_Type;
 		avp_RX_3GPP_Specific_Action, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Specific_Action;
+		avp_S6_3GPP_Maximum_Detection_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Maximum_Detection_Time;
 		avp_DNAS_NONE_Login_TCP_Port, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Login_TCP_Port;
 		avp_DNAS_NONE_Password_Retry, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Password_Retry;
-		avp_S6_3GPP_Maximum_Detection_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Maximum_Detection_Time;
 		avp_DCA_3GPP_Time_Stamps, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Time_Stamps;
 		avp_DCA_3GPP_Base_Time_Interval, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Base_Time_Interval;
 		avp_DCA_3GPP_UWAN_User_Location_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_UWAN_User_Location_Info;
 		avp_DCA_3GPP_ProSe_Role_Of_UE, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_ProSe_Role_Of_UE;
-		avp_AAA_3GPP_Ext_PDP_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Ext_PDP_Address;
 		avp_PCC_3GPP_RAT_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_RAT_Type;
+		avp_AAA_3GPP_Ext_PDP_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Ext_PDP_Address;
 		avp_DCA_3GPP_PoC_Session_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_PoC_Session_Type;
 		avp_DCA_3GPP_ISUP_Cause, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_ISUP_Cause;
 		avp_RX_3GPP_AF_Signalling_Protocol, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_AF_Signalling_Protocol;
@@ -11817,13 +11817,13 @@ type record AVP {
 		avp_AAA_3GPP_Equivalent_PLMN_List, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Equivalent_PLMN_List;
 		avp_PCC_3GPP_Default_Access, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Default_Access;
 		avp_CxDx_3GPP_Supported_Applications, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Supported_Applications;
-		avp_DNAS_NONE_ARAP_Challenge_Response, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_ARAP_Challenge_Response;
 		avp_BASE_NONE_Class, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Class;
+		avp_DNAS_NONE_ARAP_Challenge_Response, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_ARAP_Challenge_Response;
 		avp_DCA_3GPP_SM_Message_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SM_Message_Type;
 		avp_DCC_NONE_CC_Sub_Session_Id, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_CC_Sub_Session_Id;
 		avp_AAA_3GPP_IDR_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_IDR_Flags;
-		avp_AAA_3GPP_V2X_Subscription_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_V2X_Subscription_Data;
 		avp_PCC_3GPP_PS_to_CS_Session_Continuity, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_PS_to_CS_Session_Continuity;
+		avp_AAA_3GPP_V2X_Subscription_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_V2X_Subscription_Data;
 		avp_DCA_3GPP_Refund_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Refund_Information;
 		avp_DCA_3GPP_Rate_Element, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Rate_Element;
 		avp_AAA_3GPP_PDP_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_PDP_Type;
@@ -11893,10 +11893,10 @@ const AVP_Code c_AVP_Code_DCA_3GPP_Expires := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Expires };
 const AVP_Code c_AVP_Code_CxDx_3GPP_SAR_Flags := {
 	vendor_id_3GPP := avp_code_CxDx_3GPP_SAR_Flags };
-const AVP_Code c_AVP_Code_AAA_3GPP_Group_Service_Id := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_Group_Service_Id };
 const AVP_Code c_AVP_Code_PCC_3GPP_TDF_Information := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_TDF_Information };
+const AVP_Code c_AVP_Code_AAA_3GPP_Group_Service_Id := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Group_Service_Id };
 const AVP_Code c_AVP_Code_DCA_3GPP_Recipient_SCCP_Address := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Recipient_SCCP_Address };
 const AVP_Code c_AVP_Code_DCA_3GPP_Preferred_AoC_Currency := {
@@ -11953,10 +11953,10 @@ const AVP_Code c_AVP_Code_BASE_NONE_Firmware_Revision := {
 	vendor_id_NONE := avp_code_BASE_NONE_Firmware_Revision };
 const AVP_Code c_AVP_Code_DCA_3GPP_ProSe_Event_Type := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_ProSe_Event_Type };
-const AVP_Code c_AVP_Code_AAA_3GPP_SIPTO_Permission := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_SIPTO_Permission };
 const AVP_Code c_AVP_Code_PCC_3GPP_Network_Request_Support := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Network_Request_Support };
+const AVP_Code c_AVP_Code_AAA_3GPP_SIPTO_Permission := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_SIPTO_Permission };
 const AVP_Code c_AVP_Code_DCA_3GPP_Terminating_IOI := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Terminating_IOI };
 const AVP_Code c_AVP_Code_RX_3GPP_Extended_Max_Supported_BW_DL := {
@@ -11969,10 +11969,10 @@ const AVP_Code c_AVP_Code_DCA_3GPP_IMS_Information := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_IMS_Information };
 const AVP_Code c_AVP_Code_PCC_3GPP_Presence_Reporting_Area_Elements_List := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Presence_Reporting_Area_Elements_List };
-const AVP_Code c_AVP_Code_AAA_3GPP_SGs_MME_Identity := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_SGs_MME_Identity };
 const AVP_Code c_AVP_Code_PCC_3GPP_Routing_Rule_Remove := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Routing_Rule_Remove };
+const AVP_Code c_AVP_Code_AAA_3GPP_SGs_MME_Identity := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_SGs_MME_Identity };
 const AVP_Code c_AVP_Code_S6_3GPP_Roaming_Information := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Roaming_Information };
 const AVP_Code c_AVP_Code_DCA_3GPP_Number_Of_Diversions := {
@@ -12027,18 +12027,18 @@ const AVP_Code c_AVP_Code_PCC_3GPP_TFT_Filter := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_TFT_Filter };
 const AVP_Code c_AVP_Code_RX_3GPP_Max_Supported_Bandwidth_UL := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Max_Supported_Bandwidth_UL };
-const AVP_Code c_AVP_Code_DNAS_NONE_Tunnel_Medium_Type := {
-	vendor_id_NONE := avp_code_DNAS_NONE_Tunnel_Medium_Type };
 const AVP_Code c_AVP_Code_S6_3GPP_Loss_Of_Connectivity_Reason := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Loss_Of_Connectivity_Reason };
+const AVP_Code c_AVP_Code_DNAS_NONE_Tunnel_Medium_Type := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Tunnel_Medium_Type };
 const AVP_Code c_AVP_Code_DCA_3GPP_Originator := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Originator };
 const AVP_Code c_AVP_Code_DCC_NONE_User_Equipment_Info_Type := {
 	vendor_id_NONE := avp_code_DCC_NONE_User_Equipment_Info_Type };
-const AVP_Code c_AVP_Code_MIPv6_NONE_MIP6_Home_Agent_Address := {
-	vendor_id_NONE := avp_code_MIPv6_NONE_MIP6_Home_Agent_Address };
 const AVP_Code c_AVP_Code_RX_3GPP_Flow_Number := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Flow_Number };
+const AVP_Code c_AVP_Code_MIPv6_NONE_MIP6_Home_Agent_Address := {
+	vendor_id_NONE := avp_code_MIPv6_NONE_MIP6_Home_Agent_Address };
 const AVP_Code c_AVP_Code_PCC_3GPP_Resource_Allocation_Notification := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Resource_Allocation_Notification };
 const AVP_Code c_AVP_Code_DCA_3GPP_Basic_Service_Code := {
@@ -12051,10 +12051,10 @@ const AVP_Code c_AVP_Code_PCC_3GPP_Default_Bearer_Indication := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Default_Bearer_Indication };
 const AVP_Code c_AVP_Code_DCA_3GPP_ProSe_Information := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_ProSe_Information };
-const AVP_Code c_AVP_Code_AAA_3GPP_VPLMN_LIPA_Allowed := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_VPLMN_LIPA_Allowed };
 const AVP_Code c_AVP_Code_PCC_3GPP_QoS_Class_Identifier := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_QoS_Class_Identifier };
+const AVP_Code c_AVP_Code_AAA_3GPP_VPLMN_LIPA_Allowed := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_VPLMN_LIPA_Allowed };
 const AVP_Code c_AVP_Code_PCC_3GPP_Mute_Notification := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Mute_Notification };
 const AVP_Code c_AVP_Code_CxDx_3GPP_SIP_Authentication_Context := {
@@ -12067,10 +12067,10 @@ const AVP_Code c_AVP_Code_DCC_NONE_Service_Parameter_Value := {
 	vendor_id_NONE := avp_code_DCC_NONE_Service_Parameter_Value };
 const AVP_Code c_AVP_Code_CxDx_3GPP_Associated_Registered_Identities := {
 	vendor_id_3GPP := avp_code_CxDx_3GPP_Associated_Registered_Identities };
-const AVP_Code c_AVP_Code_AAA_3GPP_WLAN_offloadability_EUTRAN := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_WLAN_offloadability_EUTRAN };
 const AVP_Code c_AVP_Code_PCC_3GPP_Routing_IP_Address := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Routing_IP_Address };
+const AVP_Code c_AVP_Code_AAA_3GPP_WLAN_offloadability_EUTRAN := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_WLAN_offloadability_EUTRAN };
 const AVP_Code c_AVP_Code_DCA_3GPP_MBMS_GW_Address := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_MBMS_GW_Address };
 const AVP_Code c_AVP_Code_DCA_3GPP_Destination_Interface := {
@@ -12079,10 +12079,10 @@ const AVP_Code c_AVP_Code_DCA_3GPP_IMS_Emergency_Indicator := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_IMS_Emergency_Indicator };
 const AVP_Code c_AVP_Code_DCA_3GPP_Change_Time := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Change_Time };
-const AVP_Code c_AVP_Code_MIPv6_NONE_MIP_Session_Key := {
-	vendor_id_NONE := avp_code_MIPv6_NONE_MIP_Session_Key };
 const AVP_Code c_AVP_Code_AAA_3GPP_KASME := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_KASME };
+const AVP_Code c_AVP_Code_MIPv6_NONE_MIP_Session_Key := {
+	vendor_id_NONE := avp_code_MIPv6_NONE_MIP_Session_Key };
 const AVP_Code c_AVP_Code_DCA_3GPP_AoC_Cost_Information := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_AoC_Cost_Information };
 const AVP_Code c_AVP_Code_GI_3GPP_3GPP_User_Location_Info_Time := {
@@ -12129,40 +12129,40 @@ const AVP_Code c_AVP_Code_DCA_3GPP_PC3_EPC_Control_Protocol_Cause := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_PC3_EPC_Control_Protocol_Cause };
 const AVP_Code c_AVP_Code_S6_3GPP_Monitoring_Duration := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Monitoring_Duration };
-const AVP_Code c_AVP_Code_AAA_3GPP_Routing_Area_Identity := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_Routing_Area_Identity };
 const AVP_Code c_AVP_Code_PCC_3GPP_QoS_Information := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_QoS_Information };
+const AVP_Code c_AVP_Code_AAA_3GPP_Routing_Area_Identity := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Routing_Area_Identity };
 const AVP_Code c_AVP_Code_DCA_3GPP_Called_Party_Address := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Called_Party_Address };
-const AVP_Code c_AVP_Code_DCC_NONE_User_Equipment_Info_Value := {
-	vendor_id_NONE := avp_code_DCC_NONE_User_Equipment_Info_Value };
-const AVP_Code c_AVP_Code_DNAS_NONE_Tunneling := {
-	vendor_id_NONE := avp_code_DNAS_NONE_Tunneling };
 const AVP_Code c_AVP_Code_RX_3GPP_Service_Authorization_Info := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Service_Authorization_Info };
-const AVP_Code c_AVP_Code_BASE_NONE_Multi_Round_Time_Out := {
-	vendor_id_NONE := avp_code_BASE_NONE_Multi_Round_Time_Out };
+const AVP_Code c_AVP_Code_DNAS_NONE_Tunneling := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Tunneling };
+const AVP_Code c_AVP_Code_DCC_NONE_User_Equipment_Info_Value := {
+	vendor_id_NONE := avp_code_DCC_NONE_User_Equipment_Info_Value };
 const AVP_Code c_AVP_Code_AAA_3GPP_eDRX_Cycle_Length := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_eDRX_Cycle_Length };
+const AVP_Code c_AVP_Code_BASE_NONE_Multi_Round_Time_Out := {
+	vendor_id_NONE := avp_code_BASE_NONE_Multi_Round_Time_Out };
 const AVP_Code c_AVP_Code_S6_3GPP_Group_Monitoring_Event_Report_Item := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Group_Monitoring_Event_Report_Item };
-const AVP_Code c_AVP_Code_AAA_3GPP_Ext_PDP_Type := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_Ext_PDP_Type };
 const AVP_Code c_AVP_Code_PCC_3GPP_Rule_Failure_Code := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Rule_Failure_Code };
+const AVP_Code c_AVP_Code_AAA_3GPP_Ext_PDP_Type := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Ext_PDP_Type };
 const AVP_Code c_AVP_Code_DCA_3GPP_Time_Quota_Threshold := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Time_Quota_Threshold };
 const AVP_Code c_AVP_Code_PCC_3GPP_User_Location_Info_Time := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_User_Location_Info_Time };
-const AVP_Code c_AVP_Code_AAA_3GPP_Measurement_Period_LTE := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_Measurement_Period_LTE };
 const AVP_Code c_AVP_Code_PCC_3GPP_Usage_Monitoring_Information := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Usage_Monitoring_Information };
-const AVP_Code c_AVP_Code_BASE_NONE_Experimental_Result_Code := {
-	vendor_id_NONE := avp_code_BASE_NONE_Experimental_Result_Code };
+const AVP_Code c_AVP_Code_AAA_3GPP_Measurement_Period_LTE := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Measurement_Period_LTE };
 const AVP_Code c_AVP_Code_PCC_3GPP_Extended_APN_AMBR_DL := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Extended_APN_AMBR_DL };
+const AVP_Code c_AVP_Code_BASE_NONE_Experimental_Result_Code := {
+	vendor_id_NONE := avp_code_BASE_NONE_Experimental_Result_Code };
 const AVP_Code c_AVP_Code_CxDx_3GPP_Session_Priority := {
 	vendor_id_3GPP := avp_code_CxDx_3GPP_Session_Priority };
 const AVP_Code c_AVP_Code_DCA_3GPP_Recipient_Info := {
@@ -12175,12 +12175,12 @@ const AVP_Code c_AVP_Code_CxDx_3GPP_Deregistration_Reason := {
 	vendor_id_3GPP := avp_code_CxDx_3GPP_Deregistration_Reason };
 const AVP_Code c_AVP_Code_AAA_3GPP_GMLC_Number := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_GMLC_Number };
-const AVP_Code c_AVP_Code_DNAS_NONE_Configuration_Token := {
-	vendor_id_NONE := avp_code_DNAS_NONE_Configuration_Token };
-const AVP_Code c_AVP_Code_DNAS_NONE_Callback_Number := {
-	vendor_id_NONE := avp_code_DNAS_NONE_Callback_Number };
 const AVP_Code c_AVP_Code_AAA_3GPP_Software_Version := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Software_Version };
+const AVP_Code c_AVP_Code_DNAS_NONE_Callback_Number := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Callback_Number };
+const AVP_Code c_AVP_Code_DNAS_NONE_Configuration_Token := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Configuration_Token };
 const AVP_Code c_AVP_Code_DCA_3GPP_Interface_Type := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Interface_Type };
 const AVP_Code c_AVP_Code_AAA_3GPP_Expiration_Date := {
@@ -12191,10 +12191,10 @@ const AVP_Code c_AVP_Code_AAA_3GPP_SRES := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_SRES };
 const AVP_Code c_AVP_Code_DCA_3GPP_DRM_Content := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_DRM_Content };
-const AVP_Code c_AVP_Code_DNAS_NONE_NAS_Port_Type := {
-	vendor_id_NONE := avp_code_DNAS_NONE_NAS_Port_Type };
 const AVP_Code c_AVP_Code_AAA_3GPP_Item_Number := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Item_Number };
+const AVP_Code c_AVP_Code_DNAS_NONE_NAS_Port_Type := {
+	vendor_id_NONE := avp_code_DNAS_NONE_NAS_Port_Type };
 const AVP_Code c_AVP_Code_DCC_NONE_Multiple_Services_Indicator := {
 	vendor_id_NONE := avp_code_DCC_NONE_Multiple_Services_Indicator };
 const AVP_Code c_AVP_Code_DCA_3GPP_Early_Media_Description := {
@@ -12227,18 +12227,18 @@ const AVP_Code c_AVP_Code_DCA_3GPP_Associated_URI := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Associated_URI };
 const AVP_Code c_AVP_Code_RX_3GPP_AF_Requested_Data := {
 	vendor_id_3GPP := avp_code_RX_3GPP_AF_Requested_Data };
+const AVP_Code c_AVP_Code_PCC_3GPP_QoS_Rule_Report := {
+	vendor_id_3GPP := avp_code_PCC_3GPP_QoS_Rule_Report };
 const AVP_Code c_AVP_Code_DNAS_NONE_Filter_Id := {
 	vendor_id_NONE := avp_code_DNAS_NONE_Filter_Id };
 const AVP_Code c_AVP_Code_DNAS_NONE_ARAP_Password := {
 	vendor_id_NONE := avp_code_DNAS_NONE_ARAP_Password };
-const AVP_Code c_AVP_Code_PCC_3GPP_QoS_Rule_Report := {
-	vendor_id_3GPP := avp_code_PCC_3GPP_QoS_Rule_Report };
 const AVP_Code c_AVP_Code_DCA_3GPP_Route_Header_Received := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Route_Header_Received };
-const AVP_Code c_AVP_Code_DNAS_NONE_CHAP_Response := {
-	vendor_id_NONE := avp_code_DNAS_NONE_CHAP_Response };
 const AVP_Code c_AVP_Code_S6_3GPP_Stationary_Indication := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Stationary_Indication };
+const AVP_Code c_AVP_Code_DNAS_NONE_CHAP_Response := {
+	vendor_id_NONE := avp_code_DNAS_NONE_CHAP_Response };
 const AVP_Code c_AVP_Code_PCC_3GPP_Traffic_Steering_Policy_Identifier_DL := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Traffic_Steering_Policy_Identifier_DL };
 const AVP_Code c_AVP_Code_DCA_3GPP_Usage_Information_Report_Sequence_Number := {
@@ -12321,26 +12321,26 @@ const AVP_Code c_AVP_Code_PCC_3GPP_Offline := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Offline };
 const AVP_Code c_AVP_Code_DCA_3GPP_SIP_Method := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_SIP_Method };
+const AVP_Code c_AVP_Code_PCC_3GPP_ADC_Rule_Definition := {
+	vendor_id_3GPP := avp_code_PCC_3GPP_ADC_Rule_Definition };
+const AVP_Code c_AVP_Code_AAA_3GPP_Additional_Context_ID := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Additional_Context_ID };
 const AVP_Code c_AVP_Code_DNAS_NONE_Login_Service := {
 	vendor_id_NONE := avp_code_DNAS_NONE_Login_Service };
 const AVP_Code c_AVP_Code_DNAS_NONE_ARAP_Security_Data := {
 	vendor_id_NONE := avp_code_DNAS_NONE_ARAP_Security_Data };
-const AVP_Code c_AVP_Code_AAA_3GPP_Additional_Context_ID := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_Additional_Context_ID };
-const AVP_Code c_AVP_Code_PCC_3GPP_ADC_Rule_Definition := {
-	vendor_id_3GPP := avp_code_PCC_3GPP_ADC_Rule_Definition };
 const AVP_Code c_AVP_Code_S6_3GPP_Allowed_PLMN_List := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Allowed_PLMN_List };
-const AVP_Code c_AVP_Code_AAA_3GPP_Active_APN := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_Active_APN };
 const AVP_Code c_AVP_Code_PCC_3GPP_Bearer_Control_Mode := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Bearer_Control_Mode };
+const AVP_Code c_AVP_Code_AAA_3GPP_Active_APN := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Active_APN };
 const AVP_Code c_AVP_Code_PCC_3GPP_HeNB_Local_IP_Address := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_HeNB_Local_IP_Address };
-const AVP_Code c_AVP_Code_AAA_3GPP_SMS_Register_Request := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_SMS_Register_Request };
 const AVP_Code c_AVP_Code_PCC_3GPP_Packet_Filter_Content := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Packet_Filter_Content };
+const AVP_Code c_AVP_Code_AAA_3GPP_SMS_Register_Request := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_SMS_Register_Request };
 const AVP_Code c_AVP_Code_CxDx_3GPP_Subscription_Info := {
 	vendor_id_3GPP := avp_code_CxDx_3GPP_Subscription_Info };
 const AVP_Code c_AVP_Code_DCA_3GPP_SIP_Response_Timestamp_Fraction := {
@@ -12383,40 +12383,40 @@ const AVP_Code c_AVP_Code_DCA_3GPP_PoC_Session_Id := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_PoC_Session_Id };
 const AVP_Code c_AVP_Code_BASE_NONE_Proxy_State := {
 	vendor_id_NONE := avp_code_BASE_NONE_Proxy_State };
-const AVP_Code c_AVP_Code_MIPv6_NONE_MIP6_Agent_Info := {
-	vendor_id_NONE := avp_code_MIPv6_NONE_MIP6_Agent_Info };
 const AVP_Code c_AVP_Code_DCA_3GPP_PoC_Server_Role := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_PoC_Server_Role };
 const AVP_Code c_AVP_Code_DCA_3GPP_Forwarding_Pending := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Forwarding_Pending };
-const AVP_Code c_AVP_Code_DCC_NONE_Credit_Control_Failure_Handling := {
-	vendor_id_NONE := avp_code_DCC_NONE_Credit_Control_Failure_Handling };
 const AVP_Code c_AVP_Code_S6_3GPP_SIR_Flags := {
 	vendor_id_3GPP := avp_code_S6_3GPP_SIR_Flags };
+const AVP_Code c_AVP_Code_DCC_NONE_Credit_Control_Failure_Handling := {
+	vendor_id_NONE := avp_code_DCC_NONE_Credit_Control_Failure_Handling };
+const AVP_Code c_AVP_Code_MIPv6_NONE_MIP6_Agent_Info := {
+	vendor_id_NONE := avp_code_MIPv6_NONE_MIP6_Agent_Info };
 const AVP_Code c_AVP_Code_RX_3GPP_MPS_Identifier := {
 	vendor_id_3GPP := avp_code_RX_3GPP_MPS_Identifier };
-const AVP_Code c_AVP_Code_AAA_3GPP_MDT_Allowed_PLMN_Id := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_MDT_Allowed_PLMN_Id };
 const AVP_Code c_AVP_Code_PCC_3GPP_Credit_Management_Status := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Credit_Management_Status };
+const AVP_Code c_AVP_Code_AAA_3GPP_MDT_Allowed_PLMN_Id := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_MDT_Allowed_PLMN_Id };
 const AVP_Code c_AVP_Code_DCA_3GPP_Monitored_PLMN_Identifier := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Monitored_PLMN_Identifier };
 const AVP_Code c_AVP_Code_S6_3GPP_Service_Result := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Service_Result };
-const AVP_Code c_AVP_Code_AAA_3GPP_MME_Location_Information := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_MME_Location_Information };
 const AVP_Code c_AVP_Code_PCC_3GPP_Reporting_Level := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Reporting_Level };
+const AVP_Code c_AVP_Code_AAA_3GPP_MME_Location_Information := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_MME_Location_Information };
 const AVP_Code c_AVP_Code_DCA_3GPP_Served_Party_IP_Address := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Served_Party_IP_Address };
 const AVP_Code c_AVP_Code_RX_3GPP_Max_Supported_Bandwidth_DL := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Max_Supported_Bandwidth_DL };
 const AVP_Code c_AVP_Code_DCA_3GPP_Time_First_Reception := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Time_First_Reception };
-const AVP_Code c_AVP_Code_AAA_3GPP_Subscribed_VSRVCC := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_Subscribed_VSRVCC };
 const AVP_Code c_AVP_Code_PCC_3GPP_Pre_emption_Capability := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Pre_emption_Capability };
+const AVP_Code c_AVP_Code_AAA_3GPP_Subscribed_VSRVCC := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Subscribed_VSRVCC };
 const AVP_Code c_AVP_Code_PCC_3GPP_Monitoring_Flags := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Monitoring_Flags };
 const AVP_Code c_AVP_Code_BASE_NONE_Redirect_Max_Cache_Time := {
@@ -12557,30 +12557,30 @@ const AVP_Code c_AVP_Code_DCA_3GPP_SM_Device_Trigger_Indicator := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_SM_Device_Trigger_Indicator };
 const AVP_Code c_AVP_Code_S6_3GPP_User_Identifier := {
 	vendor_id_3GPP := avp_code_S6_3GPP_User_Identifier };
-const AVP_Code c_AVP_Code_DNAS_NONE_Framed_IPv6_Pool := {
-	vendor_id_NONE := avp_code_DNAS_NONE_Framed_IPv6_Pool };
 const AVP_Code c_AVP_Code_PCC_3GPP_QoS_Rule_Base_Name := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_QoS_Rule_Base_Name };
+const AVP_Code c_AVP_Code_DNAS_NONE_Framed_IPv6_Pool := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Framed_IPv6_Pool };
 const AVP_Code c_AVP_Code_AAA_3GPP_Restoration_Priority := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Restoration_Priority };
 const AVP_Code c_AVP_Code_DCA_3GPP_ISUP_Cause_Diagnostics := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_ISUP_Cause_Diagnostics };
-const AVP_Code c_AVP_Code_DCC_NONE_Rating_Group := {
-	vendor_id_NONE := avp_code_DCC_NONE_Rating_Group };
-const AVP_Code c_AVP_Code_MIPv6_NONE_MIP_MN_HA_SPI := {
-	vendor_id_NONE := avp_code_MIPv6_NONE_MIP_MN_HA_SPI };
 const AVP_Code c_AVP_Code_S6_3GPP_Association_Type := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Association_Type };
 const AVP_Code c_AVP_Code_PCC_3GPP_Charging_Rule_Definition := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Charging_Rule_Definition };
+const AVP_Code c_AVP_Code_DCC_NONE_Rating_Group := {
+	vendor_id_NONE := avp_code_DCC_NONE_Rating_Group };
+const AVP_Code c_AVP_Code_MIPv6_NONE_MIP_MN_HA_SPI := {
+	vendor_id_NONE := avp_code_MIPv6_NONE_MIP_MN_HA_SPI };
 const AVP_Code c_AVP_Code_RX_3GPP_Min_Requested_Bandwidth_UL := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Min_Requested_Bandwidth_UL };
 const AVP_Code c_AVP_Code_DCA_3GPP_Application_Specific_Data := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Application_Specific_Data };
-const AVP_Code c_AVP_Code_AAA_3GPP_Report_Amount := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_Report_Amount };
 const AVP_Code c_AVP_Code_PCC_3GPP_CoA_Information := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_CoA_Information };
+const AVP_Code c_AVP_Code_AAA_3GPP_Report_Amount := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Report_Amount };
 const AVP_Code c_AVP_Code_CxDx_3GPP_Secondary_Charging_Collection_Function_Name := {
 	vendor_id_3GPP := avp_code_CxDx_3GPP_Secondary_Charging_Collection_Function_Name };
 const AVP_Code c_AVP_Code_DCC_NONE_User_Equipment_Info := {
@@ -12671,10 +12671,10 @@ const AVP_Code c_AVP_Code_DCA_3GPP_PoC_Information := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_PoC_Information };
 const AVP_Code c_AVP_Code_PCC_3GPP_Presence_Reporting_Area_Status := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Presence_Reporting_Area_Status };
-const AVP_Code c_AVP_Code_AAA_3GPP_WLAN_offloadability := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_WLAN_offloadability };
 const AVP_Code c_AVP_Code_PCC_3GPP_Routing_Filter := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Routing_Filter };
+const AVP_Code c_AVP_Code_AAA_3GPP_WLAN_offloadability := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_WLAN_offloadability };
 const AVP_Code c_AVP_Code_DCA_3GPP_Data_Coding_Scheme := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Data_Coding_Scheme };
 const AVP_Code c_AVP_Code_PCC_3GPP_Metering_Method := {
@@ -12749,34 +12749,34 @@ const AVP_Code c_AVP_Code_PCC_3GPP_QoS_Upgrade := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_QoS_Upgrade };
 const AVP_Code c_AVP_Code_DCA_3GPP_PS_Append_Free_Format_Data := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_PS_Append_Free_Format_Data };
-const AVP_Code c_AVP_Code_DNAS_NONE_Service_Type := {
-	vendor_id_NONE := avp_code_DNAS_NONE_Service_Type };
 const AVP_Code c_AVP_Code_PCC_3GPP_AN_GW_Status := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_AN_GW_Status };
-const AVP_Code c_AVP_Code_AAA_3GPP_Measurement_Period_UMTS := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_Measurement_Period_UMTS };
+const AVP_Code c_AVP_Code_DNAS_NONE_Service_Type := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Service_Type };
 const AVP_Code c_AVP_Code_PCC_3GPP_Monitoring_Key := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Monitoring_Key };
+const AVP_Code c_AVP_Code_AAA_3GPP_Measurement_Period_UMTS := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Measurement_Period_UMTS };
 const AVP_Code c_AVP_Code_DCA_3GPP_Media_Initiator_Flag := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Media_Initiator_Flag };
 const AVP_Code c_AVP_Code_DCA_3GPP_ISUP_Location_Number := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_ISUP_Location_Number };
 const AVP_Code c_AVP_Code_PCC_3GPP_3GPP_PS_Data_Off_Status := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_3GPP_PS_Data_Off_Status };
-const AVP_Code c_AVP_Code_AAA_3GPP_Reset_ID := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_Reset_ID };
 const AVP_Code c_AVP_Code_PCC_3GPP_Routing_Rule_Install := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Routing_Rule_Install };
+const AVP_Code c_AVP_Code_AAA_3GPP_Reset_ID := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Reset_ID };
 const AVP_Code c_AVP_Code_DCA_3GPP_Service_Data_Container := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Service_Data_Container };
 const AVP_Code c_AVP_Code_CxDx_3GPP_Server_Assignment_Type := {
 	vendor_id_3GPP := avp_code_CxDx_3GPP_Server_Assignment_Type };
 const AVP_Code c_AVP_Code_AAA_3GPP_PUR_Flags := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_PUR_Flags };
-const AVP_Code c_AVP_Code_DNAS_NONE_Framed_Routing := {
-	vendor_id_NONE := avp_code_DNAS_NONE_Framed_Routing };
 const AVP_Code c_AVP_Code_PCC_3GPP_IP_CAN_Session_Charging_Scope := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_IP_CAN_Session_Charging_Scope };
+const AVP_Code c_AVP_Code_DNAS_NONE_Framed_Routing := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Framed_Routing };
 const AVP_Code c_AVP_Code_AAA_3GPP_IMEI := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_IMEI };
 const AVP_Code c_AVP_Code_DNAS_NONE_CHAP_Ident := {
@@ -12845,14 +12845,14 @@ const AVP_Code c_AVP_Code_DCA_3GPP_ProSe_UE_ID := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_ProSe_UE_ID };
 const AVP_Code c_AVP_Code_CxDx_3GPP_Server_Name := {
 	vendor_id_3GPP := avp_code_CxDx_3GPP_Server_Name };
-const AVP_Code c_AVP_Code_DCC_NONE_Check_Balance_Result := {
-	vendor_id_NONE := avp_code_DCC_NONE_Check_Balance_Result };
 const AVP_Code c_AVP_Code_S6_3GPP_APN_Validity_Time := {
 	vendor_id_3GPP := avp_code_S6_3GPP_APN_Validity_Time };
-const AVP_Code c_AVP_Code_AAA_3GPP_Job_Type := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_Job_Type };
 const AVP_Code c_AVP_Code_PCC_3GPP_Allocation_Retention_Priority := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Allocation_Retention_Priority };
+const AVP_Code c_AVP_Code_DCC_NONE_Check_Balance_Result := {
+	vendor_id_NONE := avp_code_DCC_NONE_Check_Balance_Result };
+const AVP_Code c_AVP_Code_AAA_3GPP_Job_Type := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Job_Type };
 const AVP_Code c_AVP_Code_BASE_NONE_Destination_Host := {
 	vendor_id_NONE := avp_code_BASE_NONE_Destination_Host };
 const AVP_Code c_AVP_Code_AAA_3GPP_Positioning_Method := {
@@ -12865,10 +12865,10 @@ const AVP_Code c_AVP_Code_DCA_3GPP_AoC_Service_Type := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_AoC_Service_Type };
 const AVP_Code c_AVP_Code_DNAS_NONE_Login_IP_Host := {
 	vendor_id_NONE := avp_code_DNAS_NONE_Login_IP_Host };
-const AVP_Code c_AVP_Code_DNAS_NONE_ARAP_Security := {
-	vendor_id_NONE := avp_code_DNAS_NONE_ARAP_Security };
 const AVP_Code c_AVP_Code_AAA_3GPP_IDA_Flags := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_IDA_Flags };
+const AVP_Code c_AVP_Code_DNAS_NONE_ARAP_Security := {
+	vendor_id_NONE := avp_code_DNAS_NONE_ARAP_Security };
 const AVP_Code c_AVP_Code_DNAS_NONE_Origin_AAA_Protocol := {
 	vendor_id_NONE := avp_code_DNAS_NONE_Origin_AAA_Protocol };
 const AVP_Code c_AVP_Code_DCA_3GPP_Time_Last_Usage := {
@@ -12885,10 +12885,10 @@ const AVP_Code c_AVP_Code_AAA_3GPP_Roaming_Restricted_Due_To_Unsupported_Feature
 	vendor_id_3GPP := avp_code_AAA_3GPP_Roaming_Restricted_Due_To_Unsupported_Feature };
 const AVP_Code c_AVP_Code_DCA_3GPP_File_Repair_Supported := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_File_Repair_Supported };
-const AVP_Code c_AVP_Code_DNAS_NONE_Tunnel_Assignment_Id := {
-	vendor_id_NONE := avp_code_DNAS_NONE_Tunnel_Assignment_Id };
 const AVP_Code c_AVP_Code_DNAS_NONE_Framed_IPX_Network := {
 	vendor_id_NONE := avp_code_DNAS_NONE_Framed_IPX_Network };
+const AVP_Code c_AVP_Code_DNAS_NONE_Tunnel_Assignment_Id := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Tunnel_Assignment_Id };
 const AVP_Code c_AVP_Code_DCC_NONE_CC_Service_Specific_Units := {
 	vendor_id_NONE := avp_code_DCC_NONE_CC_Service_Specific_Units };
 const AVP_Code c_AVP_Code_DCA_3GPP_SDP_Answer_Timestamp := {
@@ -12915,10 +12915,10 @@ const AVP_Code c_AVP_Code_DCA_3GPP_ProSe_Direct_Communication_Transmission_Data_
 	vendor_id_3GPP := avp_code_DCA_3GPP_ProSe_Direct_Communication_Transmission_Data_Container };
 const AVP_Code c_AVP_Code_S6_3GPP_Restricted_PLMN_List := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Restricted_PLMN_List };
-const AVP_Code c_AVP_Code_AAA_3GPP_Age_Of_Location_Information := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_Age_Of_Location_Information };
 const AVP_Code c_AVP_Code_PCC_3GPP_Access_Network_Charging_Identifier_Gx := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Access_Network_Charging_Identifier_Gx };
+const AVP_Code c_AVP_Code_AAA_3GPP_Age_Of_Location_Information := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Age_Of_Location_Information };
 const AVP_Code c_AVP_Code_DCA_3GPP_PoC_Group_Name := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_PoC_Group_Name };
 const AVP_Code c_AVP_Code_RX_3GPP_Extended_Max_Requested_BW_DL := {
@@ -12929,22 +12929,22 @@ const AVP_Code c_AVP_Code_DCA_3GPP_PS_Information := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_PS_Information };
 const AVP_Code c_AVP_Code_DCA_3GPP_MTC_IWF_Address := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_MTC_IWF_Address };
+const AVP_Code c_AVP_Code_PCC_3GPP_Execution_Time := {
+	vendor_id_3GPP := avp_code_PCC_3GPP_Execution_Time };
 const AVP_Code c_AVP_Code_DNAS_NONE_NAS_Identifier := {
 	vendor_id_NONE := avp_code_DNAS_NONE_NAS_Identifier };
 const AVP_Code c_AVP_Code_DNAS_NONE_Tunnel_Server_Auth_Id := {
 	vendor_id_NONE := avp_code_DNAS_NONE_Tunnel_Server_Auth_Id };
-const AVP_Code c_AVP_Code_PCC_3GPP_Execution_Time := {
-	vendor_id_3GPP := avp_code_PCC_3GPP_Execution_Time };
 const AVP_Code c_AVP_Code_CxDx_3GPP_Contact := {
 	vendor_id_3GPP := avp_code_CxDx_3GPP_Contact };
+const AVP_Code c_AVP_Code_PCC_3GPP_Charging_Correlation_Indicator := {
+	vendor_id_3GPP := avp_code_PCC_3GPP_Charging_Correlation_Indicator };
 const AVP_Code c_AVP_Code_DCC_NONE_Credit_Control := {
 	vendor_id_NONE := avp_code_DCC_NONE_Credit_Control };
 const AVP_Code c_AVP_Code_BASE_NONE_Accounting_Record_Number := {
 	vendor_id_NONE := avp_code_BASE_NONE_Accounting_Record_Number };
 const AVP_Code c_AVP_Code_AAA_3GPP_Event_Threshold_Event_1I := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Event_Threshold_Event_1I };
-const AVP_Code c_AVP_Code_PCC_3GPP_Charging_Correlation_Indicator := {
-	vendor_id_3GPP := avp_code_PCC_3GPP_Charging_Correlation_Indicator };
 const AVP_Code c_AVP_Code_DCA_3GPP_SIP_Request_Timestamp_Fraction := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_SIP_Request_Timestamp_Fraction };
 const AVP_Code c_AVP_Code_DCA_3GPP_Service_Mode := {
@@ -12983,10 +12983,10 @@ const AVP_Code c_AVP_Code_DCA_3GPP_SGSN_Address := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_SGSN_Address };
 const AVP_Code c_AVP_Code_DCA_3GPP_SGi_PtP_Tunnelling_Method := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_SGi_PtP_Tunnelling_Method };
-const AVP_Code c_AVP_Code_DNAS_NONE_Acct_Tunnel_Packets_Lost := {
-	vendor_id_NONE := avp_code_DNAS_NONE_Acct_Tunnel_Packets_Lost };
 const AVP_Code c_AVP_Code_BASE_NONE_Session_Timeout := {
 	vendor_id_NONE := avp_code_BASE_NONE_Session_Timeout };
+const AVP_Code c_AVP_Code_DNAS_NONE_Acct_Tunnel_Packets_Lost := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Acct_Tunnel_Packets_Lost };
 const AVP_Code c_AVP_Code_DCA_3GPP_NNI_Type := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_NNI_Type };
 const AVP_Code c_AVP_Code_RX_3GPP_Service_Info_Status := {
@@ -13011,10 +13011,10 @@ const AVP_Code c_AVP_Code_DCA_3GPP_Node_Functionality := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Node_Functionality };
 const AVP_Code c_AVP_Code_RX_3GPP_Flow_Description := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Flow_Description };
-const AVP_Code c_AVP_Code_AAA_3GPP_Daylight_Saving_Time := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_Daylight_Saving_Time };
 const AVP_Code c_AVP_Code_PCC_3GPP_Packet_Filter_Information := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Packet_Filter_Information };
+const AVP_Code c_AVP_Code_AAA_3GPP_Daylight_Saving_Time := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Daylight_Saving_Time };
 const AVP_Code c_AVP_Code_DCA_3GPP_Address_Domain := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Address_Domain };
 const AVP_Code c_AVP_Code_S6_3GPP_SCEF_ID := {
@@ -13023,22 +13023,22 @@ const AVP_Code c_AVP_Code_DCA_3GPP_Content_Length := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Content_Length };
 const AVP_Code c_AVP_Code_PCC_3GPP_Removal_Of_Access := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Removal_Of_Access };
-const AVP_Code c_AVP_Code_AAA_3GPP_Preferred_Data_Mode := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_Preferred_Data_Mode };
 const AVP_Code c_AVP_Code_PCC_3GPP_ADC_Rule_Report := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_ADC_Rule_Report };
+const AVP_Code c_AVP_Code_AAA_3GPP_Preferred_Data_Mode := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Preferred_Data_Mode };
 const AVP_Code c_AVP_Code_DCA_3GPP_ProSe_Functionality := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_ProSe_Functionality };
 const AVP_Code c_AVP_Code_DCA_3GPP_Low_Balance_Indication := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Low_Balance_Indication };
-const AVP_Code c_AVP_Code_AAA_3GPP_UE_SRVCC_Capability := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_UE_SRVCC_Capability };
 const AVP_Code c_AVP_Code_PCC_3GPP_Guaranteed_Bitrate_UL := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Guaranteed_Bitrate_UL };
-const AVP_Code c_AVP_Code_DNAS_NONE_NAS_IPv6_Address := {
-	vendor_id_NONE := avp_code_DNAS_NONE_NAS_IPv6_Address };
+const AVP_Code c_AVP_Code_AAA_3GPP_UE_SRVCC_Capability := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_UE_SRVCC_Capability };
 const AVP_Code c_AVP_Code_DNAS_NONE_Login_LAT_Group := {
 	vendor_id_NONE := avp_code_DNAS_NONE_Login_LAT_Group };
+const AVP_Code c_AVP_Code_DNAS_NONE_NAS_IPv6_Address := {
+	vendor_id_NONE := avp_code_DNAS_NONE_NAS_IPv6_Address };
 const AVP_Code c_AVP_Code_MIPv6_NONE_MIP_MAC_Mobility_Data := {
 	vendor_id_NONE := avp_code_MIPv6_NONE_MIP_MAC_Mobility_Data };
 const AVP_Code c_AVP_Code_DNAS_NONE_Accounting_Output_Octets := {
@@ -13089,18 +13089,18 @@ const AVP_Code c_AVP_Code_S6_3GPP_AESE_Communication_Pattern := {
 	vendor_id_3GPP := avp_code_S6_3GPP_AESE_Communication_Pattern };
 const AVP_Code c_AVP_Code_PCC_3GPP_NBIFOM_Mode := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_NBIFOM_Mode };
-const AVP_Code c_AVP_Code_DCC_NONE_Validity_Time := {
-	vendor_id_NONE := avp_code_DCC_NONE_Validity_Time };
 const AVP_Code c_AVP_Code_PCC_3GPP_Redirect_Information := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Redirect_Information };
+const AVP_Code c_AVP_Code_DCC_NONE_Validity_Time := {
+	vendor_id_NONE := avp_code_DCC_NONE_Validity_Time };
 const AVP_Code c_AVP_Code_DCA_3GPP_Monitoring_UE_VPLMN_Identifier := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Monitoring_UE_VPLMN_Identifier };
 const AVP_Code c_AVP_Code_S6_3GPP_Event_Handling := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Event_Handling };
-const AVP_Code c_AVP_Code_AAA_3GPP_Tracking_Area_Identity := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_Tracking_Area_Identity };
 const AVP_Code c_AVP_Code_PCC_3GPP_ToS_Traffic_Class := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_ToS_Traffic_Class };
+const AVP_Code c_AVP_Code_AAA_3GPP_Tracking_Area_Identity := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Tracking_Area_Identity };
 const AVP_Code c_AVP_Code_RX_3GPP_Min_Desired_Bandwidth_UL := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Min_Desired_Bandwidth_UL };
 const AVP_Code c_AVP_Code_AAA_3GPP_UVR_Flags := {
@@ -13109,16 +13109,16 @@ const AVP_Code c_AVP_Code_DCA_3GPP_PS_Free_Format_Data := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_PS_Free_Format_Data };
 const AVP_Code c_AVP_Code_CxDx_3GPP_Originating_Request := {
 	vendor_id_3GPP := avp_code_CxDx_3GPP_Originating_Request };
-const AVP_Code c_AVP_Code_AAA_3GPP_Subscription_Data_Flags := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_Subscription_Data_Flags };
 const AVP_Code c_AVP_Code_PCC_3GPP_PDN_Connection_ID := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_PDN_Connection_ID };
+const AVP_Code c_AVP_Code_AAA_3GPP_Subscription_Data_Flags := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Subscription_Data_Flags };
 const AVP_Code c_AVP_Code_DNAS_NONE_Framed_IPv6_Route := {
 	vendor_id_NONE := avp_code_DNAS_NONE_Framed_IPv6_Route };
-const AVP_Code c_AVP_Code_AAA_3GPP_DSR_Flags := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_DSR_Flags };
 const AVP_Code c_AVP_Code_PCC_3GPP_PRA_Remove := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_PRA_Remove };
+const AVP_Code c_AVP_Code_AAA_3GPP_DSR_Flags := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_DSR_Flags };
 const AVP_Code c_AVP_Code_DCC_NONE_Granted_Service_Unit := {
 	vendor_id_NONE := avp_code_DCC_NONE_Granted_Service_Unit };
 const AVP_Code c_AVP_Code_MIPv6_NONE_MIP_Timestamp := {
@@ -13157,10 +13157,10 @@ const AVP_Code c_AVP_Code_DCA_3GPP_Time_Quota_Mechanism := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Time_Quota_Mechanism };
 const AVP_Code c_AVP_Code_DCA_3GPP_Monitoring_Event_Report_Number := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Monitoring_Event_Report_Number };
-const AVP_Code c_AVP_Code_BASE_NONE_Origin_State_Id := {
-	vendor_id_NONE := avp_code_BASE_NONE_Origin_State_Id };
 const AVP_Code c_AVP_Code_S6_3GPP_IP_SM_GW_Name := {
 	vendor_id_3GPP := avp_code_S6_3GPP_IP_SM_GW_Name };
+const AVP_Code c_AVP_Code_BASE_NONE_Origin_State_Id := {
+	vendor_id_NONE := avp_code_BASE_NONE_Origin_State_Id };
 const AVP_Code c_AVP_Code_RX_3GPP_Media_Sub_Component := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Media_Sub_Component };
 const AVP_Code c_AVP_Code_DCA_3GPP_CN_Operator_Selection_Entity := {
@@ -13183,10 +13183,10 @@ const AVP_Code c_AVP_Code_DCA_3GPP_Bearer_Service := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Bearer_Service };
 const AVP_Code c_AVP_Code_CxDx_3GPP_Primary_Charging_Collection_Function_Name := {
 	vendor_id_3GPP := avp_code_CxDx_3GPP_Primary_Charging_Collection_Function_Name };
-const AVP_Code c_AVP_Code_AAA_3GPP_Time_Zone := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_Time_Zone };
 const AVP_Code c_AVP_Code_PCC_3GPP_QoS_Rule_Definition := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_QoS_Rule_Definition };
+const AVP_Code c_AVP_Code_AAA_3GPP_Time_Zone := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Time_Zone };
 const AVP_Code c_AVP_Code_S6_3GPP_Periodic_Time := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Periodic_Time };
 const AVP_Code c_AVP_Code_PCC_3GPP_Routing_Rule_Failure_Code := {
@@ -13201,10 +13201,10 @@ const AVP_Code c_AVP_Code_DCA_3GPP_Requestor_PLMN_Identifier := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Requestor_PLMN_Identifier };
 const AVP_Code c_AVP_Code_DCA_3GPP_IMS_Application_Reference_Identifier := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_IMS_Application_Reference_Identifier };
-const AVP_Code c_AVP_Code_AAA_3GPP_Service_Area_Identity := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_Service_Area_Identity };
 const AVP_Code c_AVP_Code_PCC_3GPP_Charging_Rule_Report := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Charging_Rule_Report };
+const AVP_Code c_AVP_Code_AAA_3GPP_Service_Area_Identity := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Service_Area_Identity };
 const AVP_Code c_AVP_Code_BASE_NONE_User_Name := {
 	vendor_id_NONE := avp_code_BASE_NONE_User_Name };
 const AVP_Code c_AVP_Code_AAA_3GPP_UE_PC5_AMBR := {
@@ -13251,20 +13251,20 @@ const AVP_Code c_AVP_Code_DCA_3GPP_Participant_Access_Priority := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Participant_Access_Priority };
 const AVP_Code c_AVP_Code_RX_3GPP_RS_Bandwidth := {
 	vendor_id_3GPP := avp_code_RX_3GPP_RS_Bandwidth };
-const AVP_Code c_AVP_Code_MIPv6_NONE_MIP_Algorithm_Type := {
-	vendor_id_NONE := avp_code_MIPv6_NONE_MIP_Algorithm_Type };
 const AVP_Code c_AVP_Code_S6_3GPP_Reachability_Information := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Reachability_Information };
+const AVP_Code c_AVP_Code_MIPv6_NONE_MIP_Algorithm_Type := {
+	vendor_id_NONE := avp_code_MIPv6_NONE_MIP_Algorithm_Type };
 const AVP_Code c_AVP_Code_DCA_3GPP_SDP_Session_Description := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_SDP_Session_Description };
 const AVP_Code c_AVP_Code_RX_3GPP_Extended_Min_Desired_BW_DL := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Extended_Min_Desired_BW_DL };
 const AVP_Code c_AVP_Code_DCA_3GPP_Location_Info := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Location_Info };
-const AVP_Code c_AVP_Code_AAA_3GPP_Event_Threshold_RSRQ := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_Event_Threshold_RSRQ };
 const AVP_Code c_AVP_Code_PCC_3GPP_APN_Aggregate_Max_Bitrate_UL := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_APN_Aggregate_Max_Bitrate_UL };
+const AVP_Code c_AVP_Code_AAA_3GPP_Event_Threshold_RSRQ := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Event_Threshold_RSRQ };
 const AVP_Code c_AVP_Code_DCA_3GPP_LCS_Information := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_LCS_Information };
 const AVP_Code c_AVP_Code_S6_3GPP_Service_Parameters := {
@@ -13283,12 +13283,12 @@ const AVP_Code c_AVP_Code_RX_3GPP_GCS_Identifier := {
 	vendor_id_3GPP := avp_code_RX_3GPP_GCS_Identifier };
 const AVP_Code c_AVP_Code_MIPv6_NONE_QoS_Capability := {
 	vendor_id_NONE := avp_code_MIPv6_NONE_QoS_Capability };
+const AVP_Code c_AVP_Code_PCC_3GPP_ADC_Rule_Install := {
+	vendor_id_3GPP := avp_code_PCC_3GPP_ADC_Rule_Install };
 const AVP_Code c_AVP_Code_DCC_NONE_G_S_U_Pool_Identifier := {
 	vendor_id_NONE := avp_code_DCC_NONE_G_S_U_Pool_Identifier };
 const AVP_Code c_AVP_Code_AAA_3GPP_Non_IP_PDN_Type_Indicator := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Non_IP_PDN_Type_Indicator };
-const AVP_Code c_AVP_Code_PCC_3GPP_ADC_Rule_Install := {
-	vendor_id_3GPP := avp_code_PCC_3GPP_ADC_Rule_Install };
 const AVP_Code c_AVP_Code_DCA_3GPP_Outgoing_Session_Id := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Outgoing_Session_Id };
 const AVP_Code c_AVP_Code_DCA_3GPP_PoC_Controlling_Address := {
@@ -13371,16 +13371,16 @@ const AVP_Code c_AVP_Code_PCC_3GPP_Session_Release_Cause := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Session_Release_Cause };
 const AVP_Code c_AVP_Code_AAA_3GPP_MDT_User_Consent := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_MDT_User_Consent };
+const AVP_Code c_AVP_Code_S6_3GPP_HSS_Cause := {
+	vendor_id_3GPP := avp_code_S6_3GPP_HSS_Cause };
 const AVP_Code c_AVP_Code_MIPv6_NONE_MIP6_Home_Link_Prefix := {
 	vendor_id_NONE := avp_code_MIPv6_NONE_MIP6_Home_Link_Prefix };
 const AVP_Code c_AVP_Code_DNAS_NONE_Login_LAT_Port := {
 	vendor_id_NONE := avp_code_DNAS_NONE_Login_LAT_Port };
-const AVP_Code c_AVP_Code_S6_3GPP_HSS_Cause := {
-	vendor_id_3GPP := avp_code_S6_3GPP_HSS_Cause };
-const AVP_Code c_AVP_Code_DCC_NONE_G_S_U_Pool_Reference := {
-	vendor_id_NONE := avp_code_DCC_NONE_G_S_U_Pool_Reference };
 const AVP_Code c_AVP_Code_PCC_3GPP_PCSCF_Restoration_Indication := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_PCSCF_Restoration_Indication };
+const AVP_Code c_AVP_Code_DCC_NONE_G_S_U_Pool_Reference := {
+	vendor_id_NONE := avp_code_DCC_NONE_G_S_U_Pool_Reference };
 const AVP_Code c_AVP_Code_DCA_3GPP_Layer_2_Group_ID := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Layer_2_Group_ID };
 const AVP_Code c_AVP_Code_DCA_3GPP_Interface_Port := {
@@ -13399,10 +13399,10 @@ const AVP_Code c_AVP_Code_BASE_NONE_Redirect_Host := {
 	vendor_id_NONE := avp_code_BASE_NONE_Redirect_Host };
 const AVP_Code c_AVP_Code_AAA_3GPP_Network_Access_Mode := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Network_Access_Mode };
-const AVP_Code c_AVP_Code_DNAS_NONE_ARAP_Zone_Access := {
-	vendor_id_NONE := avp_code_DNAS_NONE_ARAP_Zone_Access };
 const AVP_Code c_AVP_Code_DNAS_NONE_Framed_Compression := {
 	vendor_id_NONE := avp_code_DNAS_NONE_Framed_Compression };
+const AVP_Code c_AVP_Code_DNAS_NONE_ARAP_Zone_Access := {
+	vendor_id_NONE := avp_code_DNAS_NONE_ARAP_Zone_Access };
 const AVP_Code c_AVP_Code_GI_3GPP_3GPP_Selection_Mode := {
 	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_Selection_Mode };
 const AVP_Code c_AVP_Code_DNAS_NONE_QoS_Filter_Rule := {
@@ -13437,10 +13437,10 @@ const AVP_Code c_AVP_Code_S6_3GPP_Reachability_Type := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Reachability_Type };
 const AVP_Code c_AVP_Code_DCA_3GPP_SIP_Request_Timestamp := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_SIP_Request_Timestamp };
-const AVP_Code c_AVP_Code_DNAS_NONE_Tunnel_Private_Group_Id := {
-	vendor_id_NONE := avp_code_DNAS_NONE_Tunnel_Private_Group_Id };
 const AVP_Code c_AVP_Code_DNAS_NONE_Framed_Route := {
 	vendor_id_NONE := avp_code_DNAS_NONE_Framed_Route };
+const AVP_Code c_AVP_Code_DNAS_NONE_Tunnel_Private_Group_Id := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Tunnel_Private_Group_Id };
 const AVP_Code c_AVP_Code_DCC_NONE_CC_Request_Type := {
 	vendor_id_NONE := avp_code_DCC_NONE_CC_Request_Type };
 const AVP_Code c_AVP_Code_DCA_3GPP_ProSe_Source_IP_Address := {
@@ -13469,20 +13469,20 @@ const AVP_Code c_AVP_Code_DCA_3GPP_Time_First_Usage := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Time_First_Usage };
 const AVP_Code c_AVP_Code_CxDx_3GPP_Reason_Info := {
 	vendor_id_3GPP := avp_code_CxDx_3GPP_Reason_Info };
-const AVP_Code c_AVP_Code_AAA_3GPP_CLR_Flags := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_CLR_Flags };
 const AVP_Code c_AVP_Code_PCC_3GPP_Default_EPS_Bearer_QoS := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Default_EPS_Bearer_QoS };
+const AVP_Code c_AVP_Code_AAA_3GPP_CLR_Flags := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_CLR_Flags };
 const AVP_Code c_AVP_Code_AAA_3GPP_ULR_Flags := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_ULR_Flags };
 const AVP_Code c_AVP_Code_DCA_3GPP_Originating_SCCP_Address := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Originating_SCCP_Address };
-const AVP_Code c_AVP_Code_DNAS_NONE_Tunnel_Client_Auth_Id := {
-	vendor_id_NONE := avp_code_DNAS_NONE_Tunnel_Client_Auth_Id };
-const AVP_Code c_AVP_Code_DNAS_NONE_Calling_Station_Id := {
-	vendor_id_NONE := avp_code_DNAS_NONE_Calling_Station_Id };
 const AVP_Code c_AVP_Code_AAA_3GPP_ICS_Indicator := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_ICS_Indicator };
+const AVP_Code c_AVP_Code_DNAS_NONE_Calling_Station_Id := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Calling_Station_Id };
+const AVP_Code c_AVP_Code_DNAS_NONE_Tunnel_Client_Auth_Id := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Tunnel_Client_Auth_Id };
 const AVP_Code c_AVP_Code_DCC_NONE_Currency_Code := {
 	vendor_id_NONE := avp_code_DCC_NONE_Currency_Code };
 const AVP_Code c_AVP_Code_AAA_3GPP_Cancellation_Type := {
@@ -13543,10 +13543,10 @@ const AVP_Code c_AVP_Code_RX_3GPP_Media_Component_Number := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Media_Component_Number };
 const AVP_Code c_AVP_Code_CxDx_3GPP_Path := {
 	vendor_id_3GPP := avp_code_CxDx_3GPP_Path };
-const AVP_Code c_AVP_Code_AAA_3GPP_Event_Threshold_Event_1F := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_Event_Threshold_Event_1F };
 const AVP_Code c_AVP_Code_PCC_3GPP_Packet_Filter_Usage := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Packet_Filter_Usage };
+const AVP_Code c_AVP_Code_AAA_3GPP_Event_Threshold_Event_1F := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Event_Threshold_Event_1F };
 const AVP_Code c_AVP_Code_S6_3GPP_MONTE_Location_Type := {
 	vendor_id_3GPP := avp_code_S6_3GPP_MONTE_Location_Type };
 const AVP_Code c_AVP_Code_DCA_3GPP_Inter_Operator_Identifier := {
@@ -13559,10 +13559,10 @@ const AVP_Code c_AVP_Code_DCA_3GPP_MMTel_SService_Type := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_MMTel_SService_Type };
 const AVP_Code c_AVP_Code_CxDx_3GPP_Optional_Capability := {
 	vendor_id_3GPP := avp_code_CxDx_3GPP_Optional_Capability };
-const AVP_Code c_AVP_Code_AAA_3GPP_Reporting_Trigger := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_Reporting_Trigger };
 const AVP_Code c_AVP_Code_PCC_3GPP_Tunnel_Header_Length := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Tunnel_Header_Length };
+const AVP_Code c_AVP_Code_AAA_3GPP_Reporting_Trigger := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Reporting_Trigger };
 const AVP_Code c_AVP_Code_PCC_3GPP_Conditional_APN_Aggregate_Max_Bitrate := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Conditional_APN_Aggregate_Max_Bitrate };
 const AVP_Code c_AVP_Code_CxDx_3GPP_Secondary_Event_Charging_Function_Name := {
@@ -13583,10 +13583,10 @@ const AVP_Code c_AVP_Code_DCC_NONE_Exponent := {
 	vendor_id_NONE := avp_code_DCC_NONE_Exponent };
 const AVP_Code c_AVP_Code_MIPv6_NONE_MIP_Authenticator := {
 	vendor_id_NONE := avp_code_MIPv6_NONE_MIP_Authenticator };
-const AVP_Code c_AVP_Code_DNAS_NONE_Accounting_Input_Octets := {
-	vendor_id_NONE := avp_code_DNAS_NONE_Accounting_Input_Octets };
 const AVP_Code c_AVP_Code_AAA_3GPP_Requested_UTRAN_GERAN_Authentication_Info := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Requested_UTRAN_GERAN_Authentication_Info };
+const AVP_Code c_AVP_Code_DNAS_NONE_Accounting_Input_Octets := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Accounting_Input_Octets };
 const AVP_Code c_AVP_Code_AAA_3GPP_EPS_User_State := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_EPS_User_State };
 const AVP_Code c_AVP_Code_BASE_NONE_Origin_Host := {
@@ -13625,18 +13625,18 @@ const AVP_Code c_AVP_Code_PCC_3GPP_ADC_Rule_Name := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_ADC_Rule_Name };
 const AVP_Code c_AVP_Code_DCA_3GPP_ProSe_Function_IP_Address := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_ProSe_Function_IP_Address };
+const AVP_Code c_AVP_Code_PCC_3GPP_Guaranteed_Bitrate_DL := {
+	vendor_id_3GPP := avp_code_PCC_3GPP_Guaranteed_Bitrate_DL };
 const AVP_Code c_AVP_Code_BASE_NONE_Disconnect_Cause := {
 	vendor_id_NONE := avp_code_BASE_NONE_Disconnect_Cause };
 const AVP_Code c_AVP_Code_AAA_3GPP_Error_Diagnostic := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Error_Diagnostic };
-const AVP_Code c_AVP_Code_PCC_3GPP_Guaranteed_Bitrate_DL := {
-	vendor_id_3GPP := avp_code_PCC_3GPP_Guaranteed_Bitrate_DL };
 const AVP_Code c_AVP_Code_RX_3GPP_Extended_Max_Supported_BW_UL := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Extended_Max_Supported_BW_UL };
-const AVP_Code c_AVP_Code_DCC_NONE_CC_Total_Octets := {
-	vendor_id_NONE := avp_code_DCC_NONE_CC_Total_Octets };
 const AVP_Code c_AVP_Code_PCC_3GPP_UDP_Source_Port := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_UDP_Source_Port };
+const AVP_Code c_AVP_Code_DCC_NONE_CC_Total_Octets := {
+	vendor_id_NONE := avp_code_DCC_NONE_CC_Total_Octets };
 const AVP_Code c_AVP_Code_BASE_NONE_Accounting_Record_Type := {
 	vendor_id_NONE := avp_code_BASE_NONE_Accounting_Record_Type };
 const AVP_Code c_AVP_Code_DCA_3GPP_SMS_Result := {
@@ -13645,16 +13645,16 @@ const AVP_Code c_AVP_Code_DCA_3GPP_MMS_Information := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_MMS_Information };
 const AVP_Code c_AVP_Code_CxDx_3GPP_From_SIP_Header := {
 	vendor_id_3GPP := avp_code_CxDx_3GPP_From_SIP_Header };
-const AVP_Code c_AVP_Code_AAA_3GPP_SIPTO_Local_Network_Permission := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_SIPTO_Local_Network_Permission };
 const AVP_Code c_AVP_Code_PCC_3GPP_Routing_Rule_Definition := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Routing_Rule_Definition };
+const AVP_Code c_AVP_Code_AAA_3GPP_SIPTO_Local_Network_Permission := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_SIPTO_Local_Network_Permission };
 const AVP_Code c_AVP_Code_DCA_3GPP_CUG_Information := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_CUG_Information };
-const AVP_Code c_AVP_Code_DCC_NONE_Value_Digits := {
-	vendor_id_NONE := avp_code_DCC_NONE_Value_Digits };
 const AVP_Code c_AVP_Code_AAA_3GPP_VPLMN_Dynamic_Address_Allowed := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_VPLMN_Dynamic_Address_Allowed };
+const AVP_Code c_AVP_Code_DCC_NONE_Value_Digits := {
+	vendor_id_NONE := avp_code_DCC_NONE_Value_Digits };
 const AVP_Code c_AVP_Code_BASE_NONE_Acct_Application_Id := {
 	vendor_id_NONE := avp_code_BASE_NONE_Acct_Application_Id };
 const AVP_Code c_AVP_Code_DCA_3GPP_Associated_Party_Address := {
@@ -13665,16 +13665,16 @@ const AVP_Code c_AVP_Code_AAA_3GPP_Service_Type := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Service_Type };
 const AVP_Code c_AVP_Code_AAA_3GPP_Immediate_Response_Preferred := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Immediate_Response_Preferred };
-const AVP_Code c_AVP_Code_DNAS_NONE_Login_IPv6_Host := {
-	vendor_id_NONE := avp_code_DNAS_NONE_Login_IPv6_Host };
 const AVP_Code c_AVP_Code_DNAS_NONE_Framed_Appletalk_Zone := {
 	vendor_id_NONE := avp_code_DNAS_NONE_Framed_Appletalk_Zone };
+const AVP_Code c_AVP_Code_DNAS_NONE_Login_IPv6_Host := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Login_IPv6_Host };
 const AVP_Code c_AVP_Code_DCA_3GPP_Local_GW_Inserted_Indication := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Local_GW_Inserted_Indication };
-const AVP_Code c_AVP_Code_DCC_NONE_Final_Unit_Indication := {
-	vendor_id_NONE := avp_code_DCC_NONE_Final_Unit_Indication };
 const AVP_Code c_AVP_Code_AAA_3GPP_XRES := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_XRES };
+const AVP_Code c_AVP_Code_DCC_NONE_Final_Unit_Indication := {
+	vendor_id_NONE := avp_code_DCC_NONE_Final_Unit_Indication };
 const AVP_Code c_AVP_Code_DCA_3GPP_Deferred_Location_Event_Type := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Deferred_Location_Event_Type };
 const AVP_Code c_AVP_Code_GI_3GPP_3GPP_IMSI := {
@@ -13701,10 +13701,10 @@ const AVP_Code c_AVP_Code_DCA_3GPP_Monitoring_UE_Identifier := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Monitoring_UE_Identifier };
 const AVP_Code c_AVP_Code_S6_3GPP_Reference_ID_Validity_Time := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Reference_ID_Validity_Time };
-const AVP_Code c_AVP_Code_AAA_3GPP_E_UTRAN_Cell_Global_Identity := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_E_UTRAN_Cell_Global_Identity };
 const AVP_Code c_AVP_Code_PCC_3GPP_TFT_Packet_Filter_Information := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_TFT_Packet_Filter_Information };
+const AVP_Code c_AVP_Code_AAA_3GPP_E_UTRAN_Cell_Global_Identity := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_E_UTRAN_Cell_Global_Identity };
 const AVP_Code c_AVP_Code_RX_3GPP_Min_Desired_Bandwidth_DL := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Min_Desired_Bandwidth_DL };
 const AVP_Code c_AVP_Code_DCA_3GPP_Transmitter_Info := {
@@ -13715,10 +13715,10 @@ const AVP_Code c_AVP_Code_DCA_3GPP_PS_Furnish_Charging_Information := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_PS_Furnish_Charging_Information };
 const AVP_Code c_AVP_Code_CxDx_3GPP_Associated_Identities := {
 	vendor_id_3GPP := avp_code_CxDx_3GPP_Associated_Identities };
-const AVP_Code c_AVP_Code_BASE_NONE_Auth_Session_State := {
-	vendor_id_NONE := avp_code_BASE_NONE_Auth_Session_State };
 const AVP_Code c_AVP_Code_PCC_3GPP_Session_Linking_Indicator := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Session_Linking_Indicator };
+const AVP_Code c_AVP_Code_BASE_NONE_Auth_Session_State := {
+	vendor_id_NONE := avp_code_BASE_NONE_Auth_Session_State };
 const AVP_Code c_AVP_Code_S6_3GPP_Maximum_Number_of_Reports := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Maximum_Number_of_Reports };
 const AVP_Code c_AVP_Code_PCC_3GPP_PRA_Install := {
@@ -13729,10 +13729,10 @@ const AVP_Code c_AVP_Code_DCA_3GPP_ProSe_Range_Class := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_ProSe_Range_Class };
 const AVP_Code c_AVP_Code_DCA_3GPP_Carrier_Select_Routing_Information := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Carrier_Select_Routing_Information };
-const AVP_Code c_AVP_Code_AAA_3GPP_LIPA_Permission := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_LIPA_Permission };
 const AVP_Code c_AVP_Code_PCC_3GPP_QoS_Negotiation := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_QoS_Negotiation };
+const AVP_Code c_AVP_Code_AAA_3GPP_LIPA_Permission := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_LIPA_Permission };
 const AVP_Code c_AVP_Code_CxDx_3GPP_SIP_Auth_Data_Item := {
 	vendor_id_3GPP := avp_code_CxDx_3GPP_SIP_Auth_Data_Item };
 const AVP_Code c_AVP_Code_AAA_3GPP_3GPP2_MEID := {
@@ -13779,10 +13779,10 @@ const AVP_Code c_AVP_Code_DCA_3GPP_Outgoing_Trunk_Group_Id := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Outgoing_Trunk_Group_Id };
 const AVP_Code c_AVP_Code_DCC_NONE_Subscription_Id := {
 	vendor_id_NONE := avp_code_DCC_NONE_Subscription_Id };
-const AVP_Code c_AVP_Code_AAA_3GPP_VPLMN_CSG_Subscription_Data := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_VPLMN_CSG_Subscription_Data };
 const AVP_Code c_AVP_Code_PCC_3GPP_QoS_Rule_Remove := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_QoS_Rule_Remove };
+const AVP_Code c_AVP_Code_AAA_3GPP_VPLMN_CSG_Subscription_Data := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_VPLMN_CSG_Subscription_Data };
 const AVP_Code c_AVP_Code_DCA_3GPP_Message_Body := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Message_Body };
 const AVP_Code c_AVP_Code_S6_3GPP_Communication_Duration_Time := {
@@ -13807,14 +13807,14 @@ const AVP_Code c_AVP_Code_DCA_3GPP_Volume_Quota_Threshold := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Volume_Quota_Threshold };
 const AVP_Code c_AVP_Code_DCA_3GPP_Incremental_Cost := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Incremental_Cost };
-const AVP_Code c_AVP_Code_AAA_3GPP_Collection_Period_RRM_LTE := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_Collection_Period_RRM_LTE };
 const AVP_Code c_AVP_Code_PCC_3GPP_Usage_Monitoring_Level := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Usage_Monitoring_Level };
-const AVP_Code c_AVP_Code_AAA_3GPP_Subscriber_Status := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_Subscriber_Status };
+const AVP_Code c_AVP_Code_AAA_3GPP_Collection_Period_RRM_LTE := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Collection_Period_RRM_LTE };
 const AVP_Code c_AVP_Code_PCC_3GPP_Extended_APN_AMBR_UL := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Extended_APN_AMBR_UL };
+const AVP_Code c_AVP_Code_AAA_3GPP_Subscriber_Status := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Subscriber_Status };
 const AVP_Code c_AVP_Code_CxDx_3GPP_Identity_with_Emergency_Registration := {
 	vendor_id_3GPP := avp_code_CxDx_3GPP_Identity_with_Emergency_Registration };
 const AVP_Code c_AVP_Code_DCA_3GPP_Originator_Received_Address := {
@@ -13837,10 +13837,10 @@ const AVP_Code c_AVP_Code_DCA_3GPP_Event_Charging_TimeStamp := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Event_Charging_TimeStamp };
 const AVP_Code c_AVP_Code_RX_3GPP_RR_Bandwidth := {
 	vendor_id_3GPP := avp_code_RX_3GPP_RR_Bandwidth };
-const AVP_Code c_AVP_Code_DCC_NONE_Service_Context_Id := {
-	vendor_id_NONE := avp_code_DCC_NONE_Service_Context_Id };
 const AVP_Code c_AVP_Code_DNAS_NONE_CHAP_Auth := {
 	vendor_id_NONE := avp_code_DNAS_NONE_CHAP_Auth };
+const AVP_Code c_AVP_Code_DCC_NONE_Service_Context_Id := {
+	vendor_id_NONE := avp_code_DCC_NONE_Service_Context_Id };
 const AVP_Code c_AVP_Code_DCA_3GPP_SDP_TimeStamps := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_SDP_TimeStamps };
 const AVP_Code c_AVP_Code_DCA_3GPP_IMS_Charging_Identifier := {
@@ -13865,10 +13865,10 @@ const AVP_Code c_AVP_Code_PCC_3GPP_Charging_Rule_Name := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Charging_Rule_Name };
 const AVP_Code c_AVP_Code_RX_3GPP_Ip_Domain_Id := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Ip_Domain_Id };
-const AVP_Code c_AVP_Code_AAA_3GPP_UE_Usage_Type := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_UE_Usage_Type };
 const AVP_Code c_AVP_Code_PCC_3GPP_TDF_IP_Address := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_TDF_IP_Address };
+const AVP_Code c_AVP_Code_AAA_3GPP_UE_Usage_Type := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_UE_Usage_Type };
 const AVP_Code c_AVP_Code_S6_3GPP_Enhanced_Coverage_Restriction := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Enhanced_Coverage_Restriction };
 const AVP_Code c_AVP_Code_DCA_3GPP_Charged_Party := {
@@ -13877,16 +13877,16 @@ const AVP_Code c_AVP_Code_DCA_3GPP_PDN_Connection_Charging_ID := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_PDN_Connection_Charging_ID };
 const AVP_Code c_AVP_Code_CxDx_3GPP_User_Data_Already_Available := {
 	vendor_id_3GPP := avp_code_CxDx_3GPP_User_Data_Already_Available };
-const AVP_Code c_AVP_Code_AAA_3GPP_MME_Number_for_MT_SMS := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_MME_Number_for_MT_SMS };
 const AVP_Code c_AVP_Code_PCC_3GPP_Security_Parameter_Index := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Security_Parameter_Index };
-const AVP_Code c_AVP_Code_MIPv6_NONE_MIP6_Home_Agent_Host := {
-	vendor_id_NONE := avp_code_MIPv6_NONE_MIP6_Home_Agent_Host };
-const AVP_Code c_AVP_Code_DCC_NONE_CC_Correlation_Id := {
-	vendor_id_NONE := avp_code_DCC_NONE_CC_Correlation_Id };
+const AVP_Code c_AVP_Code_AAA_3GPP_MME_Number_for_MT_SMS := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_MME_Number_for_MT_SMS };
 const AVP_Code c_AVP_Code_PCC_3GPP_Traffic_Steering_Policy_Identifier_UL := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Traffic_Steering_Policy_Identifier_UL };
+const AVP_Code c_AVP_Code_DCC_NONE_CC_Correlation_Id := {
+	vendor_id_NONE := avp_code_DCC_NONE_CC_Correlation_Id };
+const AVP_Code c_AVP_Code_MIPv6_NONE_MIP6_Home_Agent_Host := {
+	vendor_id_NONE := avp_code_MIPv6_NONE_MIP6_Home_Agent_Host };
 const AVP_Code c_AVP_Code_BASE_NONE_Route_Record := {
 	vendor_id_NONE := avp_code_BASE_NONE_Route_Record };
 const AVP_Code c_AVP_Code_DCA_3GPP_SM_User_Data_Header := {
@@ -13899,12 +13899,12 @@ const AVP_Code c_AVP_Code_CxDx_3GPP_Mandatory_Capability := {
 	vendor_id_3GPP := avp_code_CxDx_3GPP_Mandatory_Capability };
 const AVP_Code c_AVP_Code_AAA_3GPP_Trace_NE_Type_List := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Trace_NE_Type_List };
-const AVP_Code c_AVP_Code_MIPv6_NONE_MIP6_Feature_Vector := {
-	vendor_id_NONE := avp_code_MIPv6_NONE_MIP6_Feature_Vector };
 const AVP_Code c_AVP_Code_DCA_3GPP_Charging_Characteristics_Selection_Mode := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Charging_Characteristics_Selection_Mode };
 const AVP_Code c_AVP_Code_DNAS_NONE_Port_Limit := {
 	vendor_id_NONE := avp_code_DNAS_NONE_Port_Limit };
+const AVP_Code c_AVP_Code_MIPv6_NONE_MIP6_Feature_Vector := {
+	vendor_id_NONE := avp_code_MIPv6_NONE_MIP6_Feature_Vector };
 const AVP_Code c_AVP_Code_DCC_NONE_Multiple_Services_Credit_Control := {
 	vendor_id_NONE := avp_code_DCC_NONE_Multiple_Services_Credit_Control };
 const AVP_Code c_AVP_Code_AAA_3GPP_All_APN_Configurations_Included_Indicator := {
@@ -13925,12 +13925,12 @@ const AVP_Code c_AVP_Code_DCA_3GPP_PoC_Change_Conditions := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_PoC_Change_Conditions };
 const AVP_Code c_AVP_Code_DCA_3GPP_Language := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Language };
+const AVP_Code c_AVP_Code_RX_3GPP_Extended_Min_Requested_BW_DL := {
+	vendor_id_3GPP := avp_code_RX_3GPP_Extended_Min_Requested_BW_DL };
 const AVP_Code c_AVP_Code_DNAS_NONE_ARAP_Features := {
 	vendor_id_NONE := avp_code_DNAS_NONE_ARAP_Features };
 const AVP_Code c_AVP_Code_DNAS_NONE_Framed_MTU := {
 	vendor_id_NONE := avp_code_DNAS_NONE_Framed_MTU };
-const AVP_Code c_AVP_Code_RX_3GPP_Extended_Min_Requested_BW_DL := {
-	vendor_id_3GPP := avp_code_RX_3GPP_Extended_Min_Requested_BW_DL };
 const AVP_Code c_AVP_Code_DCA_3GPP_Unit_Quota_Threshold := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Unit_Quota_Threshold };
 const AVP_Code c_AVP_Code_DNAS_NONE_Accounting_Auth_Method := {
@@ -13949,10 +13949,10 @@ const AVP_Code c_AVP_Code_DNAS_NONE_Accounting_Output_Packets := {
 	vendor_id_NONE := avp_code_DNAS_NONE_Accounting_Output_Packets };
 const AVP_Code c_AVP_Code_DCA_3GPP_Radio_Parameter_Set_Info := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Radio_Parameter_Set_Info };
-const AVP_Code c_AVP_Code_AAA_3GPP_Relay_Node_Indicator := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_Relay_Node_Indicator };
 const AVP_Code c_AVP_Code_PCC_3GPP_Rule_DeActivation_Time := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Rule_DeActivation_Time };
+const AVP_Code c_AVP_Code_AAA_3GPP_Relay_Node_Indicator := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Relay_Node_Indicator };
 const AVP_Code c_AVP_Code_S6_3GPP_T4_Data := {
 	vendor_id_3GPP := avp_code_S6_3GPP_T4_Data };
 const AVP_Code c_AVP_Code_PCC_3GPP_Fixed_User_Location_Info := {
@@ -14015,12 +14015,12 @@ const AVP_Code c_AVP_Code_GI_3GPP_3GPP_Allocate_IP_Type := {
 	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_Allocate_IP_Type };
 const AVP_Code c_AVP_Code_RX_3GPP_Specific_Action := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Specific_Action };
+const AVP_Code c_AVP_Code_S6_3GPP_Maximum_Detection_Time := {
+	vendor_id_3GPP := avp_code_S6_3GPP_Maximum_Detection_Time };
 const AVP_Code c_AVP_Code_DNAS_NONE_Login_TCP_Port := {
 	vendor_id_NONE := avp_code_DNAS_NONE_Login_TCP_Port };
 const AVP_Code c_AVP_Code_DNAS_NONE_Password_Retry := {
 	vendor_id_NONE := avp_code_DNAS_NONE_Password_Retry };
-const AVP_Code c_AVP_Code_S6_3GPP_Maximum_Detection_Time := {
-	vendor_id_3GPP := avp_code_S6_3GPP_Maximum_Detection_Time };
 const AVP_Code c_AVP_Code_DCA_3GPP_Time_Stamps := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Time_Stamps };
 const AVP_Code c_AVP_Code_DCA_3GPP_Base_Time_Interval := {
@@ -14029,10 +14029,10 @@ const AVP_Code c_AVP_Code_DCA_3GPP_UWAN_User_Location_Info := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_UWAN_User_Location_Info };
 const AVP_Code c_AVP_Code_DCA_3GPP_ProSe_Role_Of_UE := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_ProSe_Role_Of_UE };
-const AVP_Code c_AVP_Code_AAA_3GPP_Ext_PDP_Address := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_Ext_PDP_Address };
 const AVP_Code c_AVP_Code_PCC_3GPP_RAT_Type := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_RAT_Type };
+const AVP_Code c_AVP_Code_AAA_3GPP_Ext_PDP_Address := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Ext_PDP_Address };
 const AVP_Code c_AVP_Code_DCA_3GPP_PoC_Session_Type := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_PoC_Session_Type };
 const AVP_Code c_AVP_Code_DCA_3GPP_ISUP_Cause := {
@@ -14061,20 +14061,20 @@ const AVP_Code c_AVP_Code_PCC_3GPP_Default_Access := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Default_Access };
 const AVP_Code c_AVP_Code_CxDx_3GPP_Supported_Applications := {
 	vendor_id_3GPP := avp_code_CxDx_3GPP_Supported_Applications };
-const AVP_Code c_AVP_Code_DNAS_NONE_ARAP_Challenge_Response := {
-	vendor_id_NONE := avp_code_DNAS_NONE_ARAP_Challenge_Response };
 const AVP_Code c_AVP_Code_BASE_NONE_Class := {
 	vendor_id_NONE := avp_code_BASE_NONE_Class };
+const AVP_Code c_AVP_Code_DNAS_NONE_ARAP_Challenge_Response := {
+	vendor_id_NONE := avp_code_DNAS_NONE_ARAP_Challenge_Response };
 const AVP_Code c_AVP_Code_DCA_3GPP_SM_Message_Type := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_SM_Message_Type };
 const AVP_Code c_AVP_Code_DCC_NONE_CC_Sub_Session_Id := {
 	vendor_id_NONE := avp_code_DCC_NONE_CC_Sub_Session_Id };
 const AVP_Code c_AVP_Code_AAA_3GPP_IDR_Flags := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_IDR_Flags };
-const AVP_Code c_AVP_Code_AAA_3GPP_V2X_Subscription_Data := {
-	vendor_id_3GPP := avp_code_AAA_3GPP_V2X_Subscription_Data };
 const AVP_Code c_AVP_Code_PCC_3GPP_PS_to_CS_Session_Continuity := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_PS_to_CS_Session_Continuity };
+const AVP_Code c_AVP_Code_AAA_3GPP_V2X_Subscription_Data := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_V2X_Subscription_Data };
 const AVP_Code c_AVP_Code_DCA_3GPP_Refund_Information := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Refund_Information };
 const AVP_Code c_AVP_Code_DCA_3GPP_Rate_Element := {
diff --git a/library/regen-DIAMETER_Types_ttcn.sh b/library/regen-DIAMETER_Types_ttcn.sh
index 49d81943..74f3c8bd 100755
--- a/library/regen-DIAMETER_Types_ttcn.sh
+++ b/library/regen-DIAMETER_Types_ttcn.sh
@@ -7,16 +7,16 @@ cd $AVP_SH_DIR
 $AVP_SH_PATH \
         Base_IETF_RFC3588.ddf \
         BaseTypes_IETF_RFC3588.ddf \
+        NetworkAccessServer_IETF_RFC4005.ddf \
+        CreditControl_IETF_RFC4006.ddf \
+        MobileIPv6_NAS_IETF_RFC5447.ddf \
+        MobileIPv6_HA_IETF_RFC5778.ddf \
         AAAInterface_3GPP_TS29272_f10.ddf \
         GxInterface_PCC_3GPP_TS29212_f10.ddf \
         S6Interfaces_3GPP_TS29336_f00.ddf \
-        MobileIPv6_HA_IETF_RFC5778.ddf \
         RxInterface_PCC_3GPP_TS29214_f20.ddf \
-        NetworkAccessServer_IETF_RFC4005.ddf \
-        CreditControl_IETF_RFC4006.ddf \
         CxDxInterface_3GPP_TS29229_c30.ddf \
         GiSGiInterface_3GPP_TS29061_d70.ddf \
         ChargingApplications_3GPP_TS32299_d90.ddf \
-        MobileIPv6_NAS_IETF_RFC5447.ddf
 
 mv -v $AVP_SH_DIR/DIAMETER_Types.ttcn $SELF_DIR/
author	Pau Espin Pedrol <pespin@sysmocom.de>	2024-03-05 12:14:08 +0100
committer	Pau Espin Pedrol <pespin@sysmocom.de>	2024-03-05 12:50:54 +0100
commit	5b28c96469e5e9468f368bcf7b3313db20f112ce (patch)
tree	4335dbe17a54ce0d34bc6824deb0550b860c731e /library
parent	b0b5e0ad12ce555b98da3a75ea9d9a3b342cdc90 (diff)