etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 14170: fixed #4-6 and #9-13

This commit is contained in:
Alena Prokharchyk 2012-03-07 16:36:01 -08:00
parent 998a598026
commit 686761686f
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
setup/db/create-schema-premium.sql
View File

@ -96,7 +96,7 @@ CREATE TABLE `cloud_usage`.`usage_ip_address` (
`zone_id` bigint unsigned NOT NULL,
`public_ip_address` varchar(15) NOT NULL,
`is_source_nat` smallint(1) NOT NULL,
`is_system` smallint(1) NOT NULL,
`is_system` smallint(1) NOT NULL default '0',
`assigned` DATETIME NOT NULL,
`released` DATETIME NULL,
UNIQUE KEY (`id`, `assigned`)
@ -134,6 +134,7 @@ CREATE TABLE `cloud_usage`.`account` (
`removed` datetime COMMENT 'date removed',
`cleanup_needed` tinyint(1) NOT NULL default '0',
`network_domain` varchar(100) COMMENT 'Network domain name of the Vms of the account',
CONSTRAINT `uc_account__uuid` UNIQUE (`uuid`),
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

3
setup/db/db/schema-2214to30-cleanup.sql
View File

@ -59,3 +59,6 @@ ALTER TABLE `cloud`.`user_ip_address` ADD CONSTRAINT `fk_user_ip_address__physic
ALTER TABLE `cloud`.`volumes` ADD INDEX `i_volumes__last_pool_id`(`last_pool_id`);
ALTER TABLE `cloud`.`swift` MODIFY `account` varchar(255) NOT NULL;
ALTER TABLE `cloud`.`swift` MODIFY `username` varchar(255) NOT NULL;
DROP TABLE IF EXISTS `cloud`.`network_tags`;
DROP TABLE IF EXISTS `cloud_usage`.`event`;

18
setup/db/db/schema-2214to30.sql
View File

@ -75,6 +75,7 @@ CREATE TABLE `cloud`.`project_account` (
CREATE TABLE `cloud`.`project_invitations` (
`id` bigint unsigned NOT NULL auto_increment,
`uuid` varchar(40),
`project_id` bigint unsigned NOT NULL COMMENT 'project id',
`account_id` bigint unsigned COMMENT 'account id',
`domain_id` bigint unsigned COMMENT 'domain id',
@ -85,7 +86,11 @@ CREATE TABLE `cloud`.`project_invitations` (
PRIMARY KEY (`id`),
CONSTRAINT `fk_project_invitations__account_id` FOREIGN KEY(`account_id`) REFERENCES `account`(`id`) ON DELETE CASCADE,
CONSTRAINT `fk_project_invitations__domain_id` FOREIGN KEY(`domain_id`) REFERENCES `domain`(`id`) ON DELETE CASCADE,
CONSTRAINT `fk_project_invitations__project_id` FOREIGN KEY(`project_id`) REFERENCES `projects`(`id`) ON DELETE CASCADE
CONSTRAINT `fk_project_invitations__project_id` FOREIGN KEY(`project_id`) REFERENCES `projects`(`id`) ON DELETE CASCADE,
UNIQUE (`project_id`, `account_id`),
UNIQUE (`project_id`, `email`),
UNIQUE (`project_id`, `token`),
CONSTRAINT `uc_project_invitations__uuid` UNIQUE (`uuid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@ -184,15 +189,15 @@ ALTER TABLE `cloud`.`domain` ADD CONSTRAINT `uc_domain__uuid` UNIQUE (`uuid`);
ALTER TABLE `cloud`.`account` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`account` ADD CONSTRAINT `uc_account__uuid` UNIQUE (`uuid`);
ALTER TABLE `cloud_usage`.`account` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud_usage`.`account` ADD CONSTRAINT `uc_account__uuid` UNIQUE (`uuid`);
ALTER TABLE `cloud`.`user` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`user` ADD CONSTRAINT `uc_user__uuid` UNIQUE (`uuid`);
ALTER TABLE `cloud`.`projects` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`projects` ADD CONSTRAINT `uc_projects__uuid` UNIQUE (`uuid`);
ALTER TABLE `cloud`.`project_invitations` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`project_invitations` ADD CONSTRAINT `uc_project_invitations__uuid` UNIQUE (`uuid`);
ALTER TABLE `cloud`.`data_center` ADD COLUMN `uuid` varchar(40);
ALTER TABLE `cloud`.`data_center` ADD CONSTRAINT `uc_data_center__uuid` UNIQUE (`uuid`);
@ -684,4 +689,7 @@ ALTER TABLE `cloud_usage`.`usage_security_group` ADD INDEX `i_usage_security_gro
ALTER TABLE `cloud_usage`.`usage_security_group` ADD INDEX `i_usage_security_group__created`(`created`);
ALTER TABLE `cloud_usage`.`usage_security_group` ADD INDEX `i_usage_security_group__deleted`(`deleted`);
update configuration set category = 'Usage' where category = 'Premium';
UPDATE `cloud`.`configuration` SET category = 'Usage' where category = 'Premium';
ALTER TABLE `cloud`.`op_dc_vnet_alloc` ADD CONSTRAINT `fk_op_dc_vnet_alloc__data_center_id` FOREIGN KEY (`data_center_id`) REFERENCES `data_center`(`id`) ON DELETE CASCADE;
ALTER TABLE `cloud`.`domain` ADD COLUMN `type` varchar(255) NOT NULL DEFAULT 'Normal' COMMENT 'type of the domain - can be Normal or Project';