Changes in database for allowing IP parameters, changes in DB migration script, new DB version 12, small changes in openmano_schemas and other files to deal with new DB version, basictest run successfully
Change-Id: I30e00c5bcd30aab35a39746dbf568dac4164f247
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
diff --git a/database_utils/init_mano_db.sh b/database_utils/init_mano_db.sh
index cbb76ef..8afd9c2 100755
--- a/database_utils/init_mano_db.sh
+++ b/database_utils/init_mano_db.sh
@@ -26,6 +26,7 @@
DBHOST="localhost"
DBPORT="3306"
DBNAME="mano_db"
+CREATEDB=""
# Detect paths
MYSQL=$(which mysql)
@@ -43,6 +44,7 @@
echo -e " -h HOST database host. '$DBHOST' by default"
echo -e " -d NAME database name. '$DBNAME' by default. Prompts if DB access fails"
echo -e " --help shows this help"
+ echo -e " --createdb forces the deletion and creation of the database"
}
while getopts ":u:p:P:d:h:-:" o; do
@@ -63,9 +65,14 @@
DBHOST="$OPTARG"
;;
-)
- [ "${OPTARG}" == "help" ] && usage && exit 0
- echo "Invalid option: --$OPTARG" >&2 && usage >&2
- exit 1
+ if [ "${OPTARG}" == "help" ]; then
+ usage && exit 0
+ elif [ "${OPTARG}" == "createdb" ]; then
+ CREATEDB="yes"
+ else
+ echo "Invalid option: --$OPTARG" >&2 && usage >&2
+ exit 1
+ fi
;;
\?)
echo "Invalid option: -$OPTARG" >&2 && usage >&2
@@ -104,7 +111,13 @@
echo
done
-#${DIRNAME}/quick_delete_db.sh $MUSER $MPASS $MDB $HOST $PORT
+if [ -n "${CREATEDB}" ]; then
+ echo " deleting previous database ${DBNAME}"
+ echo "DROP DATABASE IF EXISTS ${DBNAME}" | mysql $DBHOST_ $DBPORT_ $DBUSER_ $DBPASS_
+ echo " creating database ${DBNAME}"
+ mysqladmin $DBUSER_ $DBPASS_ -s create ${DBNAME} || exit 1
+fi
+
echo " loading ${DIRNAME}/${DBNAME}_structure.sql"
mysql $DBHOST_ $DBPORT_ $DBUSER_ $DBPASS_ $DBNAME < ${DIRNAME}/mano_db_structure.sql
diff --git a/database_utils/migrate_mano_db.sh b/database_utils/migrate_mano_db.sh
index c6983ca..f7c2b1b 100755
--- a/database_utils/migrate_mano_db.sh
+++ b/database_utils/migrate_mano_db.sh
@@ -165,6 +165,7 @@
[ $OPENMANO_VER_NUM -ge 4033 ] && DATABASE_TARGET_VER_NUM=9 #0.4.33=> 9
[ $OPENMANO_VER_NUM -ge 4036 ] && DATABASE_TARGET_VER_NUM=10 #0.4.36=> 10
[ $OPENMANO_VER_NUM -ge 4043 ] && DATABASE_TARGET_VER_NUM=11 #0.4.43=> 11
+[ $OPENMANO_VER_NUM -ge 4046 ] && DATABASE_TARGET_VER_NUM=12 #0.4.46=> 12
#TODO ... put next versions here
@@ -558,6 +559,42 @@
echo "DELETE FROM schema_version WHERE version_int='11';" | $DBCMD || ! echo "ERROR. Aborted!" || exit -1
}
+function upgrade_to_12(){
+ echo " upgrade database from version 0.11 to version 0.12"
+ echo " create ip_profiles table, with foreign keys to all nets tables, and add ip_address column to 'interfaces' and 'sce_interfaces'"
+ echo "CREATE TABLE ip_profiles (
+ id INT(11) NOT NULL AUTO_INCREMENT,
+ net_id VARCHAR(36) NULL DEFAULT NULL,
+ sce_net_id VARCHAR(36) NULL DEFAULT NULL,
+ instance_net_id VARCHAR(36) NULL DEFAULT NULL,
+ ip_version ENUM('IPv4','IPv6') NOT NULL DEFAULT 'IPv4',
+ subnet_address VARCHAR(64) NULL DEFAULT NULL,
+ gateway_address VARCHAR(64) NULL DEFAULT NULL,
+ security_group VARCHAR(255) NULL DEFAULT NULL,
+ dns_address VARCHAR(64) NULL DEFAULT NULL,
+ dhcp_enabled ENUM('true','false') NOT NULL DEFAULT 'true',
+ dhcp_start_address VARCHAR(64) NULL DEFAULT NULL,
+ dhcp_count INT(11) NULL DEFAULT NULL,
+ PRIMARY KEY (id),
+ CONSTRAINT FK_ipprofiles_nets FOREIGN KEY (net_id) REFERENCES nets (uuid) ON DELETE CASCADE,
+ CONSTRAINT FK_ipprofiles_scenets FOREIGN KEY (sce_net_id) REFERENCES sce_nets (uuid) ON DELETE CASCADE,
+ CONSTRAINT FK_ipprofiles_instancenets FOREIGN KEY (instance_net_id) REFERENCES instance_nets (uuid) ON DELETE CASCADE )
+ COMMENT='Table containing the IP parameters of a network, either a net, a sce_net or and instance_net.'
+ COLLATE='utf8_general_ci'
+ ENGINE=InnoDB;" | $DBCMD || ! echo "ERROR. Aborted!" || exit -1
+ echo "ALTER TABLE interfaces ADD COLUMN ip_address VARCHAR(64) NULL DEFAULT NULL AFTER mac;" | $DBCMD || ! echo "ERROR. Aborted!" || exit -1
+ echo "ALTER TABLE sce_interfaces ADD COLUMN ip_address VARCHAR(64) NULL DEFAULT NULL AFTER interface_id;" | $DBCMD || ! echo "ERROR. Aborted!" || exit -1
+ echo "INSERT INTO schema_version (version_int, version, openmano_ver, comments, date) VALUES (12, '0.12', '0.4.46', 'create ip_profiles table, with foreign keys to all nets tables, and add ip_address column to interfaces and sce_interfaces', '2016-07-18');" | $DBCMD || ! echo "ERROR. Aborted!" || exit -1
+}
+function downgrade_from_12(){
+ echo " downgrade database from version 0.12 to version 0.11"
+ echo " delete ip_profiles table, and remove ip_address column in 'interfaces' and 'sce_interfaces'"
+ echo "DROP TABLE ip_profiles;" | $DBCMD || ! echo "ERROR. Aborted!" || exit -1
+ echo "ALTER TABLE interfaces DROP COLUMN ip_address;" | $DBCMD || ! echo "ERROR. Aborted!" || exit -1
+ echo "ALTER TABLE sce_interfaces DROP COLUMN ip_address;" | $DBCMD || ! echo "ERROR. Aborted!" || exit -1
+ echo "DELETE FROM schema_version WHERE version_int='12';" | $DBCMD || ! echo "ERROR. Aborted!" || exit -1
+}
+
function upgrade_to_X(){
echo " change 'datacenter_nets'"
echo "ALTER TABLE datacenter_nets ADD COLUMN vim_tenant_id VARCHAR(36) NOT NULL AFTER datacenter_id, DROP INDEX name_datacenter_id, ADD UNIQUE INDEX name_datacenter_id (name, datacenter_id, vim_tenant_id);" | $DBCMD || ! echo "ERROR. Aborted!" || exit -1