From ce8e9a9f512f32f262d771f68c5e28088dbf9e4c Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Mon, 26 Mar 2012 10:06:18 -0700 Subject: [PATCH] bug 14500: set default value for is_system field as a part of 3.0 to 3.0.1 upgrade status 14500: resolved fixed reviwed-by: Frank Zhang Conflicts: server/test/com/cloud/network/MockNetworkManagerImpl.java setup/db/db/schema-30to301.sql --- .../test/com/cloud/network/MockNetworkManagerImpl.java | 6 ++++++ setup/db/db/schema-30to301.sql | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/server/test/com/cloud/network/MockNetworkManagerImpl.java b/server/test/com/cloud/network/MockNetworkManagerImpl.java index 9c45e73b37e..a62b8180bbd 100755 --- a/server/test/com/cloud/network/MockNetworkManagerImpl.java +++ b/server/test/com/cloud/network/MockNetworkManagerImpl.java @@ -843,4 +843,10 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager, NetworkS return false; } + @Override + public List getIsolatedNetworksWithSourceNATOwnedByAccountInZone(long zoneId, Account owner) { + // TODO Auto-generated method stub + return null; + } + } diff --git a/setup/db/db/schema-30to301.sql b/setup/db/db/schema-30to301.sql index 81de759a832..70291efa569 100755 --- a/setup/db/db/schema-30to301.sql +++ b/setup/db/db/schema-30to301.sql @@ -19,4 +19,11 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Project Defaults', 'DEFAULT', 'management-server', 'max.project.networks', '20', 'The default maximum number of networks that can be created for a project'); -INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Account Defaults', 'DEFAULT', 'management-server', 'max.account.networks', '20', 'The default maximum number of networks that can be created for an account'); \ No newline at end of file + +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Account Defaults', 'DEFAULT', 'management-server', 'max.account.networks', '20', 'The default maximum number of networks that can be created for an account'); + +INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Account Defaults', 'DEFAULT', 'management-server', 'max.account.networks', '20', 'The default maximum number of networks that can be created for an account'); + +UPDATE snapshots SET removed=now() WHERE removed IS NULL AND sechost_id IN (SELECT id FROM host WHERE type='SecondaryStorage' AND removed IS NOT NULL); + +ALTER TABLE `cloud_usage`.`usage_ip_address` MODIFY COLUMN `is_system` smallint(1) NOT NULL default '0';