From: Tomek Mrugalski <tomasz@isc.org>
Date: Thu, 20 Apr 2017 13:46:24 +0000 (+0200)
Subject: [5195] flex-id value added to know identifiers list.
X-Git-Tag: trac5243x_base~1^2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=db96e406b953f0ef0f431f5c489546836d00cad9;p=thirdparty%2Fkea.git

[5195] flex-id value added to know identifiers list.
---

diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index 6ee0df3842..d167e3aeff 100644
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -480,8 +480,9 @@ UPDATE schema_version
 SET version = '5', minor = '0';
 # This line concludes database upgrade to version 5.0.
 
-# Add missing 'client-id' host identifier type.
+# Add missing 'client-id' and new 'flex-id' host identifier types.
 INSERT INTO host_identifier_type VALUES (3, 'client-id');
+INSERT INTO host_identifier_type VALUES (4, 'flex-id');
 
 # Update the schema version number
 UPDATE schema_version
diff --git a/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in b/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in
index 86385baddd..99bccebb5b 100644
--- a/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh.in
@@ -17,8 +17,9 @@ fi
 
 mysql "$@" <<EOF
 
-# Add missing 'client-id' host identifier type.
+# Add missing 'client-id' and new 'flex-id' host identifier types.
 INSERT INTO host_identifier_type VALUES (3, 'client-id');
+INSERT INTO host_identifier_type VALUES (4, 'flex-id');
 
 # Update the schema version number
 UPDATE schema_version
diff --git a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
index 75270bfd96..29bdcf608f 100644
--- a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
+++ b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
@@ -483,11 +483,11 @@ UPDATE schema_version
 
 -- Schema 3.0 specification ends here.
 
--- This is a placeholder for the changes between 3.0 and 3.1. Even if there
--- are no further changes the schema version should be set to 3.1, because
--- we have added a missing 'client-id' host reservation type entry in the
--- 3.0 -> 3.1 upgrade script. This entry had been accidentally omitted when
--- the 2.0 -> 3.0 upgrade script was created.
+-- This is a placeholder for the changes between 3.0 and 3.1. We have added a
+-- missing 'client-id' host reservation type entry that had been accidentally
+-- omitted when the 2.0 -> 3.0 upgrade script was created.
+-- Also, new flexible identifier has been added.
+INSERT INTO host_identifier_type VALUES (4, 'flex-id');
 
 -- Set 3.1 schema version.
 UPDATE schema_version
diff --git a/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in b/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in
index a65b28250e..531f250b85 100644
--- a/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh.in
@@ -32,6 +32,9 @@ INSERT INTO host_identifier_type (type, name)
         SELECT type FROM host_identifier_type WHERE type = 3
     );
 
+-- We also add a new identifier type: flex-id.
+INSERT INTO host_identifier_type VALUES (4, 'flex-id');
+
 -- Set 3.1 schema version.
 UPDATE schema_version
     SET version = '3', minor = '1';