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
This commit is contained in:
Alena Prokharchyk 2012-03-26 10:06:18 -07:00
parent 3d13371116
commit ce8e9a9f51
2 changed files with 14 additions and 1 deletions

View File

@ -843,4 +843,10 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager, NetworkS
return false;
}
@Override
public List<? extends Network> getIsolatedNetworksWithSourceNATOwnedByAccountInZone(long zoneId, Account owner) {
// TODO Auto-generated method stub
return null;
}
}

View File

@ -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');
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';