DIAMETER_Types: Generate types for 3GPP TS 29.273

The ddf file is added at the end of the list since it depends on tons of
other RFC and 3GGP TS specs, see for instance TS 29.372 Table 8.2.3.0.

Change-Id: I17f7f025ff31d9ce619cd23bfa5f1af282969dbf
diff --git a/library/DIAMETER_Types.ttcn b/library/DIAMETER_Types.ttcn
index 384e34f..3d4a895 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 NetworkAccessServer_IETF_RFC4005.ddf CreditControl_IETF_RFC4006.ddf MobileIPv6_NAS_IETF_RFC5447.ddf MobileIPv6_HA_IETF_RFC5778.ddf AAAInterface_3GPP_TS29272_f10.ddf GxInterface_PCC_3GPP_TS29212_f10.ddf S6Interfaces_3GPP_TS29336_f00.ddf RxInterface_PCC_3GPP_TS29214_f20.ddf CxDxInterface_3GPP_TS29229_c30.ddf GiSGiInterface_3GPP_TS29061_d70.ddf ChargingApplications_3GPP_TS32299_d90.ddf
+// AVP.sh Base_IETF_RFC3588.ddf BaseTypes_IETF_RFC3588.ddf NetworkAccessServer_IETF_RFC4005.ddf CreditControl_IETF_RFC4006.ddf MobileIPv6_NAS_IETF_RFC5447.ddf MobileIPv6_HA_IETF_RFC5778.ddf AAAInterface_3GPP_TS29272_f10.ddf GxInterface_PCC_3GPP_TS29212_f10.ddf S6Interfaces_3GPP_TS29336_f00.ddf RxInterface_PCC_3GPP_TS29214_f20.ddf CxDxInterface_3GPP_TS29229_c30.ddf GiSGiInterface_3GPP_TS29061_d70.ddf ChargingApplications_3GPP_TS32299_d90.ddf AAAInterface_3GPP_TS29273_f00.ddf
 module DIAMETER_Types {
 /******************************************************************************
 * Copyright (c) 2000-2019 Ericsson Telecom AB
@@ -8359,8 +8359,237 @@
 type AVP_Unsigned32 DCA_3GPP_Volume_Quota_Threshold 
 
 
-// STATISTICS: 1126 AVP descriptors found
-// STATISTICS: 1126 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:
+*   Timea Moder
+******************************************************************************/
+//
+//  File:               AAAInterface_3GPP_TS29273_f00.ddf
+//  Description:        DDF for EPS AAA according to 3GPP TS 29.273 V15.0.0
+//  Rev:                R55A
+//  Prodnr:             CNL 113 462
+///////////////////////////////////////////////
+
+
+// APPLICATION-NAME: AAA
+// APPLICATION-REVISION: V15_0_0
+
+// AVP implementations according to:
+// 3GPP TS 29.273 V15.0.0 - EPS AAA interfaces based on the Diameter protocol
+
+// Dependant applications
+// IETF RFC 3588   - Diameter Base Protocol
+// IETF RFC 4005   - Diameter Network Access Server Application
+
+// 9.2.2
+// 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
+
+
+// 8.2.3.1
+// AVP: Non-3GPP-User-Data (1500) 3GPP (10415)
+type AVP_Grouped AAA_3GPP_Non_3GPP_User_Data 
+
+// 8.2.3.3
+// AVP: Non-3GPP-IP-Access (1501) 3GPP (10415)
+type enumerated AAA_3GPP_Non_3GPP_IP_Access  {
+ NON_3GPP_SUBSCRIPTION_ALLOWED (0),
+ NON_3GPP_SUBSCRIPTION_BARRED (1)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// 8.2.3.4
+// AVP: Non-3GPP-IP-Access-APN (1502) 3GPP (10415)
+type enumerated AAA_3GPP_Non_3GPP_IP_Access_APN  {
+ NON_3GPP_APNS_ENABLE (0),
+ NON_3GPP_APNS_DISABLE (1)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// 5.2.3.9
+// AVP: AN-Trusted (1503) 3GPP (10415)
+type enumerated AAA_3GPP_AN_Trusted  {
+ TRUSTED (0),
+ UNTRUSTED (1)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// 5.2.3.7
+// AVP: ANID (1504) 3GPP (10415)
+type AVP_UTF8String AAA_3GPP_ANID 
+
+// 8.2.3.13
+// AVP: Trace-Info (1505) 3GPP (10415)
+type AVP_Grouped AAA_3GPP_Trace_Info 
+
+// 5.2.3.12
+// AVP: MIP-FA-RK (1506) 3GPP (10415)
+type AVP_OctetString AAA_3GPP_MIP_FA_RK 
+
+// 5.2.3.13
+// AVP: MIP-FA-RK-SPI (1507) 3GPP (10415)
+type AVP_Unsigned32 AAA_3GPP_MIP_FA_RK_SPI 
+
+// 5.2.3.17
+// AVP: PPR-Flags (1508) 3GPP (10415)
+type AVP_Unsigned32 AAA_3GPP_PPR_Flags 
+
+// 5.2.3.18
+// AVP: WLAN-Identifier (1509) 3GPP (10415)
+type AVP_Grouped AAA_3GPP_WLAN_Identifier 
+
+// 8.2.3.19
+// AVP: TWAN-Access-Info (1510) 3GPP (10415)
+type AVP_Grouped AAA_3GPP_TWAN_Access_Info 
+
+// 8.2.3.20
+// AVP: Access-Authorization-Flags (1511) 3GPP (10415)
+type AVP_Unsigned32 AAA_3GPP_Access_Authorization_Flags 
+
+// 8.2.3.18
+// AVP: TWAN-Default-APN-Context-Id (1512) 3GPP (10415)
+type AVP_Unsigned32 AAA_3GPP_TWAN_Default_APN_Context_Id 
+
+// 9.2.3.1.4
+// AVP: Trust-Relationship-Update (1515) 3GPP (10415)
+type enumerated AAA_3GPP_Trust_Relationship_Update  {
+ REQUEST_UPDATE (1)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// 5.2.3.14
+// AVP: Full-Network-Name (1516) 3GPP (10415)
+type AVP_OctetString AAA_3GPP_Full_Network_Name 
+
+// 5.2.3.15
+// AVP: Short-Network-Name (1517) 3GPP (10415)
+type AVP_OctetString AAA_3GPP_Short_Network_Name 
+
+// 8.2.3.21
+// AVP: AAA-Failure-Indication (1518) 3GPP (10415)
+type AVP_Unsigned32 AAA_3GPP_AAA_Failure_Indication 
+
+// 5.2.3.19
+// AVP: Transport-Access-Type (1519) 3GPP (10415)
+type enumerated AAA_3GPP_Transport_Access_Type {
+ BBF (0)
+} with {
+	variant "FIELDLENGTH(32)"
+	variant "BYTEORDER(last)"
+	variant "COMP(2scompl)"
+}
+
+// 5.2.3.20
+// AVP: DER-Flags (1520) 3GPP (10415)
+type AVP_Unsigned32 AAA_3GPP_DER_Flags 
+
+// 5.2.3.21
+// AVP: DEA-Flags (1521) 3GPP (10415)
+type AVP_Unsigned32 AAA_3GPP_DEA_Flags 
+
+// 9.2.3.1.5
+// AVP: RAR-Flags (1522) 3GPP (10415)
+type AVP_Unsigned32 AAA_3GPP_RAR_Flags 
+
+// 9.2.3.7
+// AVP: DER-S6b-Flags (1523) 3GPP (10415)
+type AVP_Unsigned32 AAA_3GPP_DER_S6b_Flags 
+
+// 5.2.3.22
+// AVP: SSID (1524) 3GPP (10415)
+type AVP_UTF8String AAA_3GPP_SSID 
+
+// 5.2.3.23
+// AVP: HESSID (1525) 3GPP (10415)
+type AVP_UTF8String AAA_3GPP_HESSID 
+
+
+// 5.2.3.24
+// AVP: Access-Network-Info (1526) 3GPP (10415)
+type AVP_Grouped AAA_3GPP_Access_Network_Info 
+
+// 5.2.3.25
+// AVP: TWAN-Connection-Mode (1527) 3GPP (10415)
+type AVP_Unsigned32 AAA_3GPP_TWAN_Connection_Mode 
+
+// 5.2.3.26
+// AVP: TWAN-Connectivity-Parameters (1528) 3GPP (10415)
+type AVP_Grouped AAA_3GPP_TWAN_Connectivity_Parameters 
+
+// 5.2.3.27
+// AVP: Connectivity-Flags (1529) 3GPP (10415)
+type AVP_Unsigned32 AAA_3GPP_Connectivity_Flags 
+
+// 5.2.3.28
+// AVP: TWAN-PCO (1530) 3GPP (10415)
+type AVP_Grouped AAA_3GPP_TWAN_PCO 
+
+// 5.2.3.29
+// AVP: TWAG-CP-Address (1531) 3GPP (10415)
+type AVP_Address AAA_3GPP_TWAG_CP_Address 
+
+// 5.2.3.30
+// AVP: TWAG-UP-Address  (1532) 3GPP (10415)
+type AVP_UTF8String AAA_3GPP_TWAG_UP_Address 
+
+// 5.2.3.31
+// AVP: TWAN-S2a-Failure-Cause (1533) 3GPP (10415)
+type AVP_Unsigned32 AAA_3GPP_TWAN_S2a_Failure_Cause 
+
+// 5.2.3.33
+// AVP: SM-Back-Off-Timer (1534) 3GPP (10415)
+type AVP_Unsigned32 AAA_3GPP_SM_Back_Off_Timer 
+
+// 5.2.3.33
+// AVP: WLCP-Key (1535) 3GPP (10415)
+type AVP_OctetString AAA_3GPP_WLCP_Key 
+
+// 9.2.3.2.6
+// AVP: Origination-Time-Stamp (1536) 3GPP (10415)
+type AVP_Unsigned64 AAA_3GPP_Origination_Time_Stamp 
+
+// 9.2.3.2.7
+// AVP: Maximum-Wait-Time (1537) 3GPP (10415)
+type AVP_Unsigned32 AAA_3GPP_Maximum_Wait_Time 
+
+// 7.2.3.5
+// AVP: Emergency-Services (1538) 3GPP (10415)
+type AVP_Unsigned32 AAA_3GPP_Emergency_Services 
+
+// 7.2.3.5
+// AVP: AAR-Flags (1539) 3GPP (10415)
+type AVP_Unsigned32 AAA_3GPP_AAR_Flags 
+
+// 5.2.3.35
+// AVP: IMEI-Check-In-VPLMN-Result (1540) 3GPP (10415)
+type AVP_Unsigned32 AAA_3GPP_IMEI_Check_In_VPLMN_Result 
+
+// 8.2.3.27
+// AVP: ERP-Authorization (1541) 3GPP (10415)
+type AVP_Unsigned32 AAA_3GPP_ERP_Authorization 
+
+
+// STATISTICS: 1166 AVP descriptors found
+// STATISTICS: 1166 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) , Authorize_Authenticate (265), Credit_Control (272), Update_Location (316), Cancel_Location (317), Authentication_Information (318), Insert_Subscriber_Data (319), Delete_Subscriber_Data (320), Purge_UE (321), Reset (322), Notify (323), ME_Identity_Check (324), Update_VCSG_Location (8388638), Cancel_VCSG_Location (8388642), TDF_Session (8388637), Subscriber_Information (8388641), Configuration_Information (8388718), Reporting_Information (8388719), NIDD_Information (8388726), User_Authorization (300), Server_Assignment (301), Location_Info (302), Multimedia_Auth (303), Registration_Termination (304), Push_Profile (305)
@@ -8598,6 +8827,7 @@
 }
 type enumerated AVP_Code_3GPP {
 	avp_code_GI_3GPP_3GPP_SGSN_IPv6_Address (15),
+	avp_code_AAA_3GPP_RAR_Flags (1522),
 	avp_code_DCA_3GPP_SCS_Address (3941),
 	avp_code_GI_3GPP_3GPP_GGSN_MCC_MNC (9),
 	avp_code_DCA_3GPP_TWAN_User_Location_Info (2714),
@@ -8608,6 +8838,7 @@
 	avp_code_DCA_3GPP_Applic_ID (1218),
 	avp_code_DCA_3GPP_Route_Header_Transmitted (3404),
 	avp_code_DCA_3GPP_Reporting_Reason (872),
+	avp_code_AAA_3GPP_Emergency_Services (1538),
 	avp_code_RX_3GPP_Media_Component_Description (517),
 	avp_code_PCC_3GPP_CSG_Information_Reporting (1071),
 	avp_code_AAA_3GPP_Measurement_Quantity (1660),
@@ -8632,11 +8863,13 @@
 	avp_code_AAA_3GPP_Last_UE_Activity_Time (1494),
 	avp_code_AAA_3GPP_Context_Identifier (1423),
 	avp_code_AAA_3GPP_Trace_Reference (1459),
+	avp_code_AAA_3GPP_TWAN_Access_Info (1510),
 	avp_code_DCA_3GPP_Status_AS_Code (2702),
 	avp_code_DCA_3GPP_LCS_Client_Type (1241),
 	avp_code_DCA_3GPP_PoC_Session_Initiation_Type (1277),
 	avp_code_RX_3GPP_Sharing_Key_UL (540),
 	avp_code_DCA_3GPP_Content_Size (1206),
+	avp_code_AAA_3GPP_Access_Network_Info (1526),
 	avp_code_RX_3GPP_AF_Charging_Identifier (505),
 	avp_code_S6_3GPP_Monitoring_Event_Report (3123),
 	avp_code_DCA_3GPP_Service_Specific_Type (1257),
@@ -8703,6 +8936,7 @@
 	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_AAA_3GPP_Non_3GPP_IP_Access_APN (1502),
 	avp_code_DCA_3GPP_Monitoring_Event_Information (3921),
 	avp_code_GI_3GPP_3GPP_NSAPI (10),
 	avp_code_DCA_3GPP_LCS_Client_Dialed_By_MS (1233),
@@ -8712,6 +8946,7 @@
 	avp_code_S6_3GPP_NIDD_Authorization_Request (3150),
 	avp_code_DCA_3GPP_Received_Talk_Burst_Time (1284),
 	avp_code_DCA_3GPP_Incoming_Trunk_Group_Id (852),
+	avp_code_AAA_3GPP_AAA_Failure_Indication (1518),
 	avp_code_DCA_3GPP_Rate_Control_Max_Message_Size (3937),
 	avp_code_PCC_3GPP_QoS_Rule_Install (1051),
 	avp_code_S6_3GPP_Periodic_Communication_Indicator (3115),
@@ -8745,7 +8980,9 @@
 	avp_code_AAA_3GPP_SRES (1454),
 	avp_code_DCA_3GPP_DRM_Content (1221),
 	avp_code_AAA_3GPP_Item_Number (1419),
+	avp_code_AAA_3GPP_ERP_Authorization (1541),
 	avp_code_DCA_3GPP_Early_Media_Description (1272),
+	avp_code_AAA_3GPP_MIP_FA_RK (1506),
 	avp_code_DCA_3GPP_Related_Change_Condition_Information (3925),
 	avp_code_S6_3GPP_Service_ID (3103),
 	avp_code_DCA_3GPP_LCS_Format_Indicator (1237),
@@ -8819,6 +9056,7 @@
 	avp_code_AAA_3GPP_Regional_Subscription_Zone_Code (1446),
 	avp_code_DCA_3GPP_Message_Class (1213),
 	avp_code_GI_3GPP_3GPP_Negotiated_DSCP (26),
+	avp_code_AAA_3GPP_TWAN_S2a_Failure_Cause (1533),
 	avp_code_DCA_3GPP_Trigger (1264),
 	avp_code_DCA_3GPP_Called_Identity_Change (3917),
 	avp_code_DCA_3GPP_ProSe_Request_Timestamp (3450),
@@ -8853,14 +9091,17 @@
 	avp_code_DCA_3GPP_Recipient_Address (1201),
 	avp_code_DCA_3GPP_Change_Condition (2037),
 	avp_code_GI_3GPP_3GPP_CG_IPv6_Address (14),
+	avp_code_AAA_3GPP_DEA_Flags (1521),
 	avp_code_DCA_3GPP_SCS_AS_Address (3940),
 	avp_code_AAA_3GPP_MO_LR (1485),
 	avp_code_DCA_3GPP_IMS_Visited_Network_Identifier (2713),
 	avp_code_DCA_3GPP_PoC_User_Role (1252),
 	avp_code_DCA_3GPP_Announcement_Identifier (3905),
+	avp_code_AAA_3GPP_Non_3GPP_IP_Access (1501),
 	avp_code_DCA_3GPP_Monitoring_Event_Report_Data (3920),
 	avp_code_DCA_3GPP_Adaptations (1217),
 	avp_code_DCA_3GPP_Quota_Holding_Time (871),
+	avp_code_AAA_3GPP_Maximum_Wait_Time (1537),
 	avp_code_RX_3GPP_Max_Requested_Bandwidth_UL (516),
 	avp_code_PCC_3GPP_Usage_Monitoring_Support (1070),
 	avp_code_S6_3GPP_Maximum_Response_Time (3134),
@@ -8889,8 +9130,10 @@
 	avp_code_AAA_3GPP_PDN_GW_Allocation_Type (1438),
 	avp_code_DCA_3GPP_Additional_Type_Information (1205),
 	avp_code_GI_3GPP_3GPP_SGSN_MCC_MNC (18),
+	avp_code_AAA_3GPP_HESSID (1525),
 	avp_code_DCA_3GPP_Content_Class (1220),
 	avp_code_DCA_3GPP_TAD_Identifier (2717),
+	avp_code_AAA_3GPP_IMEI_Check_In_VPLMN_Result (1540),
 	avp_code_DCA_3GPP_Service_Generic_Information (1256),
 	avp_code_DCA_3GPP_Variable_Part_Type (3909),
 	avp_code_DCA_3GPP_ProSe_Direct_Discovery_Model (3442),
@@ -8929,6 +9172,7 @@
 	avp_code_DCA_3GPP_Priority (1209),
 	avp_code_S6_3GPP_NIDD_Authorization_Update (3161),
 	avp_code_DCA_3GPP_Service_Specific_Data (863),
+	avp_code_AAA_3GPP_Connectivity_Flags (1529),
 	avp_code_PCC_3GPP_Packet_Filter_Operation (1062),
 	avp_code_DCA_3GPP_VCS_Information (3410),
 	avp_code_S6_3GPP_SCEF_Reference_ID_for_Deletion (3126),
@@ -8960,10 +9204,12 @@
 	avp_code_DCA_3GPP_LCS_Client_Id (1232),
 	avp_code_GI_3GPP_3GPP_PDP_Type (3),
 	avp_code_DCA_3GPP_Number_Of_Talk_Bursts (1283),
+	avp_code_AAA_3GPP_Short_Network_Name (1517),
 	avp_code_DCA_3GPP_Message_Size (1212),
 	avp_code_DCA_3GPP_Additional_Exception_Reports (3936),
 	avp_code_DCA_3GPP_Access_Transfer_Information (2709),
 	avp_code_S6_3GPP_Communication_Pattern_Set (3114),
+	avp_code_AAA_3GPP_TWAG_UP_Address (1532),
 	avp_code_DCA_3GPP_MMBox_Storage_Requested (1248),
 	avp_code_RX_3GPP_Flow_Status (511),
 	avp_code_DCA_3GPP_PC3_Control_Protocol_Cause (3434),
@@ -8991,9 +9237,11 @@
 	avp_code_AAA_3GPP_SGSN_Number (1489),
 	avp_code_AAA_3GPP_HPLMN_ODB (1418),
 	avp_code_DCA_3GPP_Time_Quota_Type (1271),
+	avp_code_AAA_3GPP_Trace_Info (1505),
 	avp_code_DCA_3GPP_Domain_Name (1200),
 	avp_code_GI_3GPP_3GPP_Charging_Characteristics (13),
 	avp_code_AAA_3GPP_PDP_Context (1469),
+	avp_code_AAA_3GPP_DER_Flags (1520),
 	avp_code_DCA_3GPP_LCS_Data_Coding_Scheme (1236),
 	avp_code_GI_3GPP_3GPP_GGSN_Address (7),
 	avp_code_DCA_3GPP_Related_IMS_Charging_Identifier_Node (2712),
@@ -9030,6 +9278,7 @@
 	avp_code_AAA_3GPP_Roaming_Restricted_Due_To_Unsupported_Feature (1457),
 	avp_code_DCA_3GPP_File_Repair_Supported (1224),
 	avp_code_DCA_3GPP_SDP_Answer_Timestamp (1275),
+	avp_code_AAA_3GPP_WLAN_Identifier (1509),
 	avp_code_DCA_3GPP_Type_Number (1204),
 	avp_code_DCA_3GPP_NIDD_Submission (3928),
 	avp_code_S6_3GPP_T4_Parameters (3106),
@@ -9066,6 +9315,7 @@
 	avp_code_AAA_3GPP_EPS_Location_Information (1496),
 	avp_code_DCA_3GPP_Access_Network_Information (1263),
 	avp_code_DCA_3GPP_Called_Identity (3916),
+	avp_code_AAA_3GPP_TWAN_Default_APN_Context_Id (1512),
 	avp_code_DCA_3GPP_SGSN_Address (1228),
 	avp_code_DCA_3GPP_SGi_PtP_Tunnelling_Method (3931),
 	avp_code_DCA_3GPP_NNI_Type (2704),
@@ -9101,8 +9351,10 @@
 	avp_code_DCA_3GPP_Requested_Party_Address (1251),
 	avp_code_DCA_3GPP_Announcement_Information (3904),
 	avp_code_AAA_3GPP_AUTN (1449),
+	avp_code_AAA_3GPP_Non_3GPP_User_Data (1500),
 	avp_code_DCA_3GPP_Delivery_Report_Requested (1216),
 	avp_code_GI_3GPP_TWAN_Identifier (29),
+	avp_code_AAA_3GPP_Origination_Time_Stamp (1536),
 	avp_code_DCA_3GPP_LCS_APN (1231),
 	avp_code_DCA_3GPP_Envelope_End_Time (1267),
 	avp_code_RX_3GPP_Sponsored_Connectivity_Data (530),
@@ -9132,11 +9384,13 @@
 	avp_code_DCA_3GPP_Account_Expiration (2309),
 	avp_code_AAA_3GPP_CSG_Id (1437),
 	avp_code_GI_3GPP_3GPP_IPv6_DNS_Servers (17),
+	avp_code_AAA_3GPP_SSID (1524),
 	avp_code_AAA_3GPP_Call_Barring_Info (1488),
 	avp_code_DCA_3GPP_BSSID (2716),
 	avp_code_DCA_3GPP_Talk_Burst_Exchange (1255),
 	avp_code_DCA_3GPP_Variable_Part_Order (3908),
 	avp_code_DCA_3GPP_Time_Quota_Mechanism (1270),
+	avp_code_AAA_3GPP_ANID (1504),
 	avp_code_DCA_3GPP_Monitoring_Event_Report_Number (3923),
 	avp_code_S6_3GPP_IP_SM_GW_Name (3101),
 	avp_code_RX_3GPP_Media_Sub_Component (519),
@@ -9174,6 +9428,7 @@
 	avp_code_DCA_3GPP_Location_Estimate_Type (1243),
 	avp_code_DCA_3GPP_Time_Indicator (3911),
 	avp_code_DCA_3GPP_Addressee_Type (1208),
+	avp_code_AAA_3GPP_TWAN_Connectivity_Parameters (1528),
 	avp_code_DCA_3GPP_Reply_Applic_ID (1223),
 	avp_code_DCA_3GPP_Participant_Access_Priority (1259),
 	avp_code_RX_3GPP_RS_Bandwidth (522),
@@ -9206,10 +9461,12 @@
 	avp_code_GI_3GPP_3GPP_Charging_Id (2),
 	avp_code_AAA_3GPP_APN_Configuration_Profile (1429),
 	avp_code_DCA_3GPP_Number_Of_Received_Talk_Bursts (1282),
+	avp_code_AAA_3GPP_Full_Network_Name (1516),
 	avp_code_DCA_3GPP_Message_Type (1211),
 	avp_code_DCA_3GPP_APN_Rate_Control_Uplink (3935),
 	avp_code_GI_3GPP_3GPP_CAMEL_Charging_Info (24),
 	avp_code_DCA_3GPP_From_Address (2708),
+	avp_code_AAA_3GPP_TWAG_CP_Address (1531),
 	avp_code_DCA_3GPP_PDP_Context_Type (1247),
 	avp_code_RX_3GPP_Flows (510),
 	avp_code_DCA_3GPP_User_Session_Id (830),
@@ -9251,6 +9508,7 @@
 	avp_code_DCA_3GPP_Rate_Control_Time_Unit (3939),
 	avp_code_GI_3GPP_External_Identifier (28),
 	avp_code_DCA_3GPP_Reason_Header (3401),
+	avp_code_AAA_3GPP_WLCP_Key (1535),
 	avp_code_S6_3GPP_Reachability_Type (3132),
 	avp_code_DCA_3GPP_SIP_Request_Timestamp (834),
 	avp_code_DCA_3GPP_ProSe_Source_IP_Address (3452),
@@ -9276,9 +9534,11 @@
 	avp_code_DCA_3GPP_Scale_Factor (2059),
 	avp_code_DCA_3GPP_IM_Information (2110),
 	avp_code_DCA_3GPP_SDP_Offer_Timestamp (1274),
+	avp_code_AAA_3GPP_PPR_Flags (1508),
 	avp_code_DCA_3GPP_MM_Content_Type (1203),
 	avp_code_DCA_3GPP_CPDT_Information (3927),
 	avp_code_GI_3GPP_3GPP_GGSN_IPv6_Address (16),
+	avp_code_AAA_3GPP_DER_S6b_Flags (1523),
 	avp_code_DCA_3GPP_SCS_Realm (3942),
 	avp_code_DCA_3GPP_LCS_Requestor_Id (1239),
 	avp_code_RX_3GPP_Access_Network_Charging_Identifier (502),
@@ -9313,6 +9573,7 @@
 	avp_code_DCA_3GPP_Serving_Node_Type (2047),
 	avp_code_AAA_3GPP_Requested_UTRAN_GERAN_Authentication_Info (1409),
 	avp_code_AAA_3GPP_EPS_User_State (1495),
+	avp_code_AAA_3GPP_Access_Authorization_Flags (1511),
 	avp_code_DCA_3GPP_PDP_Address (1227),
 	avp_code_DCA_3GPP_CP_CIoT_EPS_Optimisation_Indicator (3930),
 	avp_code_DCA_3GPP_NNI_Information (2703),
@@ -9321,6 +9582,7 @@
 	avp_code_RX_3GPP_Retry_Interval (541),
 	avp_code_DCA_3GPP_Additional_Content_Information (1207),
 	avp_code_DCA_3GPP_Cause_Code (861),
+	avp_code_AAA_3GPP_TWAN_Connection_Mode (1527),
 	avp_code_PCC_3GPP_Packet_Filter_Identifier (1060),
 	avp_code_DCA_3GPP_Address_Data (897),
 	avp_code_S6_3GPP_SCEF_Reference_ID (3124),
@@ -9351,6 +9613,7 @@
 	avp_code_DCA_3GPP_Envelope (1266),
 	avp_code_DCA_3GPP_Monitoring_Event_Configuration_Activity (3919),
 	avp_code_DCA_3GPP_IMS_Communication_Service_Identifier (1281),
+	avp_code_AAA_3GPP_Trust_Relationship_Update (1515),
 	avp_code_DCA_3GPP_APN_Rate_Control_Downlink (3934),
 	avp_code_DCA_3GPP_Session_Direction (2707),
 	avp_code_S6_3GPP_IP_SM_GW_Realm (3112),
@@ -9381,15 +9644,18 @@
 	avp_code_AAA_3GPP_CSG_Subscription_Data (1436),
 	avp_code_DCA_3GPP_Diagnostics (2039),
 	avp_code_AAA_3GPP_TS_Code (1487),
+	avp_code_AAA_3GPP_AN_Trusted (1503),
 	avp_code_DCA_3GPP_Monitoring_Event_Funtionality (3922),
 	avp_code_DCA_3GPP_Aux_Applic_Info (1219),
 	avp_code_S6_3GPP_IP_SM_GW_Number (3100),
+	avp_code_AAA_3GPP_AAR_Flags (1539),
 	avp_code_DCA_3GPP_LCS_Client_External_ID (1234),
 	avp_code_DCA_3GPP_VLR_Number (3420),
 	avp_code_PCC_3GPP_Charging_Rule_Install (1001),
 	avp_code_RX_3GPP_Rx_Request_Type (533),
 	avp_code_S6_3GPP_NIDD_Authorization_Response (3151),
 	avp_code_DCA_3GPP_Outgoing_Trunk_Group_Id (853),
+	avp_code_AAA_3GPP_Transport_Access_Type (1519),
 	avp_code_PCC_3GPP_QoS_Rule_Remove (1052),
 	avp_code_AAA_3GPP_VPLMN_CSG_Subscription_Data (1641),
 	avp_code_DCA_3GPP_Message_Body (889),
@@ -9419,6 +9685,7 @@
 	avp_code_RX_3GPP_RR_Bandwidth (521),
 	avp_code_DCA_3GPP_SDP_TimeStamps (1273),
 	avp_code_DCA_3GPP_IMS_Charging_Identifier (841),
+	avp_code_AAA_3GPP_MIP_FA_RK_SPI (1507),
 	avp_code_DCA_3GPP_Related_Trigger (3926),
 	avp_code_PCC_3GPP_APN_Aggregate_Max_Bitrate_DL (1040),
 	avp_code_S6_3GPP_SCS_Identity (3104),
@@ -9449,6 +9716,7 @@
 	avp_code_GI_3GPP_3GPP_MS_TimeZone (23),
 	avp_code_AAA_3GPP_External_Client (1479),
 	avp_code_DCA_3GPP_Charge_Reason_Code (2118),
+	avp_code_AAA_3GPP_TWAN_PCO (1530),
 	avp_code_DCA_3GPP_PoC_Change_Conditions (1261),
 	avp_code_DCA_3GPP_Language (3914),
 	avp_code_RX_3GPP_Extended_Min_Requested_BW_DL (560),
@@ -9486,6 +9754,7 @@
 	avp_code_DCA_3GPP_Rate_Control_Max_Rate (3938),
 	avp_code_DCA_3GPP_Class_Identifier (1214),
 	avp_code_GI_3GPP_3GPP_Allocate_IP_Type (27),
+	avp_code_AAA_3GPP_SM_Back_Off_Timer (1534),
 	avp_code_RX_3GPP_Specific_Action (513),
 	avp_code_S6_3GPP_Maximum_Detection_Time (3131),
 	avp_code_DCA_3GPP_Time_Stamps (833),
@@ -9548,6 +9817,7 @@
 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,
+	AAA_3GPP_RAR_Flags avp_AAA_3GPP_RAR_Flags,
 	DCA_3GPP_SCS_Address avp_DCA_3GPP_SCS_Address,
 	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,
@@ -9562,6 +9832,7 @@
 	BASE_NONE_Session_Id avp_BASE_NONE_Session_Id,
 	DCA_3GPP_Route_Header_Transmitted avp_DCA_3GPP_Route_Header_Transmitted,
 	DCA_3GPP_Reporting_Reason avp_DCA_3GPP_Reporting_Reason,
+	AAA_3GPP_Emergency_Services avp_AAA_3GPP_Emergency_Services,
 	RX_3GPP_Media_Component_Description avp_RX_3GPP_Media_Component_Description,
 	PCC_3GPP_CSG_Information_Reporting avp_PCC_3GPP_CSG_Information_Reporting,
 	AAA_3GPP_Measurement_Quantity avp_AAA_3GPP_Measurement_Quantity,
@@ -9591,6 +9862,7 @@
 	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,
+	AAA_3GPP_TWAN_Access_Info avp_AAA_3GPP_TWAN_Access_Info,
 	DCA_3GPP_Status_AS_Code avp_DCA_3GPP_Status_AS_Code,
 	DCA_3GPP_LCS_Client_Type avp_DCA_3GPP_LCS_Client_Type,
 	DNAS_NONE_Framed_Appletalk_Network avp_DNAS_NONE_Framed_Appletalk_Network,
@@ -9598,6 +9870,7 @@
 	DCA_3GPP_PoC_Session_Initiation_Type avp_DCA_3GPP_PoC_Session_Initiation_Type,
 	RX_3GPP_Sharing_Key_UL avp_RX_3GPP_Sharing_Key_UL,
 	DCA_3GPP_Content_Size avp_DCA_3GPP_Content_Size,
+	AAA_3GPP_Access_Network_Info avp_AAA_3GPP_Access_Network_Info,
 	RX_3GPP_AF_Charging_Identifier avp_RX_3GPP_AF_Charging_Identifier,
 	S6_3GPP_Monitoring_Event_Report avp_S6_3GPP_Monitoring_Event_Report,
 	DCA_3GPP_Service_Specific_Type avp_DCA_3GPP_Service_Specific_Type,
@@ -9675,6 +9948,7 @@
 	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,
+	AAA_3GPP_Non_3GPP_IP_Access_APN avp_AAA_3GPP_Non_3GPP_IP_Access_APN,
 	DCA_3GPP_Monitoring_Event_Information avp_DCA_3GPP_Monitoring_Event_Information,
 	DCC_NONE_Tariff_Time_Change avp_DCC_NONE_Tariff_Time_Change,
 	GI_3GPP_3GPP_NSAPI avp_GI_3GPP_3GPP_NSAPI,
@@ -9685,6 +9959,7 @@
 	S6_3GPP_NIDD_Authorization_Request avp_S6_3GPP_NIDD_Authorization_Request,
 	DCA_3GPP_Received_Talk_Burst_Time avp_DCA_3GPP_Received_Talk_Burst_Time,
 	DCA_3GPP_Incoming_Trunk_Group_Id avp_DCA_3GPP_Incoming_Trunk_Group_Id,
+	AAA_3GPP_AAA_Failure_Indication avp_AAA_3GPP_AAA_Failure_Indication,
 	DCA_3GPP_Rate_Control_Max_Message_Size avp_DCA_3GPP_Rate_Control_Max_Message_Size,
 	PCC_3GPP_QoS_Rule_Install avp_PCC_3GPP_QoS_Rule_Install,
 	S6_3GPP_Periodic_Communication_Indicator avp_S6_3GPP_Periodic_Communication_Indicator,
@@ -9727,8 +10002,10 @@
 	DCA_3GPP_DRM_Content avp_DCA_3GPP_DRM_Content,
 	AAA_3GPP_Item_Number avp_AAA_3GPP_Item_Number,
 	DNAS_NONE_NAS_Port_Type avp_DNAS_NONE_NAS_Port_Type,
+	AAA_3GPP_ERP_Authorization avp_AAA_3GPP_ERP_Authorization,
 	DCC_NONE_Multiple_Services_Indicator avp_DCC_NONE_Multiple_Services_Indicator,
 	DCA_3GPP_Early_Media_Description avp_DCA_3GPP_Early_Media_Description,
+	AAA_3GPP_MIP_FA_RK avp_AAA_3GPP_MIP_FA_RK,
 	DCA_3GPP_Related_Change_Condition_Information avp_DCA_3GPP_Related_Change_Condition_Information,
 	DNAS_NONE_Framed_Protocol avp_DNAS_NONE_Framed_Protocol,
 	S6_3GPP_Service_ID avp_S6_3GPP_Service_ID,
@@ -9816,6 +10093,7 @@
 	AAA_3GPP_Regional_Subscription_Zone_Code avp_AAA_3GPP_Regional_Subscription_Zone_Code,
 	DCA_3GPP_Message_Class avp_DCA_3GPP_Message_Class,
 	GI_3GPP_3GPP_Negotiated_DSCP avp_GI_3GPP_3GPP_Negotiated_DSCP,
+	AAA_3GPP_TWAN_S2a_Failure_Cause avp_AAA_3GPP_TWAN_S2a_Failure_Cause,
 	DCA_3GPP_Trigger avp_DCA_3GPP_Trigger,
 	DCA_3GPP_Called_Identity_Change avp_DCA_3GPP_Called_Identity_Change,
 	DCA_3GPP_ProSe_Request_Timestamp avp_DCA_3GPP_ProSe_Request_Timestamp,
@@ -9857,15 +10135,18 @@
 	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_DEA_Flags avp_AAA_3GPP_DEA_Flags,
 	DCA_3GPP_SCS_AS_Address avp_DCA_3GPP_SCS_AS_Address,
 	AAA_3GPP_MO_LR avp_AAA_3GPP_MO_LR,
 	DCA_3GPP_IMS_Visited_Network_Identifier avp_DCA_3GPP_IMS_Visited_Network_Identifier,
 	DCA_3GPP_PoC_User_Role avp_DCA_3GPP_PoC_User_Role,
 	DCA_3GPP_Announcement_Identifier avp_DCA_3GPP_Announcement_Identifier,
+	AAA_3GPP_Non_3GPP_IP_Access avp_AAA_3GPP_Non_3GPP_IP_Access,
 	DCA_3GPP_Monitoring_Event_Report_Data avp_DCA_3GPP_Monitoring_Event_Report_Data,
 	DCA_3GPP_Adaptations avp_DCA_3GPP_Adaptations,
 	BASE_NONE_Host_IP_Address avp_BASE_NONE_Host_IP_Address,
 	DCA_3GPP_Quota_Holding_Time avp_DCA_3GPP_Quota_Holding_Time,
+	AAA_3GPP_Maximum_Wait_Time avp_AAA_3GPP_Maximum_Wait_Time,
 	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,
@@ -9898,10 +10179,12 @@
 	AAA_3GPP_PDN_GW_Allocation_Type avp_AAA_3GPP_PDN_GW_Allocation_Type,
 	DCA_3GPP_Additional_Type_Information avp_DCA_3GPP_Additional_Type_Information,
 	GI_3GPP_3GPP_SGSN_MCC_MNC avp_GI_3GPP_3GPP_SGSN_MCC_MNC,
+	AAA_3GPP_HESSID avp_AAA_3GPP_HESSID,
 	DCA_3GPP_Content_Class avp_DCA_3GPP_Content_Class,
 	BASE_NONE_Event_Timestamp avp_BASE_NONE_Event_Timestamp,
 	DCA_3GPP_TAD_Identifier avp_DCA_3GPP_TAD_Identifier,
 	DCC_NONE_Final_Unit_Action avp_DCC_NONE_Final_Unit_Action,
+	AAA_3GPP_IMEI_Check_In_VPLMN_Result avp_AAA_3GPP_IMEI_Check_In_VPLMN_Result,
 	DCA_3GPP_Service_Generic_Information avp_DCA_3GPP_Service_Generic_Information,
 	DCA_3GPP_Variable_Part_Type avp_DCA_3GPP_Variable_Part_Type,
 	DCA_3GPP_ProSe_Direct_Discovery_Model avp_DCA_3GPP_ProSe_Direct_Discovery_Model,
@@ -9948,6 +10231,7 @@
 	S6_3GPP_NIDD_Authorization_Update avp_S6_3GPP_NIDD_Authorization_Update,
 	DCA_3GPP_Service_Specific_Data avp_DCA_3GPP_Service_Specific_Data,
 	DCC_NONE_Subscription_Id_Type avp_DCC_NONE_Subscription_Id_Type,
+	AAA_3GPP_Connectivity_Flags avp_AAA_3GPP_Connectivity_Flags,
 	PCC_3GPP_Packet_Filter_Operation avp_PCC_3GPP_Packet_Filter_Operation,
 	DCA_3GPP_VCS_Information avp_DCA_3GPP_VCS_Information,
 	S6_3GPP_SCEF_Reference_ID_for_Deletion avp_S6_3GPP_SCEF_Reference_ID_for_Deletion,
@@ -9990,10 +10274,12 @@
 	MIPv6_NONE_MIP_Replay_Mode avp_MIPv6_NONE_MIP_Replay_Mode,
 	BASE_NONE_Proxy_Host avp_BASE_NONE_Proxy_Host,
 	DCA_3GPP_Number_Of_Talk_Bursts avp_DCA_3GPP_Number_Of_Talk_Bursts,
+	AAA_3GPP_Short_Network_Name avp_AAA_3GPP_Short_Network_Name,
 	DCA_3GPP_Message_Size avp_DCA_3GPP_Message_Size,
 	DCA_3GPP_Additional_Exception_Reports avp_DCA_3GPP_Additional_Exception_Reports,
 	DCA_3GPP_Access_Transfer_Information avp_DCA_3GPP_Access_Transfer_Information,
 	S6_3GPP_Communication_Pattern_Set avp_S6_3GPP_Communication_Pattern_Set,
+	AAA_3GPP_TWAG_UP_Address avp_AAA_3GPP_TWAG_UP_Address,
 	DCA_3GPP_MMBox_Storage_Requested avp_DCA_3GPP_MMBox_Storage_Requested,
 	RX_3GPP_Flow_Status avp_RX_3GPP_Flow_Status,
 	DNAS_NONE_CHAP_Challenge avp_DNAS_NONE_CHAP_Challenge,
@@ -10026,10 +10312,12 @@
 	AAA_3GPP_SGSN_Number avp_AAA_3GPP_SGSN_Number,
 	AAA_3GPP_HPLMN_ODB avp_AAA_3GPP_HPLMN_ODB,
 	DCA_3GPP_Time_Quota_Type avp_DCA_3GPP_Time_Quota_Type,
+	AAA_3GPP_Trace_Info avp_AAA_3GPP_Trace_Info,
 	DCA_3GPP_Domain_Name avp_DCA_3GPP_Domain_Name,
 	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,
+	AAA_3GPP_DER_Flags avp_AAA_3GPP_DER_Flags,
 	DCA_3GPP_LCS_Data_Coding_Scheme avp_DCA_3GPP_LCS_Data_Coding_Scheme,
 	GI_3GPP_3GPP_GGSN_Address avp_GI_3GPP_3GPP_GGSN_Address,
 	BASE_NONE_Proxy_Info avp_BASE_NONE_Proxy_Info,
@@ -10076,6 +10364,7 @@
 	DNAS_NONE_Tunnel_Assignment_Id avp_DNAS_NONE_Tunnel_Assignment_Id,
 	DCC_NONE_CC_Service_Specific_Units avp_DCC_NONE_CC_Service_Specific_Units,
 	DCA_3GPP_SDP_Answer_Timestamp avp_DCA_3GPP_SDP_Answer_Timestamp,
+	AAA_3GPP_WLAN_Identifier avp_AAA_3GPP_WLAN_Identifier,
 	DCA_3GPP_Type_Number avp_DCA_3GPP_Type_Number,
 	DCA_3GPP_NIDD_Submission avp_DCA_3GPP_NIDD_Submission,
 	S6_3GPP_T4_Parameters avp_S6_3GPP_T4_Parameters,
@@ -10119,6 +10408,7 @@
 	AAA_3GPP_EPS_Location_Information avp_AAA_3GPP_EPS_Location_Information,
 	DCA_3GPP_Access_Network_Information avp_DCA_3GPP_Access_Network_Information,
 	DCA_3GPP_Called_Identity avp_DCA_3GPP_Called_Identity,
+	AAA_3GPP_TWAN_Default_APN_Context_Id avp_AAA_3GPP_TWAN_Default_APN_Context_Id,
 	DCA_3GPP_SGSN_Address avp_DCA_3GPP_SGSN_Address,
 	DCA_3GPP_SGi_PtP_Tunnelling_Method avp_DCA_3GPP_SGi_PtP_Tunnelling_Method,
 	BASE_NONE_Session_Timeout avp_BASE_NONE_Session_Timeout,
@@ -10163,8 +10453,10 @@
 	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,
+	AAA_3GPP_Non_3GPP_User_Data avp_AAA_3GPP_Non_3GPP_User_Data,
 	DCA_3GPP_Delivery_Report_Requested avp_DCA_3GPP_Delivery_Report_Requested,
 	GI_3GPP_TWAN_Identifier avp_GI_3GPP_TWAN_Identifier,
+	AAA_3GPP_Origination_Time_Stamp avp_AAA_3GPP_Origination_Time_Stamp,
 	DCA_3GPP_LCS_APN avp_DCA_3GPP_LCS_APN,
 	DCA_3GPP_Envelope_End_Time avp_DCA_3GPP_Envelope_End_Time,
 	RX_3GPP_Sponsored_Connectivity_Data avp_RX_3GPP_Sponsored_Connectivity_Data,
@@ -10201,12 +10493,14 @@
 	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_SSID avp_AAA_3GPP_SSID,
 	AAA_3GPP_Call_Barring_Info avp_AAA_3GPP_Call_Barring_Info,
 	DCA_3GPP_BSSID avp_DCA_3GPP_BSSID,
 	DCC_NONE_Service_Parameter_Info avp_DCC_NONE_Service_Parameter_Info,
 	DCA_3GPP_Talk_Burst_Exchange avp_DCA_3GPP_Talk_Burst_Exchange,
 	DCA_3GPP_Variable_Part_Order avp_DCA_3GPP_Variable_Part_Order,
 	DCA_3GPP_Time_Quota_Mechanism avp_DCA_3GPP_Time_Quota_Mechanism,
+	AAA_3GPP_ANID avp_AAA_3GPP_ANID,
 	DCA_3GPP_Monitoring_Event_Report_Number avp_DCA_3GPP_Monitoring_Event_Report_Number,
 	S6_3GPP_IP_SM_GW_Name avp_S6_3GPP_IP_SM_GW_Name,
 	BASE_NONE_Origin_State_Id avp_BASE_NONE_Origin_State_Id,
@@ -10252,6 +10546,7 @@
 	DCA_3GPP_Addressee_Type avp_DCA_3GPP_Addressee_Type,
 	BASE_NONE_Acct_Multi_Session_Id avp_BASE_NONE_Acct_Multi_Session_Id,
 	DCC_NONE_Subscription_Id_Data avp_DCC_NONE_Subscription_Id_Data,
+	AAA_3GPP_TWAN_Connectivity_Parameters avp_AAA_3GPP_TWAN_Connectivity_Parameters,
 	DCA_3GPP_Reply_Applic_ID avp_DCA_3GPP_Reply_Applic_ID,
 	DCA_3GPP_Participant_Access_Priority avp_DCA_3GPP_Participant_Access_Priority,
 	RX_3GPP_RS_Bandwidth avp_RX_3GPP_RS_Bandwidth,
@@ -10289,10 +10584,12 @@
 	DNAS_NONE_CHAP_Algorithm avp_DNAS_NONE_CHAP_Algorithm,
 	AAA_3GPP_APN_Configuration_Profile avp_AAA_3GPP_APN_Configuration_Profile,
 	DCA_3GPP_Number_Of_Received_Talk_Bursts avp_DCA_3GPP_Number_Of_Received_Talk_Bursts,
+	AAA_3GPP_Full_Network_Name avp_AAA_3GPP_Full_Network_Name,
 	DCA_3GPP_Message_Type avp_DCA_3GPP_Message_Type,
 	DCA_3GPP_APN_Rate_Control_Uplink avp_DCA_3GPP_APN_Rate_Control_Uplink,
 	GI_3GPP_3GPP_CAMEL_Charging_Info avp_GI_3GPP_3GPP_CAMEL_Charging_Info,
 	DCA_3GPP_From_Address avp_DCA_3GPP_From_Address,
+	AAA_3GPP_TWAG_CP_Address avp_AAA_3GPP_TWAG_CP_Address,
 	DCA_3GPP_PDP_Context_Type avp_DCA_3GPP_PDP_Context_Type,
 	RX_3GPP_Flows avp_RX_3GPP_Flows,
 	DCA_3GPP_User_Session_Id avp_DCA_3GPP_User_Session_Id,
@@ -10346,6 +10643,7 @@
 	DCA_3GPP_Rate_Control_Time_Unit avp_DCA_3GPP_Rate_Control_Time_Unit,
 	GI_3GPP_External_Identifier avp_GI_3GPP_External_Identifier,
 	DCA_3GPP_Reason_Header avp_DCA_3GPP_Reason_Header,
+	AAA_3GPP_WLCP_Key avp_AAA_3GPP_WLCP_Key,
 	S6_3GPP_Reachability_Type avp_S6_3GPP_Reachability_Type,
 	DCA_3GPP_SIP_Request_Timestamp avp_DCA_3GPP_SIP_Request_Timestamp,
 	DNAS_NONE_Framed_Route avp_DNAS_NONE_Framed_Route,
@@ -10380,9 +10678,11 @@
 	DCA_3GPP_IM_Information avp_DCA_3GPP_IM_Information,
 	DNAS_NONE_Prompt avp_DNAS_NONE_Prompt,
 	DCA_3GPP_SDP_Offer_Timestamp avp_DCA_3GPP_SDP_Offer_Timestamp,
+	AAA_3GPP_PPR_Flags avp_AAA_3GPP_PPR_Flags,
 	DCA_3GPP_MM_Content_Type avp_DCA_3GPP_MM_Content_Type,
 	DCA_3GPP_CPDT_Information avp_DCA_3GPP_CPDT_Information,
 	GI_3GPP_3GPP_GGSN_IPv6_Address avp_GI_3GPP_3GPP_GGSN_IPv6_Address,
+	AAA_3GPP_DER_S6b_Flags avp_AAA_3GPP_DER_S6b_Flags,
 	DCA_3GPP_SCS_Realm avp_DCA_3GPP_SCS_Realm,
 	DCA_3GPP_LCS_Requestor_Id avp_DCA_3GPP_LCS_Requestor_Id,
 	RX_3GPP_Access_Network_Charging_Identifier avp_RX_3GPP_Access_Network_Charging_Identifier,
@@ -10425,6 +10725,7 @@
 	DNAS_NONE_Accounting_Input_Octets avp_DNAS_NONE_Accounting_Input_Octets,
 	AAA_3GPP_EPS_User_State avp_AAA_3GPP_EPS_User_State,
 	BASE_NONE_Origin_Host avp_BASE_NONE_Origin_Host,
+	AAA_3GPP_Access_Authorization_Flags avp_AAA_3GPP_Access_Authorization_Flags,
 	DCA_3GPP_PDP_Address avp_DCA_3GPP_PDP_Address,
 	DCA_3GPP_CP_CIoT_EPS_Optimisation_Indicator avp_DCA_3GPP_CP_CIoT_EPS_Optimisation_Indicator,
 	DCA_3GPP_NNI_Information avp_DCA_3GPP_NNI_Information,
@@ -10435,6 +10736,7 @@
 	DCA_3GPP_Additional_Content_Information avp_DCA_3GPP_Additional_Content_Information,
 	DCC_NONE_Restriction_Filter_Rule avp_DCC_NONE_Restriction_Filter_Rule,
 	DCA_3GPP_Cause_Code avp_DCA_3GPP_Cause_Code,
+	AAA_3GPP_TWAN_Connection_Mode avp_AAA_3GPP_TWAN_Connection_Mode,
 	PCC_3GPP_Packet_Filter_Identifier avp_PCC_3GPP_Packet_Filter_Identifier,
 	DCA_3GPP_Address_Data avp_DCA_3GPP_Address_Data,
 	S6_3GPP_SCEF_Reference_ID avp_S6_3GPP_SCEF_Reference_ID,
@@ -10475,6 +10777,7 @@
 	DCA_3GPP_Monitoring_Event_Configuration_Activity avp_DCA_3GPP_Monitoring_Event_Configuration_Activity,
 	DCA_3GPP_IMS_Communication_Service_Identifier avp_DCA_3GPP_IMS_Communication_Service_Identifier,
 	DNAS_NONE_Framed_IP_Address avp_DNAS_NONE_Framed_IP_Address,
+	AAA_3GPP_Trust_Relationship_Update avp_AAA_3GPP_Trust_Relationship_Update,
 	DCA_3GPP_APN_Rate_Control_Downlink avp_DCA_3GPP_APN_Rate_Control_Downlink,
 	DCA_3GPP_Session_Direction avp_DCA_3GPP_Session_Direction,
 	S6_3GPP_IP_SM_GW_Realm avp_S6_3GPP_IP_SM_GW_Realm,
@@ -10509,15 +10812,18 @@
 	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,
+	AAA_3GPP_AN_Trusted avp_AAA_3GPP_AN_Trusted,
 	DCA_3GPP_Monitoring_Event_Funtionality avp_DCA_3GPP_Monitoring_Event_Funtionality,
 	DCA_3GPP_Aux_Applic_Info avp_DCA_3GPP_Aux_Applic_Info,
 	S6_3GPP_IP_SM_GW_Number avp_S6_3GPP_IP_SM_GW_Number,
+	AAA_3GPP_AAR_Flags avp_AAA_3GPP_AAR_Flags,
 	DCA_3GPP_LCS_Client_External_ID avp_DCA_3GPP_LCS_Client_External_ID,
 	DCA_3GPP_VLR_Number avp_DCA_3GPP_VLR_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,
 	DCA_3GPP_Outgoing_Trunk_Group_Id avp_DCA_3GPP_Outgoing_Trunk_Group_Id,
+	AAA_3GPP_Transport_Access_Type avp_AAA_3GPP_Transport_Access_Type,
 	DCC_NONE_Subscription_Id avp_DCC_NONE_Subscription_Id,
 	PCC_3GPP_QoS_Rule_Remove avp_PCC_3GPP_QoS_Rule_Remove,
 	AAA_3GPP_VPLMN_CSG_Subscription_Data avp_AAA_3GPP_VPLMN_CSG_Subscription_Data,
@@ -10552,6 +10858,7 @@
 	DCC_NONE_Service_Context_Id avp_DCC_NONE_Service_Context_Id,
 	DCA_3GPP_SDP_TimeStamps avp_DCA_3GPP_SDP_TimeStamps,
 	DCA_3GPP_IMS_Charging_Identifier avp_DCA_3GPP_IMS_Charging_Identifier,
+	AAA_3GPP_MIP_FA_RK_SPI avp_AAA_3GPP_MIP_FA_RK_SPI,
 	DCA_3GPP_Related_Trigger avp_DCA_3GPP_Related_Trigger,
 	PCC_3GPP_APN_Aggregate_Max_Bitrate_DL avp_PCC_3GPP_APN_Aggregate_Max_Bitrate_DL,
 	S6_3GPP_SCS_Identity avp_S6_3GPP_SCS_Identity,
@@ -10590,6 +10897,7 @@
 	AAA_3GPP_External_Client avp_AAA_3GPP_External_Client,
 	DCA_3GPP_Charge_Reason_Code avp_DCA_3GPP_Charge_Reason_Code,
 	BASE_NONE_Authorization_Lifetime avp_BASE_NONE_Authorization_Lifetime,
+	AAA_3GPP_TWAN_PCO avp_AAA_3GPP_TWAN_PCO,
 	DCA_3GPP_PoC_Change_Conditions avp_DCA_3GPP_PoC_Change_Conditions,
 	DCA_3GPP_Language avp_DCA_3GPP_Language,
 	RX_3GPP_Extended_Min_Requested_BW_DL avp_RX_3GPP_Extended_Min_Requested_BW_DL,
@@ -10636,6 +10944,7 @@
 	DCA_3GPP_Rate_Control_Max_Rate avp_DCA_3GPP_Rate_Control_Max_Rate,
 	DCA_3GPP_Class_Identifier avp_DCA_3GPP_Class_Identifier,
 	GI_3GPP_3GPP_Allocate_IP_Type avp_GI_3GPP_3GPP_Allocate_IP_Type,
+	AAA_3GPP_SM_Back_Off_Timer avp_AAA_3GPP_SM_Back_Off_Timer,
 	RX_3GPP_Specific_Action avp_RX_3GPP_Specific_Action,
 	S6_3GPP_Maximum_Detection_Time avp_S6_3GPP_Maximum_Detection_Time,
 	DNAS_NONE_Login_TCP_Port avp_DNAS_NONE_Login_TCP_Port,
@@ -10705,6 +11014,7 @@
 	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_AAA_3GPP_RAR_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_RAR_Flags;
 		avp_DCA_3GPP_SCS_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SCS_Address;
 		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;
@@ -10719,6 +11029,7 @@
 		avp_BASE_NONE_Session_Id, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Session_Id;
 		avp_DCA_3GPP_Route_Header_Transmitted, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Route_Header_Transmitted;
 		avp_DCA_3GPP_Reporting_Reason, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Reporting_Reason;
+		avp_AAA_3GPP_Emergency_Services, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Emergency_Services;
 		avp_RX_3GPP_Media_Component_Description, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Media_Component_Description;
 		avp_PCC_3GPP_CSG_Information_Reporting, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_CSG_Information_Reporting;
 		avp_AAA_3GPP_Measurement_Quantity, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Measurement_Quantity;
@@ -10748,6 +11059,7 @@
 		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_AAA_3GPP_TWAN_Access_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_TWAN_Access_Info;
 		avp_DCA_3GPP_Status_AS_Code, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Status_AS_Code;
 		avp_DCA_3GPP_LCS_Client_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_LCS_Client_Type;
 		avp_DNAS_NONE_Framed_Appletalk_Network, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Framed_Appletalk_Network;
@@ -10755,6 +11067,7 @@
 		avp_DCA_3GPP_PoC_Session_Initiation_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_PoC_Session_Initiation_Type;
 		avp_RX_3GPP_Sharing_Key_UL, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Sharing_Key_UL;
 		avp_DCA_3GPP_Content_Size, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Content_Size;
+		avp_AAA_3GPP_Access_Network_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Access_Network_Info;
 		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;
 		avp_DCA_3GPP_Service_Specific_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Service_Specific_Type;
@@ -10832,6 +11145,7 @@
 		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_AAA_3GPP_Non_3GPP_IP_Access_APN, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Non_3GPP_IP_Access_APN;
 		avp_DCA_3GPP_Monitoring_Event_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Monitoring_Event_Information;
 		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;
@@ -10842,6 +11156,7 @@
 		avp_S6_3GPP_NIDD_Authorization_Request, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_NIDD_Authorization_Request;
 		avp_DCA_3GPP_Received_Talk_Burst_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Received_Talk_Burst_Time;
 		avp_DCA_3GPP_Incoming_Trunk_Group_Id, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Incoming_Trunk_Group_Id;
+		avp_AAA_3GPP_AAA_Failure_Indication, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_AAA_Failure_Indication;
 		avp_DCA_3GPP_Rate_Control_Max_Message_Size, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Rate_Control_Max_Message_Size;
 		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;
@@ -10884,8 +11199,10 @@
 		avp_DCA_3GPP_DRM_Content, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_DRM_Content;
 		avp_AAA_3GPP_Item_Number, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Item_Number;
 		avp_DNAS_NONE_NAS_Port_Type, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_NAS_Port_Type;
+		avp_AAA_3GPP_ERP_Authorization, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_ERP_Authorization;
 		avp_DCC_NONE_Multiple_Services_Indicator, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Multiple_Services_Indicator;
 		avp_DCA_3GPP_Early_Media_Description, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Early_Media_Description;
+		avp_AAA_3GPP_MIP_FA_RK, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_MIP_FA_RK;
 		avp_DCA_3GPP_Related_Change_Condition_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Related_Change_Condition_Information;
 		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;
@@ -10973,6 +11290,7 @@
 		avp_AAA_3GPP_Regional_Subscription_Zone_Code, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Regional_Subscription_Zone_Code;
 		avp_DCA_3GPP_Message_Class, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Message_Class;
 		avp_GI_3GPP_3GPP_Negotiated_DSCP, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_Negotiated_DSCP;
+		avp_AAA_3GPP_TWAN_S2a_Failure_Cause, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_TWAN_S2a_Failure_Cause;
 		avp_DCA_3GPP_Trigger, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Trigger;
 		avp_DCA_3GPP_Called_Identity_Change, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Called_Identity_Change;
 		avp_DCA_3GPP_ProSe_Request_Timestamp, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_ProSe_Request_Timestamp;
@@ -11014,15 +11332,18 @@
 		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_DEA_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_DEA_Flags;
 		avp_DCA_3GPP_SCS_AS_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SCS_AS_Address;
 		avp_AAA_3GPP_MO_LR, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_MO_LR;
 		avp_DCA_3GPP_IMS_Visited_Network_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_IMS_Visited_Network_Identifier;
 		avp_DCA_3GPP_PoC_User_Role, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_PoC_User_Role;
 		avp_DCA_3GPP_Announcement_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Announcement_Identifier;
+		avp_AAA_3GPP_Non_3GPP_IP_Access, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Non_3GPP_IP_Access;
 		avp_DCA_3GPP_Monitoring_Event_Report_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Monitoring_Event_Report_Data;
 		avp_DCA_3GPP_Adaptations, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Adaptations;
 		avp_BASE_NONE_Host_IP_Address, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Host_IP_Address;
 		avp_DCA_3GPP_Quota_Holding_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Quota_Holding_Time;
+		avp_AAA_3GPP_Maximum_Wait_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Maximum_Wait_Time;
 		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;
@@ -11055,10 +11376,12 @@
 		avp_AAA_3GPP_PDN_GW_Allocation_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_PDN_GW_Allocation_Type;
 		avp_DCA_3GPP_Additional_Type_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Additional_Type_Information;
 		avp_GI_3GPP_3GPP_SGSN_MCC_MNC, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_SGSN_MCC_MNC;
+		avp_AAA_3GPP_HESSID, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_HESSID;
 		avp_DCA_3GPP_Content_Class, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Content_Class;
 		avp_BASE_NONE_Event_Timestamp, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Event_Timestamp;
 		avp_DCA_3GPP_TAD_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_TAD_Identifier;
 		avp_DCC_NONE_Final_Unit_Action, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Final_Unit_Action;
+		avp_AAA_3GPP_IMEI_Check_In_VPLMN_Result, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_IMEI_Check_In_VPLMN_Result;
 		avp_DCA_3GPP_Service_Generic_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Service_Generic_Information;
 		avp_DCA_3GPP_Variable_Part_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Variable_Part_Type;
 		avp_DCA_3GPP_ProSe_Direct_Discovery_Model, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_ProSe_Direct_Discovery_Model;
@@ -11105,6 +11428,7 @@
 		avp_S6_3GPP_NIDD_Authorization_Update, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_NIDD_Authorization_Update;
 		avp_DCA_3GPP_Service_Specific_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Service_Specific_Data;
 		avp_DCC_NONE_Subscription_Id_Type, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Subscription_Id_Type;
+		avp_AAA_3GPP_Connectivity_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Connectivity_Flags;
 		avp_PCC_3GPP_Packet_Filter_Operation, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Packet_Filter_Operation;
 		avp_DCA_3GPP_VCS_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_VCS_Information;
 		avp_S6_3GPP_SCEF_Reference_ID_for_Deletion, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_SCEF_Reference_ID_for_Deletion;
@@ -11147,10 +11471,12 @@
 		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_DCA_3GPP_Number_Of_Talk_Bursts, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Number_Of_Talk_Bursts;
+		avp_AAA_3GPP_Short_Network_Name, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Short_Network_Name;
 		avp_DCA_3GPP_Message_Size, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Message_Size;
 		avp_DCA_3GPP_Additional_Exception_Reports, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Additional_Exception_Reports;
 		avp_DCA_3GPP_Access_Transfer_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Access_Transfer_Information;
 		avp_S6_3GPP_Communication_Pattern_Set, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Communication_Pattern_Set;
+		avp_AAA_3GPP_TWAG_UP_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_TWAG_UP_Address;
 		avp_DCA_3GPP_MMBox_Storage_Requested, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_MMBox_Storage_Requested;
 		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;
@@ -11183,10 +11509,12 @@
 		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_DCA_3GPP_Time_Quota_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Time_Quota_Type;
+		avp_AAA_3GPP_Trace_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Trace_Info;
 		avp_DCA_3GPP_Domain_Name, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Domain_Name;
 		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_AAA_3GPP_DER_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_DER_Flags;
 		avp_DCA_3GPP_LCS_Data_Coding_Scheme, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_LCS_Data_Coding_Scheme;
 		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;
@@ -11233,6 +11561,7 @@
 		avp_DNAS_NONE_Tunnel_Assignment_Id, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Tunnel_Assignment_Id;
 		avp_DCC_NONE_CC_Service_Specific_Units, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_CC_Service_Specific_Units;
 		avp_DCA_3GPP_SDP_Answer_Timestamp, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SDP_Answer_Timestamp;
+		avp_AAA_3GPP_WLAN_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_WLAN_Identifier;
 		avp_DCA_3GPP_Type_Number, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Type_Number;
 		avp_DCA_3GPP_NIDD_Submission, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_NIDD_Submission;
 		avp_S6_3GPP_T4_Parameters, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_T4_Parameters;
@@ -11276,6 +11605,7 @@
 		avp_AAA_3GPP_EPS_Location_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_EPS_Location_Information;
 		avp_DCA_3GPP_Access_Network_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Access_Network_Information;
 		avp_DCA_3GPP_Called_Identity, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Called_Identity;
+		avp_AAA_3GPP_TWAN_Default_APN_Context_Id, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_TWAN_Default_APN_Context_Id;
 		avp_DCA_3GPP_SGSN_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SGSN_Address;
 		avp_DCA_3GPP_SGi_PtP_Tunnelling_Method, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SGi_PtP_Tunnelling_Method;
 		avp_BASE_NONE_Session_Timeout, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Session_Timeout;
@@ -11320,8 +11650,10 @@
 		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_AAA_3GPP_Non_3GPP_User_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Non_3GPP_User_Data;
 		avp_DCA_3GPP_Delivery_Report_Requested, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Delivery_Report_Requested;
 		avp_GI_3GPP_TWAN_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_TWAN_Identifier;
+		avp_AAA_3GPP_Origination_Time_Stamp, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Origination_Time_Stamp;
 		avp_DCA_3GPP_LCS_APN, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_LCS_APN;
 		avp_DCA_3GPP_Envelope_End_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Envelope_End_Time;
 		avp_RX_3GPP_Sponsored_Connectivity_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Sponsored_Connectivity_Data;
@@ -11358,12 +11690,14 @@
 		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_SSID, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_SSID;
 		avp_AAA_3GPP_Call_Barring_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Call_Barring_Info;
 		avp_DCA_3GPP_BSSID, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_BSSID;
 		avp_DCC_NONE_Service_Parameter_Info, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Service_Parameter_Info;
 		avp_DCA_3GPP_Talk_Burst_Exchange, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Talk_Burst_Exchange;
 		avp_DCA_3GPP_Variable_Part_Order, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Variable_Part_Order;
 		avp_DCA_3GPP_Time_Quota_Mechanism, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Time_Quota_Mechanism;
+		avp_AAA_3GPP_ANID, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_ANID;
 		avp_DCA_3GPP_Monitoring_Event_Report_Number, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Monitoring_Event_Report_Number;
 		avp_S6_3GPP_IP_SM_GW_Name, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_IP_SM_GW_Name;
 		avp_BASE_NONE_Origin_State_Id, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Origin_State_Id;
@@ -11409,6 +11743,7 @@
 		avp_DCA_3GPP_Addressee_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Addressee_Type;
 		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_AAA_3GPP_TWAN_Connectivity_Parameters, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_TWAN_Connectivity_Parameters;
 		avp_DCA_3GPP_Reply_Applic_ID, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Reply_Applic_ID;
 		avp_DCA_3GPP_Participant_Access_Priority, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Participant_Access_Priority;
 		avp_RX_3GPP_RS_Bandwidth, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_RS_Bandwidth;
@@ -11446,10 +11781,12 @@
 		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_DCA_3GPP_Number_Of_Received_Talk_Bursts, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Number_Of_Received_Talk_Bursts;
+		avp_AAA_3GPP_Full_Network_Name, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Full_Network_Name;
 		avp_DCA_3GPP_Message_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Message_Type;
 		avp_DCA_3GPP_APN_Rate_Control_Uplink, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_APN_Rate_Control_Uplink;
 		avp_GI_3GPP_3GPP_CAMEL_Charging_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_CAMEL_Charging_Info;
 		avp_DCA_3GPP_From_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_From_Address;
+		avp_AAA_3GPP_TWAG_CP_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_TWAG_CP_Address;
 		avp_DCA_3GPP_PDP_Context_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_PDP_Context_Type;
 		avp_RX_3GPP_Flows, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Flows;
 		avp_DCA_3GPP_User_Session_Id, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_User_Session_Id;
@@ -11503,6 +11840,7 @@
 		avp_DCA_3GPP_Rate_Control_Time_Unit, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Rate_Control_Time_Unit;
 		avp_GI_3GPP_External_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_External_Identifier;
 		avp_DCA_3GPP_Reason_Header, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Reason_Header;
+		avp_AAA_3GPP_WLCP_Key, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_WLCP_Key;
 		avp_S6_3GPP_Reachability_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Reachability_Type;
 		avp_DCA_3GPP_SIP_Request_Timestamp, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SIP_Request_Timestamp;
 		avp_DNAS_NONE_Framed_Route, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Framed_Route;
@@ -11537,9 +11875,11 @@
 		avp_DCA_3GPP_IM_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_IM_Information;
 		avp_DNAS_NONE_Prompt, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Prompt;
 		avp_DCA_3GPP_SDP_Offer_Timestamp, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SDP_Offer_Timestamp;
+		avp_AAA_3GPP_PPR_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_PPR_Flags;
 		avp_DCA_3GPP_MM_Content_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_MM_Content_Type;
 		avp_DCA_3GPP_CPDT_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_CPDT_Information;
 		avp_GI_3GPP_3GPP_GGSN_IPv6_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_GGSN_IPv6_Address;
+		avp_AAA_3GPP_DER_S6b_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_DER_S6b_Flags;
 		avp_DCA_3GPP_SCS_Realm, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SCS_Realm;
 		avp_DCA_3GPP_LCS_Requestor_Id, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_LCS_Requestor_Id;
 		avp_RX_3GPP_Access_Network_Charging_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Access_Network_Charging_Identifier;
@@ -11582,6 +11922,7 @@
 		avp_DNAS_NONE_Accounting_Input_Octets, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Accounting_Input_Octets;
 		avp_AAA_3GPP_EPS_User_State, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_EPS_User_State;
 		avp_BASE_NONE_Origin_Host, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Origin_Host;
+		avp_AAA_3GPP_Access_Authorization_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Access_Authorization_Flags;
 		avp_DCA_3GPP_PDP_Address, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_PDP_Address;
 		avp_DCA_3GPP_CP_CIoT_EPS_Optimisation_Indicator, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_CP_CIoT_EPS_Optimisation_Indicator;
 		avp_DCA_3GPP_NNI_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_NNI_Information;
@@ -11592,6 +11933,7 @@
 		avp_DCA_3GPP_Additional_Content_Information, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Additional_Content_Information;
 		avp_DCC_NONE_Restriction_Filter_Rule, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Restriction_Filter_Rule;
 		avp_DCA_3GPP_Cause_Code, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Cause_Code;
+		avp_AAA_3GPP_TWAN_Connection_Mode, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_TWAN_Connection_Mode;
 		avp_PCC_3GPP_Packet_Filter_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_Packet_Filter_Identifier;
 		avp_DCA_3GPP_Address_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Address_Data;
 		avp_S6_3GPP_SCEF_Reference_ID, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_SCEF_Reference_ID;
@@ -11632,6 +11974,7 @@
 		avp_DCA_3GPP_Monitoring_Event_Configuration_Activity, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Monitoring_Event_Configuration_Activity;
 		avp_DCA_3GPP_IMS_Communication_Service_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_IMS_Communication_Service_Identifier;
 		avp_DNAS_NONE_Framed_IP_Address, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Framed_IP_Address;
+		avp_AAA_3GPP_Trust_Relationship_Update, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Trust_Relationship_Update;
 		avp_DCA_3GPP_APN_Rate_Control_Downlink, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_APN_Rate_Control_Downlink;
 		avp_DCA_3GPP_Session_Direction, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Session_Direction;
 		avp_S6_3GPP_IP_SM_GW_Realm, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_IP_SM_GW_Realm;
@@ -11666,15 +12009,18 @@
 		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_AAA_3GPP_AN_Trusted, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_AN_Trusted;
 		avp_DCA_3GPP_Monitoring_Event_Funtionality, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Monitoring_Event_Funtionality;
 		avp_DCA_3GPP_Aux_Applic_Info, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Aux_Applic_Info;
 		avp_S6_3GPP_IP_SM_GW_Number, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_IP_SM_GW_Number;
+		avp_AAA_3GPP_AAR_Flags, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_AAR_Flags;
 		avp_DCA_3GPP_LCS_Client_External_ID, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_LCS_Client_External_ID;
 		avp_DCA_3GPP_VLR_Number, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_VLR_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_DCA_3GPP_Outgoing_Trunk_Group_Id, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Outgoing_Trunk_Group_Id;
+		avp_AAA_3GPP_Transport_Access_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_Transport_Access_Type;
 		avp_DCC_NONE_Subscription_Id, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Subscription_Id;
 		avp_PCC_3GPP_QoS_Rule_Remove, avp_header.avp_code.vendor_id_3GPP = avp_code_PCC_3GPP_QoS_Rule_Remove;
 		avp_AAA_3GPP_VPLMN_CSG_Subscription_Data, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_VPLMN_CSG_Subscription_Data;
@@ -11709,6 +12055,7 @@
 		avp_DCC_NONE_Service_Context_Id, avp_header.avp_code.vendor_id_NONE = avp_code_DCC_NONE_Service_Context_Id;
 		avp_DCA_3GPP_SDP_TimeStamps, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_SDP_TimeStamps;
 		avp_DCA_3GPP_IMS_Charging_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_IMS_Charging_Identifier;
+		avp_AAA_3GPP_MIP_FA_RK_SPI, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_MIP_FA_RK_SPI;
 		avp_DCA_3GPP_Related_Trigger, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Related_Trigger;
 		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;
@@ -11747,6 +12094,7 @@
 		avp_AAA_3GPP_External_Client, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_External_Client;
 		avp_DCA_3GPP_Charge_Reason_Code, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Charge_Reason_Code;
 		avp_BASE_NONE_Authorization_Lifetime, avp_header.avp_code.vendor_id_NONE = avp_code_BASE_NONE_Authorization_Lifetime;
+		avp_AAA_3GPP_TWAN_PCO, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_TWAN_PCO;
 		avp_DCA_3GPP_PoC_Change_Conditions, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_PoC_Change_Conditions;
 		avp_DCA_3GPP_Language, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Language;
 		avp_RX_3GPP_Extended_Min_Requested_BW_DL, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Extended_Min_Requested_BW_DL;
@@ -11793,6 +12141,7 @@
 		avp_DCA_3GPP_Rate_Control_Max_Rate, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Rate_Control_Max_Rate;
 		avp_DCA_3GPP_Class_Identifier, avp_header.avp_code.vendor_id_3GPP = avp_code_DCA_3GPP_Class_Identifier;
 		avp_GI_3GPP_3GPP_Allocate_IP_Type, avp_header.avp_code.vendor_id_3GPP = avp_code_GI_3GPP_3GPP_Allocate_IP_Type;
+		avp_AAA_3GPP_SM_Back_Off_Timer, avp_header.avp_code.vendor_id_3GPP = avp_code_AAA_3GPP_SM_Back_Off_Timer;
 		avp_RX_3GPP_Specific_Action, avp_header.avp_code.vendor_id_3GPP = avp_code_RX_3GPP_Specific_Action;
 		avp_S6_3GPP_Maximum_Detection_Time, avp_header.avp_code.vendor_id_3GPP = avp_code_S6_3GPP_Maximum_Detection_Time;
 		avp_DNAS_NONE_Login_TCP_Port, avp_header.avp_code.vendor_id_NONE = avp_code_DNAS_NONE_Login_TCP_Port;
@@ -11837,6 +12186,8 @@
 	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_AAA_3GPP_RAR_Flags := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_RAR_Flags };
 const AVP_Code c_AVP_Code_DCA_3GPP_SCS_Address := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_SCS_Address };
 const AVP_Code c_AVP_Code_GI_3GPP_3GPP_GGSN_MCC_MNC := {
@@ -11865,6 +12216,8 @@
 	vendor_id_3GPP := avp_code_DCA_3GPP_Route_Header_Transmitted };
 const AVP_Code c_AVP_Code_DCA_3GPP_Reporting_Reason := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Reporting_Reason };
+const AVP_Code c_AVP_Code_AAA_3GPP_Emergency_Services := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Emergency_Services };
 const AVP_Code c_AVP_Code_RX_3GPP_Media_Component_Description := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Media_Component_Description };
 const AVP_Code c_AVP_Code_PCC_3GPP_CSG_Information_Reporting := {
@@ -11923,6 +12276,8 @@
 	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_AAA_3GPP_TWAN_Access_Info := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_TWAN_Access_Info };
 const AVP_Code c_AVP_Code_DCA_3GPP_Status_AS_Code := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Status_AS_Code };
 const AVP_Code c_AVP_Code_DCA_3GPP_LCS_Client_Type := {
@@ -11937,6 +12292,8 @@
 	vendor_id_3GPP := avp_code_RX_3GPP_Sharing_Key_UL };
 const AVP_Code c_AVP_Code_DCA_3GPP_Content_Size := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Content_Size };
