Change in osmo-ttcn3-hacks[master]: DIAMETER_Types: Add IETF RFC4006 CreditControl + related

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Sun Apr 26 20:15:03 UTC 2020


laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17947 )

Change subject: DIAMETER_Types: Add IETF RFC4006 CreditControl + related
......................................................................

DIAMETER_Types: Add IETF RFC4006 CreditControl + related

This adds more DIAMETER types to our TTCN-3 module, specifically those
encountered on Gx between PGW and PCRF.

./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

Change-Id: Ibe7321e695337ff62fdc912270f6e13e6c6d6cf2
---
M library/DIAMETER_Types.ttcn
1 file changed, 2,708 insertions(+), 5 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/library/DIAMETER_Types.ttcn b/library/DIAMETER_Types.ttcn
index e0c34e4..972cd6e 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
+// 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
 module DIAMETER_Types {
 /******************************************************************************
 * Copyright (c) 2000-2019 Ericsson Telecom AB
@@ -3947,17 +3947,1627 @@
 type AVP_Unsigned32 RX_3GPP_Extended_Min_Requested_BW_UL 
 
 
-// STATISTICS: 523 AVP descriptors found
-// STATISTICS: 523 AVP type definitions matching AVP descriptors found
+/******************************************************************************
+* 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:               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
+******************************************************************************/
+//
+//  File:               CxDxInterface_3GPP_TS29229_c30.ddf
+//  Description:        DDF for CxDx according to 3GPP TS 29.229 V12.3.0
+//  Rev:                R55A
+//  Prodnr:             CNL 113 462
+///////////////////////////////////////////////
+
+
+// APPLICATION-NAME: CxDx
+// APPLICATION-REVISION: V12_3_0
+
+// AVP implementations according to:
+// 3GPP TS 29.229 V12.3.0 - Cx and Dx interfaces based on the Diameter protocol
+//
+//
+// Dependant applications
+// IETF RFC 3588   - Diameter Base Protocol
+// IETF RFC 4005   - Diameter Network Access Server Application
+// IETF RFC 5090 (Obsoletes: 4590)   - RADIUS Extension for Digest Authentication
+//
+// Notes:
+// Present application has its own vendor specific Diameter application id: 16777216
+//
+
+// 3GPP TS 29.229 V12.3.0 6.1
+
+
+
+
+// 3GPP 29.229 V12.3.0
+// AVP: Visited-Network-Identifier (600) 3GPP (10415)
+// 6.3.1
+type AVP_OctetString CxDx_3GPP_Visited_Network_Identifier 
+
+// 3GPP 29.229 V12.3.0
+// AVP: Public-Identity (601) 3GPP (10415)
+// 6.3.2
+type AVP_UTF8String CxDx_3GPP_Public_Identity 
+
+// 3GPP 29.229 V12.3.0
+// AVP: Server-Name (602) 3GPP (10415)
+// 6.3.3
+type AVP_UTF8String CxDx_3GPP_Server_Name 
+
+// 3GPP 29.229 V12.3.0
+// AVP: Server-Capabilities (603) 3GPP (10415)
+// 6.3.4
+type AVP_Grouped CxDx_3GPP_Server_Capabilities 
+
+// 3GPP 29.229 V12.3.0
+// AVP: Mandatory-Capability (604) 3GPP (10415)
+// 6.3.5
+type AVP_Unsigned32 CxDx_3GPP_Mandatory_Capability 
+
+// 3GPP 29.229 V12.3.0
+// AVP: Optional-Capability (605) 3GPP (10415)
+// 6.3.6
+type AVP_Unsigned32 CxDx_3GPP_Optional_Capability 
+
+// 3GPP 29.229 V12.3.0
+// AVP: User-Data (606) 3GPP (10415)
+// 6.3.7
+type AVP_OctetString CxDx_3GPP_User_Data 
+
+// 3GPP 29.229 V12.3.0
+// AVP: SIP-Number-Auth-Items (607) 3GPP (10415)
+// 6.3.8
+type AVP_Unsigned32 CxDx_3GPP_SIP_Number_Auth_Items 
+
+// 3GPP 29.229 V12.3.0
+// AVP: SIP-Authentication-Scheme (608) 3GPP (10415)
+// 6.3.9
+type AVP_UTF8String CxDx_3GPP_SIP_Authentication_Scheme 
+
+// 3GPP 29.229 V12.3.0
+// AVP: SIP-Authenticate (609) 3GPP (10415)
+// 6.3.10
+type AVP_OctetString CxDx_3GPP_SIP_Authenticate 
+
+// 3GPP 29.229 V12.3.0
+// AVP: SIP-Authorization (610) 3GPP (10415)
+// 6.3.11
+type AVP_OctetString CxDx_3GPP_SIP_Authorization 
+
+// 3GPP 29.229 V12.3.0
+// AVP: SIP-Authentication-Context (611) 3GPP (10415)
+// 6.3.12
+type AVP_OctetString CxDx_3GPP_SIP_Authentication_Context 
+
+// 3GPP 29.229 V12.3.0
+// AVP: SIP-Auth-Data-Item (612) 3GPP (10415)
+// 6.3.13
+type AVP_Grouped CxDx_3GPP_SIP_Auth_Data_Item 
+
+// 3GPP 29.229 V12.3.0
+// AVP: SIP-Item-Number (613) 3GPP (10415)
+// 6.3.14
+type AVP_Unsigned32 CxDx_3GPP_SIP_Item_Number 
+
+// 3GPP 29.229 V12.3.0
+// AVP: Server-Assignment-Type (614) 3GPP (10415)
+// 6.3.15
+type enumerated CxDx_3GPP_Server_Assignment_Type {
+ NO_ASSIGNMENT (0),
+ REGISTRATION (1),
+ RE_REGISTRATION (2),
+ UNREGISTERED_USER (3),
+ TIMEOUT_DEREGISTRATION (4),
+ USER_DEREGISTRATION (5),
+ TIMEOUT_DEREGISTRATION_STORE_SERVER_NAME (6),
+ USER_DEREGISTRATION_STORE_SERVER_NAME (7),
+ ADMINISTRATIVE_DEREGISTRATION (8),
+ AUTHENTICATION_FAILURE (9),
+ AUTHENTICATION_TIMEOUT (10),
+ DEREGISTRATION_TOO_MUCH_DATA (11),
+ AAA_USER_DATA_REQUEST (12),
+ PGW_UPDATE (13),
+ RESTORATION (14)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// 3GPP 29.229 V12.3.0
+// AVP: Deregistration-Reason (615) 3GPP (10415)
+// 6.3.16
+type AVP_Grouped CxDx_3GPP_Deregistration_Reason 
+
+// 3GPP 29.229 V12.3.0
+// AVP: Reason-Code (616) 3GPP (10415)
+// 6.3.17
+type enumerated CxDx_3GPP_Reason_Code {
+ PERMANENT_TERMINATION (0),
+ NEW_SERVER_ASSIGNED (1),
+ SERVER_CHANGE (2),
+ REMOVE_S_CSCF (3)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// 3GPP 29.229 V12.3.0
+// AVP: Reason-Info (617) 3GPP (10415)
+// 6.3.18
+type AVP_UTF8String CxDx_3GPP_Reason_Info 
+
+// 3GPP 29.229 V12.3.0
+// AVP: Charging-Information (618) 3GPP (10415)
+// 6.3.19
+type AVP_Grouped CxDx_3GPP_Charging_Information 
+
+// 3GPP 29.229 V12.3.0
+// AVP: Primary-Event-Charging-Function-Name (619) 3GPP (10415)
+// 6.3.20
+type AVP_DiameterURI CxDx_3GPP_Primary_Event_Charging_Function_Name 
+
+// 3GPP 29.229 V12.3.0
+// AVP: Secondary-Event-Charging-Function-Name (620) 3GPP (10415)
+// 6.3.21
+type AVP_DiameterURI CxDx_3GPP_Secondary_Event_Charging_Function_Name 
+
+// 3GPP 29.229 V12.3.0
+// AVP: Primary-Charging-Collection-Function-Name (621) 3GPP (10415)
+// 6.3.22
+type AVP_DiameterURI CxDx_3GPP_Primary_Charging_Collection_Function_Name 
+
+// 3GPP 29.229 V12.3.0
+// AVP: Secondary-Charging-Collection-Function-Name (622) 3GPP (10415)
+// 6.3.23
+type AVP_DiameterURI CxDx_3GPP_Secondary_Charging_Collection_Function_Name 
+
+// 3GPP 29.229 V12.3.0
+// AVP: User-Authorization-Type (623) 3GPP (10415)
+// 6.3.24
+type enumerated CxDx_3GPP_User_Authorization_Type {
+ REGISTRATION (0),
+ DE_REGISTRATION (1),
+ REGISTRATION_AND_CAPABILITIES (2)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// 3GPP 29.229 V12.3.0
+// AVP: User-Data-Already-Available (624) 3GPP (10415)
+// 6.3.26
+type enumerated CxDx_3GPP_User_Data_Already_Available {
+ USER_DATA_NOT_AVAILABLE (0),
+ USER_DATA_ALREADY_AVAILABLE (1)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// 3GPP 29.229 V12.3.0
+// AVP: Confidentiality-Key (625) 3GPP (10415)
+// 6.3.27
+type AVP_OctetString CxDx_3GPP_Confidentiality_Key 
+
+// 3GPP 29.229 V12.3.0
+// AVP: Integrity-Key (626) 3GPP (10415)
+// 6.3.28
+type AVP_OctetString CxDx_3GPP_Integrity_Key 
+
+// 3GPP 29.229 V12.3.0
+// AVP: Supported-Features (628) 3GPP (10415)
+// 6.3.29
+type AVP_Grouped CxDx_3GPP_Supported_Features 
+
+// 3GPP 29.229 V12.3.0
+// AVP: Feature-List-ID (629) 3GPP (10415)
+// 6.3.30
+type AVP_Unsigned32 CxDx_3GPP_Feature_List_ID 
+
+// 3GPP 29.229 V12.3.0
+// AVP: Feature-List (630) 3GPP (10415)
+// 6.3.31
+type AVP_Unsigned32 CxDx_3GPP_Feature_List 
+
+// 3GPP 29.229 V12.3.0
+// AVP: Supported-Applications (631) 3GPP (10415)
+// 6.3.32
+type AVP_Grouped CxDx_3GPP_Supported_Applications 
+
+// 3GPP 29.229 V12.3.0
+// AVP: Associated-Identities (632) 3GPP (10415)
+// 6.3.33
+type AVP_Grouped CxDx_3GPP_Associated_Identities 
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Originating-Request (633) 3GPP (10415)
+// 6.3.34
+type enumerated CxDx_3GPP_Originating_Request {
+ ORIGINATING (0)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Wildcarded-Public-Identity (634) 3GPP (10415)
+// 6.3.35
+type AVP_UTF8String CxDx_3GPP_Wildcarded_Public_Identity 
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: SIP-Digest-Authenticate (635) 3GPP (10415)
+// 6.3.36
+type AVP_Grouped CxDx_3GPP_SIP_Digest_Authenticate 
+
+// 3GPP 29.229 V12.3.0
+// AVP: Line-Identifier (500) ETSI (13019)
+// 6.3.42
+type AVP_OctetString CxDx_ETSI_Line_Identifier 
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: UAR-Flags (637) 3GPP (10415)
+// 6.3.44
+type AVP_Unsigned32 CxDx_3GPP_UAR_Flags 
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Loose-Route-Indication (638) 3GPP (10415)
+// 6.3.45
+type enumerated CxDx_3GPP_Loose_Route_Indication {
+ LOOSE_ROUTE_NOT_REQUIRED (0),
+ LOOSE_ROUTE_REQUIRED (1)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: SCSCF-Restoration-Info (639) 3GPP (10415)
+// 6.3.46
+type AVP_Grouped CxDx_3GPP_SCSCF_Restoration_Info 
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Path (640) 3GPP (10415)
+// 6.3.47
+type AVP_OctetString CxDx_3GPP_Path 
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Contact (641) 3GPP (10415)
+// 6.3.48
+type AVP_OctetString CxDx_3GPP_Contact 
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Subscription-Info (642) 3GPP (10415)
+// 6.3.49
+type AVP_Grouped CxDx_3GPP_Subscription_Info 
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Call-ID-SIP-Header (643) 3GPP (10415)
+// 6.3.49.1
+type AVP_OctetString CxDx_3GPP_Call_ID_SIP_Header 
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: From-SIP-Header (644) 3GPP (10415)
+// 6.3.49.2
+type AVP_OctetString CxDx_3GPP_From_SIP_Header 
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: To-SIP-Header (645) 3GPP (10415)
+// 6.3.49.3
+type AVP_OctetString CxDx_3GPP_To_SIP_Header 
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Record-Route (646) 3GPP (10415)
+// 6.3.49.4
+type AVP_OctetString CxDx_3GPP_Record_Route 
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Associated-Registered-Identities (647) 3GPP (10415)
+// 6.3.50
+type AVP_Grouped CxDx_3GPP_Associated_Registered_Identities 
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Multiple-Registration-Indication (648) 3GPP (10415)
+// 6.3.51
+type enumerated CxDx_3GPP_Multiple_Registration_Indication {
+ NOT_MULTIPLE_REGISTRATION (0),
+ MULTIPLE_REGISTRATION (1)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Restoration-Info (649) 3GPP (10415)
+// 6.3.52
+type AVP_Grouped CxDx_3GPP_Restoration_Info 
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Session-Priority (650) 3GPP (10415)
+// 6.3.56
+type enumerated CxDx_3GPP_Session_Priority {
+ PRIORITY_0 (0),
+ PRIORITY_1 (1),
+ PRIORITY_2 (2),
+ PRIORITY_3 (3),
+ PRIORITY_4 (4)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Identity-with-Emergency-Registration (651) 3GPP (10415)
+// 6.3.57
+type AVP_Grouped CxDx_3GPP_Identity_with_Emergency_Registration 
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Priviledged-Sender-Indication (652) 3GPP (10415)
+// 6.3.58
+type enumerated CxDx_3GPP_Priviledged_Sender_Indication {
+ NOT_PRIVILEDGED_SENDER (0),
+ PRIVILEDGED_SENDER (1)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: LIA-Flags (653) 3GPP (10415)
+// 6.3.59
+type AVP_Unsigned32 CxDx_3GPP_LIA_Flags 
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: Initial-CSeq-Sequence-Number (654) 3GPP (10415)
+// 6.3.62
+type AVP_Unsigned32 CxDx_3GPP_Initial_CSeq_Sequence_Number 
+
+// 3GPP TS 29.229 V12.3.0
+// AVP: SAR-Flags (655) 3GPP (10415)
+// 6.3.63
+type AVP_Unsigned32 CxDx_3GPP_SAR_Flags 
+
+/******************************************************************************
+* 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:
+*   Máté Kovács
+******************************************************************************/
+//
+//  File:               GiSGiInterface_3GPP_TS29061_d70.ddf
+//  Description:        DDF for Gi/SGi according to 3GPP TS 29.061 V13.7.0
+//  Rev:                R55A
+//  Prodnr:             CNL 113 462
+///////////////////////////////////////////////
+
+
+// APPLICATION-NAME: GI
+// APPLICATION-REVISION: V13_7_0
+
+// AVP implementations according to:
+// 3GPP TS 29.061 V13.7.0 - Interworking between the Public Land Mobile Network (PLMN) supporting packet based services and Packet Data Networks (PDN)
+//
+//
+// Dependant applications
+// -
+
+
+// 3GPP TS 29.061 V13.7.0 16a.4
+// WARNING: Enumeration item with code (265) 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
+
+
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-IMSI (1) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String GI_3GPP_3GPP_IMSI 
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-Charging-Id (2) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString GI_3GPP_3GPP_Charging_Id 
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-PDP-Type (3) 3GPP (10415)
+// 16.4.7
+type enumerated GI_3GPP_3GPP_PDP_Type {
+ IPv4 (0),
+ PPP (1),
+ IPv6 (2),
+ IPv4v6 (3),
+ NonIp (4)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-CG-Address (4) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString GI_3GPP_3GPP_CG_Address 
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-GPRS-Negotiated-QoS-Profile (5) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String GI_3GPP_3GPP_GPRS_Negotiated_QoS_Profile 
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-SGSN-Address (6) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString GI_3GPP_3GPP_SGSN_Address 
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-GGSN-Address (7) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString GI_3GPP_3GPP_GGSN_Address 
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-IMSI-MCC-MNC (8) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String GI_3GPP_3GPP_IMSI_MCC_MNC 
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-GGSN-MCC-MNC (9) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String GI_3GPP_3GPP_GGSN_MCC_MNC 
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-NSAPI (10) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString GI_3GPP_3GPP_NSAPI 
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-Session-Stop-Indicator (11) 3GPP (10415)
+type AVP_UTF8String GI_3GPP_3GPP_Session_Stop_Indicator 
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-Selection-Mode (12) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String GI_3GPP_3GPP_Selection_Mode 
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-Charging-Characteristics (13) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String GI_3GPP_3GPP_Charging_Characteristics 
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-CG-IPv6-Address (14) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString GI_3GPP_3GPP_CG_IPv6_Address 
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-SGSN-IPv6-Address (15) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString GI_3GPP_3GPP_SGSN_IPv6_Address 
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-GGSN-IPv6-Address (16) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString GI_3GPP_3GPP_GGSN_IPv6_Address 
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-IPv6-DNS-Servers (17) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString GI_3GPP_3GPP_IPv6_DNS_Servers 
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-SGSN-MCC-MNC (18) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String GI_3GPP_3GPP_SGSN_MCC_MNC 
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-IMEISV (20) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString GI_3GPP_3GPP_IMEISV 
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-RAT-Type (21) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString GI_3GPP_3GPP_RAT_Type 
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-User-Location-Info (22) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString GI_3GPP_3GPP_User_Location_Info 
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-MS-TimeZone (23) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString GI_3GPP_3GPP_MS_TimeZone 
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-CAMEL-Charging-Info (24) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString GI_3GPP_3GPP_CAMEL_Charging_Info 
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-Packet-Filter (25) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString GI_3GPP_3GPP_Packet_Filter 
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-Negotiated-DSCP (26) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString GI_3GPP_3GPP_Negotiated_DSCP 
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-Allocate-IP-Type (27) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString GI_3GPP_3GPP_Allocate_IP_Type 
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: External-Identifier (28) 3GPP (10415)
+// 16.4.7
+type AVP_UTF8String GI_3GPP_External_Identifier 
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: TWAN-Identifier (29) 3GPP (10415)
+// 16.4.7
+type AVP_OctetString GI_3GPP_TWAN_Identifier 
+
+
+// 3GPP TS 29.061 V13.7.0
+// AVP: 3GPP-User-Location-Info-Time (30) 3GPP (10415)
+// 16.4.7
+type AVP_Unsigned32 GI_3GPP_3GPP_User_Location_Info_Time 
+
+
+
+// STATISTICS: 740 AVP descriptors found
+// STATISTICS: 740 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)
+ 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)
 } with {
 	variant "FIELDLENGTH(24)"
 	variant "BYTEORDER(last)"
 }
 
 type enumerated Vendor_Id {
+	vendor_id_ETSI (13019),
 	vendor_id_NONE (0),
 	vendor_id_3GPP (10415)
 } with {
@@ -3965,80 +5575,222 @@
 	variant "BYTEORDER(last)"
 	variant "COMP(2scompl)"
 }
+type enumerated AVP_Code_ETSI {
+	avp_code_CxDx_ETSI_Line_Identifier (500)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
 type enumerated AVP_Code_NONE {
+	avp_code_DNAS_NONE_Login_LAT_Service (34),
+	avp_code_DCC_NONE_Direct_Debiting_Failure_Handling (428),
 	avp_code_MIPv6_NONE_MIP_Careof_Address (487),
 	avp_code_BASE_NONE_Session_Id (263),
+	avp_code_DCC_NONE_Requested_Service_Unit (437),
+	avp_code_DNAS_NONE_Framed_Pool (88),
+	avp_code_DCC_NONE_CC_Time (420),
+	avp_code_DCC_NONE_Used_Service_Unit (446),
 	avp_code_BASE_NONE_Auth_Application_Id (258),
+	avp_code_DNAS_NONE_Framed_Appletalk_Network (38),
+	avp_code_DNAS_NONE_Framed_IPv6_Prefix (97),
 	avp_code_BASE_NONE_Firmware_Revision (267),
 	avp_code_BASE_NONE_Auth_Grace_Period (276),
 	avp_code_BASE_NONE_Re_Auth_Request_Type (285),
+	avp_code_DCC_NONE_Redirect_Address_Type (433),
 	avp_code_MIPv6_NONE_MIP_MN_HA_MSA (492),
+	avp_code_DNAS_NONE_Tunnel_Medium_Type (65),
+	avp_code_DCC_NONE_User_Equipment_Info_Type (459),
 	avp_code_MIPv6_NONE_QoS_Resources (508),
+	avp_code_DCC_NONE_Service_Parameter_Value (442),
 	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_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_BASE_NONE_Error_Message (281),
+	avp_code_DNAS_NONE_NAS_Port_Type (61),
+	avp_code_DCC_NONE_Multiple_Services_Indicator (455),
+	avp_code_DNAS_NONE_Framed_Protocol (7),
+	avp_code_DNAS_NONE_Filter_Id (11),
+	avp_code_DNAS_NONE_ARAP_Password (70),
+	avp_code_DNAS_NONE_CHAP_Response (405),
+	avp_code_DNAS_NONE_Accounting_Input_Packets (365),
+	avp_code_DNAS_NONE_Callback_Id (20),
+	avp_code_DCC_NONE_CC_Output_Octets (414),
+	avp_code_DCC_NONE_Cost_Information (423),
 	avp_code_BASE_NONE_Error_Reporting_Host (294),
+	avp_code_DNAS_NONE_Login_Service (15),
+	avp_code_DNAS_NONE_ARAP_Security_Data (74),
+	avp_code_DNAS_NONE_State (24),
+	avp_code_DNAS_NONE_Tunnel_Preference (83),
+	avp_code_DCC_NONE_CC_Session_Failover (418),
 	avp_code_BASE_NONE_Proxy_State (33),
+	avp_code_DCC_NONE_Credit_Control_Failure_Handling (427),
 	avp_code_BASE_NONE_Redirect_Max_Cache_Time (262),
+	avp_code_DCC_NONE_Requested_Action (436),
+	avp_code_DNAS_NONE_Idle_Timeout (28),
+	avp_code_DNAS_NONE_NAS_Port_Id (87),
 	avp_code_BASE_NONE_Host_IP_Address (257),
+	avp_code_DNAS_NONE_Framed_Appletalk_Link (37),
+	avp_code_DNAS_NONE_Framed_Interface_Id (96),
 	avp_code_BASE_NONE_Vendor_Id (266),
+	avp_code_DNAS_NONE_Acct_Session_Time (46),
 	avp_code_BASE_NONE_Event_Timestamp (55),
+	avp_code_DCC_NONE_Final_Unit_Action (449),
+	avp_code_DNAS_NONE_Framed_IPv6_Pool (100),
+	avp_code_DCC_NONE_Rating_Group (432),
 	avp_code_MIPv6_NONE_MIP_MN_HA_SPI (491),
+	avp_code_DCC_NONE_User_Equipment_Info (458),
 	avp_code_MIPv6_NONE_MIP_Mobile_Node_Address (333),
+	avp_code_DCC_NONE_Service_Parameter_Type (441),
 	avp_code_BASE_NONE_Failed_AVP (279),
+	avp_code_DCC_NONE_Subscription_Id_Type (450),
+	avp_code_DNAS_NONE_User_Password (2),
+	avp_code_DNAS_NONE_Acct_Tunnel_Connection (68),
+	avp_code_DNAS_NONE_NAS_Filter_Rule (400),
 	avp_code_BASE_NONE_Session_Server_Failover (271),
 	avp_code_BASE_NONE_Experimental_Result (297),
+	avp_code_DNAS_NONE_Acct_Link_Count (51),
+	avp_code_DCC_NONE_Unit_Value (445),
+	avp_code_DNAS_NONE_Reply_Message (18),
+	avp_code_DNAS_NONE_Connect_Info (77),
 	avp_code_MIPv6_NONE_MIP_Replay_Mode (346),
 	avp_code_BASE_NONE_Proxy_Host (280),
+	avp_code_DNAS_NONE_CHAP_Challenge (60),
+	avp_code_DCC_NONE_CC_Unit_Type (454),
+	avp_code_DNAS_NONE_Service_Type (6),
+	avp_code_DNAS_NONE_Framed_Routing (10),
+	avp_code_DNAS_NONE_CHAP_Ident (404),
+	avp_code_DCC_NONE_CC_Money (413),
 	avp_code_BASE_NONE_Proxy_Info (284),
+	avp_code_DNAS_NONE_Tunnel_Type (64),
+	avp_code_DCC_NONE_Check_Balance_Result (422),
 	avp_code_BASE_NONE_Destination_Host (293),
+	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_DCC_NONE_CC_Service_Specific_Units (417),
+	avp_code_DNAS_NONE_NAS_Identifier (32),
+	avp_code_DNAS_NONE_Tunnel_Server_Auth_Id (91),
+	avp_code_DCC_NONE_Credit_Control (426),
 	avp_code_BASE_NONE_Accounting_Record_Number (485),
 	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_Login_LAT_Group (36),
 	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),
+	avp_code_DNAS_NONE_Acct_Authentic (45),
+	avp_code_DCC_NONE_Service_Identifier (439),
 	avp_code_BASE_NONE_Auth_Request_Type (274),
+	avp_code_DCC_NONE_Validity_Time (448),
+	avp_code_DNAS_NONE_Framed_IPv6_Route (99),
+	avp_code_DCC_NONE_Granted_Service_Unit (431),
 	avp_code_MIPv6_NONE_MIP_Timestamp (490),
 	avp_code_BASE_NONE_Product_Name (269),
+	avp_code_DNAS_NONE_Framed_IP_Netmask (9),
+	avp_code_DCC_NONE_Service_Parameter_Info (440),
 	avp_code_BASE_NONE_Origin_State_Id (278),
 	avp_code_BASE_NONE_User_Name (1),
 	avp_code_BASE_NONE_Accounting_Sub_Session_Id (287),
+	avp_code_DNAS_NONE_Acct_Delay_Time (41),
+	avp_code_DNAS_NONE_Tunnel_Server_Endpoint (67),
 	avp_code_BASE_NONE_Session_Binding (270),
 	avp_code_BASE_NONE_Acct_Multi_Session_Id (50),
+	avp_code_DCC_NONE_Subscription_Id_Data (444),
 	avp_code_MIPv6_NONE_MIP_Algorithm_Type (345),
 	avp_code_MIPv6_NONE_QoS_Capability (578),
+	avp_code_DCC_NONE_G_S_U_Pool_Identifier (453),
+	avp_code_DNAS_NONE_NAS_Port (5),
+	avp_code_DNAS_NONE_CHAP_Algorithm (403),
+	avp_code_DCC_NONE_CC_Input_Octets (412),
 	avp_code_BASE_NONE_Destination_Realm (283),
+	avp_code_DNAS_NONE_Login_LAT_Port (63),
+	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_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_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_DCC_NONE_Currency_Code (425),
 	avp_code_BASE_NONE_E2E_Sequence (300),
 	avp_code_BASE_NONE_Origin_Realm (296),
+	avp_code_DNAS_NONE_Prompt (76),
+	avp_code_DCC_NONE_Redirect_Server (434),
 	avp_code_BASE_NONE_Acct_Interim_Interval (85),
+	avp_code_DNAS_NONE_Login_LAT_Node (35),
+	avp_code_DNAS_NONE_Originating_Line_Info (94),
+	avp_code_DCC_NONE_Exponent (429),
 	avp_code_MIPv6_NONE_MIP_Authenticator (488),
+	avp_code_DNAS_NONE_Accounting_Input_Octets (363),
 	avp_code_BASE_NONE_Origin_Host (264),
 	avp_code_BASE_NONE_Accounting_Session_Id (44),
+	avp_code_DCC_NONE_Restriction_Filter_Rule (438),
 	avp_code_BASE_NONE_Disconnect_Cause (273),
+	avp_code_DCC_NONE_CC_Total_Octets (421),
 	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_DCC_NONE_Final_Unit_Indication (430),
 	avp_code_BASE_NONE_Result_Code (268),
+	avp_code_DNAS_NONE_Framed_IP_Address (8),
 	avp_code_BASE_NONE_Auth_Session_State (277),
 	avp_code_BASE_NONE_Vendor_Specific_Application_Id (260),
 	avp_code_MIPv6_NONE_Service_Selection (493),
+	avp_code_DNAS_NONE_Tunnel_Client_Endpoint (66),
+	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_BASE_NONE_Inband_Security_Id (299),
+	avp_code_DCC_NONE_CC_Correlation_Id (411),
 	avp_code_BASE_NONE_Route_Record (282),
+	avp_code_DNAS_NONE_Port_Limit (62),
+	avp_code_DCC_NONE_Multiple_Services_Credit_Control (456),
 	avp_code_BASE_NONE_Authorization_Lifetime (291),
+	avp_code_DNAS_NONE_ARAP_Features (71),
+	avp_code_DNAS_NONE_Framed_MTU (12),
+	avp_code_DNAS_NONE_Accounting_Auth_Method (406),
+	avp_code_DNAS_NONE_Accounting_Output_Packets (366),
+	avp_code_DCC_NONE_CC_Request_Number (415),
+	avp_code_DNAS_NONE_Called_Station_Id (30),
+	avp_code_DCC_NONE_Cost_Unit (424),
 	avp_code_BASE_NONE_Accounting_Realtime_Required (483),
 	avp_code_BASE_NONE_Termination_Cause (295),
-	avp_code_BASE_NONE_Class (25)
+	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_DCC_NONE_CC_Sub_Session_Id (419)
 } with {
 	variant "FIELDLENGTH(32)"
 	variant "BYTEORDER(last)"
 	variant "COMP(2scompl)"
 }
 type enumerated AVP_Code_3GPP {
+	avp_code_GI_3GPP_3GPP_SGSN_IPv6_Address (15),
+	avp_code_GI_3GPP_3GPP_GGSN_MCC_MNC (9),
 	avp_code_PCC_3GPP_Bearer_Identifier (1020),
 	avp_code_RX_3GPP_Content_Version (552),
 	avp_code_RX_3GPP_Media_Component_Description (517),
@@ -4050,9 +5802,11 @@
 	avp_code_AAA_3GPP_List_Of_Measurements (1625),
 	avp_code_PCC_3GPP_Default_QoS_Name (2817),
 	avp_code_AAA_3GPP_UVA_Flags (1640),
+	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_Requested_EUTRAN_Authentication_Info (1408),
+	avp_code_CxDx_3GPP_SIP_Digest_Authenticate (635),
 	avp_code_AAA_3GPP_Last_UE_Activity_Time (1494),
 	avp_code_AAA_3GPP_Context_Identifier (1423),
 	avp_code_AAA_3GPP_Trace_Reference (1459),
@@ -4069,7 +5823,9 @@
 	avp_code_AAA_3GPP_SGs_MME_Identity (1664),
 	avp_code_PCC_3GPP_Routing_Rule_Remove (1075),
 	avp_code_S6_3GPP_Roaming_Information (3139),
+	avp_code_CxDx_3GPP_SIP_Authentication_Scheme (608),
 	avp_code_AAA_3GPP_Event_Threshold_RSRP (1629),
+	avp_code_CxDx_3GPP_User_Authorization_Type (623),
 	avp_code_AAA_3GPP_PLMN_Client (1482),
 	avp_code_AAA_3GPP_Re_Synchronization_Info (1411),
 	avp_code_AAA_3GPP_RAND (1447),
@@ -4087,12 +5843,17 @@
 	avp_code_AAA_3GPP_VPLMN_LIPA_Allowed (1617),
 	avp_code_PCC_3GPP_QoS_Class_Identifier (1028),
 	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_KASME (1450),
+	avp_code_GI_3GPP_3GPP_User_Location_Info_Time (30),
 	avp_code_AAA_3GPP_Teleservice_List (1486),
 	avp_code_AAA_3GPP_UTRAN_Vector (1415),
+	avp_code_GI_3GPP_3GPP_NSAPI (10),
+	avp_code_GI_3GPP_3GPP_CG_Address (4),
 	avp_code_RX_3GPP_Application_Service_Provider_Identity (532),
 	avp_code_S6_3GPP_NIDD_Authorization_Request (3150),
 	avp_code_PCC_3GPP_QoS_Rule_Install (1051),
@@ -4111,12 +5872,15 @@
 	avp_code_AAA_3GPP_Measurement_Period_LTE (1656),
 	avp_code_PCC_3GPP_Usage_Monitoring_Information (1067),
 	avp_code_PCC_3GPP_Extended_APN_AMBR_DL (2848),
+	avp_code_CxDx_3GPP_Session_Priority (650),
+	avp_code_CxDx_3GPP_Deregistration_Reason (615),
 	avp_code_AAA_3GPP_GMLC_Number (1474),
 	avp_code_AAA_3GPP_Software_Version (1403),
 	avp_code_AAA_3GPP_Expiration_Date (1439),
 	avp_code_AAA_3GPP_SRES (1454),
 	avp_code_AAA_3GPP_Item_Number (1419),
 	avp_code_S6_3GPP_Service_ID (3103),
+	avp_code_GI_3GPP_3GPP_IMSI_MCC_MNC (8),
 	avp_code_RX_3GPP_Abort_Cause (500),
 	avp_code_PCC_3GPP_Charging_Rule_Base_Name (1004),
 	avp_code_RX_3GPP_Required_Access_Info (536),
@@ -4129,8 +5893,13 @@
 	avp_code_AAA_3GPP_Geodetic_Information (1609),
 	avp_code_PCC_3GPP_Extended_GBR_UL (2851),
 	avp_code_AAA_3GPP_MBSFN_Area_ID (1695),
+	avp_code_CxDx_3GPP_Server_Capabilities (603),
 	avp_code_AAA_3GPP_Area_Scope (1624),
+	avp_code_CxDx_3GPP_SCSCF_Restoration_Info (639),
+	avp_code_CxDx_3GPP_Initial_CSeq_Sequence_Number (654),
 	avp_code_AAA_3GPP_PUA_Flags (1442),
+	avp_code_CxDx_3GPP_Primary_Event_Charging_Function_Name (619),
+	avp_code_GI_3GPP_3GPP_User_Location_Info (22),
 	avp_code_AAA_3GPP_Notification_To_UE_User (1478),
 	avp_code_AAA_3GPP_Visited_PLMN_Id (1407),
 	avp_code_AAA_3GPP_Homogeneous_Support_of_IMS_Voice_Over_PS_Sessions (1493),
@@ -4150,10 +5919,13 @@
 	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_CxDx_3GPP_Subscription_Info (642),
 	avp_code_AAA_3GPP_APN_Configuration (1430),
+	avp_code_CxDx_3GPP_SIP_Number_Auth_Items (607),
 	avp_code_AAA_3GPP_OMC_Id (1466),
 	avp_code_AAA_3GPP_GMLC_Restriction (1481),
 	avp_code_AAA_3GPP_Regional_Subscription_Zone_Code (1446),
+	avp_code_GI_3GPP_3GPP_Negotiated_DSCP (26),
 	avp_code_S6_3GPP_SIR_Flags (3110),
 	avp_code_RX_3GPP_MPS_Identifier (528),
 	avp_code_AAA_3GPP_MDT_Allowed_PLMN_Id (1671),
@@ -4165,11 +5937,14 @@
 	avp_code_AAA_3GPP_Subscribed_VSRVCC (1636),
 	avp_code_PCC_3GPP_Pre_emption_Capability (1047),
 	avp_code_PCC_3GPP_Monitoring_Flags (2828),
+	avp_code_CxDx_3GPP_Feature_List (630),
 	avp_code_PCC_3GPP_TCP_Source_Port (2843),
 	avp_code_PCC_3GPP_Application_Detection_Information (1098),
 	avp_code_AAA_3GPP_Emergency_Info (1687),
 	avp_code_AAA_3GPP_MPS_Priority (1616),
+	avp_code_CxDx_3GPP_Record_Route (646),
 	avp_code_AAA_3GPP_Alert_Reason (1434),
+	avp_code_GI_3GPP_3GPP_CG_IPv6_Address (14),
 	avp_code_AAA_3GPP_MO_LR (1485),
 	avp_code_RX_3GPP_Max_Requested_Bandwidth_UL (516),
 	avp_code_PCC_3GPP_Usage_Monitoring_Support (1070),
@@ -4183,10 +5958,12 @@
 	avp_code_AAA_3GPP_IMSI_Group_Id (1675),
 	avp_code_AAA_3GPP_Cell_Global_Identity (1604),
 	avp_code_AAA_3GPP_PDN_Connection_Continuity (1690),
+	avp_code_CxDx_3GPP_Wildcarded_Public_Identity (634),
 	avp_code_AAA_3GPP_DSA_Flags (1422),
 	avp_code_AAA_3GPP_Trace_Data (1458),
 	avp_code_AAA_3GPP_LCS_Info (1473),
 	avp_code_AAA_3GPP_PDN_GW_Allocation_Type (1438),
+	avp_code_GI_3GPP_3GPP_SGSN_MCC_MNC (18),
 	avp_code_RX_3GPP_Extended_Max_Requested_BW_UL (555),
 	avp_code_S6_3GPP_User_Identifier (3102),
 	avp_code_PCC_3GPP_QoS_Rule_Base_Name (1074),
@@ -4196,13 +5973,16 @@
 	avp_code_RX_3GPP_Min_Requested_Bandwidth_UL (535),
 	avp_code_AAA_3GPP_Report_Amount (1628),
 	avp_code_PCC_3GPP_CoA_Information (1039),
+	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),
 	avp_code_AAA_3GPP_Number_Of_Requested_Vectors (1410),
 	avp_code_AAA_3GPP_AIR_Flags (1679),
 	avp_code_AAA_3GPP_Geographical_Information (1608),
+	avp_code_CxDx_3GPP_Loose_Route_Indication (638),
 	avp_code_AAA_3GPP_MME_User_State (1497),
 	avp_code_AAA_3GPP_Access_Restriction_Data (1426),
+	avp_code_GI_3GPP_3GPP_RAT_Type (21),
 	avp_code_AAA_3GPP_SS_Status (1477),
 	avp_code_S6_3GPP_NIDD_Authorization_Update (3161),
 	avp_code_PCC_3GPP_Packet_Filter_Operation (1062),
@@ -4211,6 +5991,7 @@
 	avp_code_S6_3GPP_IMEI_Change (3141),
 	avp_code_PCC_3GPP_IP_CAN_Type (1027),
 	avp_code_RX_3GPP_Extended_Min_Desired_BW_UL (559),
+	avp_code_CxDx_3GPP_SIP_Authorization (610),
 	avp_code_PCC_3GPP_Revalidation_Time (1042),
 	avp_code_AAA_3GPP_Logging_Interval (1631),
 	avp_code_PCC_3GPP_Presence_Reporting_Area_Status (2823),
@@ -4218,8 +5999,10 @@
 	avp_code_PCC_3GPP_Routing_Filter (1078),
 	avp_code_PCC_3GPP_Metering_Method (1007),
 	avp_code_AAA_3GPP_Non_IP_Data_Delivery_Mechanism (1682),
+	avp_code_CxDx_3GPP_Integrity_Key (626),
 	avp_code_AAA_3GPP_E_UTRAN_Vector (1414),
 	avp_code_AAA_3GPP_Trace_Event_List (1465),
+	avp_code_GI_3GPP_3GPP_PDP_Type (3),
 	avp_code_S6_3GPP_Communication_Pattern_Set (3114),
 	avp_code_RX_3GPP_Flow_Status (511),
 	avp_code_RX_3GPP_MCPTT_Identifier (547),
@@ -4231,13 +6014,16 @@
 	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_CxDx_3GPP_Server_Assignment_Type (614),
 	avp_code_AAA_3GPP_PUR_Flags (1635),
 	avp_code_PCC_3GPP_IP_CAN_Session_Charging_Scope (2827),
 	avp_code_AAA_3GPP_IMEI (1402),
 	avp_code_AAA_3GPP_Kc (1453),
 	avp_code_AAA_3GPP_SGSN_Number (1489),
 	avp_code_AAA_3GPP_HPLMN_ODB (1418),
+	avp_code_GI_3GPP_3GPP_Charging_Characteristics (13),
 	avp_code_AAA_3GPP_PDP_Context (1469),
+	avp_code_GI_3GPP_3GPP_GGSN_Address (7),
 	avp_code_S6_3GPP_Node_Type (3153),
 	avp_code_RX_3GPP_Priority_Sharing_Indicator (550),
 	avp_code_PCC_3GPP_QoS_Rule_Name (1054),
@@ -4247,12 +6033,15 @@
 	avp_code_PCC_3GPP_PCC_Rule_Status (1019),
 	avp_code_PCC_3GPP_Extended_GBR_DL (2850),
 	avp_code_AAA_3GPP_MBSFN_Area (1694),
+	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_Positioning_Method (1659),
+	avp_code_CxDx_3GPP_LIA_Flags (653),
 	avp_code_AAA_3GPP_DL_Buffering_Suggested_Packet_Count (1674),
 	avp_code_AAA_3GPP_IDA_Flags (1441),
+	avp_code_CxDx_3GPP_Charging_Information (618),
 	avp_code_AAA_3GPP_ULA_Flags (1406),
 	avp_code_AAA_3GPP_IMS_Voice_Over_PS_Sessions_Supported (1492),
 	avp_code_AAA_3GPP_Roaming_Restricted_Due_To_Unsupported_Feature (1457),
@@ -4267,12 +6056,15 @@
 	avp_code_RX_3GPP_Extended_Max_Requested_BW_DL (554),
 	avp_code_PCC_3GPP_Flow_Information (1058),
 	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_CxDx_3GPP_User_Data (606),
 	avp_code_AAA_3GPP_Report_Interval (1627),
 	avp_code_PCC_3GPP_RAN_NAS_Release_Cause (2819),
 	avp_code_AAA_3GPP_Client_Identity (1480),
 	avp_code_AAA_3GPP_Equipment_Status (1445),
+	avp_code_GI_3GPP_3GPP_Packet_Filter (25),
 	avp_code_AAA_3GPP_EPS_Location_Information (1496),
 	avp_code_RX_3GPP_Service_Info_Status (527),
 	avp_code_S6_3GPP_CIR_Flags (3145),
@@ -4289,10 +6081,12 @@
 	avp_code_PCC_3GPP_ADC_Rule_Report (1097),
 	avp_code_AAA_3GPP_UE_SRVCC_Capability (1615),
 	avp_code_PCC_3GPP_Guaranteed_Bitrate_UL (1026),
+	avp_code_CxDx_3GPP_To_SIP_Header (645),
 	avp_code_AAA_3GPP_Coupled_Node_Diameter_ID (1666),
 	avp_code_AAA_3GPP_STN_SR (1433),
 	avp_code_AAA_3GPP_ServiceTypeIdentity (1484),
 	avp_code_AAA_3GPP_AUTN (1449),
+	avp_code_GI_3GPP_TWAN_Identifier (29),
 	avp_code_RX_3GPP_Sponsored_Connectivity_Data (530),
 	avp_code_S6_3GPP_AESE_Communication_Pattern (3113),
 	avp_code_PCC_3GPP_NBIFOM_Mode (2830),
@@ -4302,6 +6096,7 @@
 	avp_code_PCC_3GPP_ToS_Traffic_Class (1014),
 	avp_code_RX_3GPP_Min_Desired_Bandwidth_UL (546),
 	avp_code_AAA_3GPP_UVR_Flags (1639),
+	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),
@@ -4309,7 +6104,9 @@
 	avp_code_AAA_3GPP_Subscribed_Periodic_RAU_TAU_Timer (1619),
 	avp_code_AAA_3GPP_Specific_APN_Info (1472),
 	avp_code_AAA_3GPP_Terminal_Information (1401),
+	avp_code_CxDx_3GPP_Restoration_Info (649),
 	avp_code_AAA_3GPP_CSG_Id (1437),
+	avp_code_GI_3GPP_3GPP_IPv6_DNS_Servers (17),
 	avp_code_AAA_3GPP_Call_Barring_Info (1488),
 	avp_code_S6_3GPP_IP_SM_GW_Name (3101),
 	avp_code_RX_3GPP_Media_Sub_Component (519),
@@ -4318,6 +6115,7 @@
 	avp_code_RX_3GPP_Min_Requested_Bandwidth_DL (534),
 	avp_code_S6_3GPP_Service_Report (3152),
 	avp_code_PCC_3GPP_Tunnel_Information (1038),
+	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_S6_3GPP_Periodic_Time (3117),
@@ -4327,8 +6125,11 @@
 	avp_code_AAA_3GPP_Service_Area_Identity (1607),
 	avp_code_PCC_3GPP_Charging_Rule_Report (1018),
 	avp_code_AAA_3GPP_UE_PC5_AMBR (1693),
+	avp_code_CxDx_3GPP_Public_Identity (601),
+	avp_code_CxDx_3GPP_UAR_Flags (637),
 	avp_code_AAA_3GPP_Collection_Period_RRM_UMTS (1658),
 	avp_code_AAA_3GPP_Operator_Determined_Barring (1425),
+	avp_code_GI_3GPP_3GPP_IMEISV (20),
 	avp_code_AAA_3GPP_SS_Code (1476),
 	avp_code_RX_3GPP_RS_Bandwidth (522),
 	avp_code_S6_3GPP_Reachability_Information (3140),
@@ -4342,10 +6143,13 @@
 	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_CxDx_3GPP_Confidentiality_Key (625),
 	avp_code_PCC_3GPP_Flow_Label (1057),
 	avp_code_AAA_3GPP_Authentication_Info (1413),
 	avp_code_AAA_3GPP_Trace_Interface_List (1464),
+	avp_code_GI_3GPP_3GPP_Charging_Id (2),
 	avp_code_AAA_3GPP_APN_Configuration_Profile (1429),
+	avp_code_GI_3GPP_3GPP_CAMEL_Charging_Info (24),
 	avp_code_RX_3GPP_Flows (510),
 	avp_code_S6_3GPP_CIA_Flags (3164),
 	avp_code_RX_3GPP_Extended_Min_Requested_BW_UL (561),
@@ -4354,27 +6158,35 @@
 	avp_code_RX_3GPP_Acceptable_Service_Info (526),
 	avp_code_PCC_3GPP_Flow_Direction (1080),
 	avp_code_S6_3GPP_Supported_Monitoring_Events (3144),
+	avp_code_CxDx_3GPP_SIP_Item_Number (613),
 	avp_code_PCC_3GPP_Session_Release_Cause (1045),
 	avp_code_AAA_3GPP_MDT_User_Consent (1634),
 	avp_code_S6_3GPP_HSS_Cause (3109),
 	avp_code_PCC_3GPP_PCSCF_Restoration_Indication (2826),
 	avp_code_AAA_3GPP_Subscription_Data_Deletion (1685),
 	avp_code_AAA_3GPP_Trace_Collection_Entity (1452),
+	avp_code_CxDx_3GPP_Feature_List_ID (629),
 	avp_code_AAA_3GPP_Network_Access_Mode (1417),
+	avp_code_GI_3GPP_3GPP_Selection_Mode (12),
 	avp_code_AAA_3GPP_Complete_Data_List_Included_Indicator (1468),
+	avp_code_GI_3GPP_3GPP_SGSN_Address (6),
+	avp_code_GI_3GPP_External_Identifier (28),
 	avp_code_S6_3GPP_Reachability_Type (3132),
 	avp_code_S6_3GPP_Type_Of_External_Identifier (3168),
 	avp_code_PCC_3GPP_Event_Report_Indication (1033),
 	avp_code_AAA_3GPP_MDT_Configuration (1622),
 	avp_code_PCC_3GPP_Usage_Monitoring_Report (1069),
+	avp_code_CxDx_3GPP_Priviledged_Sender_Indication (652),
 	avp_code_AAA_3GPP_Adjacent_Access_Restriction_Data (1673),
 	avp_code_AAA_3GPP_RAT_Frequency_Selection_Priority_ID (1440),
+	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_ULR_Flags (1405),
 	avp_code_AAA_3GPP_ICS_Indicator (1491),
 	avp_code_AAA_3GPP_Cancellation_Type (1420),
 	avp_code_AAA_3GPP_PDN_Type (1456),
+	avp_code_GI_3GPP_3GPP_GGSN_IPv6_Address (16),
 	avp_code_RX_3GPP_Access_Network_Charging_Identifier (502),
 	avp_code_S6_3GPP_AESE_Communication_Pattern_Config_Status (3120),
 	avp_code_S6_3GPP_Enhanced_Coverage_Restriction_Data (3156),
@@ -4383,13 +6195,16 @@
 	avp_code_RX_3GPP_Pre_emption_Control_Info (553),
 	avp_code_PCC_3GPP_TDF_Application_Instance_Identifier (2802),
 	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_S6_3GPP_MONTE_Location_Type (3136),
 	avp_code_AAA_3GPP_RDS_Indicator (1697),
+	avp_code_CxDx_3GPP_Optional_Capability (605),
 	avp_code_AAA_3GPP_Reporting_Trigger (1626),
 	avp_code_PCC_3GPP_Tunnel_Header_Length (1037),
 	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),
 	avp_code_AAA_3GPP_User_Id (1444),
 	avp_code_AAA_3GPP_Requested_UTRAN_GERAN_Authentication_Info (1409),
@@ -4403,12 +6218,15 @@
 	avp_code_PCC_3GPP_Guaranteed_Bitrate_DL (1025),
 	avp_code_RX_3GPP_Extended_Max_Supported_BW_UL (557),
 	avp_code_PCC_3GPP_UDP_Source_Port (2806),
+	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_VPLMN_Dynamic_Address_Allowed (1432),
+	avp_code_CxDx_3GPP_SIP_Authenticate (609),
 	avp_code_AAA_3GPP_Service_Type (1483),
 	avp_code_AAA_3GPP_Immediate_Response_Preferred (1412),
 	avp_code_AAA_3GPP_XRES (1448),
+	avp_code_GI_3GPP_3GPP_IMSI (1),
 	avp_code_AAA_3GPP_User_State (1499),
 	avp_code_S6_3GPP_IP_SM_GW_Realm (3112),
 	avp_code_S6_3GPP_Reference_ID_Validity_Time (3148),
@@ -4416,14 +6234,17 @@
 	avp_code_PCC_3GPP_TFT_Packet_Filter_Information (1013),
 	avp_code_RX_3GPP_Min_Desired_Bandwidth_DL (545),
 	avp_code_S6_3GPP_Group_Reporting_Guard_Timer (3163),
+	avp_code_CxDx_3GPP_Associated_Identities (632),
 	avp_code_PCC_3GPP_Session_Linking_Indicator (1064),
 	avp_code_S6_3GPP_Maximum_Number_of_Reports (3128),
 	avp_code_PCC_3GPP_PRA_Install (2845),
 	avp_code_AAA_3GPP_V2X_Permission (1689),
 	avp_code_AAA_3GPP_LIPA_Permission (1618),
 	avp_code_PCC_3GPP_QoS_Negotiation (1029),
+	avp_code_CxDx_3GPP_SIP_Auth_Data_Item (612),
 	avp_code_AAA_3GPP_3GPP2_MEID (1471),
 	avp_code_AAA_3GPP_Subscription_Data (1400),
+	avp_code_CxDx_3GPP_Multiple_Registration_Indication (648),
 	avp_code_AAA_3GPP_WLAN_offloadability_UTRAN (1669),
 	avp_code_AAA_3GPP_CSG_Subscription_Data (1436),
 	avp_code_AAA_3GPP_TS_Code (1487),
@@ -4439,11 +6260,13 @@
 	avp_code_AAA_3GPP_Location_Area_Identity (1606),
 	avp_code_RX_3GPP_Media_Component_Status (549),
 	avp_code_AAA_3GPP_eDRX_Cycle_Length_Value (1692),
+	avp_code_CxDx_3GPP_Visited_Network_Identifier (600),
 	avp_code_S6_3GPP_RIR_Flags (3167),
 	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_PCC_3GPP_Extended_APN_AMBR_UL (2849),
+	avp_code_CxDx_3GPP_Identity_with_Emergency_Registration (651),
 	avp_code_AAA_3GPP_LCS_PrivacyException (1475),
 	avp_code_AAA_3GPP_QoS_Subscribed (1404),
 	avp_code_RX_3GPP_RR_Bandwidth (521),
@@ -4456,13 +6279,16 @@
 	avp_code_AAA_3GPP_UE_Usage_Type (1680),
 	avp_code_PCC_3GPP_TDF_IP_Address (1091),
 	avp_code_S6_3GPP_Enhanced_Coverage_Restriction (3155),
+	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_PCC_3GPP_Traffic_Steering_Policy_Identifier_UL (2837),
 	avp_code_AAA_3GPP_Carrier_Frequency (1696),
+	avp_code_CxDx_3GPP_Mandatory_Capability (604),
 	avp_code_AAA_3GPP_Trace_NE_Type_List (1463),
 	avp_code_AAA_3GPP_All_APN_Configurations_Included_Indicator (1428),
 	avp_code_AAA_3GPP_NOR_Flags (1443),
+	avp_code_GI_3GPP_3GPP_MS_TimeZone (23),
 	avp_code_AAA_3GPP_External_Client (1479),
 	avp_code_RX_3GPP_Extended_Min_Requested_BW_DL (560),
 	avp_code_RX_3GPP_Service_URN (525),
@@ -4475,10 +6301,15 @@
 	avp_code_PCC_3GPP_ADC_Rule_Base_Name (1095),
 	avp_code_AAA_3GPP_SCEF_Realm (1684),
 	avp_code_S6_3GPP_Requested_Validity_Time (3159),
+	avp_code_CxDx_3GPP_Supported_Features (628),
 	avp_code_AAA_3GPP_Local_Time_Zone (1649),
 	avp_code_AAA_3GPP_GERAN_Vector (1416),
+	avp_code_CxDx_3GPP_Call_ID_SIP_Header (643),
 	avp_code_AAA_3GPP_EPS_Subscribed_QoS_Profile (1431),
+	avp_code_GI_3GPP_3GPP_Session_Stop_Indicator (11),
 	avp_code_AAA_3GPP_GPRS_Subscription_Data (1467),
+	avp_code_GI_3GPP_3GPP_GPRS_Negotiated_QoS_Profile (5),
+	avp_code_GI_3GPP_3GPP_Allocate_IP_Type (27),
 	avp_code_RX_3GPP_Specific_Action (513),
 	avp_code_S6_3GPP_Maximum_Detection_Time (3131),
 	avp_code_AAA_3GPP_Ext_PDP_Address (1621),
@@ -4487,9 +6318,11 @@
 	avp_code_AAA_3GPP_Adjacent_PLMNs (1672),
 	avp_code_S6_3GPP_Service_Result_Code (3147),
 	avp_code_AAA_3GPP_SGSN_Location_Information (1601),
+	avp_code_CxDx_3GPP_Reason_Code (616),
 	avp_code_PCC_3GPP_Pre_emption_Vulnerability (1048),
 	avp_code_AAA_3GPP_Equivalent_PLMN_List (1637),
 	avp_code_PCC_3GPP_Default_Access (2829),
+	avp_code_CxDx_3GPP_Supported_Applications (631),
 	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),
@@ -4501,6 +6334,7 @@
 	variant "COMP(2scompl)"
 }
 type union AVP_Code {
+	AVP_Code_ETSI vendor_id_ETSI,
 	AVP_Code_NONE vendor_id_NONE,
 	AVP_Code_3GPP vendor_id_3GPP
 }
@@ -4517,12 +6351,18 @@
 		VMPxxxxx = '11100000'B
 	} )"
 	variant (avp_code) "CROSSTAG(
+		vendor_id_ETSI, vendor_id = vendor_id_ETSI;
 		vendor_id_NONE, vendor_id = omit;
 		vendor_id_3GPP, vendor_id = vendor_id_3GPP;
 	)"
 }
 type union AVP_Data {
+	GI_3GPP_3GPP_SGSN_IPv6_Address avp_GI_3GPP_3GPP_SGSN_IPv6_Address,
+	DNAS_NONE_Login_LAT_Service avp_DNAS_NONE_Login_LAT_Service,
+	GI_3GPP_3GPP_GGSN_MCC_MNC avp_GI_3GPP_3GPP_GGSN_MCC_MNC,
+	DCC_NONE_Direct_Debiting_Failure_Handling avp_DCC_NONE_Direct_Debiting_Failure_Handling,
 	MIPv6_NONE_MIP_Careof_Address avp_MIPv6_NONE_MIP_Careof_Address,
+	CxDx_ETSI_Line_Identifier avp_CxDx_ETSI_Line_Identifier,
 	PCC_3GPP_Bearer_Identifier avp_PCC_3GPP_Bearer_Identifier,
 	RX_3GPP_Content_Version avp_RX_3GPP_Content_Version,
 	BASE_NONE_Session_Id avp_BASE_NONE_Session_Id,
@@ -4533,15 +6373,23 @@
 	PCC_3GPP_Bearer_Usage avp_PCC_3GPP_Bearer_Usage,
 	PCC_3GPP_Tunnel_Header_Filter avp_PCC_3GPP_Tunnel_Header_Filter,
 	AAA_3GPP_List_Of_Measurements avp_AAA_3GPP_List_Of_Measurements,
+	DCC_NONE_Requested_Service_Unit avp_DCC_NONE_Requested_Service_Unit,
 	PCC_3GPP_Default_QoS_Name avp_PCC_3GPP_Default_QoS_Name,
 	AAA_3GPP_UVA_Flags avp_AAA_3GPP_UVA_Flags,
+	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,
+	DNAS_NONE_Framed_Pool avp_DNAS_NONE_Framed_Pool,
+	DCC_NONE_CC_Time avp_DCC_NONE_CC_Time,
 	AAA_3GPP_Requested_EUTRAN_Authentication_Info avp_AAA_3GPP_Requested_EUTRAN_Authentication_Info,
+	CxDx_3GPP_SIP_Digest_Authenticate avp_CxDx_3GPP_SIP_Digest_Authenticate,
 	AAA_3GPP_Last_UE_Activity_Time avp_AAA_3GPP_Last_UE_Activity_Time,
 	AAA_3GPP_Context_Identifier avp_AAA_3GPP_Context_Identifier,
+	DCC_NONE_Used_Service_Unit avp_DCC_NONE_Used_Service_Unit,
 	BASE_NONE_Auth_Application_Id avp_BASE_NONE_Auth_Application_Id,
 	AAA_3GPP_Trace_Reference avp_AAA_3GPP_Trace_Reference,
+	DNAS_NONE_Framed_Appletalk_Network avp_DNAS_NONE_Framed_Appletalk_Network,
+	DNAS_NONE_Framed_IPv6_Prefix avp_DNAS_NONE_Framed_IPv6_Prefix,
 	RX_3GPP_Sharing_Key_UL avp_RX_3GPP_Sharing_Key_UL,
 	RX_3GPP_AF_Charging_Identifier avp_RX_3GPP_AF_Charging_Identifier,
 	S6_3GPP_Monitoring_Event_Report avp_S6_3GPP_Monitoring_Event_Report,
@@ -4556,7 +6404,9 @@
 	AAA_3GPP_SGs_MME_Identity avp_AAA_3GPP_SGs_MME_Identity,
 	PCC_3GPP_Routing_Rule_Remove avp_PCC_3GPP_Routing_Rule_Remove,
 	S6_3GPP_Roaming_Information avp_S6_3GPP_Roaming_Information,
+	CxDx_3GPP_SIP_Authentication_Scheme avp_CxDx_3GPP_SIP_Authentication_Scheme,
 	AAA_3GPP_Event_Threshold_RSRP avp_AAA_3GPP_Event_Threshold_RSRP,
+	CxDx_3GPP_User_Authorization_Type avp_CxDx_3GPP_User_Authorization_Type,
 	AAA_3GPP_PLMN_Client avp_AAA_3GPP_PLMN_Client,
 	AAA_3GPP_Re_Synchronization_Info avp_AAA_3GPP_Re_Synchronization_Info,
 	BASE_NONE_Auth_Grace_Period avp_BASE_NONE_Auth_Grace_Period,
@@ -4566,10 +6416,13 @@
 	AAA_3GPP_APN_OI_Replacement avp_AAA_3GPP_APN_OI_Replacement,
 	BASE_NONE_Re_Auth_Request_Type avp_BASE_NONE_Re_Auth_Request_Type,
 	S6_3GPP_External_Identifier avp_S6_3GPP_External_Identifier,
+	DCC_NONE_Redirect_Address_Type avp_DCC_NONE_Redirect_Address_Type,
 	MIPv6_NONE_MIP_MN_HA_MSA avp_MIPv6_NONE_MIP_MN_HA_MSA,
 	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,
+	DCC_NONE_User_Equipment_Info_Type avp_DCC_NONE_User_Equipment_Info_Type,
 	RX_3GPP_Flow_Number avp_RX_3GPP_Flow_Number,
 	PCC_3GPP_Resource_Allocation_Notification avp_PCC_3GPP_Resource_Allocation_Notification,
 	S6_3GPP_Monitoring_Type avp_S6_3GPP_Monitoring_Type,
@@ -4577,23 +6430,33 @@
 	AAA_3GPP_VPLMN_LIPA_Allowed avp_AAA_3GPP_VPLMN_LIPA_Allowed,
 	PCC_3GPP_QoS_Class_Identifier avp_PCC_3GPP_QoS_Class_Identifier,
 	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,
 	MIPv6_NONE_MIP_Session_Key avp_MIPv6_NONE_MIP_Session_Key,
 	AAA_3GPP_KASME avp_AAA_3GPP_KASME,
+	GI_3GPP_3GPP_User_Location_Info_Time avp_GI_3GPP_3GPP_User_Location_Info_Time,
 	AAA_3GPP_Teleservice_List avp_AAA_3GPP_Teleservice_List,
 	AAA_3GPP_UTRAN_Vector avp_AAA_3GPP_UTRAN_Vector,
+	DCC_NONE_Tariff_Time_Change avp_DCC_NONE_Tariff_Time_Change,
+	GI_3GPP_3GPP_NSAPI avp_GI_3GPP_3GPP_NSAPI,
+	GI_3GPP_3GPP_CG_Address avp_GI_3GPP_3GPP_CG_Address,
 	RX_3GPP_Application_Service_Provider_Identity avp_RX_3GPP_Application_Service_Provider_Identity,
 	S6_3GPP_NIDD_Authorization_Request avp_S6_3GPP_NIDD_Authorization_Request,
 	PCC_3GPP_QoS_Rule_Install avp_PCC_3GPP_QoS_Rule_Install,
 	S6_3GPP_Periodic_Communication_Indicator avp_S6_3GPP_Periodic_Communication_Indicator,
 	RX_3GPP_Flow_Usage avp_RX_3GPP_Flow_Usage,
 	PCC_3GPP_RAN_Rule_Support avp_PCC_3GPP_RAN_Rule_Support,
+	DNAS_NONE_Tunnel_Password avp_DNAS_NONE_Tunnel_Password,
 	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,
+	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,
 	AAA_3GPP_eDRX_Cycle_Length avp_AAA_3GPP_eDRX_Cycle_Length,
@@ -4605,32 +6468,52 @@
 	PCC_3GPP_Usage_Monitoring_Information avp_PCC_3GPP_Usage_Monitoring_Information,
 	BASE_NONE_Experimental_Result_Code avp_BASE_NONE_Experimental_Result_Code,
 	PCC_3GPP_Extended_APN_AMBR_DL avp_PCC_3GPP_Extended_APN_AMBR_DL,
+	CxDx_3GPP_Session_Priority avp_CxDx_3GPP_Session_Priority,
+	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,
 	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,
+	DNAS_NONE_NAS_Port_Type avp_DNAS_NONE_NAS_Port_Type,
 	AAA_3GPP_Item_Number avp_AAA_3GPP_Item_Number,
+	DCC_NONE_Multiple_Services_Indicator avp_DCC_NONE_Multiple_Services_Indicator,
+	DNAS_NONE_Framed_Protocol avp_DNAS_NONE_Framed_Protocol,
 	S6_3GPP_Service_ID avp_S6_3GPP_Service_ID,
+	GI_3GPP_3GPP_IMSI_MCC_MNC avp_GI_3GPP_3GPP_IMSI_MCC_MNC,
 	RX_3GPP_Abort_Cause avp_RX_3GPP_Abort_Cause,
 	PCC_3GPP_Charging_Rule_Base_Name avp_PCC_3GPP_Charging_Rule_Base_Name,
 	RX_3GPP_Required_Access_Info avp_RX_3GPP_Required_Access_Info,
 	PCC_3GPP_TDF_Destination_Realm avp_PCC_3GPP_TDF_Destination_Realm,
 	S6_3GPP_S6t_HSS_Cause avp_S6_3GPP_S6t_HSS_Cause,
 	RX_3GPP_AF_Requested_Data avp_RX_3GPP_AF_Requested_Data,
+	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,
+	DNAS_NONE_CHAP_Response avp_DNAS_NONE_CHAP_Response,
 	S6_3GPP_Stationary_Indication avp_S6_3GPP_Stationary_Indication,
 	PCC_3GPP_Traffic_Steering_Policy_Identifier_DL avp_PCC_3GPP_Traffic_Steering_Policy_Identifier_DL,
 	AAA_3GPP_Geodetic_Information avp_AAA_3GPP_Geodetic_Information,
 	PCC_3GPP_Extended_GBR_UL avp_PCC_3GPP_Extended_GBR_UL,
 	AAA_3GPP_MBSFN_Area_ID avp_AAA_3GPP_MBSFN_Area_ID,
+	CxDx_3GPP_Server_Capabilities avp_CxDx_3GPP_Server_Capabilities,
 	AAA_3GPP_Area_Scope avp_AAA_3GPP_Area_Scope,
+	DNAS_NONE_Accounting_Input_Packets avp_DNAS_NONE_Accounting_Input_Packets,
+	CxDx_3GPP_SCSCF_Restoration_Info avp_CxDx_3GPP_SCSCF_Restoration_Info,
+	CxDx_3GPP_Initial_CSeq_Sequence_Number avp_CxDx_3GPP_Initial_CSeq_Sequence_Number,
 	AAA_3GPP_PUA_Flags avp_AAA_3GPP_PUA_Flags,
+	DNAS_NONE_Callback_Id avp_DNAS_NONE_Callback_Id,
+	CxDx_3GPP_Primary_Event_Charging_Function_Name avp_CxDx_3GPP_Primary_Event_Charging_Function_Name,
+	DCC_NONE_CC_Output_Octets avp_DCC_NONE_CC_Output_Octets,
+	GI_3GPP_3GPP_User_Location_Info avp_GI_3GPP_3GPP_User_Location_Info,
 	AAA_3GPP_Notification_To_UE_User avp_AAA_3GPP_Notification_To_UE_User,
 	AAA_3GPP_Visited_PLMN_Id avp_AAA_3GPP_Visited_PLMN_Id,
 	AAA_3GPP_Homogeneous_Support_of_IMS_Voice_Over_PS_Sessions avp_AAA_3GPP_Homogeneous_Support_of_IMS_Voice_Over_PS_Sessions,
 	RX_3GPP_Codec_Data avp_RX_3GPP_Codec_Data,
 	S6_3GPP_Monitoring_Event_Config_Status avp_S6_3GPP_Monitoring_Event_Config_Status,
+	DCC_NONE_Cost_Information avp_DCC_NONE_Cost_Information,
 	BASE_NONE_Error_Reporting_Host avp_BASE_NONE_Error_Reporting_Host,
 	PCC_3GPP_Rule_Activation_Time avp_PCC_3GPP_Rule_Activation_Time,
 	S6_3GPP_Service_Data avp_S6_3GPP_Service_Data,
@@ -4638,6 +6521,8 @@
 	PCC_3GPP_NetLoc_Access_Support avp_PCC_3GPP_NetLoc_Access_Support,
 	S6_3GPP_Monitoring_Event_Configuration avp_S6_3GPP_Monitoring_Event_Configuration,
 	PCC_3GPP_Offline avp_PCC_3GPP_Offline,
+	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,
@@ -4646,11 +6531,18 @@
 	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,
+	CxDx_3GPP_Subscription_Info avp_CxDx_3GPP_Subscription_Info,
 	AAA_3GPP_APN_Configuration avp_AAA_3GPP_APN_Configuration,
+	CxDx_3GPP_SIP_Number_Auth_Items avp_CxDx_3GPP_SIP_Number_Auth_Items,
 	AAA_3GPP_OMC_Id avp_AAA_3GPP_OMC_Id,
 	AAA_3GPP_GMLC_Restriction avp_AAA_3GPP_GMLC_Restriction,
+	DNAS_NONE_State avp_DNAS_NONE_State,
+	DNAS_NONE_Tunnel_Preference avp_DNAS_NONE_Tunnel_Preference,
+	DCC_NONE_CC_Session_Failover avp_DCC_NONE_CC_Session_Failover,
 	AAA_3GPP_Regional_Subscription_Zone_Code avp_AAA_3GPP_Regional_Subscription_Zone_Code,
+	GI_3GPP_3GPP_Negotiated_DSCP avp_GI_3GPP_3GPP_Negotiated_DSCP,
 	BASE_NONE_Proxy_State avp_BASE_NONE_Proxy_State,
+	DCC_NONE_Credit_Control_Failure_Handling avp_DCC_NONE_Credit_Control_Failure_Handling,
 	S6_3GPP_SIR_Flags avp_S6_3GPP_SIR_Flags,
 	RX_3GPP_MPS_Identifier avp_RX_3GPP_MPS_Identifier,
 	AAA_3GPP_MDT_Allowed_PLMN_Id avp_AAA_3GPP_MDT_Allowed_PLMN_Id,
@@ -4663,17 +6555,25 @@
 	PCC_3GPP_Pre_emption_Capability avp_PCC_3GPP_Pre_emption_Capability,
 	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,
 	PCC_3GPP_TCP_Source_Port avp_PCC_3GPP_TCP_Source_Port,
 	PCC_3GPP_Application_Detection_Information avp_PCC_3GPP_Application_Detection_Information,
 	AAA_3GPP_Emergency_Info avp_AAA_3GPP_Emergency_Info,
 	AAA_3GPP_MPS_Priority avp_AAA_3GPP_MPS_Priority,
+	DCC_NONE_Requested_Action avp_DCC_NONE_Requested_Action,
+	CxDx_3GPP_Record_Route avp_CxDx_3GPP_Record_Route,
 	AAA_3GPP_Alert_Reason avp_AAA_3GPP_Alert_Reason,
+	GI_3GPP_3GPP_CG_IPv6_Address avp_GI_3GPP_3GPP_CG_IPv6_Address,
+	DNAS_NONE_Idle_Timeout avp_DNAS_NONE_Idle_Timeout,
+	DNAS_NONE_NAS_Port_Id avp_DNAS_NONE_NAS_Port_Id,
 	AAA_3GPP_MO_LR avp_AAA_3GPP_MO_LR,
 	BASE_NONE_Host_IP_Address avp_BASE_NONE_Host_IP_Address,
 	RX_3GPP_Max_Requested_Bandwidth_UL avp_RX_3GPP_Max_Requested_Bandwidth_UL,
 	PCC_3GPP_Usage_Monitoring_Support avp_PCC_3GPP_Usage_Monitoring_Support,
 	S6_3GPP_Maximum_Response_Time avp_S6_3GPP_Maximum_Response_Time,
 	RX_3GPP_Sponsor_Identity avp_RX_3GPP_Sponsor_Identity,
+	DNAS_NONE_Framed_Appletalk_Link avp_DNAS_NONE_Framed_Appletalk_Link,
+	DNAS_NONE_Framed_Interface_Id avp_DNAS_NONE_Framed_Interface_Id,
 	PCC_3GPP_CoA_IP_Address avp_PCC_3GPP_CoA_IP_Address,
 	PCC_3GPP_Default_QoS_Information avp_PCC_3GPP_Default_QoS_Information,
 	PCC_3GPP_AN_GW_Address avp_PCC_3GPP_AN_GW_Address,
@@ -4683,72 +6583,104 @@
 	AAA_3GPP_Cell_Global_Identity avp_AAA_3GPP_Cell_Global_Identity,
 	BASE_NONE_Vendor_Id avp_BASE_NONE_Vendor_Id,
 	AAA_3GPP_PDN_Connection_Continuity avp_AAA_3GPP_PDN_Connection_Continuity,
+	CxDx_3GPP_Wildcarded_Public_Identity avp_CxDx_3GPP_Wildcarded_Public_Identity,
+	DNAS_NONE_Acct_Session_Time avp_DNAS_NONE_Acct_Session_Time,
 	AAA_3GPP_DSA_Flags avp_AAA_3GPP_DSA_Flags,
 	AAA_3GPP_Trace_Data avp_AAA_3GPP_Trace_Data,
 	AAA_3GPP_LCS_Info avp_AAA_3GPP_LCS_Info,
 	AAA_3GPP_PDN_GW_Allocation_Type avp_AAA_3GPP_PDN_GW_Allocation_Type,
+	GI_3GPP_3GPP_SGSN_MCC_MNC avp_GI_3GPP_3GPP_SGSN_MCC_MNC,
 	BASE_NONE_Event_Timestamp avp_BASE_NONE_Event_Timestamp,
+	DCC_NONE_Final_Unit_Action avp_DCC_NONE_Final_Unit_Action,
 	RX_3GPP_Extended_Max_Requested_BW_UL avp_RX_3GPP_Extended_Max_Requested_BW_UL,
 	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,
 	AAA_3GPP_Restoration_Priority avp_AAA_3GPP_Restoration_Priority,
+	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,
 	RX_3GPP_Min_Requested_Bandwidth_UL avp_RX_3GPP_Min_Requested_Bandwidth_UL,
 	AAA_3GPP_Report_Amount avp_AAA_3GPP_Report_Amount,
 	PCC_3GPP_CoA_Information avp_PCC_3GPP_CoA_Information,
+	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,
 	MIPv6_NONE_MIP_Mobile_Node_Address avp_MIPv6_NONE_MIP_Mobile_Node_Address,
 	PCC_3GPP_Routing_Rule_Report avp_PCC_3GPP_Routing_Rule_Report,
 	AAA_3GPP_Number_Of_Requested_Vectors avp_AAA_3GPP_Number_Of_Requested_Vectors,
 	AAA_3GPP_AIR_Flags avp_AAA_3GPP_AIR_Flags,
 	AAA_3GPP_Geographical_Information avp_AAA_3GPP_Geographical_Information,
+	CxDx_3GPP_Loose_Route_Indication avp_CxDx_3GPP_Loose_Route_Indication,
+	DCC_NONE_Service_Parameter_Type avp_DCC_NONE_Service_Parameter_Type,
 	AAA_3GPP_MME_User_State avp_AAA_3GPP_MME_User_State,
 	AAA_3GPP_Access_Restriction_Data avp_AAA_3GPP_Access_Restriction_Data,
 	BASE_NONE_Failed_AVP avp_BASE_NONE_Failed_AVP,
+	GI_3GPP_3GPP_RAT_Type avp_GI_3GPP_3GPP_RAT_Type,
 	AAA_3GPP_SS_Status avp_AAA_3GPP_SS_Status,
 	S6_3GPP_NIDD_Authorization_Update avp_S6_3GPP_NIDD_Authorization_Update,
+	DCC_NONE_Subscription_Id_Type avp_DCC_NONE_Subscription_Id_Type,
 	PCC_3GPP_Packet_Filter_Operation avp_PCC_3GPP_Packet_Filter_Operation,
 	S6_3GPP_SCEF_Reference_ID_for_Deletion avp_S6_3GPP_SCEF_Reference_ID_for_Deletion,
 	RX_3GPP_SIP_Forking_Indication avp_RX_3GPP_SIP_Forking_Indication,
+	DNAS_NONE_User_Password avp_DNAS_NONE_User_Password,
 	S6_3GPP_IMEI_Change avp_S6_3GPP_IMEI_Change,
 	PCC_3GPP_IP_CAN_Type avp_PCC_3GPP_IP_CAN_Type,
 	RX_3GPP_Extended_Min_Desired_BW_UL avp_RX_3GPP_Extended_Min_Desired_BW_UL,
+	CxDx_3GPP_SIP_Authorization avp_CxDx_3GPP_SIP_Authorization,
 	PCC_3GPP_Revalidation_Time avp_PCC_3GPP_Revalidation_Time,
 	AAA_3GPP_Logging_Interval avp_AAA_3GPP_Logging_Interval,
 	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,
 	PCC_3GPP_Metering_Method avp_PCC_3GPP_Metering_Method,
+	DNAS_NONE_Acct_Tunnel_Connection avp_DNAS_NONE_Acct_Tunnel_Connection,
 	AAA_3GPP_Non_IP_Data_Delivery_Mechanism avp_AAA_3GPP_Non_IP_Data_Delivery_Mechanism,
+	DNAS_NONE_NAS_Filter_Rule avp_DNAS_NONE_NAS_Filter_Rule,
 	BASE_NONE_Session_Server_Failover avp_BASE_NONE_Session_Server_Failover,
+	CxDx_3GPP_Integrity_Key avp_CxDx_3GPP_Integrity_Key,
 	AAA_3GPP_E_UTRAN_Vector avp_AAA_3GPP_E_UTRAN_Vector,
 	BASE_NONE_Experimental_Result avp_BASE_NONE_Experimental_Result,
+	DNAS_NONE_Acct_Link_Count avp_DNAS_NONE_Acct_Link_Count,
+	DCC_NONE_Unit_Value avp_DCC_NONE_Unit_Value,
 	AAA_3GPP_Trace_Event_List avp_AAA_3GPP_Trace_Event_List,
+	GI_3GPP_3GPP_PDP_Type avp_GI_3GPP_3GPP_PDP_Type,
+	DNAS_NONE_Reply_Message avp_DNAS_NONE_Reply_Message,
+	DNAS_NONE_Connect_Info avp_DNAS_NONE_Connect_Info,
 	MIPv6_NONE_MIP_Replay_Mode avp_MIPv6_NONE_MIP_Replay_Mode,
 	BASE_NONE_Proxy_Host avp_BASE_NONE_Proxy_Host,
 	S6_3GPP_Communication_Pattern_Set avp_S6_3GPP_Communication_Pattern_Set,
 	RX_3GPP_Flow_Status avp_RX_3GPP_Flow_Status,
+	DNAS_NONE_CHAP_Challenge avp_DNAS_NONE_CHAP_Challenge,
+	DCC_NONE_CC_Unit_Type avp_DCC_NONE_CC_Unit_Type,
 	RX_3GPP_MCPTT_Identifier avp_RX_3GPP_MCPTT_Identifier,
 	S6_3GPP_Group_Monitoring_Event_Report avp_S6_3GPP_Group_Monitoring_Event_Report,
 	PCC_3GPP_QoS_Upgrade avp_PCC_3GPP_QoS_Upgrade,
+	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,
 	PCC_3GPP_Monitoring_Key avp_PCC_3GPP_Monitoring_Key,
 	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,
+	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,
 	AAA_3GPP_IMEI avp_AAA_3GPP_IMEI,
+	DNAS_NONE_CHAP_Ident avp_DNAS_NONE_CHAP_Ident,
 	AAA_3GPP_Kc avp_AAA_3GPP_Kc,
 	AAA_3GPP_SGSN_Number avp_AAA_3GPP_SGSN_Number,
 	AAA_3GPP_HPLMN_ODB avp_AAA_3GPP_HPLMN_ODB,
+	GI_3GPP_3GPP_Charging_Characteristics avp_GI_3GPP_3GPP_Charging_Characteristics,
 	AAA_3GPP_PDP_Context avp_AAA_3GPP_PDP_Context,
+	DCC_NONE_CC_Money avp_DCC_NONE_CC_Money,
+	GI_3GPP_3GPP_GGSN_Address avp_GI_3GPP_3GPP_GGSN_Address,
 	BASE_NONE_Proxy_Info avp_BASE_NONE_Proxy_Info,
 	S6_3GPP_Node_Type avp_S6_3GPP_Node_Type,
 	RX_3GPP_Priority_Sharing_Indicator avp_RX_3GPP_Priority_Sharing_Indicator,
+	DNAS_NONE_Tunnel_Type avp_DNAS_NONE_Tunnel_Type,
 	PCC_3GPP_QoS_Rule_Name avp_PCC_3GPP_QoS_Rule_Name,
 	S6_3GPP_Scheduled_Communication_Time avp_S6_3GPP_Scheduled_Communication_Time,
 	RX_3GPP_Max_Requested_Bandwidth_DL avp_RX_3GPP_Max_Requested_Bandwidth_DL,
@@ -4756,16 +6688,26 @@
 	PCC_3GPP_PCC_Rule_Status avp_PCC_3GPP_PCC_Rule_Status,
 	PCC_3GPP_Extended_GBR_DL avp_PCC_3GPP_Extended_GBR_DL,
 	AAA_3GPP_MBSFN_Area avp_AAA_3GPP_MBSFN_Area,
+	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,
 	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,
+	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_Origin_AAA_Protocol avp_DNAS_NONE_Origin_AAA_Protocol,
+	CxDx_3GPP_Charging_Information avp_CxDx_3GPP_Charging_Information,
 	AAA_3GPP_ULA_Flags avp_AAA_3GPP_ULA_Flags,
 	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,
+	DNAS_NONE_Tunnel_Assignment_Id avp_DNAS_NONE_Tunnel_Assignment_Id,
+	DNAS_NONE_Framed_IPX_Network avp_DNAS_NONE_Framed_IPX_Network,
+	DCC_NONE_CC_Service_Specific_Units avp_DCC_NONE_CC_Service_Specific_Units,
 	S6_3GPP_T4_Parameters avp_S6_3GPP_T4_Parameters,
 	RX_3GPP_Access_Network_Charging_Identifier_Value avp_RX_3GPP_Access_Network_Charging_Identifier_Value,
 	S6_3GPP_AESE_Error_Report avp_S6_3GPP_AESE_Error_Report,
@@ -4776,17 +6718,25 @@
 	PCC_3GPP_Access_Network_Charging_Identifier_Gx avp_PCC_3GPP_Access_Network_Charging_Identifier_Gx,
 	RX_3GPP_Extended_Max_Requested_BW_DL avp_RX_3GPP_Extended_Max_Requested_BW_DL,
 	PCC_3GPP_Flow_Information avp_PCC_3GPP_Flow_Information,
+	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,
+	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,
+	CxDx_3GPP_User_Data avp_CxDx_3GPP_User_Data,
 	AAA_3GPP_Report_Interval avp_AAA_3GPP_Report_Interval,
 	PCC_3GPP_RAN_NAS_Release_Cause avp_PCC_3GPP_RAN_NAS_Release_Cause,
 	AAA_3GPP_Client_Identity avp_AAA_3GPP_Client_Identity,
 	BASE_NONE_Redirect_Host_Usage avp_BASE_NONE_Redirect_Host_Usage,
 	AAA_3GPP_Equipment_Status avp_AAA_3GPP_Equipment_Status,
+	GI_3GPP_3GPP_Packet_Filter avp_GI_3GPP_3GPP_Packet_Filter,
+	DCC_NONE_Redirect_Server_Address avp_DCC_NONE_Redirect_Server_Address,
 	MIPv6_NONE_MIP6_Auth_Mode avp_MIPv6_NONE_MIP6_Auth_Mode,
 	AAA_3GPP_EPS_Location_Information avp_AAA_3GPP_EPS_Location_Information,
+	DNAS_NONE_Acct_Tunnel_Packets_Lost avp_DNAS_NONE_Acct_Tunnel_Packets_Lost,
 	BASE_NONE_Session_Timeout avp_BASE_NONE_Session_Timeout,
 	RX_3GPP_Service_Info_Status avp_RX_3GPP_Service_Info_Status,
 	S6_3GPP_CIR_Flags avp_S6_3GPP_CIR_Flags,
@@ -4803,33 +6753,48 @@
 	PCC_3GPP_ADC_Rule_Report avp_PCC_3GPP_ADC_Rule_Report,
 	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,
+	DNAS_NONE_Login_LAT_Group avp_DNAS_NONE_Login_LAT_Group,
 	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,
 	AAA_3GPP_Coupled_Node_Diameter_ID avp_AAA_3GPP_Coupled_Node_Diameter_ID,
 	AAA_3GPP_STN_SR avp_AAA_3GPP_STN_SR,
 	BASE_NONE_Supported_Vendor_Id avp_BASE_NONE_Supported_Vendor_Id,
 	AAA_3GPP_ServiceTypeIdentity avp_AAA_3GPP_ServiceTypeIdentity,
+	DNAS_NONE_Acct_Authentic avp_DNAS_NONE_Acct_Authentic,
+	DCC_NONE_Service_Identifier avp_DCC_NONE_Service_Identifier,
 	AAA_3GPP_AUTN avp_AAA_3GPP_AUTN,
+	GI_3GPP_TWAN_Identifier avp_GI_3GPP_TWAN_Identifier,
 	RX_3GPP_Sponsored_Connectivity_Data avp_RX_3GPP_Sponsored_Connectivity_Data,
 	BASE_NONE_Auth_Request_Type avp_BASE_NONE_Auth_Request_Type,
 	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,
 	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,
 	RX_3GPP_Min_Desired_Bandwidth_UL avp_RX_3GPP_Min_Desired_Bandwidth_UL,
 	AAA_3GPP_UVR_Flags avp_AAA_3GPP_UVR_Flags,
+	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,
+	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,
+	DCC_NONE_Granted_Service_Unit avp_DCC_NONE_Granted_Service_Unit,
 	MIPv6_NONE_MIP_Timestamp avp_MIPv6_NONE_MIP_Timestamp,
 	AAA_3GPP_Subscribed_Periodic_RAU_TAU_Timer avp_AAA_3GPP_Subscribed_Periodic_RAU_TAU_Timer,
 	AAA_3GPP_Specific_APN_Info avp_AAA_3GPP_Specific_APN_Info,
 	AAA_3GPP_Terminal_Information avp_AAA_3GPP_Terminal_Information,
+	CxDx_3GPP_Restoration_Info avp_CxDx_3GPP_Restoration_Info,
 	BASE_NONE_Product_Name avp_BASE_NONE_Product_Name,
 	AAA_3GPP_CSG_Id avp_AAA_3GPP_CSG_Id,
+	DNAS_NONE_Framed_IP_Netmask avp_DNAS_NONE_Framed_IP_Netmask,
+	GI_3GPP_3GPP_IPv6_DNS_Servers avp_GI_3GPP_3GPP_IPv6_DNS_Servers,
 	AAA_3GPP_Call_Barring_Info avp_AAA_3GPP_Call_Barring_Info,
+	DCC_NONE_Service_Parameter_Info avp_DCC_NONE_Service_Parameter_Info,
 	BASE_NONE_Origin_State_Id avp_BASE_NONE_Origin_State_Id,
 	S6_3GPP_IP_SM_GW_Name avp_S6_3GPP_IP_SM_GW_Name,
 	RX_3GPP_Media_Sub_Component avp_RX_3GPP_Media_Sub_Component,
@@ -4838,6 +6803,7 @@
 	RX_3GPP_Min_Requested_Bandwidth_DL avp_RX_3GPP_Min_Requested_Bandwidth_DL,
 	S6_3GPP_Service_Report avp_S6_3GPP_Service_Report,
 	PCC_3GPP_Tunnel_Information avp_PCC_3GPP_Tunnel_Information,
+	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,
 	S6_3GPP_Periodic_Time avp_S6_3GPP_Periodic_Time,
@@ -4848,12 +6814,18 @@
 	PCC_3GPP_Charging_Rule_Report avp_PCC_3GPP_Charging_Rule_Report,
 	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,
 	BASE_NONE_Accounting_Sub_Session_Id avp_BASE_NONE_Accounting_Sub_Session_Id,
+	DNAS_NONE_Acct_Delay_Time avp_DNAS_NONE_Acct_Delay_Time,
+	CxDx_3GPP_UAR_Flags avp_CxDx_3GPP_UAR_Flags,
 	AAA_3GPP_Collection_Period_RRM_UMTS avp_AAA_3GPP_Collection_Period_RRM_UMTS,
 	AAA_3GPP_Operator_Determined_Barring avp_AAA_3GPP_Operator_Determined_Barring,
+	DNAS_NONE_Tunnel_Server_Endpoint avp_DNAS_NONE_Tunnel_Server_Endpoint,
 	BASE_NONE_Session_Binding avp_BASE_NONE_Session_Binding,
+	GI_3GPP_3GPP_IMEISV avp_GI_3GPP_3GPP_IMEISV,
 	AAA_3GPP_SS_Code avp_AAA_3GPP_SS_Code,
 	BASE_NONE_Acct_Multi_Session_Id avp_BASE_NONE_Acct_Multi_Session_Id,
+	DCC_NONE_Subscription_Id_Data avp_DCC_NONE_Subscription_Id_Data,
 	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,
@@ -4866,49 +6838,77 @@
 	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,
+	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,
+	CxDx_3GPP_Confidentiality_Key avp_CxDx_3GPP_Confidentiality_Key,
 	PCC_3GPP_Flow_Label avp_PCC_3GPP_Flow_Label,
+	DNAS_NONE_NAS_Port avp_DNAS_NONE_NAS_Port,
 	AAA_3GPP_Authentication_Info avp_AAA_3GPP_Authentication_Info,
 	AAA_3GPP_Trace_Interface_List avp_AAA_3GPP_Trace_Interface_List,
+	GI_3GPP_3GPP_Charging_Id avp_GI_3GPP_3GPP_Charging_Id,
+	DNAS_NONE_CHAP_Algorithm avp_DNAS_NONE_CHAP_Algorithm,
 	AAA_3GPP_APN_Configuration_Profile avp_AAA_3GPP_APN_Configuration_Profile,
+	GI_3GPP_3GPP_CAMEL_Charging_Info avp_GI_3GPP_3GPP_CAMEL_Charging_Info,
 	RX_3GPP_Flows avp_RX_3GPP_Flows,
 	S6_3GPP_CIA_Flags avp_S6_3GPP_CIA_Flags,
 	RX_3GPP_Extended_Min_Requested_BW_UL avp_RX_3GPP_Extended_Min_Requested_BW_UL,
 	PCC_3GPP_Monitoring_Time avp_PCC_3GPP_Monitoring_Time,
+	DCC_NONE_CC_Input_Octets avp_DCC_NONE_CC_Input_Octets,
 	S6_3GPP_UE_Reachability_Configuration avp_S6_3GPP_UE_Reachability_Configuration,
 	BASE_NONE_Destination_Realm avp_BASE_NONE_Destination_Realm,
 	RX_3GPP_Acceptable_Service_Info avp_RX_3GPP_Acceptable_Service_Info,
 	PCC_3GPP_Flow_Direction avp_PCC_3GPP_Flow_Direction,
 	S6_3GPP_Supported_Monitoring_Events avp_S6_3GPP_Supported_Monitoring_Events,
+	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,
+	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,
 	AAA_3GPP_Subscription_Data_Deletion avp_AAA_3GPP_Subscription_Data_Deletion,
 	MIPv6_NONE_Chargable_User_Identity avp_MIPv6_NONE_Chargable_User_Identity,
 	AAA_3GPP_Trace_Collection_Entity avp_AAA_3GPP_Trace_Collection_Entity,
+	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,
+	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,
 	MIPv6_NONE_MIP_MN_AAA_SPI avp_MIPv6_NONE_MIP_MN_AAA_SPI,
+	GI_3GPP_3GPP_SGSN_Address avp_GI_3GPP_3GPP_SGSN_Address,
 	MIPv6_NONE_MIP_MSA_Lifetime avp_MIPv6_NONE_MIP_MSA_Lifetime,
+	GI_3GPP_External_Identifier avp_GI_3GPP_External_Identifier,
 	S6_3GPP_Reachability_Type avp_S6_3GPP_Reachability_Type,
+	DNAS_NONE_Tunnel_Private_Group_Id avp_DNAS_NONE_Tunnel_Private_Group_Id,
+	DNAS_NONE_Framed_Route avp_DNAS_NONE_Framed_Route,
+	DCC_NONE_CC_Request_Type avp_DCC_NONE_CC_Request_Type,
 	S6_3GPP_Type_Of_External_Identifier avp_S6_3GPP_Type_Of_External_Identifier,
 	PCC_3GPP_Event_Report_Indication avp_PCC_3GPP_Event_Report_Indication,
 	AAA_3GPP_MDT_Configuration avp_AAA_3GPP_MDT_Configuration,
 	PCC_3GPP_Usage_Monitoring_Report avp_PCC_3GPP_Usage_Monitoring_Report,
+	CxDx_3GPP_Priviledged_Sender_Indication avp_CxDx_3GPP_Priviledged_Sender_Indication,
 	AAA_3GPP_Adjacent_Access_Restriction_Data avp_AAA_3GPP_Adjacent_Access_Restriction_Data,
 	AAA_3GPP_RAT_Frequency_Selection_Priority_ID avp_AAA_3GPP_RAT_Frequency_Selection_Priority_ID,
+	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_ULR_Flags avp_AAA_3GPP_ULR_Flags,
+	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,
+	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,
 	BASE_NONE_Origin_Realm avp_BASE_NONE_Origin_Realm,
 	AAA_3GPP_PDN_Type avp_AAA_3GPP_PDN_Type,
+	DNAS_NONE_Prompt avp_DNAS_NONE_Prompt,
+	GI_3GPP_3GPP_GGSN_IPv6_Address avp_GI_3GPP_3GPP_GGSN_IPv6_Address,
 	RX_3GPP_Access_Network_Charging_Identifier avp_RX_3GPP_Access_Network_Charging_Identifier,
+	DCC_NONE_Redirect_Server avp_DCC_NONE_Redirect_Server,
 	S6_3GPP_AESE_Communication_Pattern_Config_Status avp_S6_3GPP_AESE_Communication_Pattern_Config_Status,
 	S6_3GPP_Enhanced_Coverage_Restriction_Data avp_S6_3GPP_Enhanced_Coverage_Restriction_Data,
 	PCC_3GPP_Bearer_Operation avp_PCC_3GPP_Bearer_Operation,
@@ -4917,21 +6917,29 @@
 	PCC_3GPP_TDF_Application_Instance_Identifier avp_PCC_3GPP_TDF_Application_Instance_Identifier,
 	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,
 	S6_3GPP_MONTE_Location_Type avp_S6_3GPP_MONTE_Location_Type,
 	AAA_3GPP_RDS_Indicator avp_AAA_3GPP_RDS_Indicator,
+	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,
 	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,
 	AAA_3GPP_User_Id avp_AAA_3GPP_User_Id,
+	DNAS_NONE_Login_LAT_Node avp_DNAS_NONE_Login_LAT_Node,
+	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,
 	AAA_3GPP_EPS_User_State avp_AAA_3GPP_EPS_User_State,
 	BASE_NONE_Origin_Host avp_BASE_NONE_Origin_Host,
 	RX_3GPP_Retry_Interval avp_RX_3GPP_Retry_Interval,
 	BASE_NONE_Accounting_Session_Id avp_BASE_NONE_Accounting_Session_Id,
+	DCC_NONE_Restriction_Filter_Rule avp_DCC_NONE_Restriction_Filter_Rule,
 	PCC_3GPP_Packet_Filter_Identifier avp_PCC_3GPP_Packet_Filter_Identifier,
 	S6_3GPP_SCEF_Reference_ID avp_S6_3GPP_SCEF_Reference_ID,
 	PCC_3GPP_Resource_Release_Notification avp_PCC_3GPP_Resource_Release_Notification,
@@ -4940,23 +6948,33 @@
 	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,
 	BASE_NONE_Accounting_Record_Type avp_BASE_NONE_Accounting_Record_Type,
+	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,
+	DCC_NONE_Value_Digits avp_DCC_NONE_Value_Digits,
 	AAA_3GPP_VPLMN_Dynamic_Address_Allowed avp_AAA_3GPP_VPLMN_Dynamic_Address_Allowed,
 	BASE_NONE_Acct_Application_Id avp_BASE_NONE_Acct_Application_Id,
+	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,
+	DCC_NONE_Final_Unit_Indication avp_DCC_NONE_Final_Unit_Indication,
 	AAA_3GPP_XRES avp_AAA_3GPP_XRES,
+	GI_3GPP_3GPP_IMSI avp_GI_3GPP_3GPP_IMSI,
 	AAA_3GPP_User_State avp_AAA_3GPP_User_State,
 	BASE_NONE_Result_Code avp_BASE_NONE_Result_Code,
+	DNAS_NONE_Framed_IP_Address avp_DNAS_NONE_Framed_IP_Address,
 	S6_3GPP_IP_SM_GW_Realm avp_S6_3GPP_IP_SM_GW_Realm,
 	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,
 	RX_3GPP_Min_Desired_Bandwidth_DL avp_RX_3GPP_Min_Desired_Bandwidth_DL,
 	S6_3GPP_Group_Reporting_Guard_Timer avp_S6_3GPP_Group_Reporting_Guard_Timer,
+	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,
 	S6_3GPP_Maximum_Number_of_Reports avp_S6_3GPP_Maximum_Number_of_Reports,
@@ -4964,17 +6982,21 @@
 	AAA_3GPP_V2X_Permission avp_AAA_3GPP_V2X_Permission,
 	AAA_3GPP_LIPA_Permission avp_AAA_3GPP_LIPA_Permission,
 	PCC_3GPP_QoS_Negotiation avp_PCC_3GPP_QoS_Negotiation,
+	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,
+	CxDx_3GPP_Multiple_Registration_Indication avp_CxDx_3GPP_Multiple_Registration_Indication,
 	BASE_NONE_Vendor_Specific_Application_Id avp_BASE_NONE_Vendor_Specific_Application_Id,
 	AAA_3GPP_WLAN_offloadability_UTRAN avp_AAA_3GPP_WLAN_offloadability_UTRAN,
 	AAA_3GPP_CSG_Subscription_Data avp_AAA_3GPP_CSG_Subscription_Data,
 	MIPv6_NONE_Service_Selection avp_MIPv6_NONE_Service_Selection,
 	AAA_3GPP_TS_Code avp_AAA_3GPP_TS_Code,
+	DNAS_NONE_Tunnel_Client_Endpoint avp_DNAS_NONE_Tunnel_Client_Endpoint,
 	S6_3GPP_IP_SM_GW_Number avp_S6_3GPP_IP_SM_GW_Number,
 	PCC_3GPP_Charging_Rule_Install avp_PCC_3GPP_Charging_Rule_Install,
 	RX_3GPP_Rx_Request_Type avp_RX_3GPP_Rx_Request_Type,
 	S6_3GPP_NIDD_Authorization_Response avp_S6_3GPP_NIDD_Authorization_Response,
+	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,
 	S6_3GPP_Communication_Duration_Time avp_S6_3GPP_Communication_Duration_Time,
@@ -4983,14 +7005,20 @@
 	AAA_3GPP_Location_Area_Identity avp_AAA_3GPP_Location_Area_Identity,
 	RX_3GPP_Media_Component_Status avp_RX_3GPP_Media_Component_Status,
 	AAA_3GPP_eDRX_Cycle_Length_Value avp_AAA_3GPP_eDRX_Cycle_Length_Value,
+	CxDx_3GPP_Visited_Network_Identifier avp_CxDx_3GPP_Visited_Network_Identifier,
 	S6_3GPP_RIR_Flags avp_S6_3GPP_RIR_Flags,
 	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,
 	PCC_3GPP_Extended_APN_AMBR_UL avp_PCC_3GPP_Extended_APN_AMBR_UL,
+	CxDx_3GPP_Identity_with_Emergency_Registration avp_CxDx_3GPP_Identity_with_Emergency_Registration,
+	DCC_NONE_Tariff_Change_Usage avp_DCC_NONE_Tariff_Change_Usage,
 	AAA_3GPP_LCS_PrivacyException avp_AAA_3GPP_LCS_PrivacyException,
 	AAA_3GPP_QoS_Subscribed avp_AAA_3GPP_QoS_Subscribed,
+	DNAS_NONE_NAS_IP_Address avp_DNAS_NONE_NAS_IP_Address,
 	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,
 	PCC_3GPP_APN_Aggregate_Max_Bitrate_DL avp_PCC_3GPP_APN_Aggregate_Max_Bitrate_DL,
 	S6_3GPP_SCS_Identity avp_S6_3GPP_SCS_Identity,
 	RX_3GPP_Access_Network_Charging_Address avp_RX_3GPP_Access_Network_Charging_Address,
@@ -5001,19 +7029,29 @@
 	AAA_3GPP_UE_Usage_Type avp_AAA_3GPP_UE_Usage_Type,
 	PCC_3GPP_TDF_IP_Address avp_PCC_3GPP_TDF_IP_Address,
 	S6_3GPP_Enhanced_Coverage_Restriction avp_S6_3GPP_Enhanced_Coverage_Restriction,
+	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,
+	DCC_NONE_CC_Correlation_Id avp_DCC_NONE_CC_Correlation_Id,
 	PCC_3GPP_Traffic_Steering_Policy_Identifier_UL avp_PCC_3GPP_Traffic_Steering_Policy_Identifier_UL,
 	BASE_NONE_Route_Record avp_BASE_NONE_Route_Record,
 	AAA_3GPP_Carrier_Frequency avp_AAA_3GPP_Carrier_Frequency,
+	CxDx_3GPP_Mandatory_Capability avp_CxDx_3GPP_Mandatory_Capability,
 	AAA_3GPP_Trace_NE_Type_List avp_AAA_3GPP_Trace_NE_Type_List,
+	DNAS_NONE_Port_Limit avp_DNAS_NONE_Port_Limit,
+	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,
+	GI_3GPP_3GPP_MS_TimeZone avp_GI_3GPP_3GPP_MS_TimeZone,
 	AAA_3GPP_External_Client avp_AAA_3GPP_External_Client,
 	BASE_NONE_Authorization_Lifetime avp_BASE_NONE_Authorization_Lifetime,
+	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,
+	DNAS_NONE_Accounting_Auth_Method avp_DNAS_NONE_Accounting_Auth_Method,
 	RX_3GPP_Service_URN avp_RX_3GPP_Service_URN,
 	S6_3GPP_Supported_Services avp_S6_3GPP_Supported_Services,
+	DNAS_NONE_Accounting_Output_Packets avp_DNAS_NONE_Accounting_Output_Packets,
 	AAA_3GPP_Relay_Node_Indicator avp_AAA_3GPP_Relay_Node_Indicator,
 	PCC_3GPP_Rule_DeActivation_Time avp_PCC_3GPP_Rule_DeActivation_Time,
 	S6_3GPP_T4_Data avp_S6_3GPP_T4_Data,
@@ -5022,13 +7060,23 @@
 	PCC_3GPP_ADC_Rule_Base_Name avp_PCC_3GPP_ADC_Rule_Base_Name,
 	AAA_3GPP_SCEF_Realm avp_AAA_3GPP_SCEF_Realm,
 	S6_3GPP_Requested_Validity_Time avp_S6_3GPP_Requested_Validity_Time,
+	DCC_NONE_CC_Request_Number avp_DCC_NONE_CC_Request_Number,
+	CxDx_3GPP_Supported_Features avp_CxDx_3GPP_Supported_Features,
 	AAA_3GPP_Local_Time_Zone avp_AAA_3GPP_Local_Time_Zone,
 	AAA_3GPP_GERAN_Vector avp_AAA_3GPP_GERAN_Vector,
+	CxDx_3GPP_Call_ID_SIP_Header avp_CxDx_3GPP_Call_ID_SIP_Header,
 	AAA_3GPP_EPS_Subscribed_QoS_Profile avp_AAA_3GPP_EPS_Subscribed_QoS_Profile,
+	GI_3GPP_3GPP_Session_Stop_Indicator avp_GI_3GPP_3GPP_Session_Stop_Indicator,
 	AAA_3GPP_GPRS_Subscription_Data avp_AAA_3GPP_GPRS_Subscription_Data,
+	GI_3GPP_3GPP_GPRS_Negotiated_QoS_Profile avp_GI_3GPP_3GPP_GPRS_Negotiated_QoS_Profile,
+	DNAS_NONE_Called_Station_Id avp_DNAS_NONE_Called_Station_Id,
+	DCC_NONE_Cost_Unit avp_DCC_NONE_Cost_Unit,
 	BASE_NONE_Accounting_Realtime_Required avp_BASE_NONE_Accounting_Realtime_Required,
 	BASE_NONE_Termination_Cause avp_BASE_NONE_Termination_Cause,
+	GI_3GPP_3GPP_Allocate_IP_Type avp_GI_3GPP_3GPP_Allocate_IP_Type,
 	RX_3GPP_Specific_Action avp_RX_3GPP_Specific_Action,
+	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,
 	AAA_3GPP_Ext_PDP_Address avp_AAA_3GPP_Ext_PDP_Address,
 	PCC_3GPP_RAT_Type avp_PCC_3GPP_RAT_Type,
@@ -5036,10 +7084,14 @@
 	AAA_3GPP_Adjacent_PLMNs avp_AAA_3GPP_Adjacent_PLMNs,
 	S6_3GPP_Service_Result_Code avp_S6_3GPP_Service_Result_Code,
 	AAA_3GPP_SGSN_Location_Information avp_AAA_3GPP_SGSN_Location_Information,
+	CxDx_3GPP_Reason_Code avp_CxDx_3GPP_Reason_Code,
 	PCC_3GPP_Pre_emption_Vulnerability avp_PCC_3GPP_Pre_emption_Vulnerability,
 	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,
+	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,
@@ -5076,7 +7128,12 @@
 	variant (avp_header) "LENGTHTO(avp_header, avp_data)"
 	variant (avp_header) "LENGTHINDEX(avp_length)"
 	variant (avp_data) "CROSSTAG(
+		avp_GI_3GPP_3GPP_SGSN_IPv6_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_SGSN_IPv6_Address;
+		avp_DNAS_NONE_Login_LAT_Service, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Login_LAT_Service;
+		avp_GI_3GPP_3GPP_GGSN_MCC_MNC, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_GGSN_MCC_MNC;
+		avp_DCC_NONE_Direct_Debiting_Failure_Handling, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Direct_Debiting_Failure_Handling;
 		avp_MIPv6_NONE_MIP_Careof_Address, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP_Careof_Address;
+		avp_CxDx_ETSI_Line_Identifier, avp_header.avp_code.vendor_id_ETSI = avp_code_CxDx_ETSI_Line_Identifier;
 		avp_PCC_3GPP_Bearer_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Bearer_Identifier;
 		avp_RX_3GPP_Content_Version, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Content_Version;
 		avp_BASE_NONE_Session_Id, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Session_Id;
@@ -5087,15 +7144,23 @@
 		avp_PCC_3GPP_Bearer_Usage, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Bearer_Usage;
 		avp_PCC_3GPP_Tunnel_Header_Filter, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Tunnel_Header_Filter;
 		avp_AAA_3GPP_List_Of_Measurements, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_List_Of_Measurements;
+		avp_DCC_NONE_Requested_Service_Unit, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Requested_Service_Unit;
 		avp_PCC_3GPP_Default_QoS_Name, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Default_QoS_Name;
 		avp_AAA_3GPP_UVA_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_UVA_Flags;
+		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_DNAS_NONE_Framed_Pool, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Framed_Pool;
+		avp_DCC_NONE_CC_Time, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_CC_Time;
 		avp_AAA_3GPP_Requested_EUTRAN_Authentication_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Requested_EUTRAN_Authentication_Info;
+		avp_CxDx_3GPP_SIP_Digest_Authenticate, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_SIP_Digest_Authenticate;
 		avp_AAA_3GPP_Last_UE_Activity_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Last_UE_Activity_Time;
 		avp_AAA_3GPP_Context_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Context_Identifier;
+		avp_DCC_NONE_Used_Service_Unit, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Used_Service_Unit;
 		avp_BASE_NONE_Auth_Application_Id, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Auth_Application_Id;
 		avp_AAA_3GPP_Trace_Reference, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Trace_Reference;
+		avp_DNAS_NONE_Framed_Appletalk_Network, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Framed_Appletalk_Network;
+		avp_DNAS_NONE_Framed_IPv6_Prefix, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Framed_IPv6_Prefix;
 		avp_RX_3GPP_Sharing_Key_UL, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Sharing_Key_UL;
 		avp_RX_3GPP_AF_Charging_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_AF_Charging_Identifier;
 		avp_S6_3GPP_Monitoring_Event_Report, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Monitoring_Event_Report;
@@ -5110,7 +7175,9 @@
 		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_S6_3GPP_Roaming_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Roaming_Information;
+		avp_CxDx_3GPP_SIP_Authentication_Scheme, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_SIP_Authentication_Scheme;
 		avp_AAA_3GPP_Event_Threshold_RSRP, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Event_Threshold_RSRP;
+		avp_CxDx_3GPP_User_Authorization_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_User_Authorization_Type;
 		avp_AAA_3GPP_PLMN_Client, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_PLMN_Client;
 		avp_AAA_3GPP_Re_Synchronization_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Re_Synchronization_Info;
 		avp_BASE_NONE_Auth_Grace_Period, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Auth_Grace_Period;
@@ -5120,10 +7187,13 @@
 		avp_AAA_3GPP_APN_OI_Replacement, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_APN_OI_Replacement;
 		avp_BASE_NONE_Re_Auth_Request_Type, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Re_Auth_Request_Type;
 		avp_S6_3GPP_External_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_External_Identifier;
+		avp_DCC_NONE_Redirect_Address_Type, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Redirect_Address_Type;
 		avp_MIPv6_NONE_MIP_MN_HA_MSA, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP_MN_HA_MSA;
 		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_DCC_NONE_User_Equipment_Info_Type, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_User_Equipment_Info_Type;
 		avp_RX_3GPP_Flow_Number, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Flow_Number;
 		avp_PCC_3GPP_Resource_Allocation_Notification, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Resource_Allocation_Notification;
 		avp_S6_3GPP_Monitoring_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Monitoring_Type;
@@ -5131,23 +7201,33 @@
 		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_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_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_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;
 		avp_AAA_3GPP_UTRAN_Vector, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_UTRAN_Vector;
+		avp_DCC_NONE_Tariff_Time_Change, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Tariff_Time_Change;
+		avp_GI_3GPP_3GPP_NSAPI, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_NSAPI;
+		avp_GI_3GPP_3GPP_CG_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_CG_Address;
 		avp_RX_3GPP_Application_Service_Provider_Identity, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Application_Service_Provider_Identity;
 		avp_S6_3GPP_NIDD_Authorization_Request, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_NIDD_Authorization_Request;
 		avp_PCC_3GPP_QoS_Rule_Install, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_QoS_Rule_Install;
 		avp_S6_3GPP_Periodic_Communication_Indicator, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Periodic_Communication_Indicator;
 		avp_RX_3GPP_Flow_Usage, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Flow_Usage;
 		avp_PCC_3GPP_RAN_Rule_Support, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_RAN_Rule_Support;
+		avp_DNAS_NONE_Tunnel_Password, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Tunnel_Password;
 		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_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_AAA_3GPP_eDRX_Cycle_Length, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_eDRX_Cycle_Length;
@@ -5159,32 +7239,52 @@
 		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_PCC_3GPP_Extended_APN_AMBR_DL, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Extended_APN_AMBR_DL;
+		avp_CxDx_3GPP_Session_Priority, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Session_Priority;
+		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_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_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_DCC_NONE_Multiple_Services_Indicator, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Multiple_Services_Indicator;
+		avp_DNAS_NONE_Framed_Protocol, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Framed_Protocol;
 		avp_S6_3GPP_Service_ID, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Service_ID;
+		avp_GI_3GPP_3GPP_IMSI_MCC_MNC, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_IMSI_MCC_MNC;
 		avp_RX_3GPP_Abort_Cause, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Abort_Cause;
 		avp_PCC_3GPP_Charging_Rule_Base_Name, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Charging_Rule_Base_Name;
 		avp_RX_3GPP_Required_Access_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Required_Access_Info;
 		avp_PCC_3GPP_TDF_Destination_Realm, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_TDF_Destination_Realm;
 		avp_S6_3GPP_S6t_HSS_Cause, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_S6t_HSS_Cause;
 		avp_RX_3GPP_AF_Requested_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_AF_Requested_Data;
+		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_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_PCC_3GPP_Traffic_Steering_Policy_Identifier_DL, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Traffic_Steering_Policy_Identifier_DL;
 		avp_AAA_3GPP_Geodetic_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Geodetic_Information;
 		avp_PCC_3GPP_Extended_GBR_UL, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Extended_GBR_UL;
 		avp_AAA_3GPP_MBSFN_Area_ID, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_MBSFN_Area_ID;
+		avp_CxDx_3GPP_Server_Capabilities, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Server_Capabilities;
 		avp_AAA_3GPP_Area_Scope, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Area_Scope;
+		avp_DNAS_NONE_Accounting_Input_Packets, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Accounting_Input_Packets;
+		avp_CxDx_3GPP_SCSCF_Restoration_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_SCSCF_Restoration_Info;
+		avp_CxDx_3GPP_Initial_CSeq_Sequence_Number, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Initial_CSeq_Sequence_Number;
 		avp_AAA_3GPP_PUA_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_PUA_Flags;
+		avp_DNAS_NONE_Callback_Id, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Callback_Id;
+		avp_CxDx_3GPP_Primary_Event_Charging_Function_Name, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Primary_Event_Charging_Function_Name;
+		avp_DCC_NONE_CC_Output_Octets, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_CC_Output_Octets;
+		avp_GI_3GPP_3GPP_User_Location_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_User_Location_Info;
 		avp_AAA_3GPP_Notification_To_UE_User, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Notification_To_UE_User;
 		avp_AAA_3GPP_Visited_PLMN_Id, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Visited_PLMN_Id;
 		avp_AAA_3GPP_Homogeneous_Support_of_IMS_Voice_Over_PS_Sessions, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Homogeneous_Support_of_IMS_Voice_Over_PS_Sessions;
 		avp_RX_3GPP_Codec_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Codec_Data;
 		avp_S6_3GPP_Monitoring_Event_Config_Status, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Monitoring_Event_Config_Status;
+		avp_DCC_NONE_Cost_Information, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Cost_Information;
 		avp_BASE_NONE_Error_Reporting_Host, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Error_Reporting_Host;
 		avp_PCC_3GPP_Rule_Activation_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Rule_Activation_Time;
 		avp_S6_3GPP_Service_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Service_Data;
@@ -5192,6 +7292,8 @@
 		avp_PCC_3GPP_NetLoc_Access_Support, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_NetLoc_Access_Support;
 		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_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;
@@ -5200,11 +7302,18 @@
 		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_CxDx_3GPP_Subscription_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Subscription_Info;
 		avp_AAA_3GPP_APN_Configuration, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_APN_Configuration;
+		avp_CxDx_3GPP_SIP_Number_Auth_Items, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_SIP_Number_Auth_Items;
 		avp_AAA_3GPP_OMC_Id, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_OMC_Id;
 		avp_AAA_3GPP_GMLC_Restriction, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_GMLC_Restriction;
+		avp_DNAS_NONE_State, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_State;
+		avp_DNAS_NONE_Tunnel_Preference, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Tunnel_Preference;
+		avp_DCC_NONE_CC_Session_Failover, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_CC_Session_Failover;
 		avp_AAA_3GPP_Regional_Subscription_Zone_Code, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Regional_Subscription_Zone_Code;
+		avp_GI_3GPP_3GPP_Negotiated_DSCP, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_Negotiated_DSCP;
 		avp_BASE_NONE_Proxy_State, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Proxy_State;
+		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_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;
@@ -5217,17 +7326,25 @@
 		avp_PCC_3GPP_Pre_emption_Capability, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Pre_emption_Capability;
 		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;
 		avp_PCC_3GPP_TCP_Source_Port, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_TCP_Source_Port;
 		avp_PCC_3GPP_Application_Detection_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Application_Detection_Information;
 		avp_AAA_3GPP_Emergency_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Emergency_Info;
 		avp_AAA_3GPP_MPS_Priority, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_MPS_Priority;
+		avp_DCC_NONE_Requested_Action, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Requested_Action;
+		avp_CxDx_3GPP_Record_Route, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Record_Route;
 		avp_AAA_3GPP_Alert_Reason, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Alert_Reason;
+		avp_GI_3GPP_3GPP_CG_IPv6_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_CG_IPv6_Address;
+		avp_DNAS_NONE_Idle_Timeout, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Idle_Timeout;
+		avp_DNAS_NONE_NAS_Port_Id, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_NAS_Port_Id;
 		avp_AAA_3GPP_MO_LR, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_MO_LR;
 		avp_BASE_NONE_Host_IP_Address, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Host_IP_Address;
 		avp_RX_3GPP_Max_Requested_Bandwidth_UL, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Max_Requested_Bandwidth_UL;
 		avp_PCC_3GPP_Usage_Monitoring_Support, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Usage_Monitoring_Support;
 		avp_S6_3GPP_Maximum_Response_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Maximum_Response_Time;
 		avp_RX_3GPP_Sponsor_Identity, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Sponsor_Identity;
+		avp_DNAS_NONE_Framed_Appletalk_Link, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Framed_Appletalk_Link;
+		avp_DNAS_NONE_Framed_Interface_Id, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Framed_Interface_Id;
 		avp_PCC_3GPP_CoA_IP_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_CoA_IP_Address;
 		avp_PCC_3GPP_Default_QoS_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Default_QoS_Information;
 		avp_PCC_3GPP_AN_GW_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_AN_GW_Address;
@@ -5237,72 +7354,104 @@
 		avp_AAA_3GPP_Cell_Global_Identity, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Cell_Global_Identity;
 		avp_BASE_NONE_Vendor_Id, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Vendor_Id;
 		avp_AAA_3GPP_PDN_Connection_Continuity, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_PDN_Connection_Continuity;
+		avp_CxDx_3GPP_Wildcarded_Public_Identity, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Wildcarded_Public_Identity;
+		avp_DNAS_NONE_Acct_Session_Time, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Acct_Session_Time;
 		avp_AAA_3GPP_DSA_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_DSA_Flags;
 		avp_AAA_3GPP_Trace_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Trace_Data;
 		avp_AAA_3GPP_LCS_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_LCS_Info;
 		avp_AAA_3GPP_PDN_GW_Allocation_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_PDN_GW_Allocation_Type;
+		avp_GI_3GPP_3GPP_SGSN_MCC_MNC, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_SGSN_MCC_MNC;
 		avp_BASE_NONE_Event_Timestamp, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Event_Timestamp;
+		avp_DCC_NONE_Final_Unit_Action, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Final_Unit_Action;
 		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_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_AAA_3GPP_Restoration_Priority, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Restoration_Priority;
+		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_RX_3GPP_Min_Requested_Bandwidth_UL, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Min_Requested_Bandwidth_UL;
 		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_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;
 		avp_MIPv6_NONE_MIP_Mobile_Node_Address, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP_Mobile_Node_Address;
 		avp_PCC_3GPP_Routing_Rule_Report, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Routing_Rule_Report;
 		avp_AAA_3GPP_Number_Of_Requested_Vectors, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Number_Of_Requested_Vectors;
 		avp_AAA_3GPP_AIR_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_AIR_Flags;
 		avp_AAA_3GPP_Geographical_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Geographical_Information;
+		avp_CxDx_3GPP_Loose_Route_Indication, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Loose_Route_Indication;
+		avp_DCC_NONE_Service_Parameter_Type, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Service_Parameter_Type;
 		avp_AAA_3GPP_MME_User_State, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_MME_User_State;
 		avp_AAA_3GPP_Access_Restriction_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Access_Restriction_Data;
 		avp_BASE_NONE_Failed_AVP, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Failed_AVP;
+		avp_GI_3GPP_3GPP_RAT_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_RAT_Type;
 		avp_AAA_3GPP_SS_Status, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_SS_Status;
 		avp_S6_3GPP_NIDD_Authorization_Update, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_NIDD_Authorization_Update;
+		avp_DCC_NONE_Subscription_Id_Type, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Subscription_Id_Type;
 		avp_PCC_3GPP_Packet_Filter_Operation, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Packet_Filter_Operation;
 		avp_S6_3GPP_SCEF_Reference_ID_for_Deletion, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_SCEF_Reference_ID_for_Deletion;
 		avp_RX_3GPP_SIP_Forking_Indication, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_SIP_Forking_Indication;
+		avp_DNAS_NONE_User_Password, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_User_Password;
 		avp_S6_3GPP_IMEI_Change, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_IMEI_Change;
 		avp_PCC_3GPP_IP_CAN_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_IP_CAN_Type;
 		avp_RX_3GPP_Extended_Min_Desired_BW_UL, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Extended_Min_Desired_BW_UL;
+		avp_CxDx_3GPP_SIP_Authorization, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_SIP_Authorization;
 		avp_PCC_3GPP_Revalidation_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Revalidation_Time;
 		avp_AAA_3GPP_Logging_Interval, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Logging_Interval;
 		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_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;
 		avp_AAA_3GPP_Non_IP_Data_Delivery_Mechanism, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Non_IP_Data_Delivery_Mechanism;
+		avp_DNAS_NONE_NAS_Filter_Rule, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_NAS_Filter_Rule;
 		avp_BASE_NONE_Session_Server_Failover, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Session_Server_Failover;
+		avp_CxDx_3GPP_Integrity_Key, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Integrity_Key;
 		avp_AAA_3GPP_E_UTRAN_Vector, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_E_UTRAN_Vector;
 		avp_BASE_NONE_Experimental_Result, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Experimental_Result;
+		avp_DNAS_NONE_Acct_Link_Count, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Acct_Link_Count;
+		avp_DCC_NONE_Unit_Value, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Unit_Value;
 		avp_AAA_3GPP_Trace_Event_List, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Trace_Event_List;
+		avp_GI_3GPP_3GPP_PDP_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_PDP_Type;
+		avp_DNAS_NONE_Reply_Message, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Reply_Message;
+		avp_DNAS_NONE_Connect_Info, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Connect_Info;
 		avp_MIPv6_NONE_MIP_Replay_Mode, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP_Replay_Mode;
 		avp_BASE_NONE_Proxy_Host, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Proxy_Host;
 		avp_S6_3GPP_Communication_Pattern_Set, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Communication_Pattern_Set;
 		avp_RX_3GPP_Flow_Status, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Flow_Status;
+		avp_DNAS_NONE_CHAP_Challenge, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_CHAP_Challenge;
+		avp_DCC_NONE_CC_Unit_Type, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_CC_Unit_Type;
 		avp_RX_3GPP_MCPTT_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_MCPTT_Identifier;
 		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_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_PCC_3GPP_Monitoring_Key, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Monitoring_Key;
 		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_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_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_AAA_3GPP_Kc, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Kc;
 		avp_AAA_3GPP_SGSN_Number, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_SGSN_Number;
 		avp_AAA_3GPP_HPLMN_ODB, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_HPLMN_ODB;
+		avp_GI_3GPP_3GPP_Charging_Characteristics, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_Charging_Characteristics;
 		avp_AAA_3GPP_PDP_Context, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_PDP_Context;
+		avp_DCC_NONE_CC_Money, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_CC_Money;
+		avp_GI_3GPP_3GPP_GGSN_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_GGSN_Address;
 		avp_BASE_NONE_Proxy_Info, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Proxy_Info;
 		avp_S6_3GPP_Node_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Node_Type;
 		avp_RX_3GPP_Priority_Sharing_Indicator, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Priority_Sharing_Indicator;
+		avp_DNAS_NONE_Tunnel_Type, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Tunnel_Type;
 		avp_PCC_3GPP_QoS_Rule_Name, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_QoS_Rule_Name;
 		avp_S6_3GPP_Scheduled_Communication_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Scheduled_Communication_Time;
 		avp_RX_3GPP_Max_Requested_Bandwidth_DL, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Max_Requested_Bandwidth_DL;
@@ -5310,16 +7459,26 @@
 		avp_PCC_3GPP_PCC_Rule_Status, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_PCC_Rule_Status;
 		avp_PCC_3GPP_Extended_GBR_DL, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Extended_GBR_DL;
 		avp_AAA_3GPP_MBSFN_Area, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_MBSFN_Area;
+		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_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_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_Origin_AAA_Protocol, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Origin_AAA_Protocol;
+		avp_CxDx_3GPP_Charging_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Charging_Information;
 		avp_AAA_3GPP_ULA_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_ULA_Flags;
 		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_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_DCC_NONE_CC_Service_Specific_Units, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_CC_Service_Specific_Units;
 		avp_S6_3GPP_T4_Parameters, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_T4_Parameters;
 		avp_RX_3GPP_Access_Network_Charging_Identifier_Value, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Access_Network_Charging_Identifier_Value;
 		avp_S6_3GPP_AESE_Error_Report, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_AESE_Error_Report;
@@ -5330,17 +7489,25 @@
 		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_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_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_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_CxDx_3GPP_User_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_User_Data;
 		avp_AAA_3GPP_Report_Interval, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Report_Interval;
 		avp_PCC_3GPP_RAN_NAS_Release_Cause, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_RAN_NAS_Release_Cause;
 		avp_AAA_3GPP_Client_Identity, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Client_Identity;
 		avp_BASE_NONE_Redirect_Host_Usage, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Redirect_Host_Usage;
 		avp_AAA_3GPP_Equipment_Status, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Equipment_Status;
+		avp_GI_3GPP_3GPP_Packet_Filter, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_Packet_Filter;
+		avp_DCC_NONE_Redirect_Server_Address, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Redirect_Server_Address;
 		avp_MIPv6_NONE_MIP6_Auth_Mode, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP6_Auth_Mode;
 		avp_AAA_3GPP_EPS_Location_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_EPS_Location_Information;
+		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_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;
@@ -5357,33 +7524,48 @@
 		avp_PCC_3GPP_ADC_Rule_Report, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_ADC_Rule_Report;
 		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_DNAS_NONE_Login_LAT_Group, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Login_LAT_Group;
 		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;
 		avp_AAA_3GPP_Coupled_Node_Diameter_ID, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Coupled_Node_Diameter_ID;
 		avp_AAA_3GPP_STN_SR, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_STN_SR;
 		avp_BASE_NONE_Supported_Vendor_Id, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Supported_Vendor_Id;
 		avp_AAA_3GPP_ServiceTypeIdentity, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_ServiceTypeIdentity;
+		avp_DNAS_NONE_Acct_Authentic, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Acct_Authentic;
+		avp_DCC_NONE_Service_Identifier, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Service_Identifier;
 		avp_AAA_3GPP_AUTN, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_AUTN;
+		avp_GI_3GPP_TWAN_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_TWAN_Identifier;
 		avp_RX_3GPP_Sponsored_Connectivity_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Sponsored_Connectivity_Data;
 		avp_BASE_NONE_Auth_Request_Type, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Auth_Request_Type;
 		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_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_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_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_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_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_AAA_3GPP_Subscribed_Periodic_RAU_TAU_Timer, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Subscribed_Periodic_RAU_TAU_Timer;
 		avp_AAA_3GPP_Specific_APN_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Specific_APN_Info;
 		avp_AAA_3GPP_Terminal_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Terminal_Information;
+		avp_CxDx_3GPP_Restoration_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Restoration_Info;
 		avp_BASE_NONE_Product_Name, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Product_Name;
 		avp_AAA_3GPP_CSG_Id, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_CSG_Id;
+		avp_DNAS_NONE_Framed_IP_Netmask, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Framed_IP_Netmask;
+		avp_GI_3GPP_3GPP_IPv6_DNS_Servers, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_IPv6_DNS_Servers;
 		avp_AAA_3GPP_Call_Barring_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Call_Barring_Info;
+		avp_DCC_NONE_Service_Parameter_Info, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Service_Parameter_Info;
 		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_RX_3GPP_Media_Sub_Component, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Media_Sub_Component;
@@ -5392,6 +7574,7 @@
 		avp_RX_3GPP_Min_Requested_Bandwidth_DL, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Min_Requested_Bandwidth_DL;
 		avp_S6_3GPP_Service_Report, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Service_Report;
 		avp_PCC_3GPP_Tunnel_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Tunnel_Information;
+		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_S6_3GPP_Periodic_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Periodic_Time;
@@ -5402,12 +7585,18 @@
 		avp_PCC_3GPP_Charging_Rule_Report, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Charging_Rule_Report;
 		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;
 		avp_BASE_NONE_Accounting_Sub_Session_Id, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Accounting_Sub_Session_Id;
+		avp_DNAS_NONE_Acct_Delay_Time, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Acct_Delay_Time;
+		avp_CxDx_3GPP_UAR_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_UAR_Flags;
 		avp_AAA_3GPP_Collection_Period_RRM_UMTS, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Collection_Period_RRM_UMTS;
 		avp_AAA_3GPP_Operator_Determined_Barring, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Operator_Determined_Barring;
+		avp_DNAS_NONE_Tunnel_Server_Endpoint, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Tunnel_Server_Endpoint;
 		avp_BASE_NONE_Session_Binding, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Session_Binding;
+		avp_GI_3GPP_3GPP_IMEISV, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_IMEISV;
 		avp_AAA_3GPP_SS_Code, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_SS_Code;
 		avp_BASE_NONE_Acct_Multi_Session_Id, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Acct_Multi_Session_Id;
+		avp_DCC_NONE_Subscription_Id_Data, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Subscription_Id_Data;
 		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;
@@ -5420,49 +7609,77 @@
 		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_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_CxDx_3GPP_Confidentiality_Key, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Confidentiality_Key;
 		avp_PCC_3GPP_Flow_Label, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Flow_Label;
+		avp_DNAS_NONE_NAS_Port, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_NAS_Port;
 		avp_AAA_3GPP_Authentication_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Authentication_Info;
 		avp_AAA_3GPP_Trace_Interface_List, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Trace_Interface_List;
+		avp_GI_3GPP_3GPP_Charging_Id, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_Charging_Id;
+		avp_DNAS_NONE_CHAP_Algorithm, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_CHAP_Algorithm;
 		avp_AAA_3GPP_APN_Configuration_Profile, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_APN_Configuration_Profile;
+		avp_GI_3GPP_3GPP_CAMEL_Charging_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_CAMEL_Charging_Info;
 		avp_RX_3GPP_Flows, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Flows;
 		avp_S6_3GPP_CIA_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_CIA_Flags;
 		avp_RX_3GPP_Extended_Min_Requested_BW_UL, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Extended_Min_Requested_BW_UL;
 		avp_PCC_3GPP_Monitoring_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Monitoring_Time;
+		avp_DCC_NONE_CC_Input_Octets, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_CC_Input_Octets;
 		avp_S6_3GPP_UE_Reachability_Configuration, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_UE_Reachability_Configuration;
 		avp_BASE_NONE_Destination_Realm, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Destination_Realm;
 		avp_RX_3GPP_Acceptable_Service_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Acceptable_Service_Info;
 		avp_PCC_3GPP_Flow_Direction, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Flow_Direction;
 		avp_S6_3GPP_Supported_Monitoring_Events, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Supported_Monitoring_Events;
+		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_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_AAA_3GPP_Subscription_Data_Deletion, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Subscription_Data_Deletion;
 		avp_MIPv6_NONE_Chargable_User_Identity, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_Chargable_User_Identity;
 		avp_AAA_3GPP_Trace_Collection_Entity, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Trace_Collection_Entity;
+		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_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;
 		avp_MIPv6_NONE_MIP_MN_AAA_SPI, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP_MN_AAA_SPI;
+		avp_GI_3GPP_3GPP_SGSN_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_SGSN_Address;
 		avp_MIPv6_NONE_MIP_MSA_Lifetime, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_MIP_MSA_Lifetime;
+		avp_GI_3GPP_External_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_External_Identifier;
 		avp_S6_3GPP_Reachability_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Reachability_Type;
+		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_DCC_NONE_CC_Request_Type, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_CC_Request_Type;
 		avp_S6_3GPP_Type_Of_External_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Type_Of_External_Identifier;
 		avp_PCC_3GPP_Event_Report_Indication, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Event_Report_Indication;
 		avp_AAA_3GPP_MDT_Configuration, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_MDT_Configuration;
 		avp_PCC_3GPP_Usage_Monitoring_Report, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Usage_Monitoring_Report;
+		avp_CxDx_3GPP_Priviledged_Sender_Indication, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Priviledged_Sender_Indication;
 		avp_AAA_3GPP_Adjacent_Access_Restriction_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Adjacent_Access_Restriction_Data;
 		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_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_ULR_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_ULR_Flags;
+		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_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;
 		avp_BASE_NONE_Origin_Realm, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Origin_Realm;
 		avp_AAA_3GPP_PDN_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_PDN_Type;
+		avp_DNAS_NONE_Prompt, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Prompt;
+		avp_GI_3GPP_3GPP_GGSN_IPv6_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_GGSN_IPv6_Address;
 		avp_RX_3GPP_Access_Network_Charging_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Access_Network_Charging_Identifier;
+		avp_DCC_NONE_Redirect_Server, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Redirect_Server;
 		avp_S6_3GPP_AESE_Communication_Pattern_Config_Status, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_AESE_Communication_Pattern_Config_Status;
 		avp_S6_3GPP_Enhanced_Coverage_Restriction_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Enhanced_Coverage_Restriction_Data;
 		avp_PCC_3GPP_Bearer_Operation, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Bearer_Operation;
@@ -5471,21 +7688,29 @@
 		avp_PCC_3GPP_TDF_Application_Instance_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_TDF_Application_Instance_Identifier;
 		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_S6_3GPP_MONTE_Location_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_MONTE_Location_Type;
 		avp_AAA_3GPP_RDS_Indicator, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_RDS_Indicator;
+		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_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;
 		avp_AAA_3GPP_User_Id, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_User_Id;
+		avp_DNAS_NONE_Login_LAT_Node, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Login_LAT_Node;
+		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_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_RX_3GPP_Retry_Interval, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Retry_Interval;
 		avp_BASE_NONE_Accounting_Session_Id, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Accounting_Session_Id;
+		avp_DCC_NONE_Restriction_Filter_Rule, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Restriction_Filter_Rule;
 		avp_PCC_3GPP_Packet_Filter_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Packet_Filter_Identifier;
 		avp_S6_3GPP_SCEF_Reference_ID, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_SCEF_Reference_ID;
 		avp_PCC_3GPP_Resource_Release_Notification, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Resource_Release_Notification;
@@ -5494,23 +7719,33 @@
 		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_BASE_NONE_Accounting_Record_Type, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Accounting_Record_Type;
+		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_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_BASE_NONE_Acct_Application_Id, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Acct_Application_Id;
+		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_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_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;
 		avp_BASE_NONE_Result_Code, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Result_Code;
+		avp_DNAS_NONE_Framed_IP_Address, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Framed_IP_Address;
 		avp_S6_3GPP_IP_SM_GW_Realm, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_IP_SM_GW_Realm;
 		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_RX_3GPP_Min_Desired_Bandwidth_DL, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Min_Desired_Bandwidth_DL;
 		avp_S6_3GPP_Group_Reporting_Guard_Timer, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Group_Reporting_Guard_Timer;
+		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_S6_3GPP_Maximum_Number_of_Reports, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Maximum_Number_of_Reports;
@@ -5518,17 +7753,21 @@
 		avp_AAA_3GPP_V2X_Permission, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_V2X_Permission;
 		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_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;
+		avp_CxDx_3GPP_Multiple_Registration_Indication, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Multiple_Registration_Indication;
 		avp_BASE_NONE_Vendor_Specific_Application_Id, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Vendor_Specific_Application_Id;
 		avp_AAA_3GPP_WLAN_offloadability_UTRAN, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_WLAN_offloadability_UTRAN;
 		avp_AAA_3GPP_CSG_Subscription_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_CSG_Subscription_Data;
 		avp_MIPv6_NONE_Service_Selection, avp_header.avp_code.vendor_id_NONE = avp_code_MIPv6_NONE_Service_Selection;
 		avp_AAA_3GPP_TS_Code, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_TS_Code;
+		avp_DNAS_NONE_Tunnel_Client_Endpoint, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Tunnel_Client_Endpoint;
 		avp_S6_3GPP_IP_SM_GW_Number, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_IP_SM_GW_Number;
 		avp_PCC_3GPP_Charging_Rule_Install, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Charging_Rule_Install;
 		avp_RX_3GPP_Rx_Request_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Rx_Request_Type;
 		avp_S6_3GPP_NIDD_Authorization_Response, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_NIDD_Authorization_Response;
+		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_S6_3GPP_Communication_Duration_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Communication_Duration_Time;
@@ -5537,14 +7776,20 @@
 		avp_AAA_3GPP_Location_Area_Identity, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Location_Area_Identity;
 		avp_RX_3GPP_Media_Component_Status, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Media_Component_Status;
 		avp_AAA_3GPP_eDRX_Cycle_Length_Value, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_eDRX_Cycle_Length_Value;
+		avp_CxDx_3GPP_Visited_Network_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Visited_Network_Identifier;
 		avp_S6_3GPP_RIR_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_RIR_Flags;
 		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_PCC_3GPP_Extended_APN_AMBR_UL, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Extended_APN_AMBR_UL;
+		avp_CxDx_3GPP_Identity_with_Emergency_Registration, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Identity_with_Emergency_Registration;
+		avp_DCC_NONE_Tariff_Change_Usage, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Tariff_Change_Usage;
 		avp_AAA_3GPP_LCS_PrivacyException, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_LCS_PrivacyException;
 		avp_AAA_3GPP_QoS_Subscribed, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_QoS_Subscribed;
+		avp_DNAS_NONE_NAS_IP_Address, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_NAS_IP_Address;
 		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_PCC_3GPP_APN_Aggregate_Max_Bitrate_DL, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_APN_Aggregate_Max_Bitrate_DL;
 		avp_S6_3GPP_SCS_Identity, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_SCS_Identity;
 		avp_RX_3GPP_Access_Network_Charging_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Access_Network_Charging_Address;
@@ -5555,19 +7800,29 @@
 		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_S6_3GPP_Enhanced_Coverage_Restriction, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Enhanced_Coverage_Restriction;
+		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_DCC_NONE_CC_Correlation_Id, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_CC_Correlation_Id;
 		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_BASE_NONE_Route_Record, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Route_Record;
 		avp_AAA_3GPP_Carrier_Frequency, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Carrier_Frequency;
+		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_DNAS_NONE_Port_Limit, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Port_Limit;
+		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;
+		avp_GI_3GPP_3GPP_MS_TimeZone, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_MS_TimeZone;
 		avp_AAA_3GPP_External_Client, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_External_Client;
 		avp_BASE_NONE_Authorization_Lifetime, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Authorization_Lifetime;
+		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_DNAS_NONE_Accounting_Auth_Method, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Accounting_Auth_Method;
 		avp_RX_3GPP_Service_URN, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Service_URN;
 		avp_S6_3GPP_Supported_Services, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Supported_Services;
+		avp_DNAS_NONE_Accounting_Output_Packets, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Accounting_Output_Packets;
 		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_S6_3GPP_T4_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_T4_Data;
@@ -5576,13 +7831,23 @@
 		avp_PCC_3GPP_ADC_Rule_Base_Name, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_ADC_Rule_Base_Name;
 		avp_AAA_3GPP_SCEF_Realm, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_SCEF_Realm;
 		avp_S6_3GPP_Requested_Validity_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Requested_Validity_Time;
+		avp_DCC_NONE_CC_Request_Number, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_CC_Request_Number;
+		avp_CxDx_3GPP_Supported_Features, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Supported_Features;
 		avp_AAA_3GPP_Local_Time_Zone, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Local_Time_Zone;
 		avp_AAA_3GPP_GERAN_Vector, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_GERAN_Vector;
+		avp_CxDx_3GPP_Call_ID_SIP_Header, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Call_ID_SIP_Header;
 		avp_AAA_3GPP_EPS_Subscribed_QoS_Profile, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_EPS_Subscribed_QoS_Profile;
+		avp_GI_3GPP_3GPP_Session_Stop_Indicator, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_Session_Stop_Indicator;
 		avp_AAA_3GPP_GPRS_Subscription_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_GPRS_Subscription_Data;
+		avp_GI_3GPP_3GPP_GPRS_Negotiated_QoS_Profile, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_GPRS_Negotiated_QoS_Profile;
+		avp_DNAS_NONE_Called_Station_Id, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Called_Station_Id;
+		avp_DCC_NONE_Cost_Unit, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Cost_Unit;
 		avp_BASE_NONE_Accounting_Realtime_Required, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Accounting_Realtime_Required;
 		avp_BASE_NONE_Termination_Cause, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Termination_Cause;
+		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_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_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;
@@ -5590,10 +7855,14 @@
 		avp_AAA_3GPP_Adjacent_PLMNs, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Adjacent_PLMNs;
 		avp_S6_3GPP_Service_Result_Code, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Service_Result_Code;
 		avp_AAA_3GPP_SGSN_Location_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_SGSN_Location_Information;
+		avp_CxDx_3GPP_Reason_Code, avp_header.avp_code.vendor_id_3GPP = avp_code_CxDx_3GPP_Reason_Code;
 		avp_PCC_3GPP_Pre_emption_Vulnerability, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Pre_emption_Vulnerability;
 		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_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;
@@ -5603,8 +7872,18 @@
 	)"
 }
 type set of GenericAVP AVP_list;
