[659-how-configure-client-class-for-pools-in-db] Added tests

diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
index 17acec5c1cd6300ac97319b70575675293029799..7eb155c1ac94eece4656853ca874b0623fee07d9 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
+++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
@@ -992,13 +992,13 @@ public:
                     }
                 }
 
-                // pool user_context (9)
+                // pd pool user_context (9)
                 ElementPtr user_context = out_bindings[9]->getJSON();
                 if (user_context) {
                     last_pd_pool->setContext(user_context);
                 }
 
-                // pd pool user_context (10)
+                // pd pool modification_ts (10)
 
                 pd_pools.push_back(last_pd_pool);
                 pd_pool_ids.push_back(last_pd_pool_id);

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 8631eeca6b1aab2dd37ee9be79cd9e5d262ad766..ff1c059fcc0db98e68aba2602adb63d751433f8c 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc
+++ b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc
@@ -208,6 +208,14 @@ public:
                                    test_options_[4]->space_name_);
 
         pool2.reset(new Pool4(IOAddress("10.0.0.50"), IOAddress("10.0.0.60")));
+
+        pool2->allowClientClass("work");
+        pool2->requireClientClass("required-class3");
+        pool2->requireClientClass("required-class4");
+        user_context = Element::createMap();
+        user_context->set("bar", Element::create("foo"));
+        pool2->setContext(user_context);
+
         subnet->addPool(pool2);
 
         test_subnets_.push_back(subnet);

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 b49f7520e43d9ca46c3e656e750094d4d1228dc3..13ade5d5de5a351b1eca6818d3915d4f4b50c039 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc
+++ b/src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc
@@ -222,8 +222,15 @@ public:
                               IOAddress("2001:db8:1::60")));
         subnet->addPool(pool2);
 
-        pdpool1.reset(new Pool6(Lease::TYPE_PD,
-                                IOAddress("2001:db8:c::"), 48, 64));
+        pool2->allowClientClass("work");
+        pool2->requireClientClass("required-class3");
+        pool2->requireClientClass("required-class4");
+        user_context = Element::createMap();
+        user_context->set("bar", Element::create("foo"));
+        pool2->setContext(user_context);
+
+        pdpool1.reset(new Pool6(IOAddress("2001:db8:c::"), 48, 64,
+                                IOAddress("2001:db8:c::1"), 96));
         subnet->addPool(pdpool1);
 
         pdpool1->getCfgOption()->add(test_options_[3]->option_,
@@ -238,6 +245,13 @@ public:
                                 IOAddress("2001:db8:d::"), 48, 64));
         subnet->addPool(pdpool2);
 
+        pdpool2->allowClientClass("work");
+        pdpool2->requireClientClass("required-class3");
+        pdpool2->requireClientClass("required-class4");
+        user_context = Element::createMap();
+        user_context->set("bar", Element::create("foo"));
+        pdpool2->setContext(user_context);
+
         test_subnets_.push_back(subnet);
 
         subnet.reset(new Subnet6(IOAddress("2001:db8:3::"),