[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 6ee0df38422a7671bba889f85f99d675d02caf0d..d167e3aeff38729d08e0d530bf7126a3653e9f93 100644 (file)
--- 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 86385badddffefc5c44ae3e19250b431cb0741e0..99bccebb5bfe4cb6d81a074cb77975340903e865 100644 (file)
--- 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 75270bfd96d1c6b06b59456c145598faefeab065..29bdcf608fcee14b12e6f2dde276d198a1bfe872 100644 (file)
--- 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 a65b28250e6fa2d6f3d5a43e5118bc94d72806d2..531f250b8541d7fdd6e667e3531b4f13151e591c 100644 (file)
--- 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';