From 99e318e9c0de4e04633dc34d491f4f4f818519c3 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Sat, 2 Mar 2019 01:04:14 +0100 Subject: [PATCH] [492-cb-subnet-merge-vs-duplicate-subnet-prefixes] Added test --- src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc b/src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc index 9a1fef2f31..a491036fac 100644 --- a/src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc +++ b/src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc @@ -269,8 +269,8 @@ TEST(CfgSubnets4Test, mergeSubnets) { SubnetID(4), 100, shared_network2)); // Fill cfg_from configuration with subnets. - // subnet 1b updates subnet 1 but leaves it in network 1 - Subnet4Ptr subnet1b(new Subnet4(IOAddress("192.0.1.0"), + // subnet 1b updates subnet 1 but leaves it in network 1 with the same ID. + Subnet4Ptr subnet1b(new Subnet4(IOAddress("192.0.10.0"), 26, 2, 3, 400, SubnetID(1))); subnet1b->setSharedNetworkName("shared-network1"); @@ -280,9 +280,8 @@ TEST(CfgSubnets4Test, mergeSubnets) { option->setData(value.begin(), value.end()); ASSERT_NO_THROW(subnet1b->getCfgOption()->add(option, false, "isc")); - // subnet 3b updates subnet 3 and removes it from network 2 Subnet4Ptr subnet3b(new Subnet4(IOAddress("192.0.3.0"), - 26, 3, 4, 500, SubnetID(3))); + 26, 3, 4, 500, SubnetID(30))); // Now Add generic option 1 to subnet 3b. value = "Team!"; -- 2.47.2