GitLab

src/lib/dhcpsrv/alloc_engine.h
src/lib/dhcpsrv/alloc_engine.cc
    allocateLeases6()
        - removed find_reservation parameter from allocateLeases6
        - removed logic that called findReservation(), this eliminates
        inadvertanly stomping an already populated host in the context.
        Places burden of doing the reservation lookup always on the caller.

src/bin/dhcp6/dhcp6_srv.cc
    removed obsolete boolean parameter from allocateLeases6 calls

src/lib/dhcpsrv/tests/alloc_engine_utils.h
src/lib/dhcpsrv/tests/alloc_engine_utils.cc
   AllocEngine6Test::findReservation() - new method which calls
   engine's findReservation() and fills in context hostname accordingly.

src/lib/dhcpsrv/tests/alloc_engine6_unittest.cc
    added calls to AlloceEnginetTest::findReservation where needed

src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
    added tests:
    TEST_F(Dhcpv6SrvTest, hostReservationWithHostName)
    TEST_F(Dhcpv6SrvTest, hostReservationWithoutHostName)

src/bin/dhcp6/tests/dhcp6_test_utils.h
src/bin/dhcp6/tests/dhcp6_test_utils.cc
    Dhcpv6SrvTest::createHost6() - this method was moved
    here from FqdnDhcpv6SrvTest()

src/bin/dhcp6/tests/fqdn_unittest.cc
    added tests:
    TEST_F(FqdnDhcpv6SrvTest, hostnameReservationSuffix)
    TEST_F(FqdnDhcpv6SrvTest, hostnameReservationNoSuffix)
    TEST_F(FqdnDhcpv6SrvTest, hostnameReservationDdnsDisabled)

src/bin/dhcp6/dhcp6_srv.h
src/bin/dhcp6/dhcp6_srv.cc

replaced parameters subnet and duid with a single paramter for context in
several methods:
    assignIA_NA()
    assignIA_PD()
    extendIA_NA()
    extendIA_PD()
    extendLeases()

appendRequestedVendorOptions() - added context parameter, removed
redundant call to selectSubnet

processClientFqdn() -
    Now sets the hostname value in the context in addition to processing FQDN.
    This centralizes the logic to handle both, since they are tightly coupled
    and can be influenced by a host reservation.

    Note that when the host name from the reservation is being used in place
    of the client FQDN, the qualyfing suffix is always appended to the hostname.
    This is consistent with the DHCPv4 behavior.

src/lib/dhcpsrv/alloc_engine.cc
    AllocEngine::allocateLeases6() - now only sets context host name
    if findReservation() is called.  This was stomping on the value
    already in the context.

Conflicts:
	src/lib/dhcpsrv/alloc_engine.cc
	src/lib/dhcpsrv/alloc_engine.h
	src/lib/dhcpsrv/tests/alloc_engine4_unittest.cc

Pulling new changes into my branch to commit typo level fixes

The .xml file is not a generated file.

problem was noticed by wlodek (and reproduced by me):

  make[4]: Entering directory
  `/home/wlodek/dev/ktest/src/bin/keactrl'

  /home/wlodek/dev/kea_test/tools/path_replacer.sh
  /home/wlodek/dev/kea_test/src/bin/keactrl/kea.conf.pre kea.conf

  /bin/bash: /home/wlodek/dev/kea_test/tools/path_replacer.sh: No
  such file or directory

This prevents failure of the CondVar unit tests which expect that the
pthread_cond_destroy returns error code if the other thread is blocked
on the conditional variable which is being destroyed.