+const AVP_Code c_AVP_Code_AAA_3GPP_Access_Network_Info := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Access_Network_Info };
 const AVP_Code c_AVP_Code_RX_3GPP_AF_Charging_Identifier := {
 	vendor_id_3GPP := avp_code_RX_3GPP_AF_Charging_Identifier };
 const AVP_Code c_AVP_Code_S6_3GPP_Monitoring_Event_Report := {
@@ -12091,6 +12448,8 @@
 	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_AAA_3GPP_Non_3GPP_IP_Access_APN := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Non_3GPP_IP_Access_APN };
 const AVP_Code c_AVP_Code_DCA_3GPP_Monitoring_Event_Information := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Monitoring_Event_Information };
 const AVP_Code c_AVP_Code_DCC_NONE_Tariff_Time_Change := {
@@ -12111,6 +12470,8 @@
 	vendor_id_3GPP := avp_code_DCA_3GPP_Received_Talk_Burst_Time };
 const AVP_Code c_AVP_Code_DCA_3GPP_Incoming_Trunk_Group_Id := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Incoming_Trunk_Group_Id };
+const AVP_Code c_AVP_Code_AAA_3GPP_AAA_Failure_Indication := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_AAA_Failure_Indication };
 const AVP_Code c_AVP_Code_DCA_3GPP_Rate_Control_Max_Message_Size := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Rate_Control_Max_Message_Size };
 const AVP_Code c_AVP_Code_PCC_3GPP_QoS_Rule_Install := {
@@ -12195,10 +12556,14 @@
 	vendor_id_3GPP := avp_code_AAA_3GPP_Item_Number };
 const AVP_Code c_AVP_Code_DNAS_NONE_NAS_Port_Type := {
 	vendor_id_NONE := avp_code_DNAS_NONE_NAS_Port_Type };
