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

Modify keys for security groups in java code instead of sql file (need to check if the key exists before dropping it) 

Conflicts:

	server/src/com/cloud/upgrade/dao/Upgrade218to22.java
This commit is contained in:
alena 2011-04-28 18:23:38 -07:00
parent 4a96e4cb0f
commit c6d5682579
2 changed files with 2090 additions and 2048 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4136
server/src/com/cloud/upgrade/dao/Upgrade218to22.java
View File

File diff suppressed because it is too large Load Diff

2
setup/db/db/schema-21to22.sql
View File

@ -413,7 +413,6 @@ ALTER TABLE `cloud`.`storage_pool` ADD COLUMN `status` varchar(32);
ALTER TABLE `cloud`.`network_group` DROP foreign key `fk_network_group__domain_id`;
ALTER TABLE `cloud`.`network_group` DROP INDEX `fk_network_group__domain_id`;
ALTER TABLE `cloud`.`network_group` DROP foreign key `fk_network_group___account_id`;
ALTER TABLE `cloud`.`network_group` DROP INDEX `fk_network_group___account_id`;;
ALTER TABLE `cloud`.`network_group` drop index `i_network_group_name`;
@ -433,7 +432,6 @@ ALTER TABLE `cloud`.`security_ingress_rule` CHANGE COLUMN `allowed_net_grp_acct`
ALTER TABLE `cloud`.`network_group_vm_map` RENAME TO `security_group_vm_map`;
ALTER TABLE `cloud`.`security_group_vm_map` CHANGE COLUMN `network_group_id` `security_group_id` bigint unsigned NOT NULL;
ALTER TABLE `cloud`.`security_group` ADD CONSTRAINT `fk_security_group___account_id` FOREIGN KEY `fk_security_group__account_id` (`account_id`) REFERENCES `account` (`id`) ON DELETE CASCADE;
ALTER TABLE `cloud`.`security_group` ADD CONSTRAINT `fk_security_group__domain_id` FOREIGN KEY `fk_security_group__domain_id` (`domain_id`) REFERENCES `domain` (`id`);
ALTER TABLE `cloud`.`security_group` ADD INDEX `i_security_group_name`(`name`);