From 01e10ceba18f1c2a1a96bedf1cee2b121e151555 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Mon, 3 Aug 2020 17:37:32 +0200 Subject: [PATCH 1/2] [#1007] Replaced some option spaces --- src/bin/dhcp4/tests/config_backend_unittest.cc | 9 +++++---- src/bin/dhcp4/tests/config_parser_unittest.cc | 9 ++++++--- src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc | 5 +++-- src/bin/dhcp6/tests/config_backend_unittest.cc | 7 ++++--- src/bin/dhcp6/tests/config_parser_unittest.cc | 12 ++++++++---- src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc | 5 +++-- src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc | 2 +- src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc | 2 +- .../mysql_cb/tests/mysql_cb_dhcp4_unittest.cc | 8 ++++---- .../mysql_cb/tests/mysql_cb_dhcp6_unittest.cc | 8 ++++---- src/lib/dhcp/tests/libdhcp++_unittest.cc | 4 ++-- src/lib/dhcpsrv/mysql_host_data_source.cc | 3 ++- src/lib/dhcpsrv/pgsql_host_data_source.cc | 3 ++- src/lib/dhcpsrv/tests/cb_ctl_dhcp_unittest.cc | 16 ++++++++++------ src/lib/dhcpsrv/tests/cfg_option_unittest.cc | 4 ++-- src/lib/yang/adaptor_option.cc | 4 ++-- src/lib/yang/tests/adaptor_option_unittests.cc | 2 +- 17 files changed, 60 insertions(+), 43 deletions(-) diff --git a/src/bin/dhcp4/tests/config_backend_unittest.cc b/src/bin/dhcp4/tests/config_backend_unittest.cc index 0a125a89e0..2aae7a56e7 100644 --- a/src/bin/dhcp4/tests/config_backend_unittest.cc +++ b/src/bin/dhcp4/tests/config_backend_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2019-2020 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -368,18 +368,19 @@ TEST_F(Dhcp4CBTest, mergeOptions) { CfgOptionPtr options = staging_cfg->getCfgOption(); // dhcp-message should come from the original config. - OptionDescriptor found_opt = options->get("dhcp4", DHO_DHCP_MESSAGE); + OptionDescriptor found_opt = + options->get(DHCP4_OPTION_SPACE, DHO_DHCP_MESSAGE); ASSERT_TRUE(found_opt.option_); EXPECT_EQ("0x0A0B0C0D", found_opt.option_->toHexString()); // host-name should come from the first back end, // (overwriting the original). - found_opt = options->get("dhcp4", DHO_HOST_NAME); + found_opt = options->get(DHCP4_OPTION_SPACE, DHO_HOST_NAME); ASSERT_TRUE(found_opt.option_); EXPECT_EQ("new.example.com", found_opt.option_->toString()); // booth-file-name should come from the first back end. - found_opt = options->get("dhcp4", DHO_BOOT_FILE_NAME); + found_opt = options->get(DHCP4_OPTION_SPACE, DHO_BOOT_FILE_NAME); ASSERT_TRUE(found_opt.option_); EXPECT_EQ("my-boot-file", found_opt.option_->toString()); } diff --git a/src/bin/dhcp4/tests/config_parser_unittest.cc b/src/bin/dhcp4/tests/config_parser_unittest.cc index 6496e0c584..ec9fe2c6a4 100644 --- a/src/bin/dhcp4/tests/config_parser_unittest.cc +++ b/src/bin/dhcp4/tests/config_parser_unittest.cc @@ -3392,7 +3392,8 @@ TEST_F(Dhcp4ParserTest, optionDataSinglePool) { Pool4Ptr pool4 = boost::dynamic_pointer_cast(pool); ASSERT_TRUE(pool4); - OptionContainerPtr options = pool4->getCfgOption()->getAll("dhcp4"); + OptionContainerPtr options = + pool4->getCfgOption()->getAll(DHCP4_OPTION_SPACE); ASSERT_EQ(2, options->size()); // Get the search index. Index #1 is to search using option code. @@ -3465,7 +3466,8 @@ TEST_F(Dhcp4ParserTest, optionDataMultiplePools) { Pool4Ptr pool41 = boost::dynamic_pointer_cast(pool1); ASSERT_TRUE(pool41); - OptionContainerPtr options1 = pool41->getCfgOption()->getAll("dhcp4"); + OptionContainerPtr options1 = + pool41->getCfgOption()->getAll(DHCP4_OPTION_SPACE); ASSERT_EQ(1, options1->size()); // Get the search index. Index #1 is to search using option code. @@ -3491,7 +3493,8 @@ TEST_F(Dhcp4ParserTest, optionDataMultiplePools) { Pool4Ptr pool42 = boost::dynamic_pointer_cast(pool2); ASSERT_TRUE(pool42); - OptionContainerPtr options2 = pool42->getCfgOption()->getAll("dhcp4"); + OptionContainerPtr options2 = + pool42->getCfgOption()->getAll(DHCP4_OPTION_SPACE); ASSERT_EQ(1, options2->size()); const OptionContainerTypeIndex& idx2 = options2->get<1>(); diff --git a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc index 3e1645516c..d339e66a41 100644 --- a/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc +++ b/src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc @@ -806,7 +806,8 @@ TEST_F(CtrlChannelDhcpv4SrvTest, configSet) { CfgMgr::instance().getCurrentCfg()->getCfgSubnets4()->getAll(); EXPECT_EQ(1, subnets->size()); - OptionDefinitionPtr def = LibDHCP::getRuntimeOptionDef("dhcp4", 163); + OptionDefinitionPtr def = + LibDHCP::getRuntimeOptionDef(DHCP4_OPTION_SPACE, 163); ASSERT_TRUE(def); // Create a config with malformed subnet that should fail to parse. @@ -835,7 +836,7 @@ TEST_F(CtrlChannelDhcpv4SrvTest, configSet) { subnets = CfgMgr::instance().getCurrentCfg()->getCfgSubnets4()->getAll(); EXPECT_EQ(1, subnets->size()); - def = LibDHCP::getRuntimeOptionDef("dhcp4", 163); + def = LibDHCP::getRuntimeOptionDef(DHCP4_OPTION_SPACE, 163); ASSERT_TRUE(def); // Create a valid config with two subnets and no command channel. diff --git a/src/bin/dhcp6/tests/config_backend_unittest.cc b/src/bin/dhcp6/tests/config_backend_unittest.cc index 00a8da44cf..4a7b09c34a 100644 --- a/src/bin/dhcp6/tests/config_backend_unittest.cc +++ b/src/bin/dhcp6/tests/config_backend_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2019-2020 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -348,14 +348,15 @@ TEST_F(Dhcp6CBTest, mergeOptions) { // bootfile-url should come from the first config back end. // (overwriting the original). - OptionDescriptor found_opt = options->get("dhcp6", D6O_BOOTFILE_URL); + OptionDescriptor found_opt = + options->get(DHCP6_OPTION_SPACE, D6O_BOOTFILE_URL); ASSERT_TRUE(found_opt.option_); OptionStringPtr opstr = boost::dynamic_pointer_cast(found_opt.option_); ASSERT_TRUE(opstr); EXPECT_EQ("updated-boot-file", opstr->getValue()); // sol-maxt-rt should come from the original config - found_opt = options->get("dhcp6", D6O_SOL_MAX_RT); + found_opt = options->get(DHCP6_OPTION_SPACE, D6O_SOL_MAX_RT); ASSERT_TRUE(found_opt.option_); OptionUint32Ptr opint = boost::dynamic_pointer_cast(found_opt.option_); ASSERT_TRUE(opint); diff --git a/src/bin/dhcp6/tests/config_parser_unittest.cc b/src/bin/dhcp6/tests/config_parser_unittest.cc index d508a277f9..c01ce50159 100644 --- a/src/bin/dhcp6/tests/config_parser_unittest.cc +++ b/src/bin/dhcp6/tests/config_parser_unittest.cc @@ -3584,7 +3584,8 @@ TEST_F(Dhcp6ParserTest, optionDataMultiplePools) { Pool6Ptr pool6 = boost::dynamic_pointer_cast(pool); ASSERT_TRUE(pool6); - OptionContainerPtr options1 = pool6->getCfgOption()->getAll("dhcp6"); + OptionContainerPtr options1 = + pool6->getCfgOption()->getAll(DHCP6_OPTION_SPACE); ASSERT_EQ(1, options1->size()); // Get the search index. Index #1 is to search using option code. @@ -3611,7 +3612,8 @@ TEST_F(Dhcp6ParserTest, optionDataMultiplePools) { pool6 = boost::dynamic_pointer_cast(pool); ASSERT_TRUE(pool6); - OptionContainerPtr options2 = pool6->getCfgOption()->getAll("dhcp6"); + OptionContainerPtr options2 = + pool6->getCfgOption()->getAll(DHCP6_OPTION_SPACE); ASSERT_EQ(1, options2->size()); const OptionContainerTypeIndex& idx2 = options2->get<1>(); @@ -3632,7 +3634,8 @@ TEST_F(Dhcp6ParserTest, optionDataMultiplePools) { pool6 = boost::dynamic_pointer_cast(pool); ASSERT_TRUE(pool6); - OptionContainerPtr options3 = pool6->getCfgOption()->getAll("dhcp6"); + OptionContainerPtr options3 = + pool6->getCfgOption()->getAll(DHCP6_OPTION_SPACE); ASSERT_EQ(1, options3->size()); const OptionContainerTypeIndex& idx3 = options3->get<1>(); @@ -3652,7 +3655,8 @@ TEST_F(Dhcp6ParserTest, optionDataMultiplePools) { pool6 = boost::dynamic_pointer_cast(pool); ASSERT_TRUE(pool6); - OptionContainerPtr options4 = pool6->getCfgOption()->getAll("dhcp6"); + OptionContainerPtr options4 = + pool6->getCfgOption()->getAll(DHCP6_OPTION_SPACE); ASSERT_EQ(1, options4->size()); const OptionContainerTypeIndex& idx4 = options4->get<1>(); diff --git a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc index 69fe15f0e8..5ae9b04ba2 100644 --- a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc +++ b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc @@ -715,7 +715,8 @@ TEST_F(CtrlChannelDhcpv6SrvTest, configSet) { CfgMgr::instance().getCurrentCfg()->getCfgSubnets6()->getAll(); EXPECT_EQ(1, subnets->size()); - OptionDefinitionPtr def = LibDHCP::getRuntimeOptionDef("dhcp6", 163); + OptionDefinitionPtr def = + LibDHCP::getRuntimeOptionDef(DHCP6_OPTION_SPACE, 163); ASSERT_TRUE(def); // Create a config with malformed subnet that should fail to parse. @@ -744,7 +745,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, configSet) { subnets = CfgMgr::instance().getCurrentCfg()->getCfgSubnets6()->getAll(); EXPECT_EQ(1, subnets->size()); - def = LibDHCP::getRuntimeOptionDef("dhcp6", 163); + def = LibDHCP::getRuntimeOptionDef(DHCP6_OPTION_SPACE, 163); ASSERT_TRUE(def); // Create a valid config with two subnets and no command channel. diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc index fc7cebc4a4..75286543d7 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc @@ -1962,7 +1962,7 @@ public: void createUpdateOptionDef4(const ServerSelector& server_selector, const OptionDefinitionPtr& option_def) { - createUpdateOptionDef(server_selector, option_def, "dhcp4", + createUpdateOptionDef(server_selector, option_def, DHCP4_OPTION_SPACE, MySqlConfigBackendDHCPv4Impl::GET_OPTION_DEF4_CODE_SPACE, MySqlConfigBackendDHCPv4Impl::INSERT_OPTION_DEF4, MySqlConfigBackendDHCPv4Impl::UPDATE_OPTION_DEF4, diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc index 8cae812c6c..0bcce50be6 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc @@ -2377,7 +2377,7 @@ public: void createUpdateOptionDef6(const ServerSelector& server_selector, const OptionDefinitionPtr& option_def) { - createUpdateOptionDef(server_selector, option_def, "dhcp6", + createUpdateOptionDef(server_selector, option_def, DHCP6_OPTION_SPACE, MySqlConfigBackendDHCPv6Impl::GET_OPTION_DEF6_CODE_SPACE, MySqlConfigBackendDHCPv6Impl::INSERT_OPTION_DEF6, MySqlConfigBackendDHCPv6Impl::UPDATE_OPTION_DEF6, diff --git a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc index 84704ffe66..56958c7d2c 100644 --- a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc +++ b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc @@ -322,15 +322,15 @@ public: OptionDefinitionPtr option_def(new OptionDefinition("foo", 234, "string", "espace")); - option_def->setOptionSpaceName("dhcp4"); + option_def->setOptionSpaceName(DHCP4_OPTION_SPACE); test_option_defs_.push_back(option_def); option_def.reset(new OptionDefinition("bar", 234, "uint32", true)); - option_def->setOptionSpaceName("dhcp4"); + option_def->setOptionSpaceName(DHCP4_OPTION_SPACE); test_option_defs_.push_back(option_def); option_def.reset(new OptionDefinition("fish", 235, "record", true)); - option_def->setOptionSpaceName("dhcp4"); + option_def->setOptionSpaceName(DHCP4_OPTION_SPACE); option_def->addRecordField("uint32"); option_def->addRecordField("string"); test_option_defs_.push_back(option_def); @@ -340,7 +340,7 @@ public: test_option_defs_.push_back(option_def); option_def.reset(new OptionDefinition("foobar", 234, "uint64", true)); - option_def->setOptionSpaceName("dhcp4"); + option_def->setOptionSpaceName(DHCP4_OPTION_SPACE); test_option_defs_.push_back(option_def); } diff --git a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc index a3ffc69e0d..7fbfd63973 100644 --- a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc +++ b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc @@ -368,15 +368,15 @@ public: OptionDefinitionPtr option_def(new OptionDefinition("foo", 1234, "string", "espace")); - option_def->setOptionSpaceName("dhcp6"); + option_def->setOptionSpaceName(DHCP6_OPTION_SPACE); test_option_defs_.push_back(option_def); option_def.reset(new OptionDefinition("bar", 1234, "uint32", true)); - option_def->setOptionSpaceName("dhcp6"); + option_def->setOptionSpaceName(DHCP6_OPTION_SPACE); test_option_defs_.push_back(option_def); option_def.reset(new OptionDefinition("fish", 5235, "record", true)); - option_def->setOptionSpaceName("dhcp6"); + option_def->setOptionSpaceName(DHCP6_OPTION_SPACE); option_def->addRecordField("uint32"); option_def->addRecordField("string"); test_option_defs_.push_back(option_def); @@ -386,7 +386,7 @@ public: test_option_defs_.push_back(option_def); option_def.reset(new OptionDefinition("bar", 1234, "uint64", true)); - option_def->setOptionSpaceName("dhcp6"); + option_def->setOptionSpaceName(DHCP6_OPTION_SPACE); test_option_defs_.push_back(option_def); } diff --git a/src/lib/dhcp/tests/libdhcp++_unittest.cc b/src/lib/dhcp/tests/libdhcp++_unittest.cc index 3e2e143f9c..bd83a19e1f 100644 --- a/src/lib/dhcp/tests/libdhcp++_unittest.cc +++ b/src/lib/dhcp/tests/libdhcp++_unittest.cc @@ -1282,7 +1282,7 @@ TEST_F(LibDhcpTest, emptyHostName) { list deferred; ASSERT_NO_THROW( - LibDHCP::unpackOptions4(packed, "dhcp4", options, deferred, false); + LibDHCP::unpackOptions4(packed, DHCP4_OPTION_SPACE, options, deferred, false); ); // Host Name should not exist, we quietly drop it when empty. @@ -2370,7 +2370,7 @@ TEST_F(LibDhcpTest, sw46options) { size_t parsed = 0; - EXPECT_NO_THROW (parsed = LibDHCP::unpackOptions6(buf, "dhcp6", options)); + EXPECT_NO_THROW (parsed = LibDHCP::unpackOptions6(buf, DHCP6_OPTION_SPACE, options)); EXPECT_EQ(mape_bin.size(), parsed); // We expect to have exactly one option (with tons of suboptions, but we'll diff --git a/src/lib/dhcpsrv/mysql_host_data_source.cc b/src/lib/dhcpsrv/mysql_host_data_source.cc index bfe97ec3b9..175c3b4ffa 100644 --- a/src/lib/dhcpsrv/mysql_host_data_source.cc +++ b/src/lib/dhcpsrv/mysql_host_data_source.cc @@ -913,7 +913,8 @@ private: // If empty or null space provided, use a default top level space. if (space.empty()) { - space = (universe_ == Option::V4 ? "dhcp4" : "dhcp6"); + space = (universe_ == Option::V4 ? + DHCP4_OPTION_SPACE : DHCP6_OPTION_SPACE); } // Convert formatted_value to string as well. diff --git a/src/lib/dhcpsrv/pgsql_host_data_source.cc b/src/lib/dhcpsrv/pgsql_host_data_source.cc index cc874375e6..544e7e4ee5 100644 --- a/src/lib/dhcpsrv/pgsql_host_data_source.cc +++ b/src/lib/dhcpsrv/pgsql_host_data_source.cc @@ -588,7 +588,8 @@ private: // If empty or null space provided, use a default top level space. if (space.empty()) { - space = (universe_ == Option::V4 ? "dhcp4" : "dhcp6"); + space = (universe_ == Option::V4 ? + DHCP4_OPTION_SPACE : DHCP6_OPTION_SPACE); } // persistent: BOOL default false diff --git a/src/lib/dhcpsrv/tests/cb_ctl_dhcp_unittest.cc b/src/lib/dhcpsrv/tests/cb_ctl_dhcp_unittest.cc index 7de0f6fa2c..814e770e44 100644 --- a/src/lib/dhcpsrv/tests/cb_ctl_dhcp_unittest.cc +++ b/src/lib/dhcpsrv/tests/cb_ctl_dhcp_unittest.cc @@ -489,7 +489,7 @@ public: // modification time is later than last audit revision time it should // be merged. auto options = srv_cfg->getCfgOption(); - auto found_opt = options->get("dhcp4", DHO_HOST_NAME); + auto found_opt = options->get(DHCP4_OPTION_SPACE, DHO_HOST_NAME); if (hasConfigElement("dhcp4_options") && (getTimestamp("dhcp4_options") > lb_modification_time)) { ASSERT_TRUE(found_opt.option_); @@ -603,8 +603,10 @@ public: { SCOPED_TRACE("global options"); // One of the options should still be there. - EXPECT_TRUE(srv_cfg->getCfgOption()->get("dhcp4", DHO_TFTP_SERVER_NAME).option_); - auto found_opt = srv_cfg->getCfgOption()->get("dhcp4", DHO_HOST_NAME); + EXPECT_TRUE(srv_cfg->getCfgOption()->get(DHCP4_OPTION_SPACE, + DHO_TFTP_SERVER_NAME).option_); + auto found_opt = srv_cfg->getCfgOption()->get(DHCP4_OPTION_SPACE, + DHO_HOST_NAME); if (deleteConfigElement("dhcp4_options", 1)) { EXPECT_FALSE(found_opt.option_); @@ -1135,7 +1137,7 @@ public: // modification time is later than last audit revision time it should // be merged. auto options = srv_cfg->getCfgOption(); - auto found_opt = options->get("dhcp6", D6O_BOOTFILE_URL); + auto found_opt = options->get(DHCP6_OPTION_SPACE, D6O_BOOTFILE_URL); if (hasConfigElement("dhcp6_options") && (getTimestamp("dhcp6_options") > lb_modification_time)) { ASSERT_TRUE(found_opt.option_); @@ -1249,8 +1251,10 @@ public: { SCOPED_TRACE("global options"); // One of the options should still be there. - EXPECT_TRUE(srv_cfg->getCfgOption()->get("dhcp6", D6O_AFTR_NAME).option_); - auto found_opt = srv_cfg->getCfgOption()->get("dhcp6", D6O_AFTR_NAME); + EXPECT_TRUE(srv_cfg->getCfgOption()->get(DHCP6_OPTION_SPACE, + D6O_AFTR_NAME).option_); + auto found_opt = srv_cfg->getCfgOption()->get(DHCP6_OPTION_SPACE, + D6O_AFTR_NAME); if (deleteConfigElement("dhcp6_options", 1)) { EXPECT_FALSE(found_opt.option_); diff --git a/src/lib/dhcpsrv/tests/cfg_option_unittest.cc b/src/lib/dhcpsrv/tests/cfg_option_unittest.cc index 93ea8aa6e4..672125c1b7 100644 --- a/src/lib/dhcpsrv/tests/cfg_option_unittest.cc +++ b/src/lib/dhcpsrv/tests/cfg_option_unittest.cc @@ -608,7 +608,7 @@ TEST_F(CfgOptionTest, createDescriptorOptionValid) { defs->add((OptionDefinitionPtr(new OptionDefinition("two", 2, "uint8", true))), "isc"); // We'll try a standard V4 option first. - std::string space = "dhcp4"; + std::string space = DHCP4_OPTION_SPACE; std::string value = "v4.example.com"; OptionPtr option(new Option(Option::V6, DHO_HOST_NAME)); option->setData(value.begin(), value.end()); @@ -622,7 +622,7 @@ TEST_F(CfgOptionTest, createDescriptorOptionValid) { EXPECT_EQ("v4.example.com", opstr->getValue()); // Next we'll try a standard V6 option. - space = "dhcp6"; + space = DHCP6_OPTION_SPACE; std::vector fqdn = { 2, 'v', '6', 7, 'e', 'x', 'a', 'm', 'p', 'l', 'e', 3, 'c', 'o', 'm', 0 }; option.reset(new Option(Option::V6, D6O_AFTR_NAME)); diff --git a/src/lib/yang/adaptor_option.cc b/src/lib/yang/adaptor_option.cc index 8205ba6ce0..e12109b112 100644 --- a/src/lib/yang/adaptor_option.cc +++ b/src/lib/yang/adaptor_option.cc @@ -77,7 +77,7 @@ AdaptorOption::setCode(ElementPtr option, const OptionCodes& codes) { void AdaptorOption::initCodes(OptionCodes& codes, const string& space) { - if (space == "dhcp4") { + if (space == DHCP4_OPTION_SPACE) { initCodesInternal(codes, space, STANDARD_V4_OPTION_DEFINITIONS, STANDARD_V4_OPTION_DEFINITIONS_SIZE); initCodesInternal(codes, space, LAST_RESORT_V4_OPTION_DEFINITIONS, @@ -85,7 +85,7 @@ AdaptorOption::initCodes(OptionCodes& codes, const string& space) { initCodesInternal(codes, "vendor-4491", DOCSIS3_V4_OPTION_DEFINITIONS, DOCSIS3_V4_OPTION_DEFINITIONS_SIZE); - } else if (space == "dhcp6") { + } else if (space == DHCP6_OPTION_SPACE) { initCodesInternal(codes, space, STANDARD_V6_OPTION_DEFINITIONS, STANDARD_V6_OPTION_DEFINITIONS_SIZE); initCodesInternal(codes, "vendor-4491", diff --git a/src/lib/yang/tests/adaptor_option_unittests.cc b/src/lib/yang/tests/adaptor_option_unittests.cc index 39831c3ef1..51c9b80b63 100644 --- a/src/lib/yang/tests/adaptor_option_unittests.cc +++ b/src/lib/yang/tests/adaptor_option_unittests.cc @@ -193,7 +193,7 @@ TEST(AdaptorOptionTest, initCodesInternal) { const size_t DEFS_SIZE = sizeof(DEFS) / sizeof(DEFS[0]); OptionCodes codes; ASSERT_NO_THROW(TestAdaptorOption::initCodesInternal(codes, - "dhcp4", + DHCP4_OPTION_SPACE, DEFS, DEFS_SIZE)); ASSERT_EQ(2, codes.size()); -- GitLab From be9c2d6b17deeda4a4db02193e63f51b15cae8b7 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Tue, 4 Aug 2020 13:04:42 +0200 Subject: [PATCH 2/2] [#1007] Addressed comments --- src/lib/dhcpsrv/parsers/simple_parser4.cc | 4 ++-- src/lib/dhcpsrv/parsers/simple_parser6.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/dhcpsrv/parsers/simple_parser4.cc b/src/lib/dhcpsrv/parsers/simple_parser4.cc index d4e9b0cece..9a3efa6c55 100644 --- a/src/lib/dhcpsrv/parsers/simple_parser4.cc +++ b/src/lib/dhcpsrv/parsers/simple_parser4.cc @@ -146,7 +146,7 @@ const SimpleKeywords SimpleParser4::OPTION4_DEF_PARAMETERS = { /// definitions. This array lists default values for those option definitions. const SimpleDefaults SimpleParser4::OPTION4_DEF_DEFAULTS = { { "record-types", Element::string, ""}, - { "space", Element::string, "dhcp4"}, + { "space", Element::string, "dhcp4"}, // DHCP4_OPTION_SPACE { "array", Element::boolean, "false"}, { "encapsulate", Element::string, "" } }; @@ -174,7 +174,7 @@ const SimpleKeywords SimpleParser4::OPTION4_PARAMETERS = { /// subnet, class or host reservations scopes. This array lists default values /// for those option-data declarations. const SimpleDefaults SimpleParser4::OPTION4_DEFAULTS = { - { "space", Element::string, "dhcp4"}, + { "space", Element::string, "dhcp4"}, // DHCP4_OPTION_SPACE { "csv-format", Element::boolean, "true"}, { "always-send", Element::boolean, "false"} }; diff --git a/src/lib/dhcpsrv/parsers/simple_parser6.cc b/src/lib/dhcpsrv/parsers/simple_parser6.cc index f61fa3f964..d9be96128f 100644 --- a/src/lib/dhcpsrv/parsers/simple_parser6.cc +++ b/src/lib/dhcpsrv/parsers/simple_parser6.cc @@ -142,7 +142,7 @@ const SimpleKeywords SimpleParser6::OPTION6_DEF_PARAMETERS = { /// definitions. This array lists default values for those option definitions. const SimpleDefaults SimpleParser6::OPTION6_DEF_DEFAULTS = { { "record-types", Element::string, ""}, - { "space", Element::string, "dhcp6"}, + { "space", Element::string, "dhcp6"}, // DHCP6_OPTION_SPACE { "array", Element::boolean, "false"}, { "encapsulate", Element::string, "" } }; @@ -170,7 +170,7 @@ const SimpleKeywords SimpleParser6::OPTION6_PARAMETERS = { /// subnet, class or host reservations scopes. This array lists default values /// for those option-data declarations. const SimpleDefaults SimpleParser6::OPTION6_DEFAULTS = { - { "space", Element::string, "dhcp6"}, + { "space", Element::string, "dhcp6"}, // DHCP6_OPTION_SPACE { "csv-format", Element::boolean, "true"}, { "always-send", Element::boolean, "false"} }; -- GitLab