+const AVP_Code c_AVP_Code_AAA_3GPP_ERP_Authorization := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_ERP_Authorization };
 const AVP_Code c_AVP_Code_DCC_NONE_Multiple_Services_Indicator := {
 	vendor_id_NONE := avp_code_DCC_NONE_Multiple_Services_Indicator };
 const AVP_Code c_AVP_Code_DCA_3GPP_Early_Media_Description := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Early_Media_Description };
+const AVP_Code c_AVP_Code_AAA_3GPP_MIP_FA_RK := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_MIP_FA_RK };
 const AVP_Code c_AVP_Code_DCA_3GPP_Related_Change_Condition_Information := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Related_Change_Condition_Information };
 const AVP_Code c_AVP_Code_DNAS_NONE_Framed_Protocol := {
@@ -12373,6 +12738,8 @@
 	vendor_id_3GPP := avp_code_DCA_3GPP_Message_Class };
 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_AAA_3GPP_TWAN_S2a_Failure_Cause := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_TWAN_S2a_Failure_Cause };
 const AVP_Code c_AVP_Code_DCA_3GPP_Trigger := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Trigger };
 const AVP_Code c_AVP_Code_DCA_3GPP_Called_Identity_Change := {
@@ -12455,6 +12822,8 @@
 	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_DEA_Flags := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_DEA_Flags };
 const AVP_Code c_AVP_Code_DCA_3GPP_SCS_AS_Address := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_SCS_AS_Address };
 const AVP_Code c_AVP_Code_AAA_3GPP_MO_LR := {
@@ -12465,6 +12834,8 @@
 	vendor_id_3GPP := avp_code_DCA_3GPP_PoC_User_Role };
 const AVP_Code c_AVP_Code_DCA_3GPP_Announcement_Identifier := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Announcement_Identifier };
