Updated Branches:
refs/heads/vim51_win8 610088fb2 -> 8aba25f18
Merge branch 'master' into vim51_win8
Conflicts:
setup/db/db/schema-410to420.sql
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8aba25f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8aba25f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8aba25f1
Branch: refs/heads/vim51_win8
Commit: 8aba25f18d557af34478dc1f67f087b0fb7e2157
Parents: 610088f 89dee27
Author: Min Chen <[email protected]>
Authored: Tue Feb 26 14:12:36 2013 -0800
Committer: Min Chen <[email protected]>
Committed: Tue Feb 26 14:12:36 2013 -0800
----------------------------------------------------------------------
api/src/com/cloud/dc/DataCenter.java | 4 +
api/src/com/cloud/user/AccountService.java | 4 +-
api/src/com/cloud/user/DomainService.java | 2 +-
api/src/com/cloud/vm/NicProfile.java | 18 +
.../org/apache/cloudstack/api/ApiConstants.java | 7 +-
.../command/admin/account/CreateAccountCmd.java | 28 +-
.../command/admin/account/DeleteAccountCmd.java | 7 -
.../command/admin/account/DisableAccountCmd.java | 15 +-
.../command/admin/account/EnableAccountCmd.java | 8 +-
.../command/admin/account/UpdateAccountCmd.java | 10 +-
.../api/command/admin/domain/CreateDomainCmd.java | 16 +-
.../api/command/admin/domain/DeleteDomainCmd.java | 7 -
.../api/command/admin/domain/UpdateDomainCmd.java | 7 -
.../api/command/admin/user/CreateUserCmd.java | 16 +-
.../api/command/admin/user/DeleteUserCmd.java | 7 -
.../api/command/admin/user/DisableUserCmd.java | 7 -
.../api/command/admin/user/EnableUserCmd.java | 7 -
.../api/command/admin/user/UpdateUserCmd.java | 7 -
.../api/command/admin/zone/CreateZoneCmd.java | 14 +
.../api/command/admin/zone/UpdateZoneCmd.java | 14 +
.../api/response/DomainRouterResponse.java | 22 +
.../cloudstack/api/response/ZoneResponse.java | 22 +
.../apache/cloudstack/region/RegionService.java | 136 ++--
client/pom.xml | 17 +-
client/tomcatconf/componentContext.xml.in | 2 +-
client/tomcatconf/nonossComponentContext.xml.in | 11 +-
core/src/com/cloud/user/AccountVO.java | 40 +-
core/src/com/cloud/user/UserVO.java | 23 +-
core/src/com/cloud/vm/UserVmCloneSettingVO.java | 50 +
.../entity/api/db/EngineDataCenterVO.java | 28 +-
.../platform/orchestration/CloudOrchestrator.java | 9 +-
.../engine/provisioning/test/ProvisioningTest.java | 2 +-
.../cloudstack/storage/test/DirectAgentTest.java | 2 +-
.../cloudstack/storage/test/volumeServiceTest.java | 2 +-
packaging/centos63/cloud-agent.rc | 2 +-
packaging/centos63/cloud-usage.rc | 4 +-
packaging/centos63/cloud.spec | 6 +-
.../debian/config/etc/init.d/cloud-early-config | 42 +-
.../root/redundant_router/arping_gateways.sh.templ | 4 +-
.../hypervisor/vmware/manager/VmwareManager.java | 3 +
.../vmware/manager/VmwareManagerImpl.java | 18 +-
.../hypervisor/vmware/resource/VmwareResource.java | 117 ++-
.../xen/discoverer/XcpServerDiscoverer.java | 10 +-
.../apache/cloudstack/storage/test/VolumeTest.java | 4 +-
scripts/vm/network/security_group.py | 10 +-
server/conf/migration-components.xml | 1 +
.../cloud/api/query/dao/DataCenterJoinDaoImpl.java | 2 +
.../api/query/dao/DomainRouterJoinDaoImpl.java | 3 +
.../com/cloud/api/query/vo/DataCenterJoinVO.java | 22 +
.../com/cloud/api/query/vo/DomainRouterJoinVO.java | 20 +
server/src/com/cloud/configuration/Config.java | 11 +-
.../cloud/configuration/ConfigurationManager.java | 4 +-
.../configuration/ConfigurationManagerImpl.java | 44 +-
server/src/com/cloud/dc/DataCenterVO.java | 30 +-
.../ExternalLoadBalancerUsageManagerImpl.java | 263 ++++--
.../src/com/cloud/network/NetworkManagerImpl.java | 6 +-
.../com/cloud/network/guru/DirectNetworkGuru.java | 2 +
.../com/cloud/network/guru/GuestNetworkGuru.java | 2 -
.../router/VirtualNetworkApplianceManagerImpl.java | 43 +-
.../src/com/cloud/projects/ProjectManagerImpl.java | 2 +-
.../server/auth/DefaultUserAuthenticator.java | 3 -
.../cloud/storage/download/DownloadListener.java | 8 +-
.../storage/download/DownloadMonitorImpl.java | 22 +-
server/src/com/cloud/user/AccountManager.java | 14 +-
server/src/com/cloud/user/AccountManagerImpl.java | 90 +--
server/src/com/cloud/user/DomainManager.java | 2 +-
server/src/com/cloud/user/DomainManagerImpl.java | 24 +-
server/src/com/cloud/user/dao/AccountDaoImpl.java | 90 +-
.../com/cloud/user/dao/UserStatisticsDaoImpl.java | 18 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 184 ++--
.../com/cloud/vm/dao/UserVmCloneSettingDao.java | 37 +
.../cloud/vm/dao/UserVmCloneSettingDaoImpl.java | 74 ++
server/src/com/cloud/vm/dao/UserVmDetailsDao.java | 3 -
.../apache/cloudstack/region/RegionManager.java | 204 +---
.../cloudstack/region/RegionManagerImpl.java | 822 ++-------------
.../cloudstack/region/RegionServiceImpl.java | 230 ++---
.../apache/cloudstack/region/RegionsApiUtil.java | 306 ------
.../com/cloud/user/MockAccountManagerImpl.java | 46 +-
.../test/com/cloud/user/MockDomainManagerImpl.java | 38 +-
.../vm/dao/UserVmCloneSettingDaoImplTest.java | 62 ++
.../UserVmCloneSettingDaoTestConfiguration.java | 52 +
.../cloud/vpc/MockConfigurationManagerImpl.java | 2 +-
.../cloudstack/region/RegionManagerTest.java | 35 +-
.../test/resources/CloneSettingDaoTestContext.xml | 42 +
setup/db/db/schema-40to410.sql | 16 +-
setup/db/db/schema-410to420.sql | 13 +-
ui/css/cloudstack3.css | 39 +-
ui/scripts/globalSettings.js | 8 +-
ui/scripts/network.js | 15 +-
ui/scripts/ui/widgets/multiEdit.js | 8 +-
usage/src/com/cloud/usage/UsageManagerImpl.java | 2 +-
91 files changed, 1589 insertions(+), 2166 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8aba25f1/client/tomcatconf/componentContext.xml.in
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8aba25f1/client/tomcatconf/nonossComponentContext.xml.in
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8aba25f1/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8aba25f1/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8aba25f1/setup/db/db/schema-40to410.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8aba25f1/setup/db/db/schema-410to420.sql
----------------------------------------------------------------------
diff --cc setup/db/db/schema-410to420.sql
index 9d335c4,4349bd0..db83416
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@@ -100,11 -101,14 +101,21 @@@ CREATE TABLE `vpc_service_map`
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT',
'management-server', 'vm.instancename.flag', 'false', 'Append guest VM display
Name (if set) to the internal name of the VM');
+INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES
(208, UUID(), 6, 'Windows 8');
+INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES
(209, UUID(), 6, 'Windows 8 (64 bit)');
+INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES
(210, UUID(), 6, 'Windows 8 Server (64 bit)');
+INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name,
guest_os_id) VALUES ("VmWare", 'Windows 8', 208);
+INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name,
guest_os_id) VALUES ("VmWare", 'Windows 8 (64 bit)', 209);
+INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name,
guest_os_id) VALUES ("VmWare", 'Windows 8 Server (64 bit)', 210);
+
+ CREATE TABLE `cloud`.`user_vm_clone_setting` (
+ `vm_id` bigint unsigned NOT NULL COMMENT 'guest VM id',
+ `clone_type` varchar(10) NOT NULL COMMENT 'Full or Linked Clone (applicable
to VMs on ESX)',
+ PRIMARY KEY (`vm_id`)
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+
+ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT',
'UserVmManager', 'vmware.create.full.clone' , 'false', 'If set to true, creates
VMs as full clones on ESX hypervisor');
+
+ -- Re-enable foreign key checking, at the end of the upgrade path
+ SET foreign_key_checks = 1;
