From: Thomas Markwalder <tmark@isc.org>
Date: Tue, 6 Oct 2015 11:25:53 +0000 (-0400)
Subject: [3967] Added lookup of hwaddr_source name to lease6 dump
X-Git-Tag: trac3874_base~25^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52476f730aa58bff6cb2506679cf3eef422a1eeb;p=thirdparty%2Fkea.git

[3967] Added lookup of hwaddr_source name to lease6 dump

src/bin/admin/scripts/mysql/dhcpdb_create.mysql
    lease6DumpData() -  added lookup of lease_hwaddr_source name

src/bin/admin/scripts/mysql/upgrade_3.0_to_4.0.sh.in
    lease6DumpData() -  added lookup of lease_hwaddr_source name

src/bin/admin/tests/data/mysql.lease6_dump_test.reference.csv
    added hwaddr_source names to test reference data

src/bin/admin/tests/mysql_tests.sh.in
    mysql_lease6_dump_test() - changed hwaddr_source test values
---

diff --git a/src/bin/admin/scripts/mysql/dhcpdb_create.mysql b/src/bin/admin/scripts/mysql/dhcpdb_create.mysql
index c30b463ffa..f0cd773507 100644
--- a/src/bin/admin/scripts/mysql/dhcpdb_create.mysql
+++ b/src/bin/admin/scripts/mysql/dhcpdb_create.mysql
@@ -340,11 +340,12 @@ SELECT
     l.hostname,
     IFNULL(HEX(l.hwaddr), ''),
     IFNULL(l.hwtype, ''),
-    IFNULL(l.hwaddr_source, ''),
+    IFNULL(h.name, ''),
     IFNULL(s.name, '')
 FROM lease6 l
     left outer join lease6_types t on (l.lease_type = t.lease_type)
-    left outer join lease_state s on (l.state = s.state);
+    left outer join lease_state s on (l.state = s.state)
+    left outer join lease_hwaddr_source h on (l.hwaddr_source = h.hwaddr_source);
 END $$
 DELIMITER ;
 
diff --git a/src/bin/admin/scripts/mysql/upgrade_3.0_to_4.0.sh.in b/src/bin/admin/scripts/mysql/upgrade_3.0_to_4.0.sh.in
index 6aa40674aa..930b457e2c 100755
--- a/src/bin/admin/scripts/mysql/upgrade_3.0_to_4.0.sh.in
+++ b/src/bin/admin/scripts/mysql/upgrade_3.0_to_4.0.sh.in
@@ -103,11 +103,12 @@ SELECT
     l.hostname,
     IFNULL(HEX(l.hwaddr), ''),
     IFNULL(l.hwtype, ''),
-    IFNULL(l.hwaddr_source, ''),
+    IFNULL(h.name, ''),
     IFNULL(s.name, '')
 FROM lease6 l
     left outer join lease6_types t on (l.lease_type = t.lease_type)
-    left outer join lease_state s on (l.state = s.state);
+    left outer join lease_state s on (l.state = s.state)
+    left outer join lease_hwaddr_source h on (l.hwaddr_source = h.hwaddr_source);
 END $$
 DELIMITER ;
 
diff --git a/src/bin/admin/tests/data/mysql.lease6_dump_test.reference.csv b/src/bin/admin/tests/data/mysql.lease6_dump_test.reference.csv
index 269c2a44d7..3d530d8b9c 100644
--- a/src/bin/admin/tests/data/mysql.lease6_dump_test.reference.csv
+++ b/src/bin/admin/tests/data/mysql.lease6_dump_test.reference.csv
@@ -1,4 +1,4 @@
 address,duid,valid_lifetime,expire,subnet_id,pref_lifetime,lease_type,iaid,prefix_len,fqdn_fwd,fqdn_rev,hostname,hwaddr,hwtype,hwaddr_source,state
-10,3230,30,2015-04-04 01:15:30,40,50,IA_TA,60,70,1,1,one.example.com,3830,90,100,default
-11,,30,2015-05-05 02:30:45,40,50,IA_TA,60,70,1,1,,3830,90,100,declined
-12,3231,30,2015-06-06 11:01:07,40,50,IA_TA,60,70,1,1,three.example.com,3830,90,100,expired-reclaimed
+10,3230,30,2015-04-04 01:15:30,40,50,IA_TA,60,70,1,1,one.example.com,3830,90,,default
+11,,30,2015-05-05 02:30:45,40,50,IA_TA,60,70,1,1,,3830,90,HWADDR_SOURCE_RAW,declined
+12,3231,30,2015-06-06 11:01:07,40,50,IA_TA,60,70,1,1,three.example.com,3830,90,HWADDR_SOURCE_DUID,expired-reclaimed
diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in
index 56930690c5..bf02d1bd03 100644
--- a/src/bin/admin/tests/mysql_tests.sh.in
+++ b/src/bin/admin/tests/mysql_tests.sh.in
@@ -389,9 +389,9 @@ mysql_lease6_dump_test() {
 
     # Insert the reference record
     insert_sql="\
-insert into lease6 values(10,20,30,\"2015-04-04 01:15:30\",40,50,1,60,70,1,1,\"one.example.com\",80,90,100, 0);\
-insert into lease6 values(11,NULL,30,\"2015-05-05 02:30:45\",40,50,1,60,70,1,1,\"\",80,90,100, 1);\
-insert into lease6 values(12,21,30,\"2015-06-06 11:01:07\",40,50,1,60,70,1,1,\"three.example.com\",80,90,100, 2);"
+insert into lease6 values(10,20,30,\"2015-04-04 01:15:30\",40,50,1,60,70,1,1,\"one.example.com\",80,90,0,0);\
+insert into lease6 values(11,NULL,30,\"2015-05-05 02:30:45\",40,50,1,60,70,1,1,\"\",80,90,1,1);\
+insert into lease6 values(12,21,30,\"2015-06-06 11:01:07\",40,50,1,60,70,1,1,\"three.example.com\",80,90,4,2);"
 
     mysql_execute "$insert_sql"
     ERRCODE=$?