You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2015/04/15 10:05:08 UTC
[08/53] [abbrv] git commit: updated refs/heads/reporter to 5c99784
db: move bigswitch related sqls to schema-451to460.sql
We ought not change older schema migrations, so moved sql statements to the latest
upgrade path.
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/770297e8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/770297e8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/770297e8
Branch: refs/heads/reporter
Commit: 770297e8cb14fea4dae2f5f0bfd8aaefa8ea0aa3
Parents: 01864ef
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Apr 9 13:00:08 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Apr 9 13:15:02 2015 +0530
----------------------------------------------------------------------
setup/db/db/schema-442to450.sql | 18 ------------------
setup/db/db/schema-451to460.sql | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/770297e8/setup/db/db/schema-442to450.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-442to450.sql b/setup/db/db/schema-442to450.sql
index 5dee6c6..4a8f250 100644
--- a/setup/db/db/schema-442to450.sql
+++ b/setup/db/db/schema-442to450.sql
@@ -284,24 +284,6 @@ CREATE TABLE `cloud`.`brocade_network_vlan_map` (
CONSTRAINT `fk_brocade_network_vlan_map__network_id` FOREIGN KEY (`network_id`) REFERENCES `networks`(`id`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-DROP TABLE IF EXISTS `cloud`.`external_bigswitch_vns_devices`;
-CREATE TABLE `cloud`.`external_bigswitch_bcf_devices` (
- `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
- `uuid` varchar(255) UNIQUE,
- `physical_network_id` bigint unsigned NOT NULL COMMENT 'id of the physical network in to which bigswitch bcf device is added',
- `provider_name` varchar(255) NOT NULL COMMENT 'Service Provider name corresponding to this bigswitch bcf device',
- `device_name` varchar(255) NOT NULL COMMENT 'name of the bigswitch bcf device',
- `host_id` bigint unsigned NOT NULL COMMENT 'host id coresponding to the external bigswitch bcf device',
- `hostname` varchar(255) NOT NULL COMMENT 'host name or IP address for the bigswitch bcf device',
- `username` varchar(255) NOT NULL COMMENT 'username for the bigswitch bcf device',
- `password` varchar(255) NOT NULL COMMENT 'password for the bigswitch bcf device',
- `nat` boolean NOT NULL COMMENT 'NAT support for the bigswitch bcf device',
- `hash` varchar(255) NOT NULL COMMENT 'topology hash for the bigswitch bcf networks',
- PRIMARY KEY (`id`),
- CONSTRAINT `fk_external_bigswitch_bcf_devices__host_id` FOREIGN KEY (`host_id`) REFERENCES `host`(`id`) ON DELETE CASCADE,
- CONSTRAINT `fk_external_bigswitch_bcf_devices__physical_network_id` FOREIGN KEY (`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
/* As part of the separation of Xen and XenServer, update the column for the network labels */
ALTER TABLE `cloud`.`physical_network_traffic_types` CHANGE `xen_network_label` `xenserver_network_label` varchar(255) COMMENT 'The network name label of the physical device dedicated to this traffic on a XenServer host';
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/770297e8/setup/db/db/schema-451to460.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-451to460.sql b/setup/db/db/schema-451to460.sql
index 6674a51..0abd4f8 100644
--- a/setup/db/db/schema-451to460.sql
+++ b/setup/db/db/schema-451to460.sql
@@ -380,3 +380,21 @@ INSERT IGNORE INTO `cloud`.`configuration` (`category`, `instance`, `component`,
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'NetworkManager', 'router.template.ovm3', 'SystemVM Template (Ovm3)', 'Name of the default router template on Ovm3.','SystemVM Template (Ovm3)', NULL, NULL, 0);
UPDATE IGNORE `cloud`.`configuration` SET `value`="PLAINTEXT" WHERE `name`="user.authenticators.exclude";
+
+DROP TABLE IF EXISTS `cloud`.`external_bigswitch_vns_devices`;
+CREATE TABLE `cloud`.`external_bigswitch_bcf_devices` (
+ `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `uuid` varchar(255) UNIQUE,
+ `physical_network_id` bigint unsigned NOT NULL COMMENT 'id of the physical network in to which bigswitch bcf device is added',
+ `provider_name` varchar(255) NOT NULL COMMENT 'Service Provider name corresponding to this bigswitch bcf device',
+ `device_name` varchar(255) NOT NULL COMMENT 'name of the bigswitch bcf device',
+ `host_id` bigint unsigned NOT NULL COMMENT 'host id coresponding to the external bigswitch bcf device',
+ `hostname` varchar(255) NOT NULL COMMENT 'host name or IP address for the bigswitch bcf device',
+ `username` varchar(255) NOT NULL COMMENT 'username for the bigswitch bcf device',
+ `password` varchar(255) NOT NULL COMMENT 'password for the bigswitch bcf device',
+ `nat` boolean NOT NULL COMMENT 'NAT support for the bigswitch bcf device',
+ `hash` varchar(255) NOT NULL COMMENT 'topology hash for the bigswitch bcf networks',
+ PRIMARY KEY (`id`),
+ CONSTRAINT `fk_external_bigswitch_bcf_devices__host_id` FOREIGN KEY (`host_id`) REFERENCES `host`(`id`) ON DELETE CASCADE,
+ CONSTRAINT `fk_external_bigswitch_bcf_devices__physical_network_id` FOREIGN KEY (`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;