[#1351] added documentation and updated unittests

diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst
index e83bd65ab39437f4db0af0fa5dd12fe562ee940e..1960c2f713f01219cc0876175e0014ac95f3ceee 100644 (file)
--- a/doc/sphinx/arm/dhcp4-srv.rst
+++ b/doc/sphinx/arm/dhcp4-srv.rst
@@ -1734,6 +1734,8 @@ currently has no means to validate it.
    +----------------------------------------+------+---------------------------+-------------+-------------+
    | tcode                                  | 101  | string                    | false       | false       |
    +----------------------------------------+------+---------------------------+-------------+-------------+
+   | v6-only-preferred                      | 108  | uint32                    | false       | false       |
+   +----------------------------------------+------+---------------------------+-------------+-------------+
    | netinfo-server-address                 | 112  | ipv4-address              | true        | false       |
    +----------------------------------------+------+---------------------------+-------------+-------------+
    | netinfo-server-tag                     | 113  | string                    | false       | false       |

diff --git a/src/lib/dhcp/dhcp4.h b/src/lib/dhcp/dhcp4.h
index 85045517f2fb786daf1e152737bccb5643c0780d..772439983047cac7d9dc02aefc9be040b67e4f3d 100644 (file)
--- a/src/lib/dhcp/dhcp4.h
+++ b/src/lib/dhcp/dhcp4.h
@@ -169,7 +169,7 @@ enum DHCPOptionType {
     DHO_PCODE                        = 100,
     DHO_TCODE                        = 101,
     // 102-107 are removed/unassigned
-    DHO_V6_ONLY_PREFERRED_OPTION_V4  = 108, /* draft-ietf-dhc-v6only */
+    DHO_V6_ONLY_PREFERRED            = 108, /* draft-ietf-dhc-v6only */
     // 109-111 are removed/unassigned
     DHO_NETINFO_ADDR                 = 112,
     DHO_NETINFO_TAG                  = 113,

diff --git a/src/lib/dhcp/std_option_defs.h b/src/lib/dhcp/std_option_defs.h
index d1e3fdc0a84d2a27b1df3a793783913e3f4002c6..0c741cabb8c6479922d23714109644a6dc14402d 100644 (file)
--- a/src/lib/dhcp/std_option_defs.h
+++ b/src/lib/dhcp/std_option_defs.h
@@ -246,8 +246,7 @@ const OptionDefParams STANDARD_V4_OPTION_DEFINITIONS[] = {
     { "geoconf-civic", DHO_GEOCONF_CIVIC, OPT_BINARY_TYPE, false, NO_RECORD_DEF, "" },
     { "pcode", DHO_PCODE, OPT_STRING_TYPE, false, NO_RECORD_DEF, "" },
     { "tcode", DHO_TCODE, OPT_STRING_TYPE, false, NO_RECORD_DEF, "" },
-    { "dhcpv6-only-preferred-option-dhcpv4", DHO_V6_ONLY_PREFERRED_OPTION_V4,
-      OPT_UINT32_TYPE, false, NO_RECORD_DEF, "" },
+    { "v6-only-preferred", DHO_V6_ONLY_PREFERRED, OPT_UINT32_TYPE, false, NO_RECORD_DEF, "" },
     { "netinfo-server-address", DHO_NETINFO_ADDR, OPT_IPV4_ADDRESS_TYPE, true, NO_RECORD_DEF, "" },
     { "netinfo-server-tag", DHO_NETINFO_TAG, OPT_STRING_TYPE, false, NO_RECORD_DEF, "" },
     { "default-url", DHO_URL, OPT_STRING_TYPE, false, NO_RECORD_DEF, "" },

diff --git a/src/lib/dhcp/tests/libdhcp++_unittest.cc b/src/lib/dhcp/tests/libdhcp++_unittest.cc
index 3373da402419ab8223637a9b56d80acc9e247c57..b42d7d46949730740cb483f011f35624c2d68e05 100644 (file)
--- a/src/lib/dhcp/tests/libdhcp++_unittest.cc
+++ b/src/lib/dhcp/tests/libdhcp++_unittest.cc
@@ -1633,6 +1633,9 @@ TEST_F(LibDhcpTest, stdOptionDefs4) {
     LibDhcpTest::testStdOptionDefs4(DHO_TCODE, begin, end,
                                     typeid(OptionString));
 
+    LibDhcpTest::testStdOptionDefs4(DHO_V6_ONLY_PREFERRED, begin, begin + 4,
+                                    typeid(OptionInt<uint32_t>));
+
     LibDhcpTest::testStdOptionDefs4(DHO_NETINFO_ADDR, begin, end,
                                     typeid(Option4AddrLst));