+const AVP_Code c_AVP_Code_AAA_3GPP_Non_3GPP_IP_Access := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Non_3GPP_IP_Access };
 const AVP_Code c_AVP_Code_DCA_3GPP_Monitoring_Event_Report_Data := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Monitoring_Event_Report_Data };
 const AVP_Code c_AVP_Code_DCA_3GPP_Adaptations := {
@@ -12473,6 +12844,8 @@
 	vendor_id_NONE := avp_code_BASE_NONE_Host_IP_Address };
 const AVP_Code c_AVP_Code_DCA_3GPP_Quota_Holding_Time := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Quota_Holding_Time };
+const AVP_Code c_AVP_Code_AAA_3GPP_Maximum_Wait_Time := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Maximum_Wait_Time };
 const AVP_Code c_AVP_Code_RX_3GPP_Max_Requested_Bandwidth_UL := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Max_Requested_Bandwidth_UL };
 const AVP_Code c_AVP_Code_PCC_3GPP_Usage_Monitoring_Support := {
@@ -12537,6 +12910,8 @@
 	vendor_id_3GPP := avp_code_DCA_3GPP_Additional_Type_Information };
 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_AAA_3GPP_HESSID := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_HESSID };
 const AVP_Code c_AVP_Code_DCA_3GPP_Content_Class := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Content_Class };
 const AVP_Code c_AVP_Code_BASE_NONE_Event_Timestamp := {
@@ -12545,6 +12920,8 @@
 	vendor_id_3GPP := avp_code_DCA_3GPP_TAD_Identifier };
 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_AAA_3GPP_IMEI_Check_In_VPLMN_Result := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_IMEI_Check_In_VPLMN_Result };
 const AVP_Code c_AVP_Code_DCA_3GPP_Service_Generic_Information := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Service_Generic_Information };
 const AVP_Code c_AVP_Code_DCA_3GPP_Variable_Part_Type := {
@@ -12637,6 +13014,8 @@
 	vendor_id_3GPP := avp_code_DCA_3GPP_Service_Specific_Data };
 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_AAA_3GPP_Connectivity_Flags := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Connectivity_Flags };
 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_DCA_3GPP_VCS_Information := {
@@ -12721,6 +13100,8 @@
 	vendor_id_NONE := avp_code_BASE_NONE_Proxy_Host };
 const AVP_Code c_AVP_Code_DCA_3GPP_Number_Of_Talk_Bursts := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Number_Of_Talk_Bursts };