+const AVP_Code c_AVP_Code_GI_3GPP_3GPP_SGSN_IPv6_Address := {
+	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_SGSN_IPv6_Address };
+const AVP_Code c_AVP_Code_DNAS_NONE_Login_LAT_Service := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Login_LAT_Service };
+const AVP_Code c_AVP_Code_GI_3GPP_3GPP_GGSN_MCC_MNC := {
+	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_GGSN_MCC_MNC };
+const AVP_Code c_AVP_Code_DCC_NONE_Direct_Debiting_Failure_Handling := {
+	vendor_id_NONE := avp_code_DCC_NONE_Direct_Debiting_Failure_Handling };
 const AVP_Code c_AVP_Code_MIPv6_NONE_MIP_Careof_Address := {
 	vendor_id_NONE := avp_code_MIPv6_NONE_MIP_Careof_Address };
+const AVP_Code c_AVP_Code_CxDx_ETSI_Line_Identifier := {
+	vendor_id_ETSI := avp_code_CxDx_ETSI_Line_Identifier };
 const AVP_Code c_AVP_Code_PCC_3GPP_Bearer_Identifier := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Bearer_Identifier };
 const AVP_Code c_AVP_Code_RX_3GPP_Content_Version := {
@@ -5625,24 +7904,40 @@
 	vendor_id_3GPP := avp_code_PCC_3GPP_Tunnel_Header_Filter };
 const AVP_Code c_AVP_Code_AAA_3GPP_List_Of_Measurements := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_List_Of_Measurements };
