[659-how-configure-client-class-for-pools-in-db] Addressed not doc comments

diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
index 4539b49160b8d000a2780a0900ae075458fbecfb..dc11af75c183e09c61bce4d953d2fb05d077f3e0 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
+++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc
@@ -485,7 +485,7 @@ public:
 
                 // {min,max}_valid_lifetime
 
-                // 3 pool fields
+                // pool client_class, require_client_classes and user_context
 
                 // server_tag at 58
 
@@ -827,6 +827,7 @@ public:
             };
 
             getPools(GET_POOL4_RANGE, in_bindings, pools, pool_ids);
+            // Break if something is found?
         }
 
         if (!pools.empty()) {

diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
index 0650c7f0ffdfeb609915fb1249efdb5a16a31653..ccf661e31f5e0504f827319b2a714afb4a41e739 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
+++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc
@@ -514,7 +514,14 @@ public:
 
                 // 71 and 72 are {min,max}_valid_lifetime
 
-                // 8 pool and pd pool fields
+                // 73 is pool client_class
+                // 74 is pool require_client_classes
+                // 75 is pool user_context
+                // 76 is pd pool excluded_prefix
+                // 77 is pd pool excluded_prefix_length
+                // 78 is pd pool client_class
+                // 79 is pd pool require_client_classes
+                // 80 is pd pool user_context
 
                 // server_tag (81 / last)
 
@@ -1040,6 +1047,7 @@ public:
             };
 
             getPools(GET_POOL6_RANGE, in_bindings, pools, pool_ids);
+            // Break if something is found?
         }
 
         if (!pools.empty()) {
@@ -1075,6 +1083,7 @@ public:
             };
 
             getPdPools(GET_PD_POOL, in_bindings, pd_pools, pd_pool_ids);
+            // Break if something is found?
         }
 
         if (!pd_pools.empty()) {

diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index d2d71c176ad31385ad57e8548d18a133b8f77dcd..0be26fa9fd321693b69fb69ba4d2558e4ff876ad 100644 (file)
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -2476,7 +2476,7 @@ END
 $$
 DELIMITER ;
 
-# add missing fields in pools.
+# Add missing fields in pools.
 ALTER TABLE dhcp4_pool
     ADD COLUMN client_class VARCHAR(128) DEFAULT NULL,
     ADD COLUMN require_client_classes LONGTEXT,

diff --git a/src/share/database/scripts/mysql/upgrade_8.1_to_8.2.sh.in b/src/share/database/scripts/mysql/upgrade_8.1_to_8.2.sh.in
index dbdc5a02da51b5cb40d56a8b0bf5ed2d3224c49c..ef9ba1f2f8e329c94010cfa6d662e06672e1126f 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_8.1_to_8.2.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_8.1_to_8.2.sh.in
@@ -117,7 +117,7 @@ END
 $$
 DELIMITER ;
 
-# add missing fields in pools.
+# Add missing fields in pools.
 ALTER TABLE dhcp4_pool
     ADD COLUMN client_class VARCHAR(128) DEFAULT NULL,
     ADD COLUMN require_client_classes LONGTEXT,