+const AVP_Code c_AVP_Code_AAA_3GPP_Short_Network_Name := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Short_Network_Name };
 const AVP_Code c_AVP_Code_DCA_3GPP_Message_Size := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Message_Size };
 const AVP_Code c_AVP_Code_DCA_3GPP_Additional_Exception_Reports := {
@@ -12729,6 +13110,8 @@
 	vendor_id_3GPP := avp_code_DCA_3GPP_Access_Transfer_Information };
 const AVP_Code c_AVP_Code_S6_3GPP_Communication_Pattern_Set := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Communication_Pattern_Set };
+const AVP_Code c_AVP_Code_AAA_3GPP_TWAG_UP_Address := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_TWAG_UP_Address };
 const AVP_Code c_AVP_Code_DCA_3GPP_MMBox_Storage_Requested := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_MMBox_Storage_Requested };
 const AVP_Code c_AVP_Code_RX_3GPP_Flow_Status := {
@@ -12793,6 +13176,8 @@
 	vendor_id_3GPP := avp_code_AAA_3GPP_HPLMN_ODB };
 const AVP_Code c_AVP_Code_DCA_3GPP_Time_Quota_Type := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Time_Quota_Type };
+const AVP_Code c_AVP_Code_AAA_3GPP_Trace_Info := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Trace_Info };
 const AVP_Code c_AVP_Code_DCA_3GPP_Domain_Name := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Domain_Name };
 const AVP_Code c_AVP_Code_GI_3GPP_3GPP_Charging_Characteristics := {
@@ -12801,6 +13186,8 @@
 	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_AAA_3GPP_DER_Flags := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_DER_Flags };
 const AVP_Code c_AVP_Code_DCA_3GPP_LCS_Data_Coding_Scheme := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_LCS_Data_Coding_Scheme };
 const AVP_Code c_AVP_Code_GI_3GPP_3GPP_GGSN_Address := {
@@ -12893,6 +13280,8 @@
 	vendor_id_NONE := avp_code_DCC_NONE_CC_Service_Specific_Units };
 const AVP_Code c_AVP_Code_DCA_3GPP_SDP_Answer_Timestamp := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_SDP_Answer_Timestamp };
