From b4dffd05e1d535fcbfc8db91fa168e0dc464743c Mon Sep 17 00:00:00 2001 From: Tomek Mrugalski Date: Wed, 24 Feb 2016 15:34:40 +0100 Subject: [PATCH] [4286] Updated CfgOptionDefTest.overrideStdOptionDef after option 65 added. --- src/lib/dhcpsrv/tests/cfg_option_def_unittest.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/lib/dhcpsrv/tests/cfg_option_def_unittest.cc b/src/lib/dhcpsrv/tests/cfg_option_def_unittest.cc index 608d7fada0..773a8f0e94 100644 --- a/src/lib/dhcpsrv/tests/cfg_option_def_unittest.cc +++ b/src/lib/dhcpsrv/tests/cfg_option_def_unittest.cc @@ -210,12 +210,10 @@ TEST(CfgOptionDefTest, overrideStdOptionDef) { def.reset(new OptionDefinition("routers", DHO_ROUTERS, "uint32")); EXPECT_THROW(cfg.add(def, DHCP4_OPTION_SPACE), isc::BadValue); - /// @todo There is no definition for the NIS Server Addr option in - /// libdhcp++. Once it is implemented it should be not allowed to - /// add a custom definition for it. At the moment, it should be ok - /// to add a definition for this option (using configuration mechanism) - /// because we haven't implemented the one in libdhcp++. - def.reset(new OptionDefinition("nis-server-addr", 65, "uint16")); + /// There is no definition for the Access Network Domain Name Option + /// (RFC5986, option code 213) in libdhcp++. Once it is implemented it + /// should be not allowed to add a custom definition for it. + def.reset(new OptionDefinition("access-netwokr-domain-name", 213, "string")); EXPECT_NO_THROW(cfg.add(def, DHCP4_OPTION_SPACE)); // It is not allowed to override the definition of the option which