From 326fdbeb51dc1f6eebbdbbdcce78cfac87a61bd9 Mon Sep 17 00:00:00 2001 From: Marcin Siodelski Date: Tue, 9 Jul 2019 00:10:38 +0200 Subject: [PATCH] [#710,!408] Fixed invalid tabulations in test config backends impl. --- .../testutils/test_config_backend_dhcp4.cc | 14 +++++----- .../testutils/test_config_backend_dhcp6.cc | 26 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.cc b/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.cc index f91796ea86..cf24885a59 100644 --- a/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.cc +++ b/src/lib/dhcpsrv/testutils/test_config_backend_dhcp4.cc @@ -562,29 +562,29 @@ TestConfigBackendDHCPv4::createUpdateOption4(const db::ServerSelector& server_se auto tags = server_selector.getTags(); auto not_in_tags = false; for (auto subnet : subnets_) { - // Get the pool: if it is not here we can directly go to the next subnet. + // Get the pool: if it is not here we can directly go to the next subnet. auto pool = subnet->getPool(Lease::TYPE_V4, pool_start_address); if (!pool) { continue; } - // Verify the subnet is in all or one of the given servers. + // Verify the subnet is in all or one of the given servers. if (!subnet->hasAllServerTag()) { - auto in_tags = false; + auto in_tags = false; for (auto tag : tags) { if (subnet->hasServerTag(ServerTag(tag))) { - in_tags = true; + in_tags = true; break; } } if (!in_tags) { - // Records the fact a subnet was found but not in a server. - not_in_tags = true; + // Records the fact a subnet was found but not in a server. + not_in_tags = true; continue; } } - // Update the option. + // Update the option. pool->getCfgOption()->del(option->space_name_, option->option_->getType()); pool->getCfgOption()->add(*option, option->space_name_); diff --git a/src/lib/dhcpsrv/testutils/test_config_backend_dhcp6.cc b/src/lib/dhcpsrv/testutils/test_config_backend_dhcp6.cc index e557f94b1c..7acf85d683 100644 --- a/src/lib/dhcpsrv/testutils/test_config_backend_dhcp6.cc +++ b/src/lib/dhcpsrv/testutils/test_config_backend_dhcp6.cc @@ -561,29 +561,29 @@ TestConfigBackendDHCPv6::createUpdateOption6(const db::ServerSelector& server_se auto tags = server_selector.getTags(); auto not_in_tags = false; for (auto subnet : subnets_) { - // Get the pool: if it is not here we can directly go to the next subnet. + // Get the pool: if it is not here we can directly go to the next subnet. auto pool = subnet->getPool(Lease::TYPE_NA, pool_start_address); if (!pool) { continue; } - // Verify the subnet is in all or one of the given servers. + // Verify the subnet is in all or one of the given servers. if (!subnet->hasAllServerTag()) { - auto in_tags = false; + auto in_tags = false; for (auto tag : tags) { if (subnet->hasServerTag(ServerTag(tag))) { - in_tags = true; + in_tags = true; break; } } if (!in_tags) { - // Records the fact a subnet was found but not in a server. - not_in_tags = true; + // Records the fact a subnet was found but not in a server. + not_in_tags = true; continue; } } - // Update the option. + // Update the option. pool->getCfgOption()->del(option->space_name_, option->option_->getType()); pool->getCfgOption()->add(*option, option->space_name_); @@ -610,15 +610,15 @@ TestConfigBackendDHCPv6::createUpdateOption6(const db::ServerSelector& server_se auto tags = server_selector.getTags(); auto not_in_tags = false; for (auto subnet : subnets_) { - // Get the pd pool: if it is not here we can directly go to the next subnet. + // Get the pd pool: if it is not here we can directly go to the next subnet. auto pdpool = subnet->getPool(Lease::TYPE_PD, pd_pool_prefix); if (!pdpool) { continue; } - // Verify the subnet is in all or one of the given servers. + // Verify the subnet is in all or one of the given servers. if (!subnet->hasAllServerTag()) { - auto in_tags = false; + auto in_tags = false; for (auto tag : tags) { if (subnet->hasServerTag(ServerTag(tag))) { in_tags = true; @@ -626,13 +626,13 @@ TestConfigBackendDHCPv6::createUpdateOption6(const db::ServerSelector& server_se } } if (!in_tags) { - // Records the fact a subnet was found but not in a server. - not_in_tags = true; + // Records the fact a subnet was found but not in a server. + not_in_tags = true; continue; } } - // Update the option. + // Update the option. pdpool->getCfgOption()->del(option->space_name_, option->option_->getType()); pdpool->getCfgOption()->add(*option, option->space_name_); -- 2.47.2