Split out only the DHCPv6 tests which are specific to a given vendor

diff --git a/src/tests/unit/all.mk b/src/tests/unit/all.mk
index 6735a0eddb8974b86a3a7ae901d35deb0f33be2f..fdaf84aa1510684ed3e1fa067feff325170d0890 100644 (file)
--- a/src/tests/unit/all.mk
+++ b/src/tests/unit/all.mk
@@ -29,7 +29,7 @@ FILES  := \
        eap_sim_decode.txt \
        eap_sim_error.txt \
        dhcpv4.txt \
-       dhcpv6.txt \
+       dhcpv6_microsoft.txt \
        dhcpv6_rfc3315.txt \
        dhcpv6_rfc3319.txt \
        dhcpv6_rfc3646.txt \

diff --git a/src/tests/unit/dhcpv6.txt b/src/tests/unit/dhcpv6.txt
index 6673076b5be016ced55e392c6e64566f403d7dca..a1c3b1a104eb41925f8db7c904934da57a6226b3 100644 (file)
--- a/src/tests/unit/dhcpv6.txt
+++ b/src/tests/unit/dhcpv6.txt
@@ -167,26 +167,5 @@ match 00 36 00 28 00 01 00 10 20 01 0d b8 85 a3 00 00 00 00 8a 2e 03 70 73 34 00
 encode-pair NTP-Server-Address = 2001:0db8:85a3:0000:0000:8a2e:0370:7334
 match 00 38 00 14 00 01 00 10 20 01 0d b8 85 a3 00 00 00 00 8a 2e 03 70 73 34
 
-#
-#  This attribute is NOT compressed!
-#
-encode-pair BCMCS-Server-Domain-Name-List = "www.example.com"
-match 00 21 00 11 03 77 77 77 07 65 78 61 6d 70 6c 65 03 63 6f 6d 00
-
-encode-pair BCMCS-Server-Domain-Name-List = "www.example.com", BCMCS-Server-Domain-Name-List = "ftp.example.com"
-match 00 21 00 22 03 77 77 77 07 65 78 61 6d 70 6c 65 03 63 6f 6d 00 03 66 74 70 07 65 78 61 6d 70 6c 65 03 63 6f 6d 00
-
-encode-pair BCMCS-Server-Domain-Name-List = "www.example.com", BCMCS-Server-Domain-Name-List = "ftp.example.com", BCMCS-Server-Domain-Name-List = "ns.example.com"
-match 00 21 00 32 03 77 77 77 07 65 78 61 6d 70 6c 65 03 63 6f 6d 00 03 66 74 70 07 65 78 61 6d 70 6c 65 03 63 6f 6d 00 02 6e 73 07 65 78 61 6d 70 6c 65 03 63 6f 6d 00
-
-#
-#  Microsoft VSAs. We have no idea what the contents are, and the documentation doesn't say.
-#
-encode-pair Microsoft-Rogue-Detection-Request = 0x00
-match 00 11 00 09 00 00 01 37 00 5e 00 01 00
-
-decode-pair -
-match Microsoft-Rogue-Detection-Request = 0x00
-
 count
 match 84

diff --git a/src/tests/unit/dhcpv6_microsoft.txt b/src/tests/unit/dhcpv6_microsoft.txt
new file mode 100644 (file)
index 0000000..602b409
--- /dev/null
+++ b/src/tests/unit/dhcpv6_microsoft.txt
@@ -0,0 +1,17 @@
+#
+#  Test vectors for DHCPv6
+#
+load dhcpv6
+dictionary-load dhcpv6
+
+#
+#  Microsoft VSAs. We have no idea what the contents are, and the documentation doesn't say.
+#
+encode-pair Microsoft-Rogue-Detection-Request = 0x00
+match 00 11 00 09 00 00 01 37 00 5e 00 01 00
+
+decode-pair -
+match Microsoft-Rogue-Detection-Request = 0x00
+
+count
+match 6

diff --git a/src/tests/unit/dhcpv6_rfc3646.txt b/src/tests/unit/dhcpv6_rfc3646.txt
index d5f08c971e3d0f4e4dc8489b4fc557ecc3d2ef0c..93d9c565878e03d6095caaff08c3c3c656e66354 100644 (file)
--- a/src/tests/unit/dhcpv6_rfc3646.txt
+++ b/src/tests/unit/dhcpv6_rfc3646.txt
@@ -83,3 +83,6 @@ match 00 17 00 20 28 04 01 4d 2a 73 44 ab 00 00 00 00 00 00 01 23 28 04 01 4d 2a
 #
 encode-pair Domain-List = "mydomain1.com", Domain-List = "mydomain2.lan", Domain-List = "corp.mydomain3.co"
 match 00 18 00 31 09 6d 79 64 6f 6d 61 69 6e 31 03 63 6f 6d 00 09 6d 79 64 6f 6d 61 69 6e 32 03 6c 61 6e 00 04 63 6f 72 70 09 6d 79 64 6f 6d 61 69 6e 33 02 63 6f 00
+
+count
+match 6