cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kis...@apache.org
Subject git commit: updated refs/heads/network_acl to cafe52a
Date Tue, 16 Apr 2013 12:04:43 GMT
Updated Branches:
  refs/heads/network_acl a60a8bc23 -> cafe52a65


CLOUDSTACK-763: Moved schema changes to 41to42 upgrade script


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cafe52a6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cafe52a6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cafe52a6

Branch: refs/heads/network_acl
Commit: cafe52a65109336f7eed3bfeaa74f88548ea350e
Parents: a60a8bc
Author: Kishan Kavala <kishan@cloud.com>
Authored: Tue Apr 16 16:58:21 2013 +0530
Committer: Kishan Kavala <kishan@cloud.com>
Committed: Tue Apr 16 16:58:21 2013 +0530

----------------------------------------------------------------------
 setup/db/create-schema.sql      |   34 ----------------------------------
 setup/db/db/schema-410to420.sql |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cafe52a6/setup/db/create-schema.sql
----------------------------------------------------------------------
diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql
index 832ecc6..37c2352 100755
--- a/setup/db/create-schema.sql
+++ b/setup/db/create-schema.sql
@@ -196,8 +196,6 @@ DROP TABLE IF EXISTS `cloud`.`vm_network_map`;
 DROP TABLE IF EXISTS `cloud`.`netapp_volume`;
 DROP TABLE IF EXISTS `cloud`.`netapp_pool`;
 DROP TABLE IF EXISTS `cloud`.`netapp_lun`;
-DROP TABLE IF EXISTS `cloud`.`network_acl`;
-DROP TABLE IF EXISTS `cloud`.`network_acl_item`;
 
 CREATE TABLE `cloud`.`version` (
   `id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id',
@@ -2478,37 +2476,5 @@ CREATE TABLE `cloud`.`nicira_nvp_nic_map` (
   CONSTRAINT `fk_nicira_nvp_nic_map__nic` FOREIGN KEY(`nic`) REFERENCES `nics`(`uuid`) ON
DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-CREATE TABLE `cloud`.`network_acl` (
-  `id` bigint unsigned NOT NULL auto_increment COMMENT 'id',
-  `name` varchar(255) NOT NULL COMMENT 'name of the network acl',
-  `uuid` varchar(40),
-  `vpc_id` bigint unsigned COMMENT 'vpc this network acl belongs to',
-  `description` varchar(1024),
-  PRIMARY KEY  (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-CREATE TABLE `cloud`.`network_acl_item` (
-  `id` bigint unsigned NOT NULL auto_increment COMMENT 'id',
-  `uuid` varchar(40),
-  `network_acl_id` bigint unsigned NOT NULL COMMENT 'network acl id',
-  `start_port` int(10) COMMENT 'starting port of a port range',
-  `end_port` int(10) COMMENT 'end port of a port range',
-  `state` char(32) NOT NULL COMMENT 'current state of this rule',
-  `protocol` char(16) NOT NULL default 'TCP' COMMENT 'protocol to open these ports for',
-  `account_id` bigint unsigned NOT NULL COMMENT 'owner id',
-  `domain_id` bigint unsigned NOT NULL COMMENT 'domain id',
-  `xid` char(40) NOT NULL COMMENT 'external id',
-  `created` datetime COMMENT 'Date created',
-  `icmp_code` int(10) COMMENT 'The ICMP code (if protocol=ICMP). A value of -1 means all
codes for the given ICMP type.',
-  `icmp_type` int(10) COMMENT 'The ICMP type (if protocol=ICMP). A value of -1 means all
types.',
-  `type` varchar(10) NOT NULL DEFAULT 'USER',
-  `traffic_type` char(32) COMMENT 'the traffic type of the rule, can be Ingress or Egress',
-  PRIMARY KEY  (`id`),
-  CONSTRAINT `fk_network_acl_item__account_id` FOREIGN KEY(`account_id`) REFERENCES `account`(`id`)
ON DELETE CASCADE,
-  CONSTRAINT `fk_network_acl_item__domain_id` FOREIGN KEY(`domain_id`) REFERENCES `domain`(`id`)
ON DELETE CASCADE,
-  CONSTRAINT `fk_network_acl_item__acl_id` FOREIGN KEY(`network_acl_id`) REFERENCES `network_acl`(`id`)
ON DELETE CASCADE,
-  CONSTRAINT `uc_network_acl_item__uuid` UNIQUE (`uuid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
 SET foreign_key_checks = 1;
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cafe52a6/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index c7c8b5b..8fa2e97 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -448,3 +448,37 @@ CREATE TABLE `cloud`.`vm_snapshots` (
 ALTER TABLE `cloud`.`hypervisor_capabilities` ADD COLUMN `vm_snapshot_enabled` tinyint(1)
DEFAULT 0 NOT NULL COMMENT 'Whether VM snapshot is supported by hypervisor';
 UPDATE `cloud`.`hypervisor_capabilities` SET `vm_snapshot_enabled`=1 WHERE `hypervisor_type`
in ('VMware', 'XenServer');
 
+CREATE TABLE `cloud`.`network_acl` (
+  `id` bigint unsigned NOT NULL auto_increment COMMENT 'id',
+  `name` varchar(255) NOT NULL COMMENT 'name of the network acl',
+  `uuid` varchar(40),
+  `vpc_id` bigint unsigned COMMENT 'vpc this network acl belongs to',
+  `description` varchar(1024),
+  PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `cloud`.`network_acl_item` (
+  `id` bigint unsigned NOT NULL auto_increment COMMENT 'id',
+  `uuid` varchar(40),
+  `network_acl_id` bigint unsigned NOT NULL COMMENT 'network acl id',
+  `start_port` int(10) COMMENT 'starting port of a port range',
+  `end_port` int(10) COMMENT 'end port of a port range',
+  `state` char(32) NOT NULL COMMENT 'current state of this rule',
+  `protocol` char(16) NOT NULL default 'TCP' COMMENT 'protocol to open these ports for',
+  `account_id` bigint unsigned NOT NULL COMMENT 'owner id',
+  `domain_id` bigint unsigned NOT NULL COMMENT 'domain id',
+  `xid` char(40) NOT NULL COMMENT 'external id',
+  `created` datetime COMMENT 'Date created',
+  `icmp_code` int(10) COMMENT 'The ICMP code (if protocol=ICMP). A value of -1 means all
codes for the given ICMP type.',
+  `icmp_type` int(10) COMMENT 'The ICMP type (if protocol=ICMP). A value of -1 means all
types.',
+  `type` varchar(10) NOT NULL DEFAULT 'USER',
+  `traffic_type` char(32) COMMENT 'the traffic type of the rule, can be Ingress or Egress',
+  PRIMARY KEY  (`id`),
+  CONSTRAINT `fk_network_acl_item__account_id` FOREIGN KEY(`account_id`) REFERENCES `account`(`id`)
ON DELETE CASCADE,
+  CONSTRAINT `fk_network_acl_item__domain_id` FOREIGN KEY(`domain_id`) REFERENCES `domain`(`id`)
ON DELETE CASCADE,
+  CONSTRAINT `fk_network_acl_item__acl_id` FOREIGN KEY(`network_acl_id`) REFERENCES `network_acl`(`id`)
ON DELETE CASCADE,
+  CONSTRAINT `uc_network_acl_item__uuid` UNIQUE (`uuid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+ALTER TABLE `cloud`.`networks` add column `network_acl_id` bigint unsigned COMMENT 'network
acl id';
+


Mime
View raw message