fixed merge

src/bin/dhcp4/dhcp4_parser.yy

@@ -88,7 +88,6 @@ using namespace std;
   CONTACT_POINTS "contact-points"
   KEYSPACE "keyspace"
   MAX_RECONNECT_TRIES "max-reconnect-tries"
-  RECONNECT_WAIT_TIME "reconnect-wait-time"
 
   VALID_LIFETIME "valid-lifetime"
   RENEW_TIMER "renew-timer"
@@ -593,7 +592,6 @@ database_map_param: database_type
                   | tcp_keepalive
                   | contact_points
                   | max_reconnect_tries
-                  | reconnect_wait_time
                   | keyspace
                   | unknown_map_entry
                   ;
@@ -704,6 +702,11 @@ keyspace: KEYSPACE {
     ctx.leave();
 };
 
+max_reconnect_tries: MAX_RECONNECT_TRIES COLON INTEGER {
+    ElementPtr n(new IntElement($3, ctx.loc2pos(@3)));
+    ctx.stack_.back()->set("max-reconnect-tries", n);
+};
+
 host_reservation_identifiers: HOST_RESERVATION_IDENTIFIERS {
     ElementPtr l(new ListElement(ctx.loc2pos(@1)));
     ctx.stack_.back()->set("host-reservation-identifiers", l);

src/bin/dhcp6/dhcp6_parser.yy

@@ -74,9 +74,8 @@ using namespace std;
   REQUEST_TIMEOUT "request-timeout"
   TCP_KEEPALIVE "tcp-keepalive"
   CONTACT_POINTS "contact-points"
-  MAX_RECONNECT_TRIES "max-reconnect-tries"
-  RECONNECT_WAIT_TIME "reconnect-wait-time"
   KEYSPACE "keyspace"
+  MAX_RECONNECT_TRIES "max-reconnect-tries"
 
   PREFERRED_LIFETIME "preferred-lifetime"
   VALID_LIFETIME "valid-lifetime"
@@ -563,7 +562,6 @@ database_map_param: database_type
                   | tcp_keepalive
                   | contact_points
                   | max_reconnect_tries
-                  | reconnect_wait_time
                   | keyspace
                   | unknown_map_entry
                   ;
@@ -666,16 +664,6 @@ contact_points: CONTACT_POINTS {
     ctx.leave();
 };
 
-max_reconnect_tries: MAX_RECONNECT_TRIES COLON INTEGER {
-    ElementPtr n(new IntElement($3, ctx.loc2pos(@3)));
-    ctx.stack_.back()->set("max-reconnect-tries", n);
-};
-
-reconnect_wait_time: RECONNECT_WAIT_TIME COLON INTEGER {
-    ElementPtr n(new IntElement($3, ctx.loc2pos(@3)));
-    ctx.stack_.back()->set("reconnect-wait-time", n);
-};
-
 keyspace: KEYSPACE {
     ctx.enter(ctx.NO_KEYWORD);
 } COLON STRING {
@@ -684,6 +672,10 @@ keyspace: KEYSPACE {
     ctx.leave();
 };
 
+max_reconnect_tries: MAX_RECONNECT_TRIES COLON INTEGER {
+    ElementPtr n(new IntElement($3, ctx.loc2pos(@3)));
+    ctx.stack_.back()->set("max-reconnect-tries", n);
+};
 
 mac_sources: MAC_SOURCES {
     ElementPtr l(new ListElement(ctx.loc2pos(@1)));

src/lib/dhcpsrv/cql_host_data_source.cc

@@ -1165,7 +1165,25 @@ CqlHostExchange::retrieve() {
     HostPtr host(new Host(host_identifier.data(), host_identifier.size(),
                           host_identifier_type, ipv4_subnet_id, ipv6_subnet_id,
                           ipv4_reservation, hostname_,
-                          host_ipv4_client_classes_, host_ipv6_client_classes_));
+                          host_ipv4_client_classes_, host_ipv6_client_classes_,
+                          static_cast<uint32_t>(host_ipv4_next_server_),
+                          host_ipv4_server_hostname_, host_ipv4_boot_file_name_));
+
+    // Set the user context if there is one.
+    if (!user_context_.empty()) {
+        try {
+            ConstElementPtr ctx = Element::fromJSON(user_context_);
+            if (!ctx || (ctx->getType() != Element::map)) {
+                isc_throw(BadValue, "user context '" << user_context_
+                          << "' is not a JSON map");
+            }
+            host->setContext(ctx);
+        } catch (const isc::data::JSONError& ex) {
+            isc_throw(BadValue, "user context '" << user_context_
+                      << "' is invalid JSON: " << ex.what());
+        }
+    }
+
     host->setHostId(id);
 
     const IPv6Resrv reservation = retrieveReservation();

src/lib/dhcpsrv/mysql_lease_mgr.cc

@@ -663,36 +663,29 @@ class MySqlLease4Exchange : public MySqlLeaseExchange {
     // Note: All array lengths are equal to the corresponding variable in the
     //       schema.
     // Note: Arrays are declared fixed length for speed of creation
-    uint32_t        addr4_;             ///< IPv4 address
-    MYSQL_BIND      bind_[LEASE_COLUMNS]; ///< Bind array
-    std::string     columns_[LEASE_COLUMNS]; ///< Column names
-    my_bool         error_[LEASE_COLUMNS]; ///< Error array
-    std::vector<uint8_t> hwaddr_;       ///< Hardware address
-    uint8_t         hwaddr_buffer_[HWAddr::MAX_HWADDR_LEN];
-                                        ///< Hardware address buffer
-    unsigned long   hwaddr_length_;     ///< Hardware address length
-    std::vector<uint8_t> client_id_;    ///< Client identification
-    uint8_t         client_id_buffer_[ClientId::MAX_CLIENT_ID_LEN];
-                                        ///< Client ID buffer
-    unsigned long   client_id_length_;  ///< Client ID address length
-    my_bool         client_id_null_;    ///< Is Client ID null?
-
-    MYSQL_TIME      expire_;            ///< Lease expiry time
-    Lease4Ptr       lease_;             ///< Pointer to lease object
-    uint32_t        subnet_id_;         ///< Subnet identification
-    uint32_t        valid_lifetime_;    ///< Lease time
-
-    my_bool         fqdn_fwd_;          ///< Has forward DNS update been
-                                        ///< performed
-    my_bool         fqdn_rev_;          ///< Has reverse DNS update been
-                                        ///< performed
-    char            hostname_buffer_[HOSTNAME_MAX_LEN];
-                                        ///< Client hostname
-    unsigned long   hostname_length_;   ///< Client hostname length
-    uint32_t        state_;             ///< Lease state
+    uint32_t               addr4_;                     ///< IPv4 address
+    MYSQL_BIND             bind_[LEASE_COLUMNS];       ///< Bind array
+    std::string            columns_[LEASE_COLUMNS];    ///< Column names
+    my_bool                error_[LEASE_COLUMNS];      ///< Error array
+    std::vector<uint8_t>   hwaddr_;                    ///< Hardware address
+    uint8_t                hwaddr_buffer_[HWAddr::MAX_HWADDR_LEN]; ///< Hardware address buffer
+    unsigned long          hwaddr_length_;             ///< Hardware address length
+    my_bool                hwaddr_null_;               ///< Used when HWAddr is null
+    std::vector<uint8_t>   client_id_;                 ///< Client identification
+    uint8_t                client_id_buffer_[ClientId::MAX_CLIENT_ID_LEN]; ///< Client ID buffer
+    unsigned long          client_id_length_;          ///< Client ID address length
+    my_bool                client_id_null_;            ///< Is Client ID null?
+    MYSQL_TIME             expire_;                    ///< Lease expiry time
+    Lease4Ptr              lease_;                     ///< Pointer to lease object
+    uint32_t               subnet_id_;                 ///< Subnet identification
+    uint32_t               valid_lifetime_;            ///< Lease time
+    my_bool                fqdn_fwd_;                  ///< Has forward DNS update been performed
+    my_bool                fqdn_rev_;                  ///< Has reverse DNS update been performed
+    char                   hostname_buffer_[HOSTNAME_MAX_LEN]; ///< Client hostname
+    unsigned long          hostname_length_;           ///< Client hostname length
+    uint32_t               state_;                     ///< Lease state
 };
 
-
 /// @brief Exchange MySQL and Lease6 Data
 ///
 /// On any MySQL operation, arrays of MYSQL_BIND structures must be built to
@@ -1212,39 +1205,35 @@ class MySqlLease6Exchange : public MySqlLeaseExchange {
     // Note: All array lengths are equal to the corresponding variable in the
     // schema.
     // Note: arrays are declared fixed length for speed of creation
-    std::string     addr6_;             ///< String form of address
-    char            addr6_buffer_[ADDRESS6_TEXT_MAX_LEN + 1]; ///< Character
-                                        ///< array form of V6 address
-    unsigned long   addr6_length_;      ///< Length of the address
-    MYSQL_BIND      bind_[LEASE_COLUMNS]; ///< Bind array
-    std::string     columns_[LEASE_COLUMNS]; ///< Column names
-    std::vector<uint8_t> duid_;         ///< Client identification
-    uint8_t         duid_buffer_[DUID::MAX_DUID_LEN]; ///< Buffer form of DUID
-    unsigned long   duid_length_;       ///< Length of the DUID
-    my_bool         error_[LEASE_COLUMNS]; ///< Error indicators
-    MYSQL_TIME      expire_;            ///< Lease expiry time
-    uint32_t        iaid_;              ///< Identity association ID
-    Lease6Ptr       lease_;             ///< Pointer to lease object
-    uint8_t         lease_type_;        ///< Lease type
-    uint8_t         prefixlen_;         ///< Prefix length
-    uint32_t        pref_lifetime_;     ///< Preferred lifetime
-    uint32_t        subnet_id_;         ///< Subnet identification
-    uint32_t        valid_lifetime_;    ///< Lease time
-    my_bool         fqdn_fwd_;          ///< Has forward DNS update been
-                                        ///< performed
-    my_bool         fqdn_rev_;          ///< Has reverse DNS update been
-                                        ///< performed
-    char            hostname_buffer_[HOSTNAME_MAX_LEN];
-                                        ///< Client hostname
-    unsigned long   hostname_length_;   ///< Client hostname length
-    uint8_t         hwaddr_buffer_[HWAddr::MAX_HWADDR_LEN];
-                                        ///< Buffer for Hardware address
-    std::vector<uint8_t> hwaddr_;       ///< Hardware address (optional)
-    unsigned long   hwaddr_length_;     ///< Aux. variable denoting hwaddr_ size()
-    my_bool         hwaddr_null_;       ///< Used when HWAddr is null
-    uint16_t        hwtype_;            ///< Hardware type
-    uint32_t        hwaddr_source_;     ///< Source of the hardware address
-    uint32_t        state_;             ///< Lease state.
+    std::string            addr6_;                     ///< String form of address
+    char                   addr6_buffer_[ADDRESS6_TEXT_MAX_LEN + 1]; ///< Character
+                                                       ///< array form of V6 address
+    unsigned long          addr6_length_;              ///< Length of the address
+    MYSQL_BIND             bind_[LEASE_COLUMNS];       ///< Bind array
+    std::string            columns_[LEASE_COLUMNS];    ///< Column names
+    std::vector<uint8_t>   duid_;                      ///< Client identification
+    uint8_t                duid_buffer_[DUID::MAX_DUID_LEN]; ///< Buffer form of DUID
+    unsigned long          duid_length_;               ///< Length of the DUID
+    my_bool                error_[LEASE_COLUMNS];      ///< Error indicators
+    MYSQL_TIME             expire_;                    ///< Lease expiry time
+    uint32_t               iaid_;                      ///< Identity association ID
+    Lease6Ptr              lease_;                     ///< Pointer to lease object
+    uint8_t                lease_type_;                ///< Lease type
+    uint8_t                prefixlen_;                 ///< Prefix length
+    uint32_t               pref_lifetime_;             ///< Preferred lifetime
+    uint32_t               subnet_id_;                 ///< Subnet identification
+    uint32_t               valid_lifetime_;            ///< Lease time
+    my_bool                fqdn_fwd_;                  ///< Has forward DNS update been performed
+    my_bool                fqdn_rev_;                  ///< Has reverse DNS update been performed
+    char                   hostname_buffer_[HOSTNAME_MAX_LEN]; ///< Client hostname
+    unsigned long          hostname_length_;           ///< Client hostname length
+    uint8_t                hwaddr_buffer_[HWAddr::MAX_HWADDR_LEN]; ///< Buffer form of Hardware address
+    std::vector<uint8_t>   hwaddr_;                    ///< Hardware address (optional)
+    unsigned long          hwaddr_length_;             ///< Aux. variable denoting hwaddr_ size()
+    my_bool                hwaddr_null_;               ///< Used when HWAddr is null
+    uint16_t               hwtype_;                    ///< Hardware type
+    uint32_t               hwaddr_source_;             ///< Source of the hardware address
+    uint32_t               state_;                     ///< Lease state.
 };
 
 /// @brief MySql derivation of the statistical lease data query

src/lib/dhcpsrv/pgsql_lease_mgr.cc

@@ -174,6 +174,7 @@ PgSqlTaggedStatement tagged_statements[] = {
         "extract(epoch from expire)::bigint, subnet_id, pref_lifetime, "
         "lease_type, iaid, prefix_len, "
         "fqdn_fwd, fqdn_rev, hostname, "
+        "hwaddr, hwtype, hwaddr_source, "
         "state "
       "FROM lease6 "
       "WHERE state != $1 AND expire < $2 "
@@ -202,8 +203,9 @@ PgSqlTaggedStatement tagged_statements[] = {
       "INSERT INTO lease6(address, duid, valid_lifetime, "
         "expire, subnet_id, pref_lifetime, "
         "lease_type, iaid, prefix_len, fqdn_fwd, fqdn_rev, hostname, "
+        "hwaddr, hwtype, hwaddr_source, "
         "state) "
-      "VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)"},
+      "VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16)"},
 
     // UPDATE_LEASE4
     { 11, { OID_INT8, OID_BYTEA, OID_BYTEA, OID_INT8, OID_TIMESTAMP, OID_INT8,

src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc

@@ -1080,6 +1080,7 @@ GenericLeaseMgrTest::testGetLease4HWAddrSubnetId() {
     EXPECT_THROW(returned = lmptr_->getLease4(*leases[1]->hwaddr_,
                                               leases[1]->subnet_id_),
                  isc::dhcp::MultipleRecords);
+
 }
 
 void

src/lib/dhcpsrv/tests/mysql_lease_mgr_unittest.cc

@@ -506,11 +506,6 @@ TEST_F(MySqlLeaseMgrTest, deleteExpiredReclaimedLeases6) {
     testDeleteExpiredReclaimedLeases6();
 }
 
-/// @brief Check that expired reclaimed DHCPv4 leases are removed.
-TEST_F(MySqlLeaseMgrTest, deleteExpiredReclaimedLeases4) {
-    testDeleteExpiredReclaimedLeases4();
-}
-
 /// @brief Verifies that IPv4 lease statistics can be recalculated.
 TEST_F(MySqlLeaseMgrTest, recountLeaseStats4) {
     testRecountLeaseStats4();

src/lib/dhcpsrv/tests/pgsql_lease_mgr_unittest.cc

@@ -494,6 +494,11 @@ TEST_F(PgSqlLeaseMgrTest, getExpiredLeases6) {
     testGetExpiredLeases6();
 }
 
+/// @brief Check that expired reclaimed DHCPv6 leases are removed.
+TEST_F(PgSqlLeaseMgrTest, deleteExpiredReclaimedLeases6) {
+    testDeleteExpiredReclaimedLeases6();
+}
+
 /// @brief Verifies that IPv4 lease statistics can be recalculated.
 TEST_F(PgSqlLeaseMgrTest, recountLeaseStats4) {
     testRecountLeaseStats4();