Added support for TLV 24.43 and TLV 25.43

src/docsis_common.h

@@ -32,7 +32,7 @@
 
 
 #ifndef NUM_IDENTIFIERS
-#define NUM_IDENTIFIERS 890
+#define NUM_IDENTIFIERS 1144
 #endif /*  NUM_IDENTIFIERS, needed in docsis_symtable.h  */
 
 #define MAXINT 2000000000

src/docsis_symtable.h

@@ -574,10 +574,137 @@ symbol_type symtable[NUM_IDENTIFIERS] =  {
 { 755,    "SFAQMLatencyTarget",                2,      753,    (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 24.40.2 MULPIv3.0-I24 Annex C.2.2.7.12.4 */
 { 756,    "DataRateUnitSetting",               41,     80,     (encode_uchar),          (decode_uchar),          0,           3             }, /* TLV 24.41 MULPIv3.0-I24 Annex C.2.2.7.13.1 */
 
-{ 192,    "VendorSpecific",                    43,     80,     (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43 MULPIv3.0-I24 Annex C.2.2.7.8 */
-{ 194,    "L2VPNEncoding",                     5,      192,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43.5 */
-{ 195,    "VPNIdentifier",                     1,      194,    (encode_hexstr),         (decode_hexstr),         4,           255           }, /* TLV 24.43.5.1 */
-{ 193,    "VendorIdentifier",                  8,      192,    (encode_hexstr),         (decode_hexstr),         3,           3             }, /* TLV 24.43.8 */
+{ 205,    "VendorSpecific",                    43,     80,     (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43 MULPIv3.0-I24 Annex C.2.1.11 */
+{ 207,    "CMLoadBalancingPolicyID",           1,      205,    (encode_uint),           (decode_uint),           0,           0             }, /* TLV 24.43.1 MULPIv3.0-I24 Annex C.1.1.18.1.1 */
+{ 192,    "CMLoadBalancingPriority",           2,      205,    (encode_uint),           (decode_uint),           0,           0             }, /* TLV 24.43.2 MULPIv3.0-I24 Annex C.1.1.18.1.2 */
+{ 193,    "CMLoadBalancingGroupID",            3,      205,    (encode_uint),           (decode_uint),           0,           0             }, /* TLV 24.43.3 MULPIv3.0-I24 Annex C.1.1.18.1.3 */
+{ 194,    "CMRangingClassIDExtension",         4,      205,    (encode_ushort),         (decode_ushort),         0,           0             }, /* TLV 24.43.4 MULPIv3.0-I24 Annex C.1.1.18.1.4 */
+{ 195,    "L2VPNEncoding",                     5,      205,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43.5 MULPIv3.0-I24 Annex C.1.1.18.1.5 */
+{ 886,    "VPNIdentifier",                     1,      195,    (encode_hexstr),         (decode_hexstr),         4,           255           }, /* TLV 24.43.5.1 L2VPN-I13 Annex B.3.1 */
+{ 887,    "NSIEncapsulationSubtype",           2,      195,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43.5.2 L2VPN-I13 Annex B.3.2 */
+{ 888,    "ServiceMultiplexingValueOther",     1,      887,    (encode_lenzero),        (decode_lenzero),        0,           0             }, /* TLV 24.43.5.2.1 L2VPN-I13 Annex B.3.2 */
+{ 889,    "ServiceMultiplexingValueIEEE8021Q", 2,      887,    (encode_ushort),         (decode_ushort),         0,           4096          }, /* TLV 24.43.5.2.2 L2VPN-I13 Annex B.3.2 */
+{ 890,    "ServiceMultiplexingValueIEEE8021ad", 3,     887,    (encode_hexstr),         (decode_hexstr),         4,           4             }, /* TLV 24.43.5.2.3 L2VPN-I13 Annex B.3.2 */
+{ 891,    "ServiceMultiplexingValueMPLSPW",    4,      887,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43.5.2.4 L2VPN-I13 Annex B.3.2 */
+{ 892,    "MPLSPseudowireID",                  1,      891,    (encode_uint),           (decode_uint),           0,           0             }, /* TLV 24.43.5.2.4.1 L2VPN-I13 Annex B.3.2 */
+{ 893,    "MPLSPeerIpAddress",                 2,      891,    (encode_char_ip_ip6),    (decode_char_ip_ip6),    0,           0             }, /* TLV 24.43.5.2.4.2 L2VPN-I13 Annex B.3.2 */
+{ 894,    "MPLSPseudowireType",                3,      891,    (encode_uchar),          (decode_uchar),          0,           0             }, /* TLV 24.43.5.2.4.3 L2VPN-I13 Annex B.3.2 */
+{ 895,    "MPLSBackupPseudowireID",            4,      891,    (encode_uint),           (decode_uint),           0,           0             }, /* TLV 24.43.5.2.4.4 L2VPN-I13 Annex B.3.2 */
+{ 896,    "MPLSBackupPeerIpAddress",           5,      891,    (encode_char_ip_ip6),    (decode_char_ip_ip6),    0,           0             }, /* TLV 24.43.5.2.4.5 L2VPN-I13 Annex B.3.2 */
+{ 897,    "ServiceMultiplexingValueL2TPv3Peer", 5,     887,    (encode_char_ip_ip6),    (decode_char_ip_ip6),    0,           0             }, /* TLV 24.43.5.2.5 L2VPN-I13 Annex B.3.2 */
+{ 898,    "IEEE8021ahEncapsulation",           6,      887,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43.5.2.6 L2VPN-I13 Annex B.3.2.2 */
+{ 899,    "ITCIEncapsulation",                 1,      898,    (encode_hexstr),         (decode_hexstr),         4,           4             }, /* TLV 24.43.5.2.6.1 L2VPN-I13 Annex B.3.2.2.1 */
+{ 900,    "BDAEncapsulation",                  2,      898,    (encode_hexstr),         (decode_hexstr),         6,           6             }, /* TLV 24.43.5.2.6.2 L2VPN-I13 Annex B.3.2.2.2 */
+{ 901,    "BTCIEncapsulation",                 3,      898,    (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 24.43.5.2.6.3 L2VPN-I13 Annex B.3.2.2.3 */
+{ 902,    "ITPIDEncapsulation",                4,      898,    (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 24.43.5.2.6.4 L2VPN-I13 Annex B.3.2.2.4 */
+{ 903,    "IPCPEncapsulation",                 5,      898,    (encode_hexstr),         (decode_hexstr),         1,           1             }, /* TLV 24.43.5.2.6.5 L2VPN-I13 Annex B.3.2.2.5 */
+{ 904,    "IDEIEncapsulation",                 6,      898,    (encode_hexstr),         (decode_hexstr),         1,           1             }, /* TLV 24.43.5.2.6.6 L2VPN-I13 Annex B.3.2.2.6 */
+{ 905,    "IUCAEncapsulation",                 7,      898,    (encode_hexstr),         (decode_hexstr),         1,           1             }, /* TLV 24.43.5.2.6.7 L2VPN-I13 Annex B.3.2.2.7 */
+{ 906,    "ISIDEncapsulation",                 8,      898,    (encode_hexstr),         (decode_hexstr),         3,           3             }, /* TLV 24.43.5.2.6.8 L2VPN-I13 Annex B.3.2.2.8 */
+{ 907,    "BTPIDEncapsulation",                9,      898,    (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 24.43.5.2.6.9 L2VPN-I13 Annex B.3.2.2.9 */
+{ 908,    "BPCPEncapsulation",                 10,     898,    (encode_hexstr),         (decode_hexstr),         1,           1             }, /* TLV 24.43.5.2.6.10 L2VPN-I13 Annex B.3.2.2.10 */
+{ 909,    "BDEIEncapsulation",                 11,     898,    (encode_hexstr),         (decode_hexstr),         1,           1             }, /* TLV 24.43.5.2.6.11 L2VPN-I13 Annex B.3.2.2.11 */
+{ 910,    "BVIDEncapsulation",                 12,     898,    (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 24.43.5.2.6.12 L2VPN-I13 Annex B.3.2.2.11 */
+{ 911,    "ServiceMultiplexingValueIEEE8021adSTPID", 8, 887,   (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 24.43.5.2.8 L2VPN-I13 Annex B.3.2.1 */
+{ 912,    "eSAFEDHCPSnooping",                 3,      195,    (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 24.43.5.3 L2VPN-I13 Annex B.3.3 */
+{ 913,    "CMInterfaceMaskCMIMSubtype",        4,      195,    (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 24.43.5.4 L2VPN-I13 Annex B.3.4 */
+{ 914,    "AttachmentGroupID",                 5,      195,    (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 24.43.5.5 L2VPN-I13 Annex B.3.5 */
+{ 915,    "SourceAttachmentIndividualID",      6,      195,    (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 24.43.5.6 L2VPN-I13 Annex B.3.6 */
+{ 916,    "TargetAttachmentIndividualID",      7,      195,    (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 24.43.5.7 L2VPN-I13 Annex B.3.7 */
+{ 917,    "IngressUserPriority",               8,      195,    (encode_uchar),          (decode_uchar),          0,           7             }, /* TLV 24.43.5.8 L2VPN-I13 Annex B.3.8 */
+{ 918,    "UserPriorityRange",                 9,      195,    (encode_char_list),      (decode_char_list),      0,           0             }, /* TLV 24.43.5.9 L2VPN-I13 Annex B.3.9 */
+{ 919,    "L2VPNSADescriptorSubtype",          10,     195,    (encode_hexstr),         (decode_hexstr),         14,          14            }, /* TLV 24.43.5.10 L2VPN-I13 Annex B.3.10 */
+{ 920,    "PseudowireType",                    12,     195,    (encode_uchar),          (decode_uchar),          4,           5             }, /* TLV 24.43.5.12 L2VPN-I13 Annex B.3.13 */
+{ 921,    "L2VPNMode",                         13,     195,    (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 24.43.5.13 L2VPN-I13 Annex B.3.14 */
+{ 922,    "TPIDTranslation",                   14,     195,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43.5.14 L2VPN-I13 Annex B.3.15 */
+{ 923,    "UpstreamTPIDTranslation",           1,      922,    (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 24.43.5.14.1 L2VPN-I13 Annex B.3.15.1 */
+{ 924,    "DownstreamTPIDTranslation",         2,      922,    (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 24.43.5.14.2 L2VPN-I13 Annex B.3.15.1 */
+{ 925,    "UpstreamSTPIDTranslation",          3,      922,    (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 24.43.5.14.3 L2VPN-I13 Annex B.3.15.1 */
+{ 926,    "DownstreamSTPIDTranslation",        4,      922,    (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 24.43.5.14.4 L2VPN-I13 Annex B.3.15.1 */
+{ 927,    "UpstreamBTPIDTranslation",          5,      922,    (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 24.43.5.14.5 L2VPN-I13 Annex B.3.15.1 */
+{ 928,    "DownstreamBTPIDTranslation",        6,      922,    (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 24.43.5.14.6 L2VPN-I13 Annex B.3.15.1 */
+{ 929,    "UpstreamITPIDTranslation",          7,      922,    (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 24.43.5.14.7 L2VPN-I13 Annex B.3.15.1 */
+{ 930,    "DownstreamITPIDTranslation",        8,      922,    (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 24.43.5.14.8 L2VPN-I13 Annex B.3.15.1 */
+{ 931,    "L2CPProcessing",                    15,     195,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43.5.15 L2VPN-I13 Annex B.3.16 */
+{ 932,    "L2CPTunnelMode",                    1,      931,    (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 24.43.5.15.1 L2VPN-I13 Annex B.3.16.1 */
+{ 933,    "L2CPDMACAddress",                   2,      931,    (encode_ether),          (decode_ether),          0,           0             }, /* TLV 24.43.5.15.2 L2VPN-I13 Annex B.3.16.1 */
+{ 934,    "L2CPOverwrotingDMACAddress",        3,      931,    (encode_ether),          (decode_ether),          0,           0             }, /* TLV 24.43.5.15.3 L2VPN-I13 Annex B.3.16.1 */
+{ 935,    "DACDisableEnableConfiguration",     16,     195,    (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 24.43.5.16 L2VPN-I13 Annex B.3.17 */
+{ 936,    "PseudowireClass",                   18,     195,    (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 24.43.5.18 L2VPN-I13 Annex B.3.18 */
+{ 937,    "ServiceDelimiter",                  19,     195,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43.5.19 L2VPN-I13 Annex B.3.19 */
+{ 938,    "CVIDDelimiter",                     1,      937,    (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 24.43.5.19.1 L2VPN-I13 Annex B.3.19.1 */
+{ 939,    "SVIDDelimiter",                     2,      937,    (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 24.43.5.19.2 L2VPN-I13 Annex B.3.19.2 */
+{ 940,    "ISIDDelimiter",                     3,      937,    (encode_hexstr),         (decode_hexstr),         3,           3             }, /* TLV 24.43.5.19.3 L2VPN-I13 Annex B.3.19.3 */
+{ 941,    "BVIDDelimiter",                     4,      937,    (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 24.43.5.19.4 L2VPN-I13 Annex B.3.19.4 */
+{ 942,    "VirtualSwitchInstanceEncoding",     20,     195,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43.5.20 L2VPN-I13 Annex B.3.20 */
+{ 943,    "VPLSClass",                         1,      942,    (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 24.43.5.20.1 L2VPN-I13 Annex B.3.20.1 */
+{ 944,    "ETreeRole",                         2,      942,    (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 24.43.5.20.2 L2VPN-I13 Annex B.3.20.2 */
+{ 945,    "ETreeRootVID",                      3,      942,    (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 24.43.5.20.3 L2VPN-I13 Annex B.3.20.3 */
+{ 946,    "ETreeLeafVID",                      4,      942,    (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 24.43.5.20.4 L2VPN-I13 Annex B.3.20.4 */
+{ 947,    "BGPAttribute",                      21,     195,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43.5.21 L2VPN-I13 Annex B.3.21 */
+{ 948,    "BGPVPNID",                          1,      947,    (encode_uint),           (decode_uint),           0,           0             }, /* TLV 24.43.5.21.1 L2VPN-I13 Annex B.3.21.1 */
+{ 949,    "RouteDistinguisher",                2,      947,    (encode_hexstr),         (decode_hexstr),         8,           8             }, /* TLV 24.43.5.21.2 L2VPN-I13 Annex B.3.21.2 */
+{ 950,    "RouteTargetImport",                 3,      947,    (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 24.43.5.21.3 L2VPN-I13 Annex B.3.21.3 */
+{ 951,    "RouteTargetExport",                 4,      947,    (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 24.43.5.21.4 L2VPN-I13 Annex B.3.21.4 */
+{ 952,    "CEIDVEID",                          5,      947,    (encode_ushort),         (decode_ushort),         0,           0             }, /* TLV 24.43.5.21.5 L2VPN-I13 Annex B.3.21.5 */
+{ 953,    "PseudowireSignaling",               23,     195,    (encode_uchar),          (decode_uchar),          0,           2             }, /* TLV 24.43.5.23 L2VPN-I13 Annex B.3.23 */
+{ 954,    "SOAMSubtype",                       24,     195,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43.5.24 L2VPN-I13 Annex B.3.24 */
+{ 955,    "MEPConfiguration",                  1,      954,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43.5.24.1 L2VPN-I13 Annex B.3.24.1 */
+{ 956,    "MDLevel",                           1,      955,    (encode_uchar),          (decode_uchar),          0,           7             }, /* TLV 24.43.5.24.1.1 L2VPN-I13 Annex B.3.24.1.1 */
+{ 957,    "MDName",                            2,      955,    (encode_string),         (decode_string),         2,           16            }, /* TLV 24.43.5.24.1.2 L2VPN-I13 Annex B.3.24.1.2 */
+{ 958,    "MAName",                            3,      955,    (encode_string),         (decode_string),         2,           28            }, /* TLV 24.43.5.24.1.3 L2VPN-I13 Annex B.3.24.1.3 */
+{ 959,    "MEPID",                             4,      955,    (encode_ushort),         (decode_ushort),         1,           8191          }, /* TLV 24.43.5.24.1.4 L2VPN-I13 Annex B.3.24.1.4 */
+{ 960,    "RemoteMEPConfiguration",            2,      954,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43.5.24.2 L2VPN-I13 Annex B.3.24.2 */
+{ 961,    "RemoteMDLevel",                     1,      960,    (encode_uchar),          (decode_uchar),          0,           7             }, /* TLV 24.43.5.24.2.1 L2VPN-I13 Annex B.3.24.2.1 */
+{ 962,    "RemoteMDName",                      2,      960,    (encode_string),         (decode_string),         2,           16            }, /* TLV 24.43.5.24.2.2 L2VPN-I13 Annex B.3.24.2.2 */
+{ 963,    "RemoteMAName",                      3,      960,    (encode_string),         (decode_string),         2,           28            }, /* TLV 24.43.5.24.2.3 L2VPN-I13 Annex B.3.24.2.3 */
+{ 964,    "RemoteMEPID",                       4,      960,    (encode_ushort),         (decode_ushort),         1,           8191          }, /* TLV 24.43.5.24.2.4 L2VPN-I13 Annex B.3.24.2.4 */
+{ 965,    "FaultManagementConfiguration",      3,      954,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43.5.24.3 L2VPN-I13 Annex B.3.24.3 */
+{ 966,    "ContinuityCheckMessages",           1,      965,    (encode_uchar),          (decode_uchar),          0,           2             }, /* TLV 24.43.5.24.3.1 L2VPN-I13 Annex B.3.24.3.1 */
+{ 967,    "LoopbackFunction",                  2,      965,    (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 24.43.5.24.3.2 L2VPN-I13 Annex B.3.24.3.2 */
+{ 968,    "LinktraceFunction",                 3,      965,    (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 24.43.5.24.3.3 L2VPN-I13 Annex B.3.24.3.3 */
+{ 969,    "PerformanceManagementConfiguration", 4,     954,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43.5.24.4 L2VPN-I13 Annex B.3.24.4 */
+{ 970,    "FrameDelayMeasurement",             1,      969,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43.5.24.4.1 L2VPN-I13 Annex B.3.24.4.1 */
+{ 971,    "FrameDelayMeasurementEnable",       1,      970,    (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 24.43.5.24.4.1.1 L2VPN-I13 Annex B.3.24.4.1.1 */
+{ 972,    "FrameDelayMeasurementOneWayTwoWay", 2,      970,    (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 24.43.5.24.4.1.2 L2VPN-I13 Annex B.3.24.4.1.2 */
+{ 973,    "FrameDelayMeasurementTransmissionPeriodicity", 3, 970, (encode_ushort),      (decode_ushort),         0,           0             }, /* TLV 24.43.5.24.4.1.3 L2VPN-I13 Annex B.3.24.4.1.3 */
+{ 974,    "FrameLossMeasurement",              2,      969,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43.5.24.4.2 L2VPN-I13 Annex B.3.24.4.2 */
+{ 975,    "FrameLossMeasurementEnable",        1,      974,    (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 24.43.5.24.4.2.1 L2VPN-I13 Annex B.3.24.4.2.1 */
+{ 976,    "FrameLossMeasurementTransmissionPeriodicity", 2, 974, (encode_ushort),       (decode_ushort),         0,           0             }, /* TLV 24.43.5.24.4.2.2 L2VPN-I13 Annex B.3.24.4.2.2 */
+{ 977,    "L2VPNDSID",                         26,     195,    (encode_uint24),         (decode_uint24),         1,           1048575       }, /* TLV 24.43.5.26 L2VPN-I13 Annex B.3.26 */
+{ 978,    "VendorSpecificL2VPNSubtype",        43,     195,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43.5.43 L2VPN-I13 Annex B.3.11 */
+{ 979,    "VendorIdentifier",                  8,      978,    (encode_hexstr),         (decode_hexstr),         3,           3             }, /* TLV 24.43.5.43.8 L2VPN-I13 Annex B.3.11 */
+{ 980,    "ExtendedCMTSMICConfigurationSetting", 6,    205,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43.6 MULPIv3.0-I24 Annex C.1.1.18.1.6 */
+{ 981,    "ExtendedCMTSMICHMACtype",           1,      980,    (encode_uchar),          (decode_uchar),          0,           0             }, /* TLV 24.43.6.1 MULPIv3.0-I24 Annex C.1.1.18.1.6.1 */
+{ 982,    "ExtendedCMTSMICBitmap",             2,      980,    (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 24.43.6.2 MULPIv3.0-I24 Annex C.1.1.18.1.6.2 */
+{ 983,    "ExplicitExtendedCMTSMICDigest",     3,      980,    (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 24.43.6.3 MULPIv3.0-I24 Annex C.1.1.18.1.6.3 */
+{ 984,    "SAVAuthorizationEncoding",          7,      205,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43.7 MULPIv3.0-I24 Annex C.1.1.18.1.7 */
+{ 985,    "SAVGroupName",                      1,      984,    (encode_string),         (decode_string),         1,           15            }, /* TLV 24.43.7.1 MULPIv3.0-I24 Annex C.1.1.18.1.7.1 */
+{ 986,    "SAVStaticPrefixRule",               2,      984,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43.7.2 MULPIv3.0-I24 Annex C.1.1.18.1.7.2 */
+{ 987,    "SAVStaticPrefixAddress",            1,      986,    (encode_ip_ip6),         (decode_ip_ip6),         0,           0             }, /* TLV 24.43.7.2.1 MULPIv3.0-I24 Annex C.1.1.18.1.7.2.1 */
+{ 988,    "SAVStaticPrefixLength",             2,      986,    (encode_uchar),          (decode_uchar),          0,           0             }, /* TLV 24.43.7.2.2 MULPIv3.0-I24 Annex C.1.1.18.1.7.2.2 */
+{ 989,    "VendorIdentifier",                  8,      205,    (encode_hexstr),         (decode_hexstr),         3,           3             }, /* TLV 24.43.8 MULPIv3.0-I24 Annex C.2.1.11 */
+{ 990,    "CMAttributeMasks",                  9,      205,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43.9 MULPIv3.0-I24 Annex C.1.1.18.1.8 */
+{ 991,    "CMDownstreamRequiredAttributeMask", 1,      990,    (encode_hexstr),         (decode_hexstr),         4,           4             }, /* TLV 24.43.9.1 MULPIv3.0-I24 Annex C.1.1.18.1.8.1 */
+{ 992,    "CMDownstreamForbiddenAttributeMask", 2,     990,    (encode_hexstr),         (decode_hexstr),         4,           4             }, /* TLV 24.43.9.2 MULPIv3.0-I24 Annex C.1.1.18.1.8.2 */
+{ 993,    "CMUpstreamRequiredAttributeMask",   3,      990,    (encode_hexstr),         (decode_hexstr),         4,           4             }, /* TLV 24.43.9.3 MULPIv3.0-I24 Annex C.1.1.18.1.8.3 */
+{ 994,    "CMUpstreamForbiddenAttributeMask",  4,      990,    (encode_hexstr),         (decode_hexstr),         4,           4             }, /* TLV 24.43.9.4 MULPIv3.0-I24 Annex C.1.1.18.1.8.4 */
+{ 995,    "IPMulticastJoinAuthorization",      10,     205,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43.10 MULPIv3.0-I24 Annex C.1.1.18.1.9 */
+{ 996,    "IPMulticastProfileName",            1,      995,    (encode_string),         (decode_string),         1,           15            }, /* TLV 24.43.10.1 MULPIv3.0-I24 Annex C.1.1.18.1.9.1 */
+{ 997,    "IPMulticastJoinAuthStaticSessionRule", 2,   995,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43.10.2 MULPIv3.0-I24 Annex C.1.1.18.1.9.2 */
+{ 998,    "MulticastRulePriority",             1,      997,    (encode_uchar),          (decode_uchar),          0,           255           }, /* TLV 24.43.10.2.1 MULPIv3.0-I24 Annex C.1.1.18.1.9.2.1 */
+{ 999,    "AuthorizationAction",               2,      997,    (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 24.43.10.2.2 MULPIv3.0-I24 Annex C.1.1.18.1.9.2.2 */
+{ 1000,   "SourcePrefixAddress",               3,      997,    (encode_ip_ip6),         (decode_ip_ip6),         0,           0             }, /* TLV 24.43.10.2.3 MULPIv3.0-I24 Annex C.1.1.18.1.9.2.3 */
+{ 1001,   "SourcePrefixLength",                4,      997,    (encode_uchar),          (decode_uchar),          0,           128           }, /* TLV 24.43.10.2.4 MULPIv3.0-I24 Annex C.1.1.18.1.9.2.4 */
+{ 1002,   "GroupPrefixAddress",                5,      997,    (encode_ip_ip6),         (decode_ip_ip6),         0,           0             }, /* TLV 24.43.10.2.5 MULPIv3.0-I24 Annex C.1.1.18.1.9.2.5 */
+{ 1003,   "GroupPrefixLength",                 6,      997,    (encode_uchar),          (decode_uchar),          0,           128           }, /* TLV 24.43.10.2.6 MULPIv3.0-I24 Annex C.1.1.18.1.9.2.6 */
+{ 1004,   "MaximumMulticastSessions",          3,      995,    (encode_ushort),         (decode_ushort),         0,           0             }, /* TLV 24.43.10.3 MULPIv3.0-I24 Annex C.1.1.18.1.9.3 */
+{ 1005,   "ServiceTypeIdentifier",             11,     205,    (encode_string),         (decode_string),         1,           16            }, /* TLV 24.43.11 MULPIv3.0-I24 Annex C.1.1.18.1.10 */
+{ 1006,   "DEMARCAutoConfiguration",           12,     205,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 24.43.12 MULPIv3.0-I24 Annex C.1.1.18.1.11 */
+{ 1007,   "DACDisableEnableConfig",            1,      1006,   (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 24.43.12.1 DEMARCv1.0-I04 Annex B.1 */
+{ 1008,   "CMIMEncoding",                      2,      1006,   (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 24.43.12.2 DEMARCv1.0-I04 Annex B.2 */
+{ 1009,   "UpstreamServiceClassName",          3,      1006,   (encode_strzero),        (decode_strzero),        2,           16            }, /* TLV 24.43.12.3 DEMARCv1.0-I04 Annex B.3 */
+{ 1010,   "DownstreamServiceClassName",        4,      1006,   (encode_strzero),        (decode_strzero),        2,           16            }, /* TLV 24.43.12.4 DEMARCv1.0-I04 Annex B.4 */
 
 /* Downstream Service Flow */
 
@@ -594,10 +721,138 @@ symbol_type symtable[NUM_IDENTIFIERS] =  {
 { 112,    "ActQosParamsTimeout",               12,     102,    (encode_ushort),         (decode_ushort),         0,           65535         }, /* TLV 25.12 MULPIv3.0-I24 Annex C.2.2.7.6 */
 { 113,    "AdmQosParamsTimeout",               13,     102,    (encode_ushort),         (decode_ushort),         0,           65535         }, /* TLV 25.13 MULPIv3.0-I24 Annex C.2.2.7.7 */
 { 114,    "MaxDsLatency",                      14,     102,    (encode_uint),           (decode_uint),           0,           0             }, /* TLV 25.14 MULPIv3.0-I24 Annex C.2.2.9.1 */
-{ 196,    "VendorSpecific",                    43,     102,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43 MULPIv3.0-I24 Annex C.2.2.7.8 */
-{ 197,    "VendorIdentifier",                  8,      196,    (encode_hexstr),         (decode_hexstr),         3,           3             }, /* TLV 25.43.8 */
-{ 198,    "L2VPNEncoding",                     5,      196,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43.5 */
-{ 199,    "VPNIdentifier",                     1,      198,    (encode_hexstr),         (decode_hexstr),         4,           255           }, /* TLV 25.43.5.1 */
+
+{ 199,    "VendorSpecific",                    43,     102,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43 MULPIv3.0-I24 Annex C.2.1.11 */
+{ 196,    "CMLoadBalancingPolicyID",           1,      199,    (encode_uint),           (decode_uint),           0,           0             }, /* TLV 25.43.1 MULPIv3.0-I24 Annex C.1.1.18.1.1 */
+{ 197,    "CMLoadBalancingPriority",           2,      199,    (encode_uint),           (decode_uint),           0,           0             }, /* TLV 25.43.2 MULPIv3.0-I24 Annex C.1.1.18.1.2 */
+{ 198,    "CMLoadBalancingGroupID",            3,      199,    (encode_uint),           (decode_uint),           0,           0             }, /* TLV 25.43.3 MULPIv3.0-I24 Annex C.1.1.18.1.3 */
+{ 1011,   "CMRangingClassIDExtension",         4,      199,    (encode_ushort),         (decode_ushort),         0,           0             }, /* TLV 25.43.4 MULPIv3.0-I24 Annex C.1.1.18.1.4 */
+{ 1012,   "L2VPNEncoding",                     5,      199,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43.5 MULPIv3.0-I24 Annex C.1.1.18.1.5 */
+{ 1013,   "VPNIdentifier",                     1,      1012,   (encode_hexstr),         (decode_hexstr),         4,           255           }, /* TLV 25.43.5.1 L2VPN-I13 Annex B.3.1 */
+{ 1014,   "NSIEncapsulationSubtype",           2,      1012,   (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43.5.2 L2VPN-I13 Annex B.3.2 */
+{ 1015,   "ServiceMultiplexingValueOther",     1,      1014,   (encode_lenzero),        (decode_lenzero),        0,           0             }, /* TLV 25.43.5.2.1 L2VPN-I13 Annex B.3.2 */
+{ 1016,   "ServiceMultiplexingValueIEEE8021Q", 2,      1014,   (encode_ushort),         (decode_ushort),         0,           4096          }, /* TLV 25.43.5.2.2 L2VPN-I13 Annex B.3.2 */
+{ 1017,   "ServiceMultiplexingValueIEEE8021ad", 3,     1014,   (encode_hexstr),         (decode_hexstr),         4,           4             }, /* TLV 25.43.5.2.3 L2VPN-I13 Annex B.3.2 */
+{ 1018,   "ServiceMultiplexingValueMPLSPW",    4,      1014,   (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43.5.2.4 L2VPN-I13 Annex B.3.2 */
+{ 1019,   "MPLSPseudowireID",                  1,      1018,   (encode_uint),           (decode_uint),           0,           0             }, /* TLV 25.43.5.2.4.1 L2VPN-I13 Annex B.3.2 */
+{ 1020,   "MPLSPeerIpAddress",                 2,      1018,   (encode_char_ip_ip6),    (decode_char_ip_ip6),    0,           0             }, /* TLV 25.43.5.2.4.2 L2VPN-I13 Annex B.3.2 */
+{ 1021,   "MPLSPseudowireType",                3,      1018,   (encode_uchar),          (decode_uchar),          0,           0             }, /* TLV 25.43.5.2.4.3 L2VPN-I13 Annex B.3.2 */
+{ 1022,   "MPLSBackupPseudowireID",            4,      1018,   (encode_uint),           (decode_uint),           0,           0             }, /* TLV 25.43.5.2.4.4 L2VPN-I13 Annex B.3.2 */
+{ 1023,   "MPLSBackupPeerIpAddress",           5,      1018,   (encode_char_ip_ip6),    (decode_char_ip_ip6),    0,           0             }, /* TLV 25.43.5.2.4.5 L2VPN-I13 Annex B.3.2 */
+{ 1024,   "ServiceMultiplexingValueL2TPv3Peer", 5,     1014,   (encode_char_ip_ip6),    (decode_char_ip_ip6),    0,           0             }, /* TLV 25.43.5.2.5 L2VPN-I13 Annex B.3.2 */
+{ 1025,   "IEEE8021ahEncapsulation",           6,      1014,   (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43.5.2.6 L2VPN-I13 Annex B.3.2.2 */
+{ 1026,   "ITCIEncapsulation",                 1,      1025,   (encode_hexstr),         (decode_hexstr),         4,           4             }, /* TLV 25.43.5.2.6.1 L2VPN-I13 Annex B.3.2.2.1 */
+{ 1027,   "BDAEncapsulation",                  2,      1025,   (encode_hexstr),         (decode_hexstr),         6,           6             }, /* TLV 25.43.5.2.6.2 L2VPN-I13 Annex B.3.2.2.2 */
+{ 1028,   "BTCIEncapsulation",                 3,      1025,   (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 25.43.5.2.6.3 L2VPN-I13 Annex B.3.2.2.3 */
+{ 1029,   "ITPIDEncapsulation",                4,      1025,   (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 25.43.5.2.6.4 L2VPN-I13 Annex B.3.2.2.4 */
+{ 1030,   "IPCPEncapsulation",                 5,      1025,   (encode_hexstr),         (decode_hexstr),         1,           1             }, /* TLV 25.43.5.2.6.5 L2VPN-I13 Annex B.3.2.2.5 */
+{ 1031,   "IDEIEncapsulation",                 6,      1025,   (encode_hexstr),         (decode_hexstr),         1,           1             }, /* TLV 25.43.5.2.6.6 L2VPN-I13 Annex B.3.2.2.6 */
+{ 1032,   "IUCAEncapsulation",                 7,      1025,   (encode_hexstr),         (decode_hexstr),         1,           1             }, /* TLV 25.43.5.2.6.7 L2VPN-I13 Annex B.3.2.2.7 */
+{ 1033,   "ISIDEncapsulation",                 8,      1025,   (encode_hexstr),         (decode_hexstr),         3,           3             }, /* TLV 25.43.5.2.6.8 L2VPN-I13 Annex B.3.2.2.8 */
+{ 1034,   "BTPIDEncapsulation",                9,      1025,   (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 25.43.5.2.6.9 L2VPN-I13 Annex B.3.2.2.9 */
+{ 1035,   "BPCPEncapsulation",                 10,     1025,   (encode_hexstr),         (decode_hexstr),         1,           1             }, /* TLV 25.43.5.2.6.10 L2VPN-I13 Annex B.3.2.2.10 */
+{ 1036,   "BDEIEncapsulation",                 11,     1025,   (encode_hexstr),         (decode_hexstr),         1,           1             }, /* TLV 25.43.5.2.6.11 L2VPN-I13 Annex B.3.2.2.11 */
+{ 1037,   "BVIDEncapsulation",                 12,     1025,   (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 25.43.5.2.6.12 L2VPN-I13 Annex B.3.2.2.11 */
+{ 1038,   "ServiceMultiplexingValueIEEE8021adSTPID", 8, 1014,  (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 25.43.5.2.8 L2VPN-I13 Annex B.3.2.1 */
+{ 1039,   "eSAFEDHCPSnooping",                 3,      1012,   (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 25.43.5.3 L2VPN-I13 Annex B.3.3 */
+{ 1040,   "CMInterfaceMaskCMIMSubtype",        4,      1012,   (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 25.43.5.4 L2VPN-I13 Annex B.3.4 */
+{ 1041,   "AttachmentGroupID",                 5,      1012,   (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 25.43.5.5 L2VPN-I13 Annex B.3.5 */
+{ 1042,   "SourceAttachmentIndividualID",      6,      1012,   (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 25.43.5.6 L2VPN-I13 Annex B.3.6 */
+{ 1043,   "TargetAttachmentIndividualID",      7,      1012,   (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 25.43.5.7 L2VPN-I13 Annex B.3.7 */
+{ 1044,   "IngressUserPriority",               8,      1012,   (encode_uchar),          (decode_uchar),          0,           7             }, /* TLV 25.43.5.8 L2VPN-I13 Annex B.3.8 */
+{ 1045,   "UserPriorityRange",                 9,      1012,   (encode_char_list),      (decode_char_list),      0,           0             }, /* TLV 25.43.5.9 L2VPN-I13 Annex B.3.9 */
+{ 1046,   "L2VPNSADescriptorSubtype",          10,     1012,   (encode_hexstr),         (decode_hexstr),         14,          14            }, /* TLV 25.43.5.10 L2VPN-I13 Annex B.3.10 */
+{ 1047,   "PseudowireType",                    12,     1012,   (encode_uchar),          (decode_uchar),          4,           5             }, /* TLV 25.43.5.12 L2VPN-I13 Annex B.3.13 */
+{ 1048,   "L2VPNMode",                         13,     1012,   (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 25.43.5.13 L2VPN-I13 Annex B.3.14 */
+{ 1049,   "TPIDTranslation",                   14,     1012,   (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43.5.14 L2VPN-I13 Annex B.3.15 */
+{ 1050,   "UpstreamTPIDTranslation",           1,      1049,   (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 25.43.5.14.1 L2VPN-I13 Annex B.3.15.1 */
+{ 1051,   "DownstreamTPIDTranslation",         2,      1049,   (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 25.43.5.14.2 L2VPN-I13 Annex B.3.15.1 */
+{ 1052,   "UpstreamSTPIDTranslation",          3,      1049,   (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 25.43.5.14.3 L2VPN-I13 Annex B.3.15.1 */
+{ 1053,   "DownstreamSTPIDTranslation",        4,      1049,   (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 25.43.5.14.4 L2VPN-I13 Annex B.3.15.1 */
+{ 1054,   "UpstreamBTPIDTranslation",          5,      1049,   (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 25.43.5.14.5 L2VPN-I13 Annex B.3.15.1 */
+{ 1055,   "DownstreamBTPIDTranslation",        6,      1049,   (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 25.43.5.14.6 L2VPN-I13 Annex B.3.15.1 */
+{ 1056,   "UpstreamITPIDTranslation",          7,      1049,   (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 25.43.5.14.7 L2VPN-I13 Annex B.3.15.1 */
+{ 1057,   "DownstreamITPIDTranslation",        8,      1049,   (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 25.43.5.14.8 L2VPN-I13 Annex B.3.15.1 */
+{ 1058,   "L2CPProcessing",                    15,     1012,   (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43.5.15 L2VPN-I13 Annex B.3.16 */
+{ 1059,   "L2CPTunnelMode",                    1,      1058,   (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 25.43.5.15.1 L2VPN-I13 Annex B.3.16.1 */
+{ 1060,   "L2CPDMACAddress",                   2,      1058,   (encode_ether),          (decode_ether),          0,           0             }, /* TLV 25.43.5.15.2 L2VPN-I13 Annex B.3.16.1 */
+{ 1061,   "L2CPOverwrotingDMACAddress",        3,      1058,   (encode_ether),          (decode_ether),          0,           0             }, /* TLV 25.43.5.15.3 L2VPN-I13 Annex B.3.16.1 */
+{ 1062,   "DACDisableEnableConfiguration",     16,     1012,   (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 25.43.5.16 L2VPN-I13 Annex B.3.17 */
+{ 1063,   "PseudowireClass",                   18,     1012,   (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 25.43.5.18 L2VPN-I13 Annex B.3.18 */
+{ 1064,   "ServiceDelimiter",                  19,     1012,   (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43.5.19 L2VPN-I13 Annex B.3.19 */
+{ 1065,   "CVIDDelimiter",                     1,      1064,   (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 25.43.5.19.1 L2VPN-I13 Annex B.3.19.1 */
+{ 1066,   "SVIDDelimiter",                     2,      1064,   (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 25.43.5.19.2 L2VPN-I13 Annex B.3.19.2 */
+{ 1067,   "ISIDDelimiter",                     3,      1064,   (encode_hexstr),         (decode_hexstr),         3,           3             }, /* TLV 25.43.5.19.3 L2VPN-I13 Annex B.3.19.3 */
+{ 1068,   "BVIDDelimiter",                     4,      1064,   (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 25.43.5.19.4 L2VPN-I13 Annex B.3.19.4 */
+{ 1069,   "VirtualSwitchInstanceEncoding",     20,     1012,   (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43.5.20 L2VPN-I13 Annex B.3.20 */
+{ 1070,   "VPLSClass",                         1,      1069,   (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 25.43.5.20.1 L2VPN-I13 Annex B.3.20.1 */
+{ 1071,   "ETreeRole",                         2,      1069,   (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 25.43.5.20.2 L2VPN-I13 Annex B.3.20.2 */
+{ 1072,   "ETreeRootVID",                      3,      1069,   (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 25.43.5.20.3 L2VPN-I13 Annex B.3.20.3 */
+{ 1073,   "ETreeLeafVID",                      4,      1069,   (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 25.43.5.20.4 L2VPN-I13 Annex B.3.20.4 */
+{ 1074,   "BGPAttribute",                      21,     1012,   (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43.5.21 L2VPN-I13 Annex B.3.21 */
+{ 1075,   "BGPVPNID",                          1,      1074,   (encode_uint),           (decode_uint),           0,           0             }, /* TLV 25.43.5.21.1 L2VPN-I13 Annex B.3.21.1 */
+{ 1076,   "RouteDistinguisher",                2,      1074,   (encode_hexstr),         (decode_hexstr),         8,           8             }, /* TLV 25.43.5.21.2 L2VPN-I13 Annex B.3.21.2 */
+{ 1077,   "RouteTargetImport",                 3,      1074,   (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 25.43.5.21.3 L2VPN-I13 Annex B.3.21.3 */
+{ 1078,   "RouteTargetExport",                 4,      1074,   (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 25.43.5.21.4 L2VPN-I13 Annex B.3.21.4 */
+{ 1079,   "CEIDVEID",                          5,      1074,   (encode_ushort),         (decode_ushort),         0,           0             }, /* TLV 25.43.5.21.5 L2VPN-I13 Annex B.3.21.5 */
+{ 1080,   "PseudowireSignaling",               23,     1012,   (encode_uchar),          (decode_uchar),          0,           2             }, /* TLV 25.43.5.23 L2VPN-I13 Annex B.3.23 */
+{ 1081,   "SOAMSubtype",                       24,     1012,   (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43.5.24 L2VPN-I13 Annex B.3.24 */
+{ 1082,   "MEPConfiguration",                  1,      1081,   (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43.5.24.1 L2VPN-I13 Annex B.3.24.1 */
+{ 1083,   "MDLevel",                           1,      1082,   (encode_uchar),          (decode_uchar),          0,           7             }, /* TLV 25.43.5.24.1.1 L2VPN-I13 Annex B.3.24.1.1 */
+{ 1084,   "MDName",                            2,      1082,   (encode_string),         (decode_string),         2,           16            }, /* TLV 25.43.5.24.1.2 L2VPN-I13 Annex B.3.24.1.2 */
+{ 1085,   "MAName",                            3,      1082,   (encode_string),         (decode_string),         2,           28            }, /* TLV 25.43.5.24.1.3 L2VPN-I13 Annex B.3.24.1.3 */
+{ 1086,   "MEPID",                             4,      1082,   (encode_ushort),         (decode_ushort),         1,           8191          }, /* TLV 25.43.5.24.1.4 L2VPN-I13 Annex B.3.24.1.4 */
+{ 1087,   "RemoteMEPConfiguration",            2,      1081,   (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43.5.24.2 L2VPN-I13 Annex B.3.24.2 */
+{ 1088,   "RemoteMDLevel",                     1,      1087,   (encode_uchar),          (decode_uchar),          0,           7             }, /* TLV 25.43.5.24.2.1 L2VPN-I13 Annex B.3.24.2.1 */
+{ 1089,   "RemoteMDName",                      2,      1087,   (encode_string),         (decode_string),         2,           16            }, /* TLV 25.43.5.24.2.2 L2VPN-I13 Annex B.3.24.2.2 */
+{ 1090,   "RemoteMAName",                      3,      1087,   (encode_string),         (decode_string),         2,           28            }, /* TLV 25.43.5.24.2.3 L2VPN-I13 Annex B.3.24.2.3 */
+{ 1091,   "RemoteMEPID",                       4,      1087,   (encode_ushort),         (decode_ushort),         1,           8191          }, /* TLV 25.43.5.24.2.4 L2VPN-I13 Annex B.3.24.2.4 */
+{ 1092,   "FaultManagementConfiguration",      3,      1081,   (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43.5.24.3 L2VPN-I13 Annex B.3.24.3 */
+{ 1093,   "ContinuityCheckMessages",           1,      1092,   (encode_uchar),          (decode_uchar),          0,           2             }, /* TLV 25.43.5.24.3.1 L2VPN-I13 Annex B.3.24.3.1 */
+{ 1094,   "LoopbackFunction",                  2,      1092,   (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 25.43.5.24.3.2 L2VPN-I13 Annex B.3.24.3.2 */
+{ 1095,   "LinktraceFunction",                 3,      1092,   (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 25.43.5.24.3.3 L2VPN-I13 Annex B.3.24.3.3 */
+{ 1096,   "PerformanceManagementConfiguration", 4,     1081,   (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43.5.24.4 L2VPN-I13 Annex B.3.24.4 */
+{ 1097,   "FrameDelayMeasurement",             1,      1096,   (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43.5.24.4.1 L2VPN-I13 Annex B.3.24.4.1 */
+{ 1098,   "FrameDelayMeasurementEnable",       1,      1097,   (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 25.43.5.24.4.1.1 L2VPN-I13 Annex B.3.24.4.1.1 */
+{ 1099,   "FrameDelayMeasurementOneWayTwoWay", 2,      1097,   (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 25.43.5.24.4.1.2 L2VPN-I13 Annex B.3.24.4.1.2 */
+{ 1100,   "FrameDelayMeasurementTransmissionPeriodicity", 3, 1097, (encode_ushort),     (decode_ushort),         0,           0             }, /* TLV 25.43.5.24.4.1.3 L2VPN-I13 Annex B.3.24.4.1.3 */
+{ 1101,   "FrameLossMeasurement",              2,      1096,   (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43.5.24.4.2 L2VPN-I13 Annex B.3.24.4.2 */
+{ 1102,   "FrameLossMeasurementEnable",        1,      1101,   (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 25.43.5.24.4.2.1 L2VPN-I13 Annex B.3.24.4.2.1 */
+{ 1103,   "FrameLossMeasurementTransmissionPeriodicity", 2, 1101, (encode_ushort),      (decode_ushort),         0,           0             }, /* TLV 25.43.5.24.4.2.2 L2VPN-I13 Annex B.3.24.4.2.2 */
+{ 1104,   "L2VPNDSID",                         26,     1012,   (encode_uint24),         (decode_uint24),         1,           1048575       }, /* TLV 25.43.5.26 L2VPN-I13 Annex B.3.26 */
+{ 1105,   "VendorSpecificL2VPNSubtype",        43,     1012,   (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43.5.43 L2VPN-I13 Annex B.3.11 */
+{ 1106,   "VendorIdentifier",                  8,      1105,   (encode_hexstr),         (decode_hexstr),         3,           3             }, /* TLV 25.43.5.43.8 L2VPN-I13 Annex B.3.11 */
+{ 1107,   "ExtendedCMTSMICConfigurationSetting", 6,    199,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43.6 MULPIv3.0-I24 Annex C.1.1.18.1.6 */
+{ 1108,   "ExtendedCMTSMICHMACtype",           1,      1107,   (encode_uchar),          (decode_uchar),          0,           0             }, /* TLV 25.43.6.1 MULPIv3.0-I24 Annex C.1.1.18.1.6.1 */
+{ 1109,   "ExtendedCMTSMICBitmap",             2,      1107,   (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 25.43.6.2 MULPIv3.0-I24 Annex C.1.1.18.1.6.2 */
+{ 1110,   "ExplicitExtendedCMTSMICDigest",     3,      1107,   (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 25.43.6.3 MULPIv3.0-I24 Annex C.1.1.18.1.6.3 */
+{ 1111,   "SAVAuthorizationEncoding",          7,      199,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43.7 MULPIv3.0-I24 Annex C.1.1.18.1.7 */
+{ 1112,   "SAVGroupName",                      1,      1111,   (encode_string),         (decode_string),         1,           15            }, /* TLV 25.43.7.1 MULPIv3.0-I24 Annex C.1.1.18.1.7.1 */
+{ 1113,   "SAVStaticPrefixRule",               2,      1111,   (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43.7.2 MULPIv3.0-I24 Annex C.1.1.18.1.7.2 */
+{ 1114,   "SAVStaticPrefixAddress",            1,      1113,   (encode_ip_ip6),         (decode_ip_ip6),         0,           0             }, /* TLV 25.43.7.2.1 MULPIv3.0-I24 Annex C.1.1.18.1.7.2.1 */
+{ 1115,   "SAVStaticPrefixLength",             2,      1113,   (encode_uchar),          (decode_uchar),          0,           0             }, /* TLV 25.43.7.2.2 MULPIv3.0-I24 Annex C.1.1.18.1.7.2.2 */
+{ 1116,   "VendorIdentifier",                  8,      199,    (encode_hexstr),         (decode_hexstr),         3,           3             }, /* TLV 25.43.8 MULPIv3.0-I24 Annex C.2.1.11 */
+{ 1117,   "CMAttributeMasks",                  9,      199,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43.9 MULPIv3.0-I24 Annex C.1.1.18.1.8 */
+{ 1118,   "CMDownstreamRequiredAttributeMask", 1,      1117,   (encode_hexstr),         (decode_hexstr),         4,           4             }, /* TLV 25.43.9.1 MULPIv3.0-I24 Annex C.1.1.18.1.8.1 */
+{ 1119,   "CMDownstreamForbiddenAttributeMask", 2,     1117,   (encode_hexstr),         (decode_hexstr),         4,           4             }, /* TLV 25.43.9.2 MULPIv3.0-I24 Annex C.1.1.18.1.8.2 */
+{ 1120,   "CMUpstreamRequiredAttributeMask",   3,      1117,   (encode_hexstr),         (decode_hexstr),         4,           4             }, /* TLV 25.43.9.3 MULPIv3.0-I24 Annex C.1.1.18.1.8.3 */
+{ 1121,   "CMUpstreamForbiddenAttributeMask",  4,      1117,   (encode_hexstr),         (decode_hexstr),         4,           4             }, /* TLV 25.43.9.4 MULPIv3.0-I24 Annex C.1.1.18.1.8.4 */
+{ 1122,   "IPMulticastJoinAuthorization",      10,     199,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43.10 MULPIv3.0-I24 Annex C.1.1.18.1.9 */
+{ 1123,   "IPMulticastProfileName",            1,      1122,   (encode_string),         (decode_string),         1,           15            }, /* TLV 25.43.10.1 MULPIv3.0-I24 Annex C.1.1.18.1.9.1 */
+{ 1124,   "IPMulticastJoinAuthStaticSessionRule", 2,   1122,   (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43.10.2 MULPIv3.0-I24 Annex C.1.1.18.1.9.2 */
+{ 1125,   "MulticastRulePriority",             1,      1124,   (encode_uchar),          (decode_uchar),          0,           255           }, /* TLV 25.43.10.2.1 MULPIv3.0-I24 Annex C.1.1.18.1.9.2.1 */
+{ 1126,   "AuthorizationAction",               2,      1124,   (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 25.43.10.2.2 MULPIv3.0-I24 Annex C.1.1.18.1.9.2.2 */
+{ 1127,   "SourcePrefixAddress",               3,      1124,   (encode_ip_ip6),         (decode_ip_ip6),         0,           0             }, /* TLV 25.43.10.2.3 MULPIv3.0-I24 Annex C.1.1.18.1.9.2.3 */
+{ 1128,   "SourcePrefixLength",                4,      1124,   (encode_uchar),          (decode_uchar),          0,           128           }, /* TLV 25.43.10.2.4 MULPIv3.0-I24 Annex C.1.1.18.1.9.2.4 */
+{ 1129,   "GroupPrefixAddress",                5,      1124,   (encode_ip_ip6),         (decode_ip_ip6),         0,           0             }, /* TLV 25.43.10.2.5 MULPIv3.0-I24 Annex C.1.1.18.1.9.2.5 */
+{ 1130,   "GroupPrefixLength",                 6,      1124,   (encode_uchar),          (decode_uchar),          0,           128           }, /* TLV 25.43.10.2.6 MULPIv3.0-I24 Annex C.1.1.18.1.9.2.6 */
+{ 1131,   "MaximumMulticastSessions",          3,      1122,   (encode_ushort),         (decode_ushort),         0,           0             }, /* TLV 25.43.10.3 MULPIv3.0-I24 Annex C.1.1.18.1.9.3 */
+{ 1132,   "ServiceTypeIdentifier",             11,     199,    (encode_string),         (decode_string),         1,           16            }, /* TLV 25.43.11 MULPIv3.0-I24 Annex C.1.1.18.1.10 */
+{ 1133,   "DEMARCAutoConfiguration",           12,     199,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 25.43.12 MULPIv3.0-I24 Annex C.1.1.18.1.11 */
+{ 1134,   "DACDisableEnableConfig",            1,      1133,   (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 25.43.12.1 DEMARCv1.0-I04 Annex B.1 */
+{ 1135,   "CMIMEncoding",                      2,      1133,   (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 25.43.12.2 DEMARCv1.0-I04 Annex B.2 */
+{ 1136,   "UpstreamServiceClassName",          3,      1133,   (encode_strzero),        (decode_strzero),        2,           16            }, /* TLV 25.43.12.3 DEMARCv1.0-I04 Annex B.3 */
+{ 1137,   "DownstreamServiceClassName",        4,      1133,   (encode_strzero),        (decode_strzero),        2,           16            }, /* TLV 25.43.12.4 DEMARCv1.0-I04 Annex B.4 */
 
 /* Payload Header Suppression - Appendix C.2.2.8 */
 
@@ -978,7 +1233,7 @@ symbol_type symtable[NUM_IDENTIFIERS] =  {
 { 236,    "SNMPv3AccessViewMask",              3,      233,    (encode_hexstr),         (decode_hexstr),         2,           2             }, /* TLV 202.54.3 eRouter-I12 Annex B.4.6.3 */
 { 237,    "SNMPv3AccessViewType",              4,      233,    (encode_uchar),          (decode_uchar),          1,           2             }, /* TLV 202.54.4 eRouter-I12 Annex B.4.6.4 */
 
-/* A little more organized -> Start with 886. re-use 207,205 */
+/* A little more organized -> Start with 1138 */
 
 /* Generic TLV ... we only use the limits, code and length don't matter ...*/
 { 998,    "GenericTLV",                        0,      0,      (encode_nothing),        (decode_special),        0,           0             },

tests/TLV_24_43_1_to_4_CMLoadBalancingPolicyID.conf

@@ -0,0 +1,29 @@
+Main 
+{
+	NetworkAccess 1;
+	UsServiceFlow
+	{
+		UsServiceFlowRef 1;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		DsServiceFlowRef 2;
+		QosParamSetType 7;
+	}
+	UsServiceFlow
+	{
+		VendorSpecific
+		{
+			VendorIdentifier 0xffffff;
+			CMLoadBalancingPolicyID 1;
+			CMLoadBalancingPriority 1;
+			CMLoadBalancingGroupID 1;
+			CMRangingClassIDExtension 1;
+		}
+	}
+	/* CmMic d92c093dd8134bd597e1eae929bb12d4; */
+	/* CmtsMic 93d22ef287536f6f56583efd7ec9ca67; */
+	/*EndOfDataMkr*/
+	/* Pad */
+}

tests/TLV_24_43_1_to_4_CMLoadBalancingPolicyID.txt

@@ -0,0 +1,25 @@
+Main 
+{
+NetworkAccess 1;
+UsServiceFlow
+{
+UsServiceFlowRef 1;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+DsServiceFlowRef 2;
+QosParamSetType 7;
+}
+UsServiceFlow
+{
+VendorSpecific
+{
+VendorIdentifier 0xffffff;
+CMLoadBalancingPolicyID 1;
+CMLoadBalancingPriority 1;
+CMLoadBalancingGroupID 1;
+CMRangingClassIDExtension 1;
+}
+}
+}

tests/TLV_24_43_5_10_and_12.conf

@@ -0,0 +1,29 @@
+Main 
+{
+	NetworkAccess 1;
+	UsServiceFlow
+	{
+		UsServiceFlowRef 1;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		DsServiceFlowRef 2;
+		QosParamSetType 7;
+	}
+	UsServiceFlow
+	{
+		VendorSpecific
+		{
+			VendorIdentifier 0xffffff;
+			L2VPNEncoding
+			{
+				L2VPNSADescriptorSubtype 0x0102030405060708091011121314;
+				PseudowireType 5;
+			}
+		}
+	}
+	/* CmMic b96b292a5fc9706bb7f44f942a69c10c; */
+	/* CmtsMic 70fe02a9b9b20b947298129cf669c5e3; */
+	/*EndOfDataMkr*/
+}

tests/TLV_24_43_5_10_and_12.txt

@@ -0,0 +1,26 @@
+Main 
+{
+NetworkAccess 1;
+UsServiceFlow
+{
+UsServiceFlowRef 1;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+DsServiceFlowRef 2;
+QosParamSetType 7;
+}
+UsServiceFlow
+{
+VendorSpecific
+{
+VendorIdentifier 0xffffff;
+L2VPNEncoding
+{
+L2VPNSADescriptorSubtype 0x0102030405060708091011121314;
+PseudowireType 5;
+}
+}
+}
+}

tests/TLV_24_43_5_13_L2VPNMode.conf

@@ -0,0 +1,28 @@
+Main 
+{
+	NetworkAccess 1;
+	UsServiceFlow
+	{
+		UsServiceFlowRef 1;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		DsServiceFlowRef 2;
+		QosParamSetType 7;
+	}
+	UsServiceFlow
+	{
+		VendorSpecific
+		{
+			VendorIdentifier 0xffffff;
+			L2VPNEncoding
+			{
+				L2VPNMode 1;
+			}
+		}
+	}
+	/* CmMic 3f456c16c196aaee0ac2040be07fcf14; */
+	/* CmtsMic 0b021d768fa1f45d5188ef26cbec95a4; */
+	/*EndOfDataMkr*/
+}

tests/TLV_24_43_5_13_L2VPNMode.txt

@@ -0,0 +1,25 @@
+Main 
+{
+NetworkAccess 1;
+UsServiceFlow
+{
+UsServiceFlowRef 1;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+DsServiceFlowRef 2;
+QosParamSetType 7;
+}
+UsServiceFlow
+{
+VendorSpecific
+{
+VendorIdentifier 0xffffff;
+L2VPNEncoding
+{
+L2VPNMode 1;
+}
+}
+}
+}

tests/TLV_24_43_5_14_DPoE.conf

@@ -0,0 +1,60 @@
+Main 
+{
+	NetworkAccess 1;
+	UsServiceFlow
+	{
+		UsServiceFlowRef 1;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		DsServiceFlowRef 2;
+		QosParamSetType 7;
+	}
+	UsServiceFlow
+	{
+		VendorSpecific
+		{
+			VendorIdentifier 0xffffff;
+			L2VPNEncoding
+			{
+				TPIDTranslation
+				{
+					UpstreamTPIDTranslation 0x0102;
+					DownstreamTPIDTranslation 0x0102;
+					UpstreamSTPIDTranslation 0x0102;
+					DownstreamSTPIDTranslation 0x0102;
+					UpstreamBTPIDTranslation 0x0102;
+					DownstreamBTPIDTranslation 0x0102;
+					UpstreamITPIDTranslation 0x0102;
+					DownstreamITPIDTranslation 0x0102;
+				}
+				L2CPProcessing
+				{
+					L2CPTunnelMode 1;
+					L2CPDMACAddress 00:11:22:33:44:55;
+					L2CPOverwrotingDMACAddress 55:44:33:22:11:00;
+				}
+				DACDisableEnableConfiguration 1;
+				PseudowireClass 0x010203;
+				ServiceDelimiter
+				{
+					CVIDDelimiter 0x0102;
+					SVIDDelimiter 0x0102;
+					ISIDDelimiter 0x010203;
+					BVIDDelimiter 0x0102;
+				}
+				VirtualSwitchInstanceEncoding
+				{
+					VPLSClass 0x0102;
+					ETreeRole 1;
+					ETreeRootVID 0x0102;
+					ETreeLeafVID 0x0304;
+				}
+			}
+		}
+	}
+	/* CmMic 3ad23aee23c163b803899be905fffa82; */
+	/* CmtsMic ecf556a61328467bb3ae2f46eea3b3a4; */
+	/*EndOfDataMkr*/
+}

tests/TLV_24_43_5_14_DPoE.txt

@@ -0,0 +1,57 @@
+Main 
+{
+NetworkAccess 1;
+UsServiceFlow
+{
+UsServiceFlowRef 1;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+DsServiceFlowRef 2;
+QosParamSetType 7;
+}
+UsServiceFlow
+{
+VendorSpecific
+{
+VendorIdentifier 0xffffff;
+L2VPNEncoding
+{
+TPIDTranslation
+{
+UpstreamTPIDTranslation 0x0102;
+DownstreamTPIDTranslation 0x0102;
+UpstreamSTPIDTranslation 0x0102;
+DownstreamSTPIDTranslation 0x0102;
+UpstreamBTPIDTranslation 0x0102;
+DownstreamBTPIDTranslation 0x0102;
+UpstreamITPIDTranslation 0x0102;
+DownstreamITPIDTranslation 0x0102;
+}
+L2CPProcessing
+{
+L2CPTunnelMode 1;
+L2CPDMACAddress 00:11:22:33:44:55;
+L2CPOverwrotingDMACAddress 55:44:33:22:11:00;
+}
+DACDisableEnableConfiguration 1;
+PseudowireClass 0x010203;
+ServiceDelimiter
+{
+CVIDDelimiter 0x0102;
+SVIDDelimiter 0x0102;
+ISIDDelimiter 0x010203;
+BVIDDelimiter 0x0102;
+}
+VirtualSwitchInstanceEncoding
+{
+VPLSClass 0x0102;
+ETreeRole 1;
+ETreeRootVID 0x0102;
+ETreeLeafVID 0x0304;
+}
+}
+}
+}
+}

tests/TLV_24_43_5_24_SOAMSubtype.conf

@@ -0,0 +1,69 @@
+Main 
+{
+	UsServiceFlow
+	{
+		VendorSpecific
+		{
+			VendorIdentifier 0xffffff;
+			L2VPNEncoding
+			{
+				SOAMSubtype
+				{
+					MEPConfiguration
+					{
+						MDLevel 0;
+						MDName "MD Name";
+						MAName "MA Name";
+						MEPID 1;
+					}
+					RemoteMEPConfiguration
+					{
+						RemoteMDLevel 0;
+						RemoteMDName "MD Name";
+						RemoteMAName "MA Name";
+						RemoteMEPID 1;
+					}
+					FaultManagementConfiguration
+					{
+						ContinuityCheckMessages 0;
+						LoopbackFunction 0;
+						LinktraceFunction 0;
+					}
+					PerformanceManagementConfiguration
+					{
+						FrameDelayMeasurement
+						{
+							FrameDelayMeasurementEnable 0;
+							FrameDelayMeasurementOneWayTwoWay 1;
+							FrameDelayMeasurementTransmissionPeriodicity 0;
+						}
+						FrameLossMeasurement
+						{
+							FrameLossMeasurementEnable 0;
+							FrameLossMeasurementTransmissionPeriodicity 0;
+						}
+					}
+				}
+				L2VPNDSID 1;
+				VendorSpecificL2VPNSubtype
+				{
+					VendorIdentifier 0x010203;
+				}
+			}
+		}
+	}
+	NetworkAccess 1;
+	UsServiceFlow
+	{
+		UsServiceFlowRef 1;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		DsServiceFlowRef 2;
+		QosParamSetType 7;
+	}
+	/* CmMic 441048749d066b5986581da503dfb7f5; */
+	/* CmtsMic 8e0d19f5c8014fdf4da1983e9850be55; */
+	/*EndOfDataMkr*/
+}

tests/TLV_24_43_5_24_SOAMSubtype.txt

@@ -0,0 +1,66 @@
+Main 
+{
+UsServiceFlow
+{
+VendorSpecific
+{
+VendorIdentifier 0xffffff;
+L2VPNEncoding
+{
+SOAMSubtype
+{
+MEPConfiguration
+{
+MDLevel 0;
+MDName "MD Name";
+MAName "MA Name";
+MEPID 1;
+}
+RemoteMEPConfiguration
+{
+RemoteMDLevel 0;
+RemoteMDName "MD Name";
+RemoteMAName "MA Name";
+RemoteMEPID 1;
+}
+FaultManagementConfiguration
+{
+ContinuityCheckMessages 0;
+LoopbackFunction 0;
+LinktraceFunction 0;
+}
+PerformanceManagementConfiguration
+{
+FrameDelayMeasurement
+{
+FrameDelayMeasurementEnable 0;
+FrameDelayMeasurementOneWayTwoWay 1;
+FrameDelayMeasurementTransmissionPeriodicity 0;
+}
+FrameLossMeasurement
+{
+FrameLossMeasurementEnable 0;
+FrameLossMeasurementTransmissionPeriodicity 0;
+}
+}
+}
+L2VPNDSID 1;
+VendorSpecificL2VPNSubtype
+{
+VendorIdentifier 0x010203;
+}
+}
+}
+}
+NetworkAccess 1;
+UsServiceFlow
+{
+UsServiceFlowRef 1;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+DsServiceFlowRef 2;
+QosParamSetType 7;
+}
+}

tests/TLV_24_43_5_L2VPNEncoding.conf

@@ -0,0 +1,76 @@
+Main 
+{
+	UsServiceFlow
+	{
+		VendorSpecific
+		{
+			VendorIdentifier 0xffffff;
+			L2VPNEncoding
+			{
+				AttachmentGroupID 0x0102;
+				NSIEncapsulationSubtype
+				{
+					ServiceMultiplexingValueOther 0x00;
+					ServiceMultiplexingValueIEEE8021Q 258;
+					ServiceMultiplexingValueIEEE8021ad 0x01020304;
+					ServiceMultiplexingValueMPLSPW
+					{
+						MPLSPseudowireID 1;
+						MPLSPeerIpAddress 1.1.1.1;
+						MPLSPseudowireType 5;
+						MPLSBackupPseudowireID 1;
+						MPLSBackupPeerIpAddress 1.1.1.1;
+					}
+					ServiceMultiplexingValueL2TPv3Peer 1.2.3.4;
+					IEEE8021ahEncapsulation
+					{
+						ITCIEncapsulation 0x00000001;
+						BDAEncapsulation 0x0a0b0c0d0e0f;
+						BTCIEncapsulation 0x0001;
+						ITPIDEncapsulation 0x0001;
+						IPCPEncapsulation 0x01;
+						IDEIEncapsulation 0x01;
+						IUCAEncapsulation 0x01;
+						ISIDEncapsulation 0x000001;
+						BTPIDEncapsulation 0x0001;
+						BPCPEncapsulation 0x01;
+						BDEIEncapsulation 0x01;
+						BVIDEncapsulation 0x0001;
+					}
+					ServiceMultiplexingValueIEEE8021adSTPID 0x88a8;
+				}
+				eSAFEDHCPSnooping 0x000000;
+				CMInterfaceMaskCMIMSubtype 0x000080;
+				VPNIdentifier 0x01020304;
+				SourceAttachmentIndividualID 0x0102;
+				TargetAttachmentIndividualID 0x0102;
+				IngressUserPriority 1;
+				UserPriorityRange 1,2;
+				BGPAttribute
+				{
+					BGPVPNID 1;
+					RouteDistinguisher 0x0101010100000001;
+					RouteTargetImport 0x0000000101010101;
+					RouteTargetExport 0x0000000101010101;
+					CEIDVEID 5;
+				}
+				PseudowireSignaling 0;
+			}
+		}
+	}
+	NetworkAccess 1;
+	UsServiceFlow
+	{
+		UsServiceFlowRef 1;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		DsServiceFlowRef 2;
+		QosParamSetType 7;
+	}
+	/* CmMic 7707b93283b45df52d1488bb4cd2656e; */
+	/* CmtsMic 0704433abd4b9015e12b9c14a008d9cf; */
+	/*EndOfDataMkr*/
+	/* Pad */
+}

tests/TLV_24_43_5_L2VPNEncoding.txt

@@ -0,0 +1,72 @@
+Main 
+{
+UsServiceFlow
+{
+VendorSpecific
+{
+VendorIdentifier 0xffffff;
+L2VPNEncoding
+{
+AttachmentGroupID 0x0102;
+NSIEncapsulationSubtype
+{
+ServiceMultiplexingValueOther 0x00;
+ServiceMultiplexingValueIEEE8021Q 258;
+ServiceMultiplexingValueIEEE8021ad 0x01020304;
+ServiceMultiplexingValueMPLSPW
+{
+MPLSPseudowireID 1;
+MPLSPeerIpAddress 1.1.1.1;
+MPLSPseudowireType 5;
+MPLSBackupPseudowireID 1;
+MPLSBackupPeerIpAddress 1.1.1.1;
+}
+ServiceMultiplexingValueL2TPv3Peer 1.2.3.4;
+IEEE8021ahEncapsulation
+{
+ITCIEncapsulation 0x00000001;
+BDAEncapsulation 0x0a0b0c0d0e0f;
+BTCIEncapsulation 0x0001;
+ITPIDEncapsulation 0x0001;
+IPCPEncapsulation 0x01;
+IDEIEncapsulation 0x01;
+IUCAEncapsulation 0x01;
+ISIDEncapsulation 0x000001;
+BTPIDEncapsulation 0x0001;
+BPCPEncapsulation 0x01;
+BDEIEncapsulation 0x01;
+BVIDEncapsulation 0x0001;
+}
+ServiceMultiplexingValueIEEE8021adSTPID 0x88a8;
+}
+eSAFEDHCPSnooping 0x000000;
+CMInterfaceMaskCMIMSubtype 0x000080;
+VPNIdentifier 0x01020304;
+SourceAttachmentIndividualID 0x0102;
+TargetAttachmentIndividualID 0x0102;
+IngressUserPriority 1;
+UserPriorityRange 1,2;
+BGPAttribute
+{
+BGPVPNID 1;
+RouteDistinguisher 0x0101010100000001;
+RouteTargetImport 0x0000000101010101;
+RouteTargetExport 0x0000000101010101;
+CEIDVEID 5;
+}
+PseudowireSignaling 0;
+}
+}
+}
+NetworkAccess 1;
+UsServiceFlow
+{
+UsServiceFlowRef 1;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+DsServiceFlowRef 2;
+QosParamSetType 7;
+}
+}

tests/TLV_24_43_6_ExtendedCMTSMICConfiguration.conf

@@ -0,0 +1,31 @@
+Main 
+{
+	NetworkAccess 1;
+	UsServiceFlow
+	{
+		UsServiceFlowRef 1;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		DsServiceFlowRef 2;
+		QosParamSetType 7;
+	}
+	UsServiceFlow
+	{
+		VendorSpecific
+		{
+			VendorIdentifier 0xffffff;
+			ExtendedCMTSMICConfigurationSetting
+			{
+				ExtendedCMTSMICHMACtype 1;
+				ExtendedCMTSMICBitmap 0x00;
+				ExplicitExtendedCMTSMICDigest 0x00;
+			}
+		}
+	}
+	/* CmMic cdbe9e034251db32c66adc0d10e52288; */
+	/* CmtsMic a608167448ce38b1d1c8193d3a917adb; */
+	/*EndOfDataMkr*/
+	/* Pad */
+}

tests/TLV_24_43_6_ExtendedCMTSMICConfiguration.txt

@@ -0,0 +1,27 @@
+Main 
+{
+NetworkAccess 1;
+UsServiceFlow
+{
+UsServiceFlowRef 1;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+DsServiceFlowRef 2;
+QosParamSetType 7;
+}
+UsServiceFlow
+{
+VendorSpecific
+{
+VendorIdentifier 0xffffff;
+ExtendedCMTSMICConfigurationSetting
+{
+ExtendedCMTSMICHMACtype 1;
+ExtendedCMTSMICBitmap 0x00;
+ExplicitExtendedCMTSMICDigest 0x00;
+}
+}
+}
+}

tests/TLV_24_43_last_tlvs.conf

@@ -0,0 +1,60 @@
+Main 
+{
+	UsServiceFlow
+	{
+		VendorSpecific
+		{
+			VendorIdentifier 0xffffff;
+			SAVAuthorizationEncoding
+			{
+				SAVGroupName "SAVGROUPNAME";
+				SAVStaticPrefixRule
+				{
+					SAVStaticPrefixAddress 0.0.0.0;
+					SAVStaticPrefixLength 0;
+				}
+			}
+			CMAttributeMasks
+			{
+				CMDownstreamRequiredAttributeMask 0x00000000;
+				CMDownstreamForbiddenAttributeMask 0x00000000;
+				CMUpstreamRequiredAttributeMask 0x00000000;
+				CMUpstreamForbiddenAttributeMask 0xe0000001;
+			}
+			IPMulticastJoinAuthorization
+			{
+				IPMulticastProfileName "profileName";
+				IPMulticastJoinAuthStaticSessionRule
+				{
+					MulticastRulePriority 0;
+					AuthorizationAction 0;
+					SourcePrefixAddress 0.0.0.0;
+					SourcePrefixAddress 0.0.0.0;
+					SourcePrefixLength 32;
+					GroupPrefixAddress 0.0.0.0;
+					GroupPrefixLength 32;
+				}
+				MaximumMulticastSessions 0;
+			}
+			ServiceTypeIdentifier "basic";
+			DEMARCAutoConfiguration
+			{
+				DACDisableEnableConfig 1;
+			}
+		}
+	}
+	NetworkAccess 1;
+	UsServiceFlow
+	{
+		UsServiceFlowRef 1;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		DsServiceFlowRef 2;
+		QosParamSetType 7;
+	}
+	/* CmMic ef2cc06f8a62c6515016c75d8788bbda; */
+	/* CmtsMic c18d0fa21aa5f54f983fe63e0d80a7fe; */
+	/*EndOfDataMkr*/
+}

tests/TLV_24_43_last_tlvs.txt

@@ -0,0 +1,57 @@
+Main 
+{
+UsServiceFlow
+{
+VendorSpecific
+{
+VendorIdentifier 0xffffff;
+SAVAuthorizationEncoding
+{
+SAVGroupName "SAVGROUPNAME";
+SAVStaticPrefixRule
+{
+SAVStaticPrefixAddress 0.0.0.0;
+SAVStaticPrefixLength 0;
+}
+}
+CMAttributeMasks
+{
+CMDownstreamRequiredAttributeMask 0x00000000;
+CMDownstreamForbiddenAttributeMask 0x00000000;
+CMUpstreamRequiredAttributeMask 0x00000000;
+CMUpstreamForbiddenAttributeMask 0xe0000001;
+}
+IPMulticastJoinAuthorization
+{
+IPMulticastProfileName "profileName";
+IPMulticastJoinAuthStaticSessionRule
+{
+MulticastRulePriority 0;
+AuthorizationAction 0;
+SourcePrefixAddress 0.0.0.0;
+SourcePrefixAddress 0.0.0.0;
+SourcePrefixLength 32;
+GroupPrefixAddress 0.0.0.0;
+GroupPrefixLength 32;
+}
+MaximumMulticastSessions 0;
+}
+ServiceTypeIdentifier "basic";
+DEMARCAutoConfiguration
+{
+DACDisableEnableConfig 1;
+}
+}
+}
+NetworkAccess 1;
+UsServiceFlow
+{
+UsServiceFlowRef 1;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+DsServiceFlowRef 2;
+QosParamSetType 7;
+}
+}

tests/TLV_25_43_1_to_4_CMLoadBalancingPolicyID.conf

@@ -0,0 +1,29 @@
+Main 
+{
+	NetworkAccess 1;
+	UsServiceFlow
+	{
+		UsServiceFlowRef 1;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		DsServiceFlowRef 2;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		VendorSpecific
+		{
+			VendorIdentifier 0xffffff;
+			CMLoadBalancingPolicyID 1;
+			CMLoadBalancingPriority 1;
+			CMLoadBalancingGroupID 1;
+			CMRangingClassIDExtension 1;
+		}
+	}
+	/* CmMic 29bd0fba942858e2fed942514292d24e; */
+	/* CmtsMic 68f2c0670e550610c2b10c4c7b712a00; */
+	/*EndOfDataMkr*/
+	/* Pad */
+}

tests/TLV_25_43_1_to_4_CMLoadBalancingPolicyID.txt

@@ -0,0 +1,25 @@
+Main 
+{
+NetworkAccess 1;
+UsServiceFlow
+{
+UsServiceFlowRef 1;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+DsServiceFlowRef 2;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+VendorSpecific
+{
+VendorIdentifier 0xffffff;
+CMLoadBalancingPolicyID 1;
+CMLoadBalancingPriority 1;
+CMLoadBalancingGroupID 1;
+CMRangingClassIDExtension 1;
+}
+}
+}

tests/TLV_25_43_5_10_and_12.conf

@@ -0,0 +1,29 @@
+Main 
+{
+	NetworkAccess 1;
+	DsServiceFlow
+	{
+		DsServiceFlowRef 1;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		DsServiceFlowRef 2;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		VendorSpecific
+		{
+			VendorIdentifier 0xffffff;
+			L2VPNEncoding
+			{
+				L2VPNSADescriptorSubtype 0x0102030405060708091011121314;
+				PseudowireType 5;
+			}
+		}
+	}
+	/* CmMic 32d387f81d75602c0cc45f1a082e5800; */
+	/* CmtsMic f4c76af1dc35fc73b04b93a11053d730; */
+	/*EndOfDataMkr*/
+}

tests/TLV_25_43_5_10_and_12.txt

@@ -0,0 +1,26 @@
+Main 
+{
+NetworkAccess 1;
+DsServiceFlow
+{
+UsServiceFlowRef 1;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+DsServiceFlowRef 2;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+VendorSpecific
+{
+VendorIdentifier 0xffffff;
+L2VPNEncoding
+{
+L2VPNSADescriptorSubtype 0x0102030405060708091011121314;
+PseudowireType 5;
+}
+}
+}
+}

tests/TLV_25_43_5_13_L2VPNMode.conf

@@ -0,0 +1,28 @@
+Main 
+{
+	NetworkAccess 1;
+	DsServiceFlow
+	{
+		DsServiceFlowRef 1;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		DsServiceFlowRef 2;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		VendorSpecific
+		{
+			VendorIdentifier 0xffffff;
+			L2VPNEncoding
+			{
+				L2VPNMode 1;
+			}
+		}
+	}
+	/* CmMic 00bef142ad2be25060c24e8b9c4e8c95; */
+	/* CmtsMic 41884b4154c71ecdf79b6a481ba93bc7; */
+	/*EndOfDataMkr*/
+}

tests/TLV_25_43_5_13_L2VPNMode.txt

@@ -0,0 +1,25 @@
+Main 
+{
+NetworkAccess 1;
+DsServiceFlow
+{
+UsServiceFlowRef 1;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+DsServiceFlowRef 2;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+VendorSpecific
+{
+VendorIdentifier 0xffffff;
+L2VPNEncoding
+{
+L2VPNMode 1;
+}
+}
+}
+}

tests/TLV_25_43_5_14_DPoE.conf

@@ -0,0 +1,60 @@
+Main 
+{
+	NetworkAccess 1;
+	DsServiceFlow
+	{
+		DsServiceFlowRef 1;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		DsServiceFlowRef 2;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		VendorSpecific
+		{
+			VendorIdentifier 0xffffff;
+			L2VPNEncoding
+			{
+				TPIDTranslation
+				{
+					UpstreamTPIDTranslation 0x0102;
+					DownstreamTPIDTranslation 0x0102;
+					UpstreamSTPIDTranslation 0x0102;
+					DownstreamSTPIDTranslation 0x0102;
+					UpstreamBTPIDTranslation 0x0102;
+					DownstreamBTPIDTranslation 0x0102;
+					UpstreamITPIDTranslation 0x0102;
+					DownstreamITPIDTranslation 0x0102;
+				}
+				L2CPProcessing
+				{
+					L2CPTunnelMode 1;
+					L2CPDMACAddress 00:11:22:33:44:55;
+					L2CPOverwrotingDMACAddress 55:44:33:22:11:00;
+				}
+				DACDisableEnableConfiguration 1;
+				PseudowireClass 0x010203;
+				ServiceDelimiter
+				{
+					CVIDDelimiter 0x0102;
+					SVIDDelimiter 0x0102;
+					ISIDDelimiter 0x010203;
+					BVIDDelimiter 0x0102;
+				}
+				VirtualSwitchInstanceEncoding
+				{
+					VPLSClass 0x0102;
+					ETreeRole 1;
+					ETreeRootVID 0x0102;
+					ETreeLeafVID 0x0304;
+				}
+			}
+		}
+	}
+	/* CmMic aa652f0f5bf11e29d48a7474be7639e5; */
+	/* CmtsMic b514dda33f79123b1dac238dee822296; */
+	/*EndOfDataMkr*/
+}

tests/TLV_25_43_5_14_DPoE.txt

@@ -0,0 +1,57 @@
+Main 
+{
+NetworkAccess 1;
+DsServiceFlow
+{
+UsServiceFlowRef 1;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+DsServiceFlowRef 2;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+VendorSpecific
+{
+VendorIdentifier 0xffffff;
+L2VPNEncoding
+{
+TPIDTranslation
+{
+UpstreamTPIDTranslation 0x0102;
+DownstreamTPIDTranslation 0x0102;
+UpstreamSTPIDTranslation 0x0102;
+DownstreamSTPIDTranslation 0x0102;
+UpstreamBTPIDTranslation 0x0102;
+DownstreamBTPIDTranslation 0x0102;
+UpstreamITPIDTranslation 0x0102;
+DownstreamITPIDTranslation 0x0102;
+}
+L2CPProcessing
+{
+L2CPTunnelMode 1;
+L2CPDMACAddress 00:11:22:33:44:55;
+L2CPOverwrotingDMACAddress 55:44:33:22:11:00;
+}
+DACDisableEnableConfiguration 1;
+PseudowireClass 0x010203;
+ServiceDelimiter
+{
+CVIDDelimiter 0x0102;
+SVIDDelimiter 0x0102;
+ISIDDelimiter 0x010203;
+BVIDDelimiter 0x0102;
+}
+VirtualSwitchInstanceEncoding
+{
+VPLSClass 0x0102;
+ETreeRole 1;
+ETreeRootVID 0x0102;
+ETreeLeafVID 0x0304;
+}
+}
+}
+}
+}

tests/TLV_25_43_5_24_SOAMSubtype.conf

@@ -0,0 +1,69 @@
+Main 
+{
+	DsServiceFlow
+	{
+		VendorSpecific
+		{
+			VendorIdentifier 0xffffff;
+			L2VPNEncoding
+			{
+				SOAMSubtype
+				{
+					MEPConfiguration
+					{
+						MDLevel 0;
+						MDName "MD Name";
+						MAName "MA Name";
+						MEPID 1;
+					}
+					RemoteMEPConfiguration
+					{
+						RemoteMDLevel 0;
+						RemoteMDName "MD Name";
+						RemoteMAName "MA Name";
+						RemoteMEPID 1;
+					}
+					FaultManagementConfiguration
+					{
+						ContinuityCheckMessages 0;
+						LoopbackFunction 0;
+						LinktraceFunction 0;
+					}
+					PerformanceManagementConfiguration
+					{
+						FrameDelayMeasurement
+						{
+							FrameDelayMeasurementEnable 0;
+							FrameDelayMeasurementOneWayTwoWay 1;
+							FrameDelayMeasurementTransmissionPeriodicity 0;
+						}
+						FrameLossMeasurement
+						{
+							FrameLossMeasurementEnable 0;
+							FrameLossMeasurementTransmissionPeriodicity 0;
+						}
+					}
+				}
+				L2VPNDSID 1;
+				VendorSpecificL2VPNSubtype
+				{
+					VendorIdentifier 0x010203;
+				}
+			}
+		}
+	}
+	NetworkAccess 1;
+	UsServiceFlow
+	{
+		UsServiceFlowRef 1;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		DsServiceFlowRef 2;
+		QosParamSetType 7;
+	}
+	/* CmMic 8fff817c3bc98827a2f6e23f9fed977f; */
+	/* CmtsMic 6794f63028747e6ef5ebf8884e1b8505; */
+	/*EndOfDataMkr*/
+}

tests/TLV_25_43_5_24_SOAMSubtype.txt

@@ -0,0 +1,66 @@
+Main 
+{
+DsServiceFlow
+{
+VendorSpecific
+{
+VendorIdentifier 0xffffff;
+L2VPNEncoding
+{
+SOAMSubtype
+{
+MEPConfiguration
+{
+MDLevel 0;
+MDName "MD Name";
+MAName "MA Name";
+MEPID 1;
+}
+RemoteMEPConfiguration
+{
+RemoteMDLevel 0;
+RemoteMDName "MD Name";
+RemoteMAName "MA Name";
+RemoteMEPID 1;
+}
+FaultManagementConfiguration
+{
+ContinuityCheckMessages 0;
+LoopbackFunction 0;
+LinktraceFunction 0;
+}
+PerformanceManagementConfiguration
+{
+FrameDelayMeasurement
+{
+FrameDelayMeasurementEnable 0;
+FrameDelayMeasurementOneWayTwoWay 1;
+FrameDelayMeasurementTransmissionPeriodicity 0;
+}
+FrameLossMeasurement
+{
+FrameLossMeasurementEnable 0;
+FrameLossMeasurementTransmissionPeriodicity 0;
+}
+}
+}
+L2VPNDSID 1;
+VendorSpecificL2VPNSubtype
+{
+VendorIdentifier 0x010203;
+}
+}
+}
+}
+NetworkAccess 1;
+UsServiceFlow
+{
+UsServiceFlowRef 1;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+DsServiceFlowRef 2;
+QosParamSetType 7;
+}
+}

tests/TLV_25_43_5_L2VPNEncoding.conf

@@ -0,0 +1,76 @@
+Main 
+{
+	DsServiceFlow
+	{
+		VendorSpecific
+		{
+			VendorIdentifier 0xffffff;
+			L2VPNEncoding
+			{
+				AttachmentGroupID 0x0102;
+				NSIEncapsulationSubtype
+				{
+					ServiceMultiplexingValueOther 0x00;
+					ServiceMultiplexingValueIEEE8021Q 258;
+					ServiceMultiplexingValueIEEE8021ad 0x01020304;
+					ServiceMultiplexingValueMPLSPW
+					{
+						MPLSPseudowireID 1;
+						MPLSPeerIpAddress 1.1.1.1;
+						MPLSPseudowireType 5;
+						MPLSBackupPseudowireID 1;
+						MPLSBackupPeerIpAddress 1.1.1.1;
+					}
+					ServiceMultiplexingValueL2TPv3Peer 1.2.3.4;
+					IEEE8021ahEncapsulation
+					{
+						ITCIEncapsulation 0x00000001;
+						BDAEncapsulation 0x0a0b0c0d0e0f;
+						BTCIEncapsulation 0x0001;
+						ITPIDEncapsulation 0x0001;
+						IPCPEncapsulation 0x01;
+						IDEIEncapsulation 0x01;
+						IUCAEncapsulation 0x01;
+						ISIDEncapsulation 0x000001;
+						BTPIDEncapsulation 0x0001;
+						BPCPEncapsulation 0x01;
+						BDEIEncapsulation 0x01;
+						BVIDEncapsulation 0x0001;
+					}
+					ServiceMultiplexingValueIEEE8021adSTPID 0x88a8;
+				}
+				eSAFEDHCPSnooping 0x000000;
+				CMInterfaceMaskCMIMSubtype 0x000080;
+				VPNIdentifier 0x01020304;
+				SourceAttachmentIndividualID 0x0102;
+				TargetAttachmentIndividualID 0x0102;
+				IngressUserPriority 1;
+				UserPriorityRange 1,2;
+				BGPAttribute
+				{
+					BGPVPNID 1;
+					RouteDistinguisher 0x0101010100000001;
+					RouteTargetImport 0x0000000101010101;
+					RouteTargetExport 0x0000000101010101;
+					CEIDVEID 5;
+				}
+				PseudowireSignaling 0;
+			}
+		}
+	}
+	NetworkAccess 1;
+	UsServiceFlow
+	{
+		UsServiceFlowRef 1;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		DsServiceFlowRef 2;
+		QosParamSetType 7;
+	}
+	/* CmMic 3f502383f0d8a0ee4d37d60718dc6f5d; */
+	/* CmtsMic c793264b87f380f76f7623c93601b54f; */
+	/*EndOfDataMkr*/
+	/* Pad */
+}

tests/TLV_25_43_5_L2VPNEncoding.txt

@@ -0,0 +1,72 @@
+Main 
+{
+DsServiceFlow
+{
+VendorSpecific
+{
+VendorIdentifier 0xffffff;
+L2VPNEncoding
+{
+AttachmentGroupID 0x0102;
+NSIEncapsulationSubtype
+{
+ServiceMultiplexingValueOther 0x00;
+ServiceMultiplexingValueIEEE8021Q 258;
+ServiceMultiplexingValueIEEE8021ad 0x01020304;
+ServiceMultiplexingValueMPLSPW
+{
+MPLSPseudowireID 1;
+MPLSPeerIpAddress 1.1.1.1;
+MPLSPseudowireType 5;
+MPLSBackupPseudowireID 1;
+MPLSBackupPeerIpAddress 1.1.1.1;
+}
+ServiceMultiplexingValueL2TPv3Peer 1.2.3.4;
+IEEE8021ahEncapsulation
+{
+ITCIEncapsulation 0x00000001;
+BDAEncapsulation 0x0a0b0c0d0e0f;
+BTCIEncapsulation 0x0001;
+ITPIDEncapsulation 0x0001;
+IPCPEncapsulation 0x01;
+IDEIEncapsulation 0x01;
+IUCAEncapsulation 0x01;
+ISIDEncapsulation 0x000001;
+BTPIDEncapsulation 0x0001;
+BPCPEncapsulation 0x01;
+BDEIEncapsulation 0x01;
+BVIDEncapsulation 0x0001;
+}
+ServiceMultiplexingValueIEEE8021adSTPID 0x88a8;
+}
+eSAFEDHCPSnooping 0x000000;
+CMInterfaceMaskCMIMSubtype 0x000080;
+VPNIdentifier 0x01020304;
+SourceAttachmentIndividualID 0x0102;
+TargetAttachmentIndividualID 0x0102;
+IngressUserPriority 1;
+UserPriorityRange 1,2;
+BGPAttribute
+{
+BGPVPNID 1;
+RouteDistinguisher 0x0101010100000001;
+RouteTargetImport 0x0000000101010101;
+RouteTargetExport 0x0000000101010101;
+CEIDVEID 5;
+}
+PseudowireSignaling 0;
+}
+}
+}
+NetworkAccess 1;
+UsServiceFlow
+{
+UsServiceFlowRef 1;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+DsServiceFlowRef 2;
+QosParamSetType 7;
+}
+}

tests/TLV_25_43_6_ExtendedCMTSMICConfiguration.conf

@@ -0,0 +1,31 @@
+Main 
+{
+	NetworkAccess 1;
+	DsServiceFlow
+	{
+		DsServiceFlowRef 1;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		DsServiceFlowRef 2;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		VendorSpecific
+		{
+			VendorIdentifier 0xffffff;
+			ExtendedCMTSMICConfigurationSetting
+			{
+				ExtendedCMTSMICHMACtype 1;
+				ExtendedCMTSMICBitmap 0x00;
+				ExplicitExtendedCMTSMICDigest 0x00;
+			}
+		}
+	}
+	/* CmMic 073ba0dfad5a1d659f87862a2cf29e2f; */
+	/* CmtsMic 72d7ae74aa7ae3202fc01f5886649111; */
+	/*EndOfDataMkr*/
+	/* Pad */
+}

tests/TLV_25_43_6_ExtendedCMTSMICConfiguration.txt

@@ -0,0 +1,27 @@
+Main 
+{
+NetworkAccess 1;
+DsServiceFlow
+{
+UsServiceFlowRef 1;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+DsServiceFlowRef 2;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+VendorSpecific
+{
+VendorIdentifier 0xffffff;
+ExtendedCMTSMICConfigurationSetting
+{
+ExtendedCMTSMICHMACtype 1;
+ExtendedCMTSMICBitmap 0x00;
+ExplicitExtendedCMTSMICDigest 0x00;
+}
+}
+}
+}

tests/TLV_25_43_last_tlvs.conf

@@ -0,0 +1,60 @@
+Main 
+{
+	DsServiceFlow
+	{
+		VendorSpecific
+		{
+			VendorIdentifier 0xffffff;
+			SAVAuthorizationEncoding
+			{
+				SAVGroupName "SAVGROUPNAME";
+				SAVStaticPrefixRule
+				{
+					SAVStaticPrefixAddress 0.0.0.0;
+					SAVStaticPrefixLength 0;
+				}
+			}
+			CMAttributeMasks
+			{
+				CMDownstreamRequiredAttributeMask 0x00000000;
+				CMDownstreamForbiddenAttributeMask 0x00000000;
+				CMUpstreamRequiredAttributeMask 0x00000000;
+				CMUpstreamForbiddenAttributeMask 0xe0000001;
+			}
+			IPMulticastJoinAuthorization
+			{
+				IPMulticastProfileName "profileName";
+				IPMulticastJoinAuthStaticSessionRule
+				{
+					MulticastRulePriority 0;
+					AuthorizationAction 0;
+					SourcePrefixAddress 0.0.0.0;
+					SourcePrefixAddress 0.0.0.0;
+					SourcePrefixLength 32;
+					GroupPrefixAddress 0.0.0.0;
+					GroupPrefixLength 32;
+				}
+				MaximumMulticastSessions 0;
+			}
+			ServiceTypeIdentifier "basic";
+			DEMARCAutoConfiguration
+			{
+				DACDisableEnableConfig 1;
+			}
+		}
+	}
+	NetworkAccess 1;
+	UsServiceFlow
+	{
+		UsServiceFlowRef 1;
+		QosParamSetType 7;
+	}
+	DsServiceFlow
+	{
+		DsServiceFlowRef 2;
+		QosParamSetType 7;
+	}
+	/* CmMic bf18c91a7ae1210308a74054ed5839e1; */
+	/* CmtsMic e5e9745253852a9f1a813189fd7f91ef; */
+	/*EndOfDataMkr*/
+}

tests/TLV_25_43_last_tlvs.txt

@@ -0,0 +1,57 @@
+Main 
+{
+DsServiceFlow
+{
+VendorSpecific
+{
+VendorIdentifier 0xffffff;
+SAVAuthorizationEncoding
+{
+SAVGroupName "SAVGROUPNAME";
+SAVStaticPrefixRule
+{
+SAVStaticPrefixAddress 0.0.0.0;
+SAVStaticPrefixLength 0;
+}
+}
+CMAttributeMasks
+{
+CMDownstreamRequiredAttributeMask 0x00000000;
+CMDownstreamForbiddenAttributeMask 0x00000000;
+CMUpstreamRequiredAttributeMask 0x00000000;
+CMUpstreamForbiddenAttributeMask 0xe0000001;
+}
+IPMulticastJoinAuthorization
+{
+IPMulticastProfileName "profileName";
+IPMulticastJoinAuthStaticSessionRule
+{
+MulticastRulePriority 0;
+AuthorizationAction 0;
+SourcePrefixAddress 0.0.0.0;
+SourcePrefixAddress 0.0.0.0;
+SourcePrefixLength 32;
+GroupPrefixAddress 0.0.0.0;
+GroupPrefixLength 32;
+}
+MaximumMulticastSessions 0;
+}
+ServiceTypeIdentifier "basic";
+DEMARCAutoConfiguration
+{
+DACDisableEnableConfig 1;
+}
+}
+}
+NetworkAccess 1;
+UsServiceFlow
+{
+UsServiceFlowRef 1;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+DsServiceFlowRef 2;
+QosParamSetType 7;
+}
+}