From 3df2bd98fc15a45f6ed0913ddf41e003bd1b145c Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Wed, 7 Mar 2012 13:34:43 -0800 Subject: [PATCH] bug 14170: issues #1-#3 are fixed --- .../src/com/cloud/upgrade/dao/Upgrade2214to30.java | 2 +- server/test/com/cloud/vm/MockUserVmManagerImpl.java | 12 ++++++------ setup/db/db/schema-2214to30-cleanup.sql | 3 +++ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/server/src/com/cloud/upgrade/dao/Upgrade2214to30.java b/server/src/com/cloud/upgrade/dao/Upgrade2214to30.java index e509062be74..a0a3a83c8bb 100755 --- a/server/src/com/cloud/upgrade/dao/Upgrade2214to30.java +++ b/server/src/com/cloud/upgrade/dao/Upgrade2214to30.java @@ -526,7 +526,7 @@ public class Upgrade2214to30 implements DbUpgrade { // drop keys s_logger.debug("Dropping public_ip_address keys from `cloud`.`secondary_storage_vm` and console_proxy tables..."); for (String tableName : uniqueKeys.keySet()) { - DbUpgradeUtils.dropKeysIfExist(conn, tableName, uniqueKeys.get(tableName), true); + DbUpgradeUtils.dropKeysIfExist(conn, tableName, uniqueKeys.get(tableName), false); } } diff --git a/server/test/com/cloud/vm/MockUserVmManagerImpl.java b/server/test/com/cloud/vm/MockUserVmManagerImpl.java index 1254251c2e5..782d70c3916 100644 --- a/server/test/com/cloud/vm/MockUserVmManagerImpl.java +++ b/server/test/com/cloud/vm/MockUserVmManagerImpl.java @@ -304,12 +304,6 @@ public class MockUserVmManagerImpl implements UserVmManager, UserVmService, Mana return null; } - @Override - public UserVm startVirtualMachine(long vmId) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { - // TODO Auto-generated method stub - return null; - } - @Override public void deletePrivateTemplateRecord(Long templateId) { // TODO Auto-generated method stub @@ -394,4 +388,10 @@ public class MockUserVmManagerImpl implements UserVmManager, UserVmService, Mana return null; } + @Override + public UserVm startVirtualMachine(long vmId, Long hostId) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { + // TODO Auto-generated method stub + return null; + } + } diff --git a/setup/db/db/schema-2214to30-cleanup.sql b/setup/db/db/schema-2214to30-cleanup.sql index 55d7798d357..4c2eece237c 100644 --- a/setup/db/db/schema-2214to30-cleanup.sql +++ b/setup/db/db/schema-2214to30-cleanup.sql @@ -56,3 +56,6 @@ ALTER TABLE `cloud`.`vlan` ADD CONSTRAINT `fk_vlan__physical_network_id` FOREIGN ALTER TABLE `cloud`.`op_dc_vnet_alloc` ADD CONSTRAINT `fk_op_dc_vnet_alloc__physical_network_id` FOREIGN KEY (`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE; ALTER TABLE `cloud`.`user_ip_address` ADD CONSTRAINT `fk_user_ip_address__physical_network_id` FOREIGN KEY (`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE; +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;