From: Francis Dupont <fdupont@isc.org>
Date: Wed, 19 Jun 2019 07:16:20 +0000 (+0200)
Subject: [567-remove-lease-t1_-and-t2_-members] Last var/kea cleanups
X-Git-Tag: Kea-1.6.0-beta2~268
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86900123a836c3e7b9e432855c2214e4ef15cf4b;p=thirdparty%2Fkea.git

[567-remove-lease-t1_-and-t2_-members] Last var/kea cleanups
---

diff --git a/src/bin/dhcp4/tests/kea_controller_unittest.cc b/src/bin/dhcp4/tests/kea_controller_unittest.cc
index dec6e7cd55..724af35212 100644
--- a/src/bin/dhcp4/tests/kea_controller_unittest.cc
+++ b/src/bin/dhcp4/tests/kea_controller_unittest.cc
@@ -688,7 +688,7 @@ TEST_F(JSONFileBackendTest, configBroken) {
 ///
 /// @todo: Unfortunately, we have this test disabled, because all loaded
 /// configs use memfile, which attempts to create lease file in
-/// /usr/local/var/kea/kea-leases4.csv. We have couple options here:
+/// /usr/local/var/lib/kea/kea-leases4.csv. We have couple options here:
 /// a) disable persistence in example configs - a very bad thing to do
 ///    as users will forget to reenable it and then will be surprised when their
 ///    leases disappear
diff --git a/src/lib/database/tests/dbaccess_parser_unittest.cc b/src/lib/database/tests/dbaccess_parser_unittest.cc
index 260032b4f9..d524b15bec 100644
--- a/src/lib/database/tests/dbaccess_parser_unittest.cc
+++ b/src/lib/database/tests/dbaccess_parser_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2019 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -269,7 +269,7 @@ TEST_F(DbAccessParserTest, emptyKeyword) {
 TEST_F(DbAccessParserTest, persistV4Memfile) {
     const char* config[] = {"type", "memfile",
                             "persist", "true",
-                            "name", "/opt/kea/var/kea-leases4.csv",
+                            "name", "/opt/var/lib/kea/kea-leases4.csv",
                             NULL};
 
     string json_config = toJson(config);
@@ -288,7 +288,7 @@ TEST_F(DbAccessParserTest, persistV4Memfile) {
 TEST_F(DbAccessParserTest, persistV6Memfile) {
     const char* config[] = {"type", "memfile",
                             "persist", "true",
-                            "name", "/opt/kea/var/kea-leases6.csv",
+                            "name", "/opt/var/lib/kea/kea-leases6.csv",
                             NULL};
 
     string json_config = toJson(config);
@@ -306,7 +306,7 @@ TEST_F(DbAccessParserTest, persistV6Memfile) {
 // lfc-interval parameter.
 TEST_F(DbAccessParserTest, validLFCInterval) {
     const char* config[] = {"type", "memfile",
-                            "name", "/opt/kea/var/kea-leases6.csv",
+                            "name", "/opt/var/lib/kea/kea-leases6.csv",
                             "lfc-interval", "3600",
                             NULL};
 
@@ -324,7 +324,7 @@ TEST_F(DbAccessParserTest, validLFCInterval) {
 // lfc-interval parameter.
 TEST_F(DbAccessParserTest, negativeLFCInterval) {
     const char* config[] = {"type", "memfile",
-                            "name", "/opt/kea/var/kea-leases6.csv",
+                            "name", "/opt/var/lib/kea/kea-leases6.csv",
                             "lfc-interval", "-1",
                             NULL};
 
@@ -340,7 +340,7 @@ TEST_F(DbAccessParserTest, negativeLFCInterval) {
 // the max uint32_t) value of the lfc-interval parameter.
 TEST_F(DbAccessParserTest, largeLFCInterval) {
     const char* config[] = {"type", "memfile",
-                            "name", "/opt/kea/var/kea-leases6.csv",
+                            "name", "/opt/var/lib/kea/kea-leases6.csv",
                             "lfc-interval", "4294967296",
                             NULL};
 
@@ -356,7 +356,7 @@ TEST_F(DbAccessParserTest, largeLFCInterval) {
 // timeout parameter.
 TEST_F(DbAccessParserTest, validTimeout) {
     const char* config[] = {"type", "memfile",
-                            "name", "/opt/kea/var/kea-leases6.csv",
+                            "name", "/opt/var/lib/kea/kea-leases6.csv",
                             "connect-timeout", "3600",
                             NULL};
 
@@ -374,7 +374,7 @@ TEST_F(DbAccessParserTest, validTimeout) {
 // timeout parameter.
 TEST_F(DbAccessParserTest, negativeTimeout) {
     const char* config[] = {"type", "memfile",
-                            "name", "/opt/kea/var/kea-leases6.csv",
+                            "name", "/opt/var/lib/kea/kea-leases6.csv",
                             "connect-timeout", "-1",
                             NULL};
 
@@ -390,7 +390,7 @@ TEST_F(DbAccessParserTest, negativeTimeout) {
 // the max uint32_t) value of the timeout parameter.
 TEST_F(DbAccessParserTest, largeTimeout) {
     const char* config[] = {"type", "memfile",
-                            "name", "/opt/kea/var/kea-leases6.csv",
+                            "name", "/opt/var/lib/kea/kea-leases6.csv",
                             "connect-timeout", "4294967296",
                             NULL};
 
@@ -406,7 +406,7 @@ TEST_F(DbAccessParserTest, largeTimeout) {
 // port parameter.
 TEST_F(DbAccessParserTest, validPort) {
     const char* config[] = {"type", "memfile",
-                            "name", "/opt/kea/var/kea-leases6.csv",
+                            "name", "/opt/var/lib/kea/kea-leases6.csv",
                             "port", "3306",
                             NULL};
 
@@ -424,7 +424,7 @@ TEST_F(DbAccessParserTest, validPort) {
 // port parameter.
 TEST_F(DbAccessParserTest, negativePort) {
     const char* config[] = {"type", "memfile",
-                            "name", "/opt/kea/var/kea-leases6.csv",
+                            "name", "/opt/var/lib/kea/kea-leases6.csv",
                             "port", "-1",
                             NULL};
 
@@ -440,7 +440,7 @@ TEST_F(DbAccessParserTest, negativePort) {
 // the max uint16_t) value of the timeout parameter.
 TEST_F(DbAccessParserTest, largePort) {
     const char* config[] = {"type", "memfile",
-                            "name", "/opt/kea/var/kea-leases6.csv",
+                            "name", "/opt/var/lib/kea/kea-leases6.csv",
                             "port", "65536",
                             NULL};