+const AVP_Code c_AVP_Code_DCC_NONE_Requested_Service_Unit := {
+	vendor_id_NONE := avp_code_DCC_NONE_Requested_Service_Unit };
 const AVP_Code c_AVP_Code_PCC_3GPP_Default_QoS_Name := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Default_QoS_Name };
 const AVP_Code c_AVP_Code_AAA_3GPP_UVA_Flags := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_UVA_Flags };
+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_DNAS_NONE_Framed_Pool := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Framed_Pool };
+const AVP_Code c_AVP_Code_DCC_NONE_CC_Time := {
+	vendor_id_NONE := avp_code_DCC_NONE_CC_Time };
 const AVP_Code c_AVP_Code_AAA_3GPP_Requested_EUTRAN_Authentication_Info := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Requested_EUTRAN_Authentication_Info };
+const AVP_Code c_AVP_Code_CxDx_3GPP_SIP_Digest_Authenticate := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_SIP_Digest_Authenticate };
 const AVP_Code c_AVP_Code_AAA_3GPP_Last_UE_Activity_Time := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Last_UE_Activity_Time };
 const AVP_Code c_AVP_Code_AAA_3GPP_Context_Identifier := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Context_Identifier };
+const AVP_Code c_AVP_Code_DCC_NONE_Used_Service_Unit := {
+	vendor_id_NONE := avp_code_DCC_NONE_Used_Service_Unit };
 const AVP_Code c_AVP_Code_BASE_NONE_Auth_Application_Id := {
 	vendor_id_NONE := avp_code_BASE_NONE_Auth_Application_Id };
 const AVP_Code c_AVP_Code_AAA_3GPP_Trace_Reference := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Trace_Reference };
