fixed merge

src/lib/dhcpsrv/alloc_engine.h

@@ -143,6 +143,7 @@ class AllocEngine : public boost::noncopyable {
 
         virtual isc::asiolink::IOAddress
             pickAddressInternal(const SubnetPtr& subnet,
+                                const ClientClasses& client_classes,
                                 const DuidPtr& duid,
                                 const isc::asiolink::IOAddress& hint,
                                 uint8_t psid_offset,
@@ -174,7 +175,8 @@ class AllocEngine : public boost::noncopyable {
         /// @return result address or prefix
         static isc::asiolink::IOAddress
         increaseAddress(const isc::asiolink::IOAddress& address,
-                        bool prefix, const uint8_t prefix_len);
+                        bool prefix, const uint8_t prefix_len,
+                        uint8_t psid_offset = 0, uint8_t psid_len = 0);
 
     };
 

src/lib/dhcpsrv/cql_lease_mgr.cc

@@ -537,7 +537,7 @@ CqlLease4Exchange::createBindForDelete(const IOAddress &address, AnyArray &data,
 
     try {
         // address: bigint
-        address_ = lease_->addr_.addressPlusPortToUint64();
+        address_ = address.addressPlusPortToUint64();
 
         // Start with a fresh array.
         data.clear();

src/lib/dhcpsrv/tests/cql_lease_mgr_unittest.cc

@@ -85,24 +85,6 @@ class CqlLeaseMgrTest : public GenericLeaseMgrTest {
         initializeTest();
     }
 
-    /// @brief Destroys the LM and the schema.
-    void destroyTest() {
-        try {
-            lmptr_->rollback();
-        } catch (...) {
-            // Rollback may fail if backend is in read only mode. That's ok.
-        }
-        LeaseMgrFactory::destroy();
-        destroyCqlSchema(false, true);
-    }
-
-    /// @brief Constructor
-    ///
-    /// Deletes everything from the database and opens it.
-    CqlLeaseMgrTest() {
-        initializeTest();
-    }
-
     /// @brief Destructor
     ///
     /// Rolls back all pending transactions. The deletion of lmptr_ will close