+const AVP_Code c_AVP_Code_AAA_3GPP_WLAN_Identifier := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_WLAN_Identifier };
 const AVP_Code c_AVP_Code_DCA_3GPP_Type_Number := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Type_Number };
 const AVP_Code c_AVP_Code_DCA_3GPP_NIDD_Submission := {
@@ -12979,6 +13368,8 @@
 	vendor_id_3GPP := avp_code_DCA_3GPP_Access_Network_Information };
 const AVP_Code c_AVP_Code_DCA_3GPP_Called_Identity := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Called_Identity };
+const AVP_Code c_AVP_Code_AAA_3GPP_TWAN_Default_APN_Context_Id := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_TWAN_Default_APN_Context_Id };
 const AVP_Code c_AVP_Code_DCA_3GPP_SGSN_Address := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_SGSN_Address };
 const AVP_Code c_AVP_Code_DCA_3GPP_SGi_PtP_Tunnelling_Method := {
@@ -13067,10 +13458,14 @@
 	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_AAA_3GPP_Non_3GPP_User_Data := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Non_3GPP_User_Data };
 const AVP_Code c_AVP_Code_DCA_3GPP_Delivery_Report_Requested := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Delivery_Report_Requested };
 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_AAA_3GPP_Origination_Time_Stamp := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Origination_Time_Stamp };
 const AVP_Code c_AVP_Code_DCA_3GPP_LCS_APN := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_LCS_APN };
 const AVP_Code c_AVP_Code_DCA_3GPP_Envelope_End_Time := {
@@ -13143,6 +13538,8 @@
 	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_SSID := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_SSID };
 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_DCA_3GPP_BSSID := {
@@ -13155,6 +13552,8 @@
 	vendor_id_3GPP := avp_code_DCA_3GPP_Variable_Part_Order };
 const AVP_Code c_AVP_Code_DCA_3GPP_Time_Quota_Mechanism := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Time_Quota_Mechanism };