+const AVP_Code c_AVP_Code_DNAS_NONE_Framed_Appletalk_Network := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Framed_Appletalk_Network };
+const AVP_Code c_AVP_Code_DNAS_NONE_Framed_IPv6_Prefix := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Framed_IPv6_Prefix };
 const AVP_Code c_AVP_Code_RX_3GPP_Sharing_Key_UL := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Sharing_Key_UL };
 const AVP_Code c_AVP_Code_RX_3GPP_AF_Charging_Identifier := {
@@ -5671,8 +7966,12 @@
 	vendor_id_3GPP := avp_code_PCC_3GPP_Routing_Rule_Remove };
 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_CxDx_3GPP_SIP_Authentication_Scheme := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_SIP_Authentication_Scheme };
 const AVP_Code c_AVP_Code_AAA_3GPP_Event_Threshold_RSRP := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Event_Threshold_RSRP };
+const AVP_Code c_AVP_Code_CxDx_3GPP_User_Authorization_Type := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_User_Authorization_Type };
 const AVP_Code c_AVP_Code_AAA_3GPP_PLMN_Client := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_PLMN_Client };
 const AVP_Code c_AVP_Code_AAA_3GPP_Re_Synchronization_Info := {
@@ -5691,14 +7990,20 @@
 	vendor_id_NONE := avp_code_BASE_NONE_Re_Auth_Request_Type };
 const AVP_Code c_AVP_Code_S6_3GPP_External_Identifier := {
 	vendor_id_3GPP := avp_code_S6_3GPP_External_Identifier };
