Updated TLV 43.5.2.2 and 43.5.2.3 to be more human readable.

src/docsis_symtable.h

@@ -200,10 +200,10 @@ symbol_type symtable[NUM_IDENTIFIERS] =  {
 { 355,    "CMRangingClassIDExtension",         4,      200,    (encode_ushort),         (decode_ushort),         0,           0             }, /* TLV 22.43.4 MULPIv3.0-I24 Annex C.1.1.18.1.4 */
 { 202,    "L2VPNEncoding",                     5,      200,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 22.43.5 MULPIv3.0-I24 Annex C.1.1.18.1.5 */
 { 203,    "VPNIdentifier",                     1,      202,    (encode_hexstr),         (decode_hexstr),         4,           255           }, /* TLV 22.43.5.1 L2VPN-I13 Annex B.3.1 */
-{ 350,    "NSIEncapsulationSubtype",           2,      202,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 22.43.5.2 L2VPN-I13 Annex B.3.2 */
+{ 350,    "NSIEncapsulation",                  2,      202,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 22.43.5.2 L2VPN-I13 Annex B.3.2 */
 { 351,    "ServiceMultiplexingValueOther",     1,      350,    (encode_lenzero),        (decode_lenzero),        0,           0             }, /* TLV 22.43.5.2.1 L2VPN-I13 Annex B.3.2 */
-{ 356,    "ServiceMultiplexingValueIEEE8021Q", 2,      350,    (encode_ushort),         (decode_ushort),         0,           4096          }, /* TLV 22.43.5.2.2 L2VPN-I13 Annex B.3.2 */
-{ 357,    "ServiceMultiplexingValueIEEE8021ad", 3,     350,    (encode_hexstr),         (decode_hexstr),         4,           4             }, /* TLV 22.43.5.2.3 L2VPN-I13 Annex B.3.2 */
+{ 356,    "NSIEncapsulationSingleQTag",        2,      350,    (encode_ushort),         (decode_ushort),         0,           4096          }, /* TLV 22.43.5.2.2 L2VPN-I13 Annex B.3.2 */
+{ 357,    "NSIEncapsulationDualQTag",          3,      350,    (encode_dual_qtag),      (decode_dual_qtag),      0,           0             }, /* TLV 22.43.5.2.3 L2VPN-I13 Annex B.3.2 */
 { 358,    "ServiceMultiplexingValueMPLSPW",    4,      350,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 22.43.5.2.4 L2VPN-I13 Annex B.3.2 */
 { 359,    "MPLSPseudowireID",                  1,      358,    (encode_uint),           (decode_uint),           0,           0             }, /* TLV 22.43.5.2.4.1 L2VPN-I13 Annex B.3.2 */
 { 360,    "MPLSPeerIpAddress",                 2,      358,    (encode_char_ip_ip6),    (decode_char_ip_ip6),    0,           0             }, /* TLV 22.43.5.2.4.2 L2VPN-I13 Annex B.3.2 */
@@ -396,10 +396,10 @@ symbol_type symtable[NUM_IDENTIFIERS] =  {
 { 760,    "CMRangingClassIDExtension",         4,      204,    (encode_ushort),         (decode_ushort),         0,           0             }, /* TLV 23.43.4 MULPIv3.0-I24 Annex C.1.1.18.1.4 */
 { 761,    "L2VPNEncoding",                     5,      204,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 23.43.5 MULPIv3.0-I24 Annex C.1.1.18.1.5 */
 { 762,    "VPNIdentifier",                     1,      761,    (encode_hexstr),         (decode_hexstr),         4,           255           }, /* TLV 23.43.5.1 L2VPN-I13 Annex B.3.1 */
-{ 763,    "NSIEncapsulationSubtype",           2,      761,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 23.43.5.2 L2VPN-I13 Annex B.3.2 */
+{ 763,    "NSIEncapsulation",                  2,      761,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 23.43.5.2 L2VPN-I13 Annex B.3.2 */
 { 764,    "ServiceMultiplexingValueOther",     1,      763,    (encode_lenzero),        (decode_lenzero),        0,           0             }, /* TLV 23.43.5.2.1 L2VPN-I13 Annex B.3.2 */
-{ 765,    "ServiceMultiplexingValueIEEE8021Q", 2,      763,    (encode_ushort),         (decode_ushort),         0,           4096          }, /* TLV 23.43.5.2.2 L2VPN-I13 Annex B.3.2 */
-{ 766,    "ServiceMultiplexingValueIEEE8021ad", 3,     763,    (encode_hexstr),         (decode_hexstr),         4,           4             }, /* TLV 23.43.5.2.3 L2VPN-I13 Annex B.3.2 */
+{ 765,    "NSIEncapsulationSingleQTag",        2,      763,    (encode_ushort),         (decode_ushort),         0,           4096          }, /* TLV 23.43.5.2.2 L2VPN-I13 Annex B.3.2 */
+{ 766,    "NSIEncapsulationDualQTag",          3,      763,    (encode_dual_qtag),      (decode_dual_qtag),      0,           0             }, /* TLV 23.43.5.2.3 L2VPN-I13 Annex B.3.2 */
 { 767,    "ServiceMultiplexingValueMPLSPW",    4,      763,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 23.43.5.2.4 L2VPN-I13 Annex B.3.2 */
 { 768,    "MPLSPseudowireID",                  1,      767,    (encode_uint),           (decode_uint),           0,           0             }, /* TLV 23.43.5.2.4.1 L2VPN-I13 Annex B.3.2 */
 { 769,    "MPLSPeerIpAddress",                 2,      767,    (encode_char_ip_ip6),    (decode_char_ip_ip6),    0,           0             }, /* TLV 23.43.5.2.4.2 L2VPN-I13 Annex B.3.2 */
@@ -566,10 +566,10 @@ symbol_type symtable[NUM_IDENTIFIERS] =  {
 { 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 */
+{ 887,    "NSIEncapsulation",                  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 */
+{ 889,    "NSIEncapsulationSingleQTag",        2,      887,    (encode_ushort),         (decode_ushort),         0,           4096          }, /* TLV 24.43.5.2.2 L2VPN-I13 Annex B.3.2 */
+{ 890,    "NSIEncapsulationDualQTag",          3,      887,    (encode_dual_qtag),      (decode_dual_qtag),      0,           0             }, /* 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 */
@@ -727,10 +727,10 @@ symbol_type symtable[NUM_IDENTIFIERS] =  {
 { 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 */
+{ 1014,   "NSIEncapsulation",                  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 */
+{ 1016,   "NSIEncapsulationSingleQTag",        2,      1014,   (encode_ushort),         (decode_ushort),         0,           4096          }, /* TLV 25.43.5.2.2 L2VPN-I13 Annex B.3.2 */
+{ 1017,   "NSIEncapsulationDualQTag",          3,      1014,   (encode_dual_qtag),      (decode_dual_qtag),      0,           0             }, /* 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 */
@@ -870,10 +870,10 @@ symbol_type symtable[NUM_IDENTIFIERS] =  {
 { 1142,   "CMRangingClassIDExtension",         4,      1138,   (encode_ushort),         (decode_ushort),         0,           0             }, /* TLV 26.43.4 MULPIv3.0-I24 Annex C.1.1.18.1.4 */
 { 1143,   "L2VPNEncoding",                     5,      1138,   (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 26.43.5 MULPIv3.0-I24 Annex C.1.1.18.1.5 */
 { 1144,   "VPNIdentifier",                     1,      1143,   (encode_hexstr),         (decode_hexstr),         4,           255           }, /* TLV 26.43.5.1 L2VPN-I13 Annex B.3.1 */
-{ 1145,   "NSIEncapsulationSubtype",           2,      1143,   (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 26.43.5.2 L2VPN-I13 Annex B.3.2 */
+{ 1145,   "NSIEncapsulation",                  2,      1143,   (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 26.43.5.2 L2VPN-I13 Annex B.3.2 */
 { 1146,   "ServiceMultiplexingValueOther",     1,      1145,   (encode_lenzero),        (decode_lenzero),        0,           0             }, /* TLV 26.43.5.2.1 L2VPN-I13 Annex B.3.2 */
-{ 1147,   "ServiceMultiplexingValueIEEE8021Q", 2,      1145,   (encode_ushort),         (decode_ushort),         0,           4096          }, /* TLV 26.43.5.2.2 L2VPN-I13 Annex B.3.2 */
-{ 1148,   "ServiceMultiplexingValueIEEE8021ad", 3,     1145,   (encode_hexstr),         (decode_hexstr),         4,           4             }, /* TLV 26.43.5.2.3 L2VPN-I13 Annex B.3.2 */
+{ 1147,   "NSIEncapsulationSingleQTag",        2,      1145,   (encode_ushort),         (decode_ushort),         0,           4096          }, /* TLV 26.43.5.2.2 L2VPN-I13 Annex B.3.2 */
+{ 1148,   "NSIEncapsulationDualQTag",          3,      1145,   (encode_dual_qtag),      (decode_dual_qtag),      0,           0             }, /* TLV 26.43.5.2.3 L2VPN-I13 Annex B.3.2 */
 { 1149,   "ServiceMultiplexingValueMPLSPW",    4,      1145,   (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 26.43.5.2.4 L2VPN-I13 Annex B.3.2 */
 { 1150,   "MPLSPseudowireID",                  1,      1149,   (encode_uint),           (decode_uint),           0,           0             }, /* TLV 26.43.5.2.4.1 L2VPN-I13 Annex B.3.2 */
 { 1151,   "MPLSPeerIpAddress",                 2,      1149,   (encode_char_ip_ip6),    (decode_char_ip_ip6),    0,           0             }, /* TLV 26.43.5.2.4.2 L2VPN-I13 Annex B.3.2 */
@@ -1250,10 +1250,10 @@ symbol_type symtable[NUM_IDENTIFIERS] =  {
 { 613,    "CMRangingClassIDExtension",         4,      609,    (encode_ushort),         (decode_ushort),         0,           0             }, /* TLV 60.43.4 MULPIv3.0-I24 Annex C.1.1.18.1.4 */
 { 615,    "L2VPNEncoding",                     5,      609,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 60.43.5 MULPIv3.0-I24 Annex C.1.1.18.1.5 */
 { 616,    "VPNIdentifier",                     1,      615,    (encode_hexstr),         (decode_hexstr),         4,           255           }, /* TLV 60.43.5.1 L2VPN-I13 Annex B.3.1 */
-{ 617,    "NSIEncapsulationSubtype",           2,      615,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 60.43.5.2 L2VPN-I13 Annex B.3.2 */
+{ 617,    "NSIEncapsulation",                  2,      615,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 60.43.5.2 L2VPN-I13 Annex B.3.2 */
 { 618,    "ServiceMultiplexingValueOther",     1,      617,    (encode_lenzero),        (decode_lenzero),        0,           0             }, /* TLV 60.43.5.2.1 L2VPN-I13 Annex B.3.2 */
-{ 619,    "ServiceMultiplexingValueIEEE8021Q", 2,      617,    (encode_ushort),         (decode_ushort),         0,           4096          }, /* TLV 60.43.5.2.2 L2VPN-I13 Annex B.3.2 */
-{ 620,    "ServiceMultiplexingValueIEEE8021ad", 3,     617,    (encode_hexstr),         (decode_hexstr),         4,           4             }, /* TLV 60.43.5.2.3 L2VPN-I13 Annex B.3.2 */
+{ 619,    "NSIEncapsulationSingleQTag",        2,      617,    (encode_ushort),         (decode_ushort),         0,           4096          }, /* TLV 60.43.5.2.2 L2VPN-I13 Annex B.3.2 */
+{ 620,    "NSIEncapsulationDualQTag",          3,      617,    (encode_dual_qtag),      (decode_dual_qtag),      0,           0             }, /* TLV 60.43.5.2.3 L2VPN-I13 Annex B.3.2 */
 { 621,    "ServiceMultiplexingValueMPLSPW",    4,      617,    (encode_nothing),        (decode_aggregate),      0,           0             }, /* TLV 60.43.5.2.4 L2VPN-I13 Annex B.3.2 */
 { 622,    "MPLSPseudowireID",                  1,      621,    (encode_uint),           (decode_uint),           0,           0             }, /* TLV 60.43.5.2.4.1 L2VPN-I13 Annex B.3.2 */
 { 623,    "MPLSPeerIpAddress",                 2,      621,    (encode_char_ip_ip6),    (decode_char_ip_ip6),    0,           0             }, /* TLV 60.43.5.2.4.2 L2VPN-I13 Annex B.3.2 */

tests/TLV_22_43_5_2_1.conf

@@ -18,7 +18,7 @@ Main
 			VendorIdentifier 0xffffff;
 			L2VPNEncoding
 			{
-				NSIEncapsulationSubtype
+				NSIEncapsulation
 				{
 					ServiceMultiplexingValueOther 0x00;
 				}

tests/TLV_22_43_5_2_1.txt

@@ -18,7 +18,7 @@ VendorSpecific
 VendorIdentifier 0xffffff;
 L2VPNEncoding
 {
-NSIEncapsulationSubtype
+NSIEncapsulation
 {
 ServiceMultiplexingValueOther 0x00;
 }

tests/TLV_22_43_5_2_2_ServiceMultiplexingValueIEEE8021Q.conf

@@ -7,9 +7,9 @@ Main
 			VendorIdentifier 0xffffff;
 			L2VPNEncoding
 			{
-				NSIEncapsulationSubtype
+				NSIEncapsulation
 				{
-					ServiceMultiplexingValueIEEE8021Q 15;
+					NSIEncapsulationSingleQTag 15;
 				}
 			}
 		}

tests/TLV_22_43_5_2_2_ServiceMultiplexingValueIEEE8021Q.txt

@@ -1,33 +1,30 @@
 Main 
 {
-	UsPacketClass
-	{
-		VendorSpecific
-		{
-			VendorIdentifier 0xffffff;
-			L2VPNEncoding
-			{
-				NSIEncapsulationSubtype
-				{
-					ServiceMultiplexingValueIEEE8021Q 15;
-				}
-			}
-		}
-		ClassifierRef 1;
-		ServiceFlowRef 1;
-	}
-	NetworkAccess 1;
-	UsServiceFlow
-	{
-		UsServiceFlowRef 1;
-		QosParamSetType 7;
-	}
-	DsServiceFlow
-	{
-		DsServiceFlowRef 2;
-		QosParamSetType 7;
-	}
-	/* CmMic 84149283b81e152cae15b8cbc233f940; */
-	/* CmtsMic 2a1ce030469d7eb9d8cb5e80d4509da9; */
-	/*EndOfDataMkr*/
+UsPacketClass
+{
+VendorSpecific
+{
+VendorIdentifier 0xffffff;
+L2VPNEncoding
+{
+NSIEncapsulation
+{
+NSIEncapsulationSingleQTag 15;
+}
+}
+}
+ClassifierRef 1;
+ServiceFlowRef 1;
+}
+NetworkAccess 1;
+UsServiceFlow
+{
+UsServiceFlowRef 1;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+DsServiceFlowRef 2;
+QosParamSetType 7;
+}
 }

tests/TLV_22_43_5_2_3_ServiceMultiplexingValueIEEE8021ad.conf

@@ -7,9 +7,9 @@ Main
 			VendorIdentifier 0xffffff;
 			L2VPNEncoding
 			{
-				NSIEncapsulationSubtype
+				NSIEncapsulation
 				{
-					ServiceMultiplexingValueIEEE8021ad 0x01020304;
+					NSIEncapsulationDualQTag 11,22;
 				}
 			}
 		}
@@ -27,7 +27,7 @@ Main
 		DsServiceFlowRef 2;
 		QosParamSetType 7;
 	}
-	/* CmMic 07037e114dbc770c829862d4d7ac3cf0; */
-	/* CmtsMic 2c27ae495b0c2b9be9bb7ee69a55ac95; */
+	/* CmMic 2ca3fa3e29b0caca5075cd3271ef4ed6; */
+	/* CmtsMic e964f7f1b20636a4e5dc0c4e578b5e7c; */
 	/*EndOfDataMkr*/
 }

tests/TLV_22_43_5_2_3_ServiceMultiplexingValueIEEE8021ad.txt

@@ -1,33 +1,30 @@
 Main 
 {
-	UsPacketClass
-	{
-		VendorSpecific
-		{
-			VendorIdentifier 0xffffff;
-			L2VPNEncoding
-			{
-				NSIEncapsulationSubtype
-				{
-					ServiceMultiplexingValueIEEE8021ad 0x01020304;
-				}
-			}
-		}
-		ClassifierRef 1;
-		ServiceFlowRef 1;
-	}
-	NetworkAccess 1;
-	UsServiceFlow
-	{
-		UsServiceFlowRef 1;
-		QosParamSetType 7;
-	}
-	DsServiceFlow
-	{
-		DsServiceFlowRef 2;
-		QosParamSetType 7;
-	}
-	/* CmMic 07037e114dbc770c829862d4d7ac3cf0; */
-	/* CmtsMic 0be334fb17848e86b6735fd580776ae3; */
-	/*EndOfDataMkr*/
+UsPacketClass
+{
+VendorSpecific
+{
+VendorIdentifier 0xffffff;
+L2VPNEncoding
+{
+NSIEncapsulation
+{
+NSIEncapsulationDualQTag 11,22;
+}
+}
+}
+ClassifierRef 1;
+ServiceFlowRef 1;
+}
+NetworkAccess 1;
+UsServiceFlow
+{
+UsServiceFlowRef 1;
+QosParamSetType 7;
+}
+DsServiceFlow
+{
+DsServiceFlowRef 2;
+QosParamSetType 7;
+}
 }

tests/TLV_22_43_5_2_4_2_MPLSPeerIpAddress.conf

@@ -18,7 +18,7 @@ Main
 			VendorIdentifier 0xffffff;
 			L2VPNEncoding
 			{
-				NSIEncapsulationSubtype
+				NSIEncapsulation
 				{
 					ServiceMultiplexingValueMPLSPW
 					{

tests/TLV_22_43_5_2_4_2_MPLSPeerIpAddress.txt

@@ -18,7 +18,7 @@ VendorSpecific
 VendorIdentifier 0xffffff;
 L2VPNEncoding
 {
-NSIEncapsulationSubtype
+NSIEncapsulation
 {
 ServiceMultiplexingValueMPLSPW
 {

tests/TLV_22_43_5_2_4_ServiceMultiplexingValueMPLSPW.conf

@@ -7,7 +7,7 @@ Main
 			VendorIdentifier 0xffffff;
 			L2VPNEncoding
 			{
-				NSIEncapsulationSubtype
+				NSIEncapsulation
 				{
 					ServiceMultiplexingValueMPLSPW
 					{

tests/TLV_22_43_5_2_4_ServiceMultiplexingValueMPLSPW.txt

@@ -7,7 +7,7 @@ VendorSpecific
 VendorIdentifier 0xffffff;
 L2VPNEncoding
 {
-NSIEncapsulationSubtype
+NSIEncapsulation
 {
 ServiceMultiplexingValueMPLSPW
 {

tests/TLV_22_43_5_2_5_ServiceMultiplexingValueL2TPv3Peer.conf

@@ -18,7 +18,7 @@ Main
 			VendorIdentifier 0xffffff;
 			L2VPNEncoding
 			{
-				NSIEncapsulationSubtype
+				NSIEncapsulation
 				{
 					ServiceMultiplexingValueL2TPv3Peer 2002::2:1;
 				}

tests/TLV_22_43_5_2_5_ServiceMultiplexingValueL2TPv3Peer.txt

@@ -18,7 +18,7 @@ VendorSpecific
 VendorIdentifier 0xffffff;
 L2VPNEncoding
 {
-NSIEncapsulationSubtype
+NSIEncapsulation
 {
 ServiceMultiplexingValueL2TPv3Peer 2002::2:1;
 }

tests/TLV_22_43_5_2_6_IEEE8021ahEncapsulation.conf

@@ -7,7 +7,7 @@ Main
 			VendorIdentifier 0xffffff;
 			L2VPNEncoding
 			{
-				NSIEncapsulationSubtype
+				NSIEncapsulation
 				{
 					IEEE8021ahEncapsulation
 					{

tests/TLV_22_43_5_2_6_IEEE8021ahEncapsulation.txt

@@ -7,7 +7,7 @@ VendorSpecific
 VendorIdentifier 0xffffff;
 L2VPNEncoding
 {
-NSIEncapsulationSubtype
+NSIEncapsulation
 {
 IEEE8021ahEncapsulation
 {

tests/TLV_22_43_5_2_8_ServiceMultiplexingValueIEEE8021adSTPID.conf

@@ -18,7 +18,7 @@ Main
 			VendorIdentifier 0xffffff;
 			L2VPNEncoding
 			{
-				NSIEncapsulationSubtype
+				NSIEncapsulation
 				{
 					ServiceMultiplexingValueIEEE8021adSTPID 0x88a8;
 				}

tests/TLV_22_43_5_2_8_ServiceMultiplexingValueIEEE8021adSTPID.txt

@@ -18,7 +18,7 @@ VendorSpecific
 VendorIdentifier 0xffffff;
 L2VPNEncoding
 {
-NSIEncapsulationSubtype
+NSIEncapsulation
 {
 ServiceMultiplexingValueIEEE8021adSTPID 0x88a8;
 }

tests/TLV_23_43_5_L2VPNEncoding.conf

@@ -8,11 +8,11 @@ Main
 			L2VPNEncoding
 			{
 				AttachmentGroupID 0x0102;
-				NSIEncapsulationSubtype
+				NSIEncapsulation
 				{
 					ServiceMultiplexingValueOther 0x00;
-					ServiceMultiplexingValueIEEE8021Q 258;
-					ServiceMultiplexingValueIEEE8021ad 0x01020304;
+					NSIEncapsulationSingleQTag 258;
+					NSIEncapsulationDualQTag 11,22;
 					ServiceMultiplexingValueMPLSPW
 					{
 						MPLSPseudowireID 1;
@@ -69,8 +69,8 @@ Main
 		DsServiceFlowRef 2;
 		QosParamSetType 7;
 	}
-	/* CmMic b5c2d1ed0cb89732d1d6f4fc57cdfb6a; */
-	/* CmtsMic 42d50b815ff3bef8b5a75d7a5bfdd9e5; */
+	/* CmMic 0419aa51242f6b3036deaaa1859eb94f; */
+	/* CmtsMic b952356c71ae9b88515e3b429a86aa24; */
 	/*EndOfDataMkr*/
 	/* Pad */
 }

tests/TLV_23_43_5_L2VPNEncoding.txt

@@ -8,11 +8,11 @@ VendorIdentifier 0xffffff;
 L2VPNEncoding
 {
 AttachmentGroupID 0x0102;
-NSIEncapsulationSubtype
+NSIEncapsulation
 {
 ServiceMultiplexingValueOther 0x00;
-ServiceMultiplexingValueIEEE8021Q 258;
-ServiceMultiplexingValueIEEE8021ad 0x01020304;
+NSIEncapsulationSingleQTag 258;
+NSIEncapsulationDualQTag 11,22;
 ServiceMultiplexingValueMPLSPW
 {
 MPLSPseudowireID 1;

tests/TLV_24_43_5_L2VPNEncoding.conf

@@ -8,11 +8,11 @@ Main
 			L2VPNEncoding
 			{
 				AttachmentGroupID 0x0102;
-				NSIEncapsulationSubtype
+				NSIEncapsulation
 				{
 					ServiceMultiplexingValueOther 0x00;
-					ServiceMultiplexingValueIEEE8021Q 258;
-					ServiceMultiplexingValueIEEE8021ad 0x01020304;
+					NSIEncapsulationSingleQTag 258;
+					NSIEncapsulationDualQTag 11,22;
 					ServiceMultiplexingValueMPLSPW
 					{
 						MPLSPseudowireID 1;
@@ -69,8 +69,8 @@ Main
 		DsServiceFlowRef 2;
 		QosParamSetType 7;
 	}
-	/* CmMic 7707b93283b45df52d1488bb4cd2656e; */
-	/* CmtsMic 0704433abd4b9015e12b9c14a008d9cf; */
+	/* CmMic d742513aee041a8dc0021514a5bc4b9b; */
+	/* CmtsMic 1ae7d46e79bbcab6641e9e8784655bba; */
 	/*EndOfDataMkr*/
 	/* Pad */
 }

tests/TLV_24_43_5_L2VPNEncoding.txt

@@ -8,11 +8,11 @@ VendorIdentifier 0xffffff;
 L2VPNEncoding
 {
 AttachmentGroupID 0x0102;
-NSIEncapsulationSubtype
+NSIEncapsulation
 {
 ServiceMultiplexingValueOther 0x00;
-ServiceMultiplexingValueIEEE8021Q 258;
-ServiceMultiplexingValueIEEE8021ad 0x01020304;
+NSIEncapsulationSingleQTag 258;
+NSIEncapsulationDualQTag 11,22;
 ServiceMultiplexingValueMPLSPW
 {
 MPLSPseudowireID 1;

tests/TLV_25_43_5_L2VPNEncoding.conf

@@ -8,11 +8,11 @@ Main
 			L2VPNEncoding
 			{
 				AttachmentGroupID 0x0102;
-				NSIEncapsulationSubtype
+				NSIEncapsulation
 				{
 					ServiceMultiplexingValueOther 0x00;
-					ServiceMultiplexingValueIEEE8021Q 258;
-					ServiceMultiplexingValueIEEE8021ad 0x01020304;
+					NSIEncapsulationSingleQTag 258;
+					NSIEncapsulationDualQTag 11,22;
 					ServiceMultiplexingValueMPLSPW
 					{
 						MPLSPseudowireID 1;
@@ -69,8 +69,8 @@ Main
 		DsServiceFlowRef 2;
 		QosParamSetType 7;
 	}
-	/* CmMic 3f502383f0d8a0ee4d37d60718dc6f5d; */
-	/* CmtsMic c793264b87f380f76f7623c93601b54f; */
+	/* CmMic 14801ce955ca46daf94bdbb6f0c7bcf0; */
+	/* CmtsMic c6324d96da4d23490afd18410263a985; */
 	/*EndOfDataMkr*/
 	/* Pad */
 }

tests/TLV_25_43_5_L2VPNEncoding.txt

@@ -8,11 +8,11 @@ VendorIdentifier 0xffffff;
 L2VPNEncoding
 {
 AttachmentGroupID 0x0102;
-NSIEncapsulationSubtype
+NSIEncapsulation
 {
 ServiceMultiplexingValueOther 0x00;
-ServiceMultiplexingValueIEEE8021Q 258;
-ServiceMultiplexingValueIEEE8021ad 0x01020304;
+NSIEncapsulationSingleQTag 258;
+NSIEncapsulationDualQTag 11,22;
 ServiceMultiplexingValueMPLSPW
 {
 MPLSPseudowireID 1;

tests/TLV_26_43_5_L2VPNEncoding.conf

@@ -8,11 +8,11 @@ Main
 			L2VPNEncoding
 			{
 				AttachmentGroupID 0x0102;
-				NSIEncapsulationSubtype
+				NSIEncapsulation
 				{
 					ServiceMultiplexingValueOther 0x00;
-					ServiceMultiplexingValueIEEE8021Q 258;
-					ServiceMultiplexingValueIEEE8021ad 0x01020304;
+					NSIEncapsulationSingleQTag 258;
+					NSIEncapsulationDualQTag 11,22;
 					ServiceMultiplexingValueMPLSPW
 					{
 						MPLSPseudowireID 1;
@@ -69,8 +69,8 @@ Main
 		DsServiceFlowRef 2;
 		QosParamSetType 7;
 	}
-	/* CmMic 52862b2e58c3af0b14173cd2c41f7089; */
-	/* CmtsMic 22c5ee784a7b9337101bf2a270d96cf5; */
+	/* CmMic 7c3e290146f805b4d074bd865af579f8; */
+	/* CmtsMic f43373cc3e99f4ad31ab180b85f5a36e; */
 	/*EndOfDataMkr*/
 	/* Pad */
 }

tests/TLV_26_43_5_L2VPNEncoding.txt

@@ -8,11 +8,11 @@ VendorIdentifier 0xffffff;
 L2VPNEncoding
 {
 AttachmentGroupID 0x0102;
-NSIEncapsulationSubtype
+NSIEncapsulation
 {
 ServiceMultiplexingValueOther 0x00;
-ServiceMultiplexingValueIEEE8021Q 258;
-ServiceMultiplexingValueIEEE8021ad 0x01020304;
+NSIEncapsulationSingleQTag 258;
+NSIEncapsulationDualQTag 11,22;
 ServiceMultiplexingValueMPLSPW
 {
 MPLSPseudowireID 1;

tests/TLV_43_5_L2VPNEncoding.conf

@@ -10,7 +10,7 @@ Main
 			{
 				ServiceMultiplexingValueOther 0x00;
 				NSIEncapsulationSingleQTag 258;
-				NSIEncapsulationDualQTag 258,772;
+				NSIEncapsulationDualQTag 11,22;
 				ServiceMultiplexingValueMPLSPW
 				{
 					MPLSPseudowireID 1;
@@ -66,7 +66,7 @@ Main
 		DsServiceFlowRef 2;
 		QosParamSetType 7;
 	}
-	/* CmMic 684f4d6e2dfc8866fa2d2b43121714ac; */
-	/* CmtsMic 1334e8a56b8d21caf50bc1d2a0f48e0a; */
+	/* CmMic 5780b5a8b5448b2e975edcbfcf1070bc; */
+	/* CmtsMic 54426e6eb4807cc7817f8bfad8f9e6ab; */
 	/*EndOfDataMkr*/
 }

tests/TLV_43_5_L2VPNEncoding.txt

@@ -6,11 +6,11 @@ VendorIdentifier 0xffffff;
 L2VPNEncoding
 {
 AttachmentGroupID 0x0102;
-NSIEncapsulationSubtype
+NSIEncapsulation
 {
 ServiceMultiplexingValueOther 0x00;
-ServiceMultiplexingValueIEEE8021Q 258;
-ServiceMultiplexingValueIEEE8021ad 0x01020304;
+NSIEncapsulationSingleQTag 258;
+NSIEncapsulationDualQTag 11,22;
 ServiceMultiplexingValueMPLSPW
 {
 MPLSPseudowireID 1;

tests/TLV_60_43_5_2_NSIEncapsulationSubtype.conf

@@ -8,11 +8,11 @@ Main
 			L2VPNEncoding
 			{
 				VPNIdentifier 0x01020304;
-				NSIEncapsulationSubtype
+				NSIEncapsulation
 				{
 					ServiceMultiplexingValueOther 0x00;
-					ServiceMultiplexingValueIEEE8021Q 258;
-					ServiceMultiplexingValueIEEE8021ad 0x01020304;
+					NSIEncapsulationSingleQTag 258;
+					NSIEncapsulationDualQTag 11,22;
 					ServiceMultiplexingValueMPLSPW
 					{
 						MPLSPseudowireID 1;
@@ -53,7 +53,7 @@ Main
 		DsServiceFlowRef 2;
 		QosParamSetType 7;
 	}
-	/* CmMic ffe66672799c655e56675adb647cd3a9; */
-	/* CmtsMic 02e03b017d034944d49dfec4e1ad6428; */
+	/* CmMic 84a06a7b18505d599272a464dfd0fa2e; */
+	/* CmtsMic 9990f95879c76ea9613a1d1174f7abb1; */
 	/*EndOfDataMkr*/
 }

tests/TLV_60_43_5_2_NSIEncapsulationSubtype.txt

@@ -8,11 +8,11 @@ VendorIdentifier 0xffffff;
 L2VPNEncoding
 {
 VPNIdentifier 0x01020304;
-NSIEncapsulationSubtype
+NSIEncapsulation
 {
 ServiceMultiplexingValueOther 0x00;
-ServiceMultiplexingValueIEEE8021Q 258;
-ServiceMultiplexingValueIEEE8021ad 0x01020304;
+NSIEncapsulationSingleQTag 258;
+NSIEncapsulationDualQTag 11,22;
 ServiceMultiplexingValueMPLSPW
 {
 MPLSPseudowireID 1;