+const AVP_Code c_AVP_Code_AAA_3GPP_ANID := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_ANID };
 const AVP_Code c_AVP_Code_DCA_3GPP_Monitoring_Event_Report_Number := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Monitoring_Event_Report_Number };
 const AVP_Code c_AVP_Code_S6_3GPP_IP_SM_GW_Name := {
@@ -13245,6 +13644,8 @@
 	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_AAA_3GPP_TWAN_Connectivity_Parameters := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_TWAN_Connectivity_Parameters };
 const AVP_Code c_AVP_Code_DCA_3GPP_Reply_Applic_ID := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Reply_Applic_ID };
 const AVP_Code c_AVP_Code_DCA_3GPP_Participant_Access_Priority := {
@@ -13319,6 +13720,8 @@
 	vendor_id_3GPP := avp_code_AAA_3GPP_APN_Configuration_Profile };
 const AVP_Code c_AVP_Code_DCA_3GPP_Number_Of_Received_Talk_Bursts := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Number_Of_Received_Talk_Bursts };
+const AVP_Code c_AVP_Code_AAA_3GPP_Full_Network_Name := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Full_Network_Name };
 const AVP_Code c_AVP_Code_DCA_3GPP_Message_Type := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Message_Type };
 const AVP_Code c_AVP_Code_DCA_3GPP_APN_Rate_Control_Uplink := {
@@ -13327,6 +13730,8 @@
 	vendor_id_3GPP := avp_code_GI_3GPP_3GPP_CAMEL_Charging_Info };
 const AVP_Code c_AVP_Code_DCA_3GPP_From_Address := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_From_Address };