+const AVP_Code c_AVP_Code_DCC_NONE_Redirect_Address_Type := {
+	vendor_id_NONE := avp_code_DCC_NONE_Redirect_Address_Type };
 const AVP_Code c_AVP_Code_MIPv6_NONE_MIP_MN_HA_MSA := {
 	vendor_id_NONE := avp_code_MIPv6_NONE_MIP_MN_HA_MSA };
 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_DCC_NONE_User_Equipment_Info_Type := {
+	vendor_id_NONE := avp_code_DCC_NONE_User_Equipment_Info_Type };
 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_PCC_3GPP_Resource_Allocation_Notification := {
@@ -5713,10 +8018,16 @@
 	vendor_id_3GPP := avp_code_PCC_3GPP_QoS_Class_Identifier };
 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 := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_SIP_Authentication_Context };
 const AVP_Code c_AVP_Code_MIPv6_NONE_QoS_Resources := {
 	vendor_id_NONE := avp_code_MIPv6_NONE_QoS_Resources };
 const AVP_Code c_AVP_Code_AAA_3GPP_Logging_Duration := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Logging_Duration };
+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 := {
@@ -5725,10 +8036,18 @@
 	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_GI_3GPP_3GPP_User_Location_Info_Time := {
+	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_User_Location_Info_Time };
 const AVP_Code c_AVP_Code_AAA_3GPP_Teleservice_List := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Teleservice_List };
 const AVP_Code c_AVP_Code_AAA_3GPP_UTRAN_Vector := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_UTRAN_Vector };
+const AVP_Code c_AVP_Code_DCC_NONE_Tariff_Time_Change := {
+	vendor_id_NONE := avp_code_DCC_NONE_Tariff_Time_Change };
+const AVP_Code c_AVP_Code_GI_3GPP_3GPP_NSAPI := {
+	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_NSAPI };
+const AVP_Code c_AVP_Code_GI_3GPP_3GPP_CG_Address := {
+	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_CG_Address };
 const AVP_Code c_AVP_Code_RX_3GPP_Application_Service_Provider_Identity := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Application_Service_Provider_Identity };
 const AVP_Code c_AVP_Code_S6_3GPP_NIDD_Authorization_Request := {
@@ -5741,12 +8060,18 @@
 	vendor_id_3GPP := avp_code_RX_3GPP_Flow_Usage };
 const AVP_Code c_AVP_Code_PCC_3GPP_RAN_Rule_Support := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_RAN_Rule_Support };
+const AVP_Code c_AVP_Code_DNAS_NONE_Tunnel_Password := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Tunnel_Password };
 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_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 := {
@@ -5769,8 +8094,16 @@
 	vendor_id_NONE := avp_code_BASE_NONE_Experimental_Result_Code };
 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_CxDx_3GPP_Session_Priority := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_Session_Priority };