+const AVP_Code c_AVP_Code_AAA_3GPP_TWAG_CP_Address := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_TWAG_CP_Address };
 const AVP_Code c_AVP_Code_DCA_3GPP_PDP_Context_Type := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_PDP_Context_Type };
 const AVP_Code c_AVP_Code_RX_3GPP_Flows := {
@@ -13433,6 +13838,8 @@
 	vendor_id_3GPP := avp_code_GI_3GPP_External_Identifier };
 const AVP_Code c_AVP_Code_DCA_3GPP_Reason_Header := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Reason_Header };
+const AVP_Code c_AVP_Code_AAA_3GPP_WLCP_Key := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_WLCP_Key };
 const AVP_Code c_AVP_Code_S6_3GPP_Reachability_Type := {
 	vendor_id_3GPP := avp_code_S6_3GPP_Reachability_Type };
 const AVP_Code c_AVP_Code_DCA_3GPP_SIP_Request_Timestamp := {
@@ -13501,12 +13908,16 @@
 	vendor_id_NONE := avp_code_DNAS_NONE_Prompt };
 const AVP_Code c_AVP_Code_DCA_3GPP_SDP_Offer_Timestamp := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_SDP_Offer_Timestamp };
+const AVP_Code c_AVP_Code_AAA_3GPP_PPR_Flags := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_PPR_Flags };
 const AVP_Code c_AVP_Code_DCA_3GPP_MM_Content_Type := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_MM_Content_Type };
 const AVP_Code c_AVP_Code_DCA_3GPP_CPDT_Information := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_CPDT_Information };
 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_AAA_3GPP_DER_S6b_Flags := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_DER_S6b_Flags };
 const AVP_Code c_AVP_Code_DCA_3GPP_SCS_Realm := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_SCS_Realm };
 const AVP_Code c_AVP_Code_DCA_3GPP_LCS_Requestor_Id := {
@@ -13591,6 +14002,8 @@
 	vendor_id_3GPP := avp_code_AAA_3GPP_EPS_User_State };
 const AVP_Code c_AVP_Code_BASE_NONE_Origin_Host := {
 	vendor_id_NONE := avp_code_BASE_NONE_Origin_Host };
+const AVP_Code c_AVP_Code_AAA_3GPP_Access_Authorization_Flags := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Access_Authorization_Flags };
 const AVP_Code c_AVP_Code_DCA_3GPP_PDP_Address := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_PDP_Address };
 const AVP_Code c_AVP_Code_DCA_3GPP_CP_CIoT_EPS_Optimisation_Indicator := {
@@ -13611,6 +14024,8 @@
 	vendor_id_NONE := avp_code_DCC_NONE_Restriction_Filter_Rule };
 const AVP_Code c_AVP_Code_DCA_3GPP_Cause_Code := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Cause_Code };
+const AVP_Code c_AVP_Code_AAA_3GPP_TWAN_Connection_Mode := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_TWAN_Connection_Mode };
 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_DCA_3GPP_Address_Data := {
@@ -13691,6 +14106,8 @@
 	vendor_id_3GPP := avp_code_DCA_3GPP_IMS_Communication_Service_Identifier };
 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_AAA_3GPP_Trust_Relationship_Update := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Trust_Relationship_Update };
 const AVP_Code c_AVP_Code_DCA_3GPP_APN_Rate_Control_Downlink := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_APN_Rate_Control_Downlink };
 const AVP_Code c_AVP_Code_DCA_3GPP_Session_Direction := {
@@ -13759,12 +14176,16 @@
 	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_AAA_3GPP_AN_Trusted := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_AN_Trusted };
 const AVP_Code c_AVP_Code_DCA_3GPP_Monitoring_Event_Funtionality := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Monitoring_Event_Funtionality };
 const AVP_Code c_AVP_Code_DCA_3GPP_Aux_Applic_Info := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Aux_Applic_Info };
 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_AAA_3GPP_AAR_Flags := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_AAR_Flags };
 const AVP_Code c_AVP_Code_DCA_3GPP_LCS_Client_External_ID := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_LCS_Client_External_ID };
 const AVP_Code c_AVP_Code_DCA_3GPP_VLR_Number := {
@@ -13777,6 +14198,8 @@
 	vendor_id_3GPP := avp_code_S6_3GPP_NIDD_Authorization_Response };
 const AVP_Code c_AVP_Code_DCA_3GPP_Outgoing_Trunk_Group_Id := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Outgoing_Trunk_Group_Id };
+const AVP_Code c_AVP_Code_AAA_3GPP_Transport_Access_Type := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_Transport_Access_Type };
 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_PCC_3GPP_QoS_Rule_Remove := {
@@ -13845,6 +14268,8 @@
 	vendor_id_3GPP := avp_code_DCA_3GPP_SDP_TimeStamps };
 const AVP_Code c_AVP_Code_DCA_3GPP_IMS_Charging_Identifier := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_IMS_Charging_Identifier };
+const AVP_Code c_AVP_Code_AAA_3GPP_MIP_FA_RK_SPI := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_MIP_FA_RK_SPI };
 const AVP_Code c_AVP_Code_DCA_3GPP_Related_Trigger := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_Related_Trigger };
 const AVP_Code c_AVP_Code_PCC_3GPP_APN_Aggregate_Max_Bitrate_DL := {
@@ -13921,6 +14346,8 @@
 	vendor_id_3GPP := avp_code_DCA_3GPP_Charge_Reason_Code };
 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_AAA_3GPP_TWAN_PCO := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_TWAN_PCO };
 const AVP_Code c_AVP_Code_DCA_3GPP_PoC_Change_Conditions := {
 	vendor_id_3GPP := avp_code_DCA_3GPP_PoC_Change_Conditions };
 const AVP_Code c_AVP_Code_DCA_3GPP_Language := {
@@ -14013,6 +14440,8 @@
 	vendor_id_3GPP := avp_code_DCA_3GPP_Class_Identifier };
 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_AAA_3GPP_SM_Back_Off_Timer := {
+	vendor_id_3GPP := avp_code_AAA_3GPP_SM_Back_Off_Timer };
 const AVP_Code c_AVP_Code_RX_3GPP_Specific_Action := {
 	vendor_id_3GPP := avp_code_RX_3GPP_Specific_Action };
 const AVP_Code c_AVP_Code_S6_3GPP_Maximum_Detection_Time := {