+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_AAA_3GPP_Expiration_Date := {
@@ -5779,10 +8112,18 @@
 	vendor_id_NONE := avp_code_BASE_NONE_Error_Message };
 const AVP_Code c_AVP_Code_AAA_3GPP_SRES := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_SRES };
+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_DCC_NONE_Multiple_Services_Indicator := {
+	vendor_id_NONE := avp_code_DCC_NONE_Multiple_Services_Indicator };
+const AVP_Code c_AVP_Code_DNAS_NONE_Framed_Protocol := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Framed_Protocol };
 const AVP_Code c_AVP_Code_S6_3GPP_Service_ID := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Service_ID };
+const AVP_Code c_AVP_Code_GI_3GPP_3GPP_IMSI_MCC_MNC := {
+	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_IMSI_MCC_MNC };
 const AVP_Code c_AVP_Code_RX_3GPP_Abort_Cause := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Abort_Cause };
 const AVP_Code c_AVP_Code_PCC_3GPP_Charging_Rule_Base_Name := {
@@ -5795,8 +8136,14 @@
 	vendor_id_3GPP := avp_code_S6_3GPP_S6t_HSS_Cause };
 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_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_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_PCC_3GPP_Traffic_Steering_Policy_Identifier_DL := {
@@ -5807,10 +8154,26 @@
 	vendor_id_3GPP := avp_code_PCC_3GPP_Extended_GBR_UL };
 const AVP_Code c_AVP_Code_AAA_3GPP_MBSFN_Area_ID := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_MBSFN_Area_ID };
+const AVP_Code c_AVP_Code_CxDx_3GPP_Server_Capabilities := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_Server_Capabilities };
 const AVP_Code c_AVP_Code_AAA_3GPP_Area_Scope := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Area_Scope };
+const AVP_Code c_AVP_Code_DNAS_NONE_Accounting_Input_Packets := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Accounting_Input_Packets };
+const AVP_Code c_AVP_Code_CxDx_3GPP_SCSCF_Restoration_Info := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_SCSCF_Restoration_Info };
+const AVP_Code c_AVP_Code_CxDx_3GPP_Initial_CSeq_Sequence_Number := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_Initial_CSeq_Sequence_Number };
 const AVP_Code c_AVP_Code_AAA_3GPP_PUA_Flags := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_PUA_Flags };
+const AVP_Code c_AVP_Code_DNAS_NONE_Callback_Id := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Callback_Id };
+const AVP_Code c_AVP_Code_CxDx_3GPP_Primary_Event_Charging_Function_Name := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_Primary_Event_Charging_Function_Name };
+const AVP_Code c_AVP_Code_DCC_NONE_CC_Output_Octets := {
+	vendor_id_NONE := avp_code_DCC_NONE_CC_Output_Octets };
+const AVP_Code c_AVP_Code_GI_3GPP_3GPP_User_Location_Info := {
+	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_User_Location_Info };
 const AVP_Code c_AVP_Code_AAA_3GPP_Notification_To_UE_User := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Notification_To_UE_User };
 const AVP_Code c_AVP_Code_AAA_3GPP_Visited_PLMN_Id := {
@@ -5821,6 +8184,8 @@
 	vendor_id_3GPP := avp_code_RX_3GPP_Codec_Data };
 const AVP_Code c_AVP_Code_S6_3GPP_Monitoring_Event_Config_Status := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Monitoring_Event_Config_Status };
+const AVP_Code c_AVP_Code_DCC_NONE_Cost_Information := {
+	vendor_id_NONE := avp_code_DCC_NONE_Cost_Information };
 const AVP_Code c_AVP_Code_BASE_NONE_Error_Reporting_Host := {
 	vendor_id_NONE := avp_code_BASE_NONE_Error_Reporting_Host };
 const AVP_Code c_AVP_Code_PCC_3GPP_Rule_Activation_Time := {
@@ -5835,6 +8200,10 @@
 	vendor_id_3GPP := avp_code_S6_3GPP_Monitoring_Event_Configuration };
 const AVP_Code c_AVP_Code_PCC_3GPP_Offline := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Offline };
+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 := {
@@ -5851,16 +8220,30 @@
 	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_CxDx_3GPP_Subscription_Info := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_Subscription_Info };
 const AVP_Code c_AVP_Code_AAA_3GPP_APN_Configuration := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_APN_Configuration };
+const AVP_Code c_AVP_Code_CxDx_3GPP_SIP_Number_Auth_Items := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_SIP_Number_Auth_Items };
 const AVP_Code c_AVP_Code_AAA_3GPP_OMC_Id := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_OMC_Id };
 const AVP_Code c_AVP_Code_AAA_3GPP_GMLC_Restriction := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_GMLC_Restriction };
+const AVP_Code c_AVP_Code_DNAS_NONE_State := {
+	vendor_id_NONE := avp_code_DNAS_NONE_State };
+const AVP_Code c_AVP_Code_DNAS_NONE_Tunnel_Preference := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Tunnel_Preference };
+const AVP_Code c_AVP_Code_DCC_NONE_CC_Session_Failover := {
+	vendor_id_NONE := avp_code_DCC_NONE_CC_Session_Failover };
 const AVP_Code c_AVP_Code_AAA_3GPP_Regional_Subscription_Zone_Code := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Regional_Subscription_Zone_Code };
+const AVP_Code c_AVP_Code_GI_3GPP_3GPP_Negotiated_DSCP := {
+	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_Negotiated_DSCP };
 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_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_RX_3GPP_MPS_Identifier := {
@@ -5885,6 +8268,8 @@
 	vendor_id_3GPP := avp_code_PCC_3GPP_Monitoring_Flags };
 const AVP_Code c_AVP_Code_BASE_NONE_Redirect_Max_Cache_Time := {
 	vendor_id_NONE := avp_code_BASE_NONE_Redirect_Max_Cache_Time };
+const AVP_Code c_AVP_Code_CxDx_3GPP_Feature_List := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_Feature_List };
 const AVP_Code c_AVP_Code_PCC_3GPP_TCP_Source_Port := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_TCP_Source_Port };
 const AVP_Code c_AVP_Code_PCC_3GPP_Application_Detection_Information := {
@@ -5893,8 +8278,18 @@
 	vendor_id_3GPP := avp_code_AAA_3GPP_Emergency_Info };
 const AVP_Code c_AVP_Code_AAA_3GPP_MPS_Priority := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_MPS_Priority };
+const AVP_Code c_AVP_Code_DCC_NONE_Requested_Action := {
+	vendor_id_NONE := avp_code_DCC_NONE_Requested_Action };
+const AVP_Code c_AVP_Code_CxDx_3GPP_Record_Route := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_Record_Route };
 const AVP_Code c_AVP_Code_AAA_3GPP_Alert_Reason := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Alert_Reason };
+const AVP_Code c_AVP_Code_GI_3GPP_3GPP_CG_IPv6_Address := {
+	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_CG_IPv6_Address };
+const AVP_Code c_AVP_Code_DNAS_NONE_Idle_Timeout := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Idle_Timeout };
+const AVP_Code c_AVP_Code_DNAS_NONE_NAS_Port_Id := {
+	vendor_id_NONE := avp_code_DNAS_NONE_NAS_Port_Id };
 const AVP_Code c_AVP_Code_AAA_3GPP_MO_LR := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_MO_LR };
 const AVP_Code c_AVP_Code_BASE_NONE_Host_IP_Address := {
@@ -5907,6 +8302,10 @@
 	vendor_id_3GPP := avp_code_S6_3GPP_Maximum_Response_Time };
 const AVP_Code c_AVP_Code_RX_3GPP_Sponsor_Identity := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Sponsor_Identity };
+const AVP_Code c_AVP_Code_DNAS_NONE_Framed_Appletalk_Link := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Framed_Appletalk_Link };
+const AVP_Code c_AVP_Code_DNAS_NONE_Framed_Interface_Id := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Framed_Interface_Id };
 const AVP_Code c_AVP_Code_PCC_3GPP_CoA_IP_Address := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_CoA_IP_Address };
 const AVP_Code c_AVP_Code_PCC_3GPP_Default_QoS_Information := {
@@ -5925,6 +8324,10 @@
 	vendor_id_NONE := avp_code_BASE_NONE_Vendor_Id };
 const AVP_Code c_AVP_Code_AAA_3GPP_PDN_Connection_Continuity := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_PDN_Connection_Continuity };
+const AVP_Code c_AVP_Code_CxDx_3GPP_Wildcarded_Public_Identity := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_Wildcarded_Public_Identity };
+const AVP_Code c_AVP_Code_DNAS_NONE_Acct_Session_Time := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Acct_Session_Time };
 const AVP_Code c_AVP_Code_AAA_3GPP_DSA_Flags := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_DSA_Flags };
 const AVP_Code c_AVP_Code_AAA_3GPP_Trace_Data := {
@@ -5933,16 +8336,24 @@
 	vendor_id_3GPP := avp_code_AAA_3GPP_LCS_Info };
 const AVP_Code c_AVP_Code_AAA_3GPP_PDN_GW_Allocation_Type := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_PDN_GW_Allocation_Type };
+const AVP_Code c_AVP_Code_GI_3GPP_3GPP_SGSN_MCC_MNC := {
+	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_SGSN_MCC_MNC };
 const AVP_Code c_AVP_Code_BASE_NONE_Event_Timestamp := {
 	vendor_id_NONE := avp_code_BASE_NONE_Event_Timestamp };
+const AVP_Code c_AVP_Code_DCC_NONE_Final_Unit_Action := {
+	vendor_id_NONE := avp_code_DCC_NONE_Final_Unit_Action };
 const AVP_Code c_AVP_Code_RX_3GPP_Extended_Max_Requested_BW_UL := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Extended_Max_Requested_BW_UL };
 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_AAA_3GPP_Restoration_Priority := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Restoration_Priority };
+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 := {
@@ -5955,6 +8366,10 @@
 	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_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 := {
+	vendor_id_NONE := avp_code_DCC_NONE_User_Equipment_Info };
 const AVP_Code c_AVP_Code_AAA_3GPP_A_MSISDN := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_A_MSISDN };
 const AVP_Code c_AVP_Code_MIPv6_NONE_MIP_Mobile_Node_Address := {
@@ -5967,28 +8382,40 @@
 	vendor_id_3GPP := avp_code_AAA_3GPP_AIR_Flags };
 const AVP_Code c_AVP_Code_AAA_3GPP_Geographical_Information := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Geographical_Information };
+const AVP_Code c_AVP_Code_CxDx_3GPP_Loose_Route_Indication := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_Loose_Route_Indication };
+const AVP_Code c_AVP_Code_DCC_NONE_Service_Parameter_Type := {
+	vendor_id_NONE := avp_code_DCC_NONE_Service_Parameter_Type };
 const AVP_Code c_AVP_Code_AAA_3GPP_MME_User_State := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_MME_User_State };
 const AVP_Code c_AVP_Code_AAA_3GPP_Access_Restriction_Data := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Access_Restriction_Data };
 const AVP_Code c_AVP_Code_BASE_NONE_Failed_AVP := {
 	vendor_id_NONE := avp_code_BASE_NONE_Failed_AVP };
+const AVP_Code c_AVP_Code_GI_3GPP_3GPP_RAT_Type := {
+	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_RAT_Type };
 const AVP_Code c_AVP_Code_AAA_3GPP_SS_Status := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_SS_Status };
 const AVP_Code c_AVP_Code_S6_3GPP_NIDD_Authorization_Update := {
 	vendor_id_3GPP := avp_code_S6_3GPP_NIDD_Authorization_Update };
+const AVP_Code c_AVP_Code_DCC_NONE_Subscription_Id_Type := {
+	vendor_id_NONE := avp_code_DCC_NONE_Subscription_Id_Type };
 const AVP_Code c_AVP_Code_PCC_3GPP_Packet_Filter_Operation := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Packet_Filter_Operation };
 const AVP_Code c_AVP_Code_S6_3GPP_SCEF_Reference_ID_for_Deletion := {
 	vendor_id_3GPP := avp_code_S6_3GPP_SCEF_Reference_ID_for_Deletion };
 const AVP_Code c_AVP_Code_RX_3GPP_SIP_Forking_Indication := {
 	vendor_id_3GPP := avp_code_RX_3GPP_SIP_Forking_Indication };
+const AVP_Code c_AVP_Code_DNAS_NONE_User_Password := {
+	vendor_id_NONE := avp_code_DNAS_NONE_User_Password };
 const AVP_Code c_AVP_Code_S6_3GPP_IMEI_Change := {
 	vendor_id_3GPP := avp_code_S6_3GPP_IMEI_Change };
 const AVP_Code c_AVP_Code_PCC_3GPP_IP_CAN_Type := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_IP_CAN_Type };
 const AVP_Code c_AVP_Code_RX_3GPP_Extended_Min_Desired_BW_UL := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Extended_Min_Desired_BW_UL };
+const AVP_Code c_AVP_Code_CxDx_3GPP_SIP_Authorization := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_SIP_Authorization };
 const AVP_Code c_AVP_Code_PCC_3GPP_Revalidation_Time := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Revalidation_Time };
 const AVP_Code c_AVP_Code_AAA_3GPP_Logging_Interval := {
@@ -6001,16 +8428,32 @@
 	vendor_id_3GPP := avp_code_PCC_3GPP_Routing_Filter };
 const AVP_Code c_AVP_Code_PCC_3GPP_Metering_Method := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Metering_Method };
+const AVP_Code c_AVP_Code_DNAS_NONE_Acct_Tunnel_Connection := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Acct_Tunnel_Connection };
 const AVP_Code c_AVP_Code_AAA_3GPP_Non_IP_Data_Delivery_Mechanism := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Non_IP_Data_Delivery_Mechanism };
+const AVP_Code c_AVP_Code_DNAS_NONE_NAS_Filter_Rule := {
+	vendor_id_NONE := avp_code_DNAS_NONE_NAS_Filter_Rule };
 const AVP_Code c_AVP_Code_BASE_NONE_Session_Server_Failover := {
 	vendor_id_NONE := avp_code_BASE_NONE_Session_Server_Failover };
+const AVP_Code c_AVP_Code_CxDx_3GPP_Integrity_Key := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_Integrity_Key };
 const AVP_Code c_AVP_Code_AAA_3GPP_E_UTRAN_Vector := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_E_UTRAN_Vector };
 const AVP_Code c_AVP_Code_BASE_NONE_Experimental_Result := {
 	vendor_id_NONE := avp_code_BASE_NONE_Experimental_Result };
+const AVP_Code c_AVP_Code_DNAS_NONE_Acct_Link_Count := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Acct_Link_Count };
+const AVP_Code c_AVP_Code_DCC_NONE_Unit_Value := {
+	vendor_id_NONE := avp_code_DCC_NONE_Unit_Value };
 const AVP_Code c_AVP_Code_AAA_3GPP_Trace_Event_List := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Trace_Event_List };
+const AVP_Code c_AVP_Code_GI_3GPP_3GPP_PDP_Type := {
+	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_PDP_Type };
+const AVP_Code c_AVP_Code_DNAS_NONE_Reply_Message := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Reply_Message };
+const AVP_Code c_AVP_Code_DNAS_NONE_Connect_Info := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Connect_Info };
 const AVP_Code c_AVP_Code_MIPv6_NONE_MIP_Replay_Mode := {
 	vendor_id_NONE := avp_code_MIPv6_NONE_MIP_Replay_Mode };
 const AVP_Code c_AVP_Code_BASE_NONE_Proxy_Host := {
@@ -6019,12 +8462,18 @@
 	vendor_id_3GPP := avp_code_S6_3GPP_Communication_Pattern_Set };
 const AVP_Code c_AVP_Code_RX_3GPP_Flow_Status := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Flow_Status };
+const AVP_Code c_AVP_Code_DNAS_NONE_CHAP_Challenge := {
+	vendor_id_NONE := avp_code_DNAS_NONE_CHAP_Challenge };
+const AVP_Code c_AVP_Code_DCC_NONE_CC_Unit_Type := {
+	vendor_id_NONE := avp_code_DCC_NONE_CC_Unit_Type };
 const AVP_Code c_AVP_Code_RX_3GPP_MCPTT_Identifier := {
 	vendor_id_3GPP := avp_code_RX_3GPP_MCPTT_Identifier };
 const AVP_Code c_AVP_Code_S6_3GPP_Group_Monitoring_Event_Report := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Group_Monitoring_Event_Report };
 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_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 := {
@@ -6037,26 +8486,40 @@
 	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_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_AAA_3GPP_IMEI := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_IMEI };
+const AVP_Code c_AVP_Code_DNAS_NONE_CHAP_Ident := {
+	vendor_id_NONE := avp_code_DNAS_NONE_CHAP_Ident };
 const AVP_Code c_AVP_Code_AAA_3GPP_Kc := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Kc };
 const AVP_Code c_AVP_Code_AAA_3GPP_SGSN_Number := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_SGSN_Number };
 const AVP_Code c_AVP_Code_AAA_3GPP_HPLMN_ODB := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_HPLMN_ODB };
+const AVP_Code c_AVP_Code_GI_3GPP_3GPP_Charging_Characteristics := {
+	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_Charging_Characteristics };
 const AVP_Code c_AVP_Code_AAA_3GPP_PDP_Context := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_PDP_Context };
+const AVP_Code c_AVP_Code_DCC_NONE_CC_Money := {
+	vendor_id_NONE := avp_code_DCC_NONE_CC_Money };
+const AVP_Code c_AVP_Code_GI_3GPP_3GPP_GGSN_Address := {
+	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_GGSN_Address };
 const AVP_Code c_AVP_Code_BASE_NONE_Proxy_Info := {
 	vendor_id_NONE := avp_code_BASE_NONE_Proxy_Info };
 const AVP_Code c_AVP_Code_S6_3GPP_Node_Type := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Node_Type };
 const AVP_Code c_AVP_Code_RX_3GPP_Priority_Sharing_Indicator := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Priority_Sharing_Indicator };
+const AVP_Code c_AVP_Code_DNAS_NONE_Tunnel_Type := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Tunnel_Type };
 const AVP_Code c_AVP_Code_PCC_3GPP_QoS_Rule_Name := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_QoS_Rule_Name };
 const AVP_Code c_AVP_Code_S6_3GPP_Scheduled_Communication_Time := {
@@ -6071,6 +8534,10 @@
 	vendor_id_3GPP := avp_code_PCC_3GPP_Extended_GBR_DL };
 const AVP_Code c_AVP_Code_AAA_3GPP_MBSFN_Area := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_MBSFN_Area };
+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 := {
@@ -6081,16 +8548,32 @@
 	vendor_id_NONE := avp_code_BASE_NONE_Destination_Host };
 const AVP_Code c_AVP_Code_AAA_3GPP_Positioning_Method := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Positioning_Method };
+const AVP_Code c_AVP_Code_CxDx_3GPP_LIA_Flags := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_LIA_Flags };
 const AVP_Code c_AVP_Code_AAA_3GPP_DL_Buffering_Suggested_Packet_Count := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_DL_Buffering_Suggested_Packet_Count };
+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_Origin_AAA_Protocol := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Origin_AAA_Protocol };
+const AVP_Code c_AVP_Code_CxDx_3GPP_Charging_Information := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_Charging_Information };
 const AVP_Code c_AVP_Code_AAA_3GPP_ULA_Flags := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_ULA_Flags };
 const AVP_Code c_AVP_Code_AAA_3GPP_IMS_Voice_Over_PS_Sessions_Supported := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_IMS_Voice_Over_PS_Sessions_Supported };
 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_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_DCC_NONE_CC_Service_Specific_Units := {
+	vendor_id_NONE := avp_code_DCC_NONE_CC_Service_Specific_Units };
 const AVP_Code c_AVP_Code_S6_3GPP_T4_Parameters := {
 	vendor_id_3GPP := avp_code_S6_3GPP_T4_Parameters };
 const AVP_Code c_AVP_Code_RX_3GPP_Access_Network_Charging_Identifier_Value := {
@@ -6111,14 +8594,24 @@
 	vendor_id_3GPP := avp_code_RX_3GPP_Extended_Max_Requested_BW_DL };
 const AVP_Code c_AVP_Code_PCC_3GPP_Flow_Information := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Flow_Information };
+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_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_CxDx_3GPP_User_Data := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_User_Data };
 const AVP_Code c_AVP_Code_AAA_3GPP_Report_Interval := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Report_Interval };
 const AVP_Code c_AVP_Code_PCC_3GPP_RAN_NAS_Release_Cause := {
@@ -6129,10 +8622,16 @@
 	vendor_id_NONE := avp_code_BASE_NONE_Redirect_Host_Usage };
 const AVP_Code c_AVP_Code_AAA_3GPP_Equipment_Status := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Equipment_Status };
+const AVP_Code c_AVP_Code_GI_3GPP_3GPP_Packet_Filter := {
+	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_Packet_Filter };
+const AVP_Code c_AVP_Code_DCC_NONE_Redirect_Server_Address := {
+	vendor_id_NONE := avp_code_DCC_NONE_Redirect_Server_Address };
 const AVP_Code c_AVP_Code_MIPv6_NONE_MIP6_Auth_Mode := {
 	vendor_id_NONE := avp_code_MIPv6_NONE_MIP6_Auth_Mode };
 const AVP_Code c_AVP_Code_AAA_3GPP_EPS_Location_Information := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_EPS_Location_Information };
+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_RX_3GPP_Service_Info_Status := {
@@ -6165,8 +8664,16 @@
 	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_DNAS_NONE_Login_LAT_Group := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Login_LAT_Group };
 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 := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Accounting_Output_Octets };
+const AVP_Code c_AVP_Code_CxDx_3GPP_To_SIP_Header := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_To_SIP_Header };
 const AVP_Code c_AVP_Code_AAA_3GPP_Coupled_Node_Diameter_ID := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Coupled_Node_Diameter_ID };
 const AVP_Code c_AVP_Code_AAA_3GPP_STN_SR := {
@@ -6175,8 +8682,14 @@
 	vendor_id_NONE := avp_code_BASE_NONE_Supported_Vendor_Id };
 const AVP_Code c_AVP_Code_AAA_3GPP_ServiceTypeIdentity := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_ServiceTypeIdentity };
+const AVP_Code c_AVP_Code_DNAS_NONE_Acct_Authentic := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Acct_Authentic };
+const AVP_Code c_AVP_Code_DCC_NONE_Service_Identifier := {
+	vendor_id_NONE := avp_code_DCC_NONE_Service_Identifier };
 const AVP_Code c_AVP_Code_AAA_3GPP_AUTN := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_AUTN };
+const AVP_Code c_AVP_Code_GI_3GPP_TWAN_Identifier := {
+	vendor_id_3GPP := avp_code_GI_3GPP_TWAN_Identifier };
 const AVP_Code c_AVP_Code_RX_3GPP_Sponsored_Connectivity_Data := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Sponsored_Connectivity_Data };
 const AVP_Code c_AVP_Code_BASE_NONE_Auth_Request_Type := {
@@ -6185,6 +8698,8 @@
 	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_S6_3GPP_Event_Handling := {
@@ -6197,14 +8712,20 @@
 	vendor_id_3GPP := avp_code_RX_3GPP_Min_Desired_Bandwidth_UL };
 const AVP_Code c_AVP_Code_AAA_3GPP_UVR_Flags := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_UVR_Flags };
+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_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_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 := {
 	vendor_id_NONE := avp_code_MIPv6_NONE_MIP_Timestamp };
 const AVP_Code c_AVP_Code_AAA_3GPP_Subscribed_Periodic_RAU_TAU_Timer := {
@@ -6213,12 +8734,20 @@
 	vendor_id_3GPP := avp_code_AAA_3GPP_Specific_APN_Info };
 const AVP_Code c_AVP_Code_AAA_3GPP_Terminal_Information := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Terminal_Information };
+const AVP_Code c_AVP_Code_CxDx_3GPP_Restoration_Info := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_Restoration_Info };
 const AVP_Code c_AVP_Code_BASE_NONE_Product_Name := {
 	vendor_id_NONE := avp_code_BASE_NONE_Product_Name };
 const AVP_Code c_AVP_Code_AAA_3GPP_CSG_Id := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_CSG_Id };
+const AVP_Code c_AVP_Code_DNAS_NONE_Framed_IP_Netmask := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Framed_IP_Netmask };
+const AVP_Code c_AVP_Code_GI_3GPP_3GPP_IPv6_DNS_Servers := {
+	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_IPv6_DNS_Servers };
 const AVP_Code c_AVP_Code_AAA_3GPP_Call_Barring_Info := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Call_Barring_Info };
+const AVP_Code c_AVP_Code_DCC_NONE_Service_Parameter_Info := {
+	vendor_id_NONE := avp_code_DCC_NONE_Service_Parameter_Info };
 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 := {
@@ -6235,6 +8764,8 @@
 	vendor_id_3GPP := avp_code_S6_3GPP_Service_Report };
 const AVP_Code c_AVP_Code_PCC_3GPP_Tunnel_Information := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Tunnel_Information };
+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 := {
@@ -6255,18 +8786,30 @@
 	vendor_id_NONE := avp_code_BASE_NONE_User_Name };
 const AVP_Code c_AVP_Code_AAA_3GPP_UE_PC5_AMBR := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_UE_PC5_AMBR };
+const AVP_Code c_AVP_Code_CxDx_3GPP_Public_Identity := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_Public_Identity };
 const AVP_Code c_AVP_Code_BASE_NONE_Accounting_Sub_Session_Id := {
 	vendor_id_NONE := avp_code_BASE_NONE_Accounting_Sub_Session_Id };
+const AVP_Code c_AVP_Code_DNAS_NONE_Acct_Delay_Time := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Acct_Delay_Time };
+const AVP_Code c_AVP_Code_CxDx_3GPP_UAR_Flags := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_UAR_Flags };
 const AVP_Code c_AVP_Code_AAA_3GPP_Collection_Period_RRM_UMTS := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Collection_Period_RRM_UMTS };
 const AVP_Code c_AVP_Code_AAA_3GPP_Operator_Determined_Barring := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Operator_Determined_Barring };
+const AVP_Code c_AVP_Code_DNAS_NONE_Tunnel_Server_Endpoint := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Tunnel_Server_Endpoint };
 const AVP_Code c_AVP_Code_BASE_NONE_Session_Binding := {
 	vendor_id_NONE := avp_code_BASE_NONE_Session_Binding };
+const AVP_Code c_AVP_Code_GI_3GPP_3GPP_IMEISV := {
+	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_IMEISV };
 const AVP_Code c_AVP_Code_AAA_3GPP_SS_Code := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_SS_Code };
 const AVP_Code c_AVP_Code_BASE_NONE_Acct_Multi_Session_Id := {
 	vendor_id_NONE := avp_code_BASE_NONE_Acct_Multi_Session_Id };
+const AVP_Code c_AVP_Code_DCC_NONE_Subscription_Id_Data := {
+	vendor_id_NONE := avp_code_DCC_NONE_Subscription_Id_Data };
 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 := {
@@ -6291,18 +8834,30 @@
 	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_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_CxDx_3GPP_Confidentiality_Key := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_Confidentiality_Key };
 const AVP_Code c_AVP_Code_PCC_3GPP_Flow_Label := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Flow_Label };
+const AVP_Code c_AVP_Code_DNAS_NONE_NAS_Port := {
+	vendor_id_NONE := avp_code_DNAS_NONE_NAS_Port };
 const AVP_Code c_AVP_Code_AAA_3GPP_Authentication_Info := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Authentication_Info };
 const AVP_Code c_AVP_Code_AAA_3GPP_Trace_Interface_List := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Trace_Interface_List };
+const AVP_Code c_AVP_Code_GI_3GPP_3GPP_Charging_Id := {
+	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_Charging_Id };
+const AVP_Code c_AVP_Code_DNAS_NONE_CHAP_Algorithm := {
+	vendor_id_NONE := avp_code_DNAS_NONE_CHAP_Algorithm };
 const AVP_Code c_AVP_Code_AAA_3GPP_APN_Configuration_Profile := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_APN_Configuration_Profile };
+const AVP_Code c_AVP_Code_GI_3GPP_3GPP_CAMEL_Charging_Info := {
+	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_CAMEL_Charging_Info };
 const AVP_Code c_AVP_Code_RX_3GPP_Flows := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Flows };
 const AVP_Code c_AVP_Code_S6_3GPP_CIA_Flags := {
@@ -6311,6 +8866,8 @@
 	vendor_id_3GPP := avp_code_RX_3GPP_Extended_Min_Requested_BW_UL };
 const AVP_Code c_AVP_Code_PCC_3GPP_Monitoring_Time := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Monitoring_Time };
+const AVP_Code c_AVP_Code_DCC_NONE_CC_Input_Octets := {
+	vendor_id_NONE := avp_code_DCC_NONE_CC_Input_Octets };
 const AVP_Code c_AVP_Code_S6_3GPP_UE_Reachability_Configuration := {
 	vendor_id_3GPP := avp_code_S6_3GPP_UE_Reachability_Configuration };
 const AVP_Code c_AVP_Code_BASE_NONE_Destination_Realm := {
@@ -6321,12 +8878,18 @@
 	vendor_id_3GPP := avp_code_PCC_3GPP_Flow_Direction };
 const AVP_Code c_AVP_Code_S6_3GPP_Supported_Monitoring_Events := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Supported_Monitoring_Events };
+const AVP_Code c_AVP_Code_CxDx_3GPP_SIP_Item_Number := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_SIP_Item_Number };
 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_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_AAA_3GPP_Subscription_Data_Deletion := {
@@ -6335,18 +8898,38 @@
 	vendor_id_NONE := avp_code_MIPv6_NONE_Chargable_User_Identity };
 const AVP_Code c_AVP_Code_AAA_3GPP_Trace_Collection_Entity := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Trace_Collection_Entity };
+const AVP_Code c_AVP_Code_CxDx_3GPP_Feature_List_ID := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_Feature_List_ID };
 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_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 := {
+	vendor_id_NONE := avp_code_DNAS_NONE_QoS_Filter_Rule };
 const AVP_Code c_AVP_Code_AAA_3GPP_Complete_Data_List_Included_Indicator := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Complete_Data_List_Included_Indicator };
 const AVP_Code c_AVP_Code_MIPv6_NONE_MIP_MN_AAA_SPI := {
 	vendor_id_NONE := avp_code_MIPv6_NONE_MIP_MN_AAA_SPI };
+const AVP_Code c_AVP_Code_GI_3GPP_3GPP_SGSN_Address := {
+	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_SGSN_Address };
 const AVP_Code c_AVP_Code_MIPv6_NONE_MIP_MSA_Lifetime := {
 	vendor_id_NONE := avp_code_MIPv6_NONE_MIP_MSA_Lifetime };
+const AVP_Code c_AVP_Code_GI_3GPP_External_Identifier := {
+	vendor_id_3GPP := avp_code_GI_3GPP_External_Identifier };
 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_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_DCC_NONE_CC_Request_Type := {
+	vendor_id_NONE := avp_code_DCC_NONE_CC_Request_Type };
 const AVP_Code c_AVP_Code_S6_3GPP_Type_Of_External_Identifier := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Type_Of_External_Identifier };
 const AVP_Code c_AVP_Code_PCC_3GPP_Event_Report_Indication := {
@@ -6355,18 +8938,28 @@
 	vendor_id_3GPP := avp_code_AAA_3GPP_MDT_Configuration };
 const AVP_Code c_AVP_Code_PCC_3GPP_Usage_Monitoring_Report := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Usage_Monitoring_Report };
+const AVP_Code c_AVP_Code_CxDx_3GPP_Priviledged_Sender_Indication := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_Priviledged_Sender_Indication };
 const AVP_Code c_AVP_Code_AAA_3GPP_Adjacent_Access_Restriction_Data := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Adjacent_Access_Restriction_Data };
 const AVP_Code c_AVP_Code_AAA_3GPP_RAT_Frequency_Selection_Priority_ID := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_RAT_Frequency_Selection_Priority_ID };
+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_ULR_Flags := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_ULR_Flags };
+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_DCC_NONE_Currency_Code := {
+	vendor_id_NONE := avp_code_DCC_NONE_Currency_Code };
 const AVP_Code c_AVP_Code_AAA_3GPP_Cancellation_Type := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Cancellation_Type };
 const AVP_Code c_AVP_Code_BASE_NONE_E2E_Sequence := {
@@ -6375,8 +8968,14 @@
 	vendor_id_NONE := avp_code_BASE_NONE_Origin_Realm };
 const AVP_Code c_AVP_Code_AAA_3GPP_PDN_Type := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_PDN_Type };
+const AVP_Code c_AVP_Code_DNAS_NONE_Prompt := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Prompt };
+const AVP_Code c_AVP_Code_GI_3GPP_3GPP_GGSN_IPv6_Address := {
+	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_GGSN_IPv6_Address };
 const AVP_Code c_AVP_Code_RX_3GPP_Access_Network_Charging_Identifier := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Access_Network_Charging_Identifier };
+const AVP_Code c_AVP_Code_DCC_NONE_Redirect_Server := {
+	vendor_id_NONE := avp_code_DCC_NONE_Redirect_Server };
 const AVP_Code c_AVP_Code_S6_3GPP_AESE_Communication_Pattern_Config_Status := {
 	vendor_id_3GPP := avp_code_S6_3GPP_AESE_Communication_Pattern_Config_Status };
 const AVP_Code c_AVP_Code_S6_3GPP_Enhanced_Coverage_Restriction_Data := {
@@ -6393,6 +8992,8 @@
 	vendor_id_NONE := avp_code_BASE_NONE_Acct_Interim_Interval };
 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 := {
@@ -6401,18 +9002,30 @@
 	vendor_id_3GPP := avp_code_S6_3GPP_MONTE_Location_Type };
 const AVP_Code c_AVP_Code_AAA_3GPP_RDS_Indicator := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_RDS_Indicator };
+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_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 := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_Secondary_Event_Charging_Function_Name };
 const AVP_Code c_AVP_Code_AAA_3GPP_Group_PLMN_Id := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Group_PLMN_Id };
 const AVP_Code c_AVP_Code_AAA_3GPP_User_Id := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_User_Id };
+const AVP_Code c_AVP_Code_DNAS_NONE_Login_LAT_Node := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Login_LAT_Node };
+const AVP_Code c_AVP_Code_DNAS_NONE_Originating_Line_Info := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Originating_Line_Info };
+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_AAA_3GPP_EPS_User_State := {
@@ -6423,6 +9036,8 @@
 	vendor_id_3GPP := avp_code_RX_3GPP_Retry_Interval };
 const AVP_Code c_AVP_Code_BASE_NONE_Accounting_Session_Id := {
 	vendor_id_NONE := avp_code_BASE_NONE_Accounting_Session_Id };
+const AVP_Code c_AVP_Code_DCC_NONE_Restriction_Filter_Rule := {
+	vendor_id_NONE := avp_code_DCC_NONE_Restriction_Filter_Rule };
 const AVP_Code c_AVP_Code_PCC_3GPP_Packet_Filter_Identifier := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Packet_Filter_Identifier };
 const AVP_Code c_AVP_Code_S6_3GPP_SCEF_Reference_ID := {
@@ -6439,28 +9054,46 @@
 	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_BASE_NONE_Accounting_Record_Type := {
 	vendor_id_NONE := avp_code_BASE_NONE_Accounting_Record_Type };
+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_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_BASE_NONE_Acct_Application_Id := {
 	vendor_id_NONE := avp_code_BASE_NONE_Acct_Application_Id };
+const AVP_Code c_AVP_Code_CxDx_3GPP_SIP_Authenticate := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_SIP_Authenticate };
 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_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_GI_3GPP_3GPP_IMSI := {
+	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_IMSI };
 const AVP_Code c_AVP_Code_AAA_3GPP_User_State := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_User_State };
 const AVP_Code c_AVP_Code_BASE_NONE_Result_Code := {
 	vendor_id_NONE := avp_code_BASE_NONE_Result_Code };
+const AVP_Code c_AVP_Code_DNAS_NONE_Framed_IP_Address := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Framed_IP_Address };
 const AVP_Code c_AVP_Code_S6_3GPP_IP_SM_GW_Realm := {
 	vendor_id_3GPP := avp_code_S6_3GPP_IP_SM_GW_Realm };
 const AVP_Code c_AVP_Code_S6_3GPP_Reference_ID_Validity_Time := {
@@ -6473,6 +9106,8 @@
 	vendor_id_3GPP := avp_code_RX_3GPP_Min_Desired_Bandwidth_DL };
 const AVP_Code c_AVP_Code_S6_3GPP_Group_Reporting_Guard_Timer := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Group_Reporting_Guard_Timer };
+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 := {
@@ -6487,10 +9122,14 @@
 	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_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 := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_3GPP2_MEID };
 const AVP_Code c_AVP_Code_AAA_3GPP_Subscription_Data := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Subscription_Data };
+const AVP_Code c_AVP_Code_CxDx_3GPP_Multiple_Registration_Indication := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_Multiple_Registration_Indication };
 const AVP_Code c_AVP_Code_BASE_NONE_Vendor_Specific_Application_Id := {
 	vendor_id_NONE := avp_code_BASE_NONE_Vendor_Specific_Application_Id };
 const AVP_Code c_AVP_Code_AAA_3GPP_WLAN_offloadability_UTRAN := {
@@ -6501,6 +9140,8 @@
 	vendor_id_NONE := avp_code_MIPv6_NONE_Service_Selection };
 const AVP_Code c_AVP_Code_AAA_3GPP_TS_Code := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_TS_Code };
+const AVP_Code c_AVP_Code_DNAS_NONE_Tunnel_Client_Endpoint := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Tunnel_Client_Endpoint };
 const AVP_Code c_AVP_Code_S6_3GPP_IP_SM_GW_Number := {
 	vendor_id_3GPP := avp_code_S6_3GPP_IP_SM_GW_Number };
 const AVP_Code c_AVP_Code_PCC_3GPP_Charging_Rule_Install := {
@@ -6509,6 +9150,8 @@
 	vendor_id_3GPP := avp_code_RX_3GPP_Rx_Request_Type };
 const AVP_Code c_AVP_Code_S6_3GPP_NIDD_Authorization_Response := {
 	vendor_id_3GPP := avp_code_S6_3GPP_NIDD_Authorization_Response };
+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 := {
@@ -6525,6 +9168,8 @@
 	vendor_id_3GPP := avp_code_RX_3GPP_Media_Component_Status };
 const AVP_Code c_AVP_Code_AAA_3GPP_eDRX_Cycle_Length_Value := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_eDRX_Cycle_Length_Value };
+const AVP_Code c_AVP_Code_CxDx_3GPP_Visited_Network_Identifier := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_Visited_Network_Identifier };
 const AVP_Code c_AVP_Code_S6_3GPP_RIR_Flags := {
 	vendor_id_3GPP := avp_code_S6_3GPP_RIR_Flags };
 const AVP_Code c_AVP_Code_AAA_3GPP_Collection_Period_RRM_LTE := {
@@ -6535,12 +9180,22 @@
 	vendor_id_3GPP := avp_code_AAA_3GPP_Subscriber_Status };
 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_CxDx_3GPP_Identity_with_Emergency_Registration := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_Identity_with_Emergency_Registration };
+const AVP_Code c_AVP_Code_DCC_NONE_Tariff_Change_Usage := {
+	vendor_id_NONE := avp_code_DCC_NONE_Tariff_Change_Usage };
 const AVP_Code c_AVP_Code_AAA_3GPP_LCS_PrivacyException := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_LCS_PrivacyException };
 const AVP_Code c_AVP_Code_AAA_3GPP_QoS_Subscribed := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_QoS_Subscribed };
+const AVP_Code c_AVP_Code_DNAS_NONE_NAS_IP_Address := {
+	vendor_id_NONE := avp_code_DNAS_NONE_NAS_IP_Address };
 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_PCC_3GPP_APN_Aggregate_Max_Bitrate_DL := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_APN_Aggregate_Max_Bitrate_DL };
 const AVP_Code c_AVP_Code_S6_3GPP_SCS_Identity := {
@@ -6561,32 +9216,52 @@
 	vendor_id_3GPP := avp_code_PCC_3GPP_TDF_IP_Address };
 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_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_DCC_NONE_CC_Correlation_Id := {
+	vendor_id_NONE := avp_code_DCC_NONE_CC_Correlation_Id };
 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_BASE_NONE_Route_Record := {
 	vendor_id_NONE := avp_code_BASE_NONE_Route_Record };
 const AVP_Code c_AVP_Code_AAA_3GPP_Carrier_Frequency := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Carrier_Frequency };
+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_DNAS_NONE_Port_Limit := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Port_Limit };
+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 := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_All_APN_Configurations_Included_Indicator };
 const AVP_Code c_AVP_Code_AAA_3GPP_NOR_Flags := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_NOR_Flags };
+const AVP_Code c_AVP_Code_GI_3GPP_3GPP_MS_TimeZone := {
+	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_MS_TimeZone };
 const AVP_Code c_AVP_Code_AAA_3GPP_External_Client := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_External_Client };
 const AVP_Code c_AVP_Code_BASE_NONE_Authorization_Lifetime := {
 	vendor_id_NONE := avp_code_BASE_NONE_Authorization_Lifetime };
+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_DNAS_NONE_Accounting_Auth_Method := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Accounting_Auth_Method };
 const AVP_Code c_AVP_Code_RX_3GPP_Service_URN := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Service_URN };
 const AVP_Code c_AVP_Code_S6_3GPP_Supported_Services := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Supported_Services };
+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_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 := {
@@ -6603,20 +9278,40 @@
 	vendor_id_3GPP := avp_code_AAA_3GPP_SCEF_Realm };
 const AVP_Code c_AVP_Code_S6_3GPP_Requested_Validity_Time := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Requested_Validity_Time };
+const AVP_Code c_AVP_Code_DCC_NONE_CC_Request_Number := {
+	vendor_id_NONE := avp_code_DCC_NONE_CC_Request_Number };
+const AVP_Code c_AVP_Code_CxDx_3GPP_Supported_Features := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_Supported_Features };
 const AVP_Code c_AVP_Code_AAA_3GPP_Local_Time_Zone := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Local_Time_Zone };
 const AVP_Code c_AVP_Code_AAA_3GPP_GERAN_Vector := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_GERAN_Vector };
+const AVP_Code c_AVP_Code_CxDx_3GPP_Call_ID_SIP_Header := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_Call_ID_SIP_Header };
 const AVP_Code c_AVP_Code_AAA_3GPP_EPS_Subscribed_QoS_Profile := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_EPS_Subscribed_QoS_Profile };
+const AVP_Code c_AVP_Code_GI_3GPP_3GPP_Session_Stop_Indicator := {
+	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_Session_Stop_Indicator };
 const AVP_Code c_AVP_Code_AAA_3GPP_GPRS_Subscription_Data := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_GPRS_Subscription_Data };
+const AVP_Code c_AVP_Code_GI_3GPP_3GPP_GPRS_Negotiated_QoS_Profile := {
+	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_GPRS_Negotiated_QoS_Profile };
+const AVP_Code c_AVP_Code_DNAS_NONE_Called_Station_Id := {
+	vendor_id_NONE := avp_code_DNAS_NONE_Called_Station_Id };
+const AVP_Code c_AVP_Code_DCC_NONE_Cost_Unit := {
+	vendor_id_NONE := avp_code_DCC_NONE_Cost_Unit };
 const AVP_Code c_AVP_Code_BASE_NONE_Accounting_Realtime_Required := {
 	vendor_id_NONE := avp_code_BASE_NONE_Accounting_Realtime_Required };
 const AVP_Code c_AVP_Code_BASE_NONE_Termination_Cause := {
 	vendor_id_NONE := avp_code_BASE_NONE_Termination_Cause };
+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_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_AAA_3GPP_Ext_PDP_Address := {
@@ -6631,14 +9326,22 @@
 	vendor_id_3GPP := avp_code_S6_3GPP_Service_Result_Code };
 const AVP_Code c_AVP_Code_AAA_3GPP_SGSN_Location_Information := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_SGSN_Location_Information };
+const AVP_Code c_AVP_Code_CxDx_3GPP_Reason_Code := {
+	vendor_id_3GPP := avp_code_CxDx_3GPP_Reason_Code };
 const AVP_Code c_AVP_Code_PCC_3GPP_Pre_emption_Vulnerability := {
 	vendor_id_3GPP := avp_code_PCC_3GPP_Pre_emption_Vulnerability };
 const AVP_Code c_AVP_Code_AAA_3GPP_Equivalent_PLMN_List := {
 	vendor_id_3GPP := avp_code_AAA_3GPP_Equivalent_PLMN_List };
 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_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 := {

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/17947
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ibe7321e695337ff62fdc912270f6e13e6c6d6cf2
Gerrit-Change-Number: 17947
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200426/5fc91075/attachment.htm>


More information about the gerrit-log mailing list