Merge branch 'master' into ui-vm-affinity
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b6c354a0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b6c354a0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b6c354a0 Branch: refs/heads/master Commit: b6c354a057a5be49185ca87fa7982ba154d11317 Parents: e907a08 f66b9b5 Author: Brian Federle <brian.fede...@citrix.com> Authored: Wed Apr 10 14:58:50 2013 -0700 Committer: Brian Federle <brian.fede...@citrix.com> Committed: Wed Apr 10 14:58:50 2013 -0700 ---------------------------------------------------------------------- agent/src/com/cloud/agent/AgentShell.java | 3 +- .../consoleproxy/ConsoleProxyResource.java | 4 +- api/src/com/cloud/agent/api/to/FirewallRuleTO.java | 6 + .../api/commands/CreatePrivateNetworkCmd.java | 197 -- .../cloud/api/commands/DestroyConsoleProxyCmd.java | 93 - .../cloud/consoleproxy/ConsoleProxyService.java | 23 - api/src/com/cloud/offering/NetworkOffering.java | 1 + api/src/org/apache/cloudstack/api/BaseCmd.java | 2 - .../user/vmsnapshot/CreateVMSnapshotCmd.java | 2 +- .../user/vmsnapshot/DeleteVMSnapshotCmd.java | 2 +- .../command/user/vmsnapshot/ListVMSnapshotCmd.java | 2 +- .../user/vmsnapshot/RevertToSnapshotCmd.java | 2 +- .../api/response/FirewallRuleResponse.java | 12 + client/pom.xml | 16 + client/tomcatconf/applicationContext.xml.in | 2 +- .../cloud/hypervisor/HypervisorCapabilitiesVO.java | 13 +- .../src/com/cloud/resource/ServerResourceBase.java | 2 +- .../resource/CifsSecondaryStorageResource.java | 755 ------ .../resource/LocalSecondaryStorageResource.java | 246 -- .../resource/NfsSecondaryStorageResource.java | 1842 -------------- .../storage/resource/SecondaryStorageResource.java | 28 - .../resource/SecondaryStorageResourceHandler.java | 24 - .../cloud/storage/template/DownloadManager.java | 103 - .../storage/template/DownloadManagerImpl.java | 1049 -------- .../com/cloud/storage/template/UploadManager.java | 85 - .../cloud/storage/template/UploadManagerImpl.java | 645 ----- deps/install-non-oss.sh | 13 - docs/en-US/Book_Info.xml | 2 +- docs/en-US/Release_Notes.xml | 90 +- docs/en-US/add-clusters-vsphere.xml | 104 +- docs/en-US/added-API-commands-4.2.xml | 43 + docs/en-US/added-API-commands.xml | 2 +- docs/en-US/aws-ec2-introduction.xml | 2 +- docs/en-US/building-documentation.xml | 2 +- docs/en-US/building-marvin.xml | 2 +- docs/en-US/building-translation.xml | 2 +- ...change-console-proxy-ssl-certificate-domain.xml | 2 +- docs/en-US/citrix-xenserver-installation.xml | 2 +- docs/en-US/configure-package-repository.xml | 2 +- docs/en-US/configure-vpn.xml | 2 +- docs/en-US/console-proxy.xml | 2 +- docs/en-US/hypervisor-host-install-libvirt.xml | 2 +- ...hypervisor-host-install-network-openvswitch.xml | 2 +- docs/en-US/hypervisor-host-install-network.xml | 4 +- docs/en-US/images/add-cluster.png | Bin 46302 -> 35697 bytes docs/en-US/images/dvswitch-config.png | Bin 0 -> 41955 bytes docs/en-US/images/dvswitchconfig.png | Bin 0 -> 38642 bytes .../en-US/management-server-install-prepare-os.xml | 2 +- docs/en-US/management-server-lb.xml | 2 +- docs/en-US/minimum-system-requirements.xml | 2 +- docs/en-US/multiple-ip-nic.xml | 91 + docs/en-US/networks.xml | 1 + docs/en-US/translating-documentation.xml | 2 +- docs/en-US/using-sshkeys.xml | 2 +- docs/en-US/vmware-cluster-config-dvswitch.xml | 193 ++ docs/en-US/vmware-install.xml | 511 +++-- docs/en-US/vmware-requirements.xml | 2 +- docs/en-US/whats-new.xml | 6 +- docs/en-US/writing-new-documentation.xml | 4 +- .../cloud/entity/api/VMEntityManagerImpl.java | 2 +- .../debian/config/etc/init.d/cloud-early-config | 56 +- plugins/hypervisors/simulator/pom.xml | 5 + .../com/cloud/resource/AgentStorageResource.java | 2 +- .../resource/SimulatorSecondaryDiscoverer.java | 3 +- plugins/hypervisors/vmware/pom.xml | 5 + .../src/com/cloud/hypervisor/guru/VMwareGuru.java | 5 +- .../resource/PremiumSecondaryStorageResource.java | 2 + .../VmwareSecondaryStorageResourceHandler.java | 1 + .../xen/resource/CitrixResourceBase.java | 2 +- .../element/JuniperSRXExternalFirewallElement.java | 2 +- .../cloud/network/resource/JuniperSrxResource.java | 322 ++- pom.xml | 4 + scripts/network/juniper/application-add.xml | 2 +- scripts/network/juniper/security-policy-add.xml | 4 +- scripts/vm/hypervisor/kvm/patchviasocket.pl | 2 +- scripts/vm/systemvm/injectkeys.sh | 26 +- server/src/com/cloud/api/ApiResponseHelper.java | 1 + server/src/com/cloud/configuration/Config.java | 4 +- .../AgentBasedConsoleProxyManager.java | 184 +-- .../AgentBasedConsoleProxyManager.java.orig | 298 +++ .../src/com/cloud/consoleproxy/AgentHookBase.java | 266 ++ .../cloud/consoleproxy/ConsoleProxyManager.java | 17 +- .../consoleproxy/ConsoleProxyManagerImpl.java | 380 +-- .../cloud/consoleproxy/ConsoleProxyService.java | 25 + .../consoleproxy/StaticConsoleProxyManager.java | 84 +- server/src/com/cloud/deploy/FirstFitPlanner.java | 39 +- .../hypervisor/dao/HypervisorCapabilitiesDao.java | 2 + .../dao/HypervisorCapabilitiesDaoImpl.java | 7 + .../network/ExternalFirewallDeviceManagerImpl.java | 12 +- .../src/com/cloud/network/NetworkManagerImpl.java | 16 +- .../PremiumSecondaryStorageManagerImpl.java | 6 +- .../storage/download/DownloadMonitorImpl.java | 11 +- .../secondary/SecondaryStorageDiscoverer.java | 322 --- .../secondary/SecondaryStorageManagerImpl.java | 10 +- .../src/com/cloud/upgrade/dao/Upgrade410to420.java | 60 + server/src/com/cloud/user/AccountManagerImpl.java | 6 +- server/src/com/cloud/vm/UserVmManagerImpl.java | 21 +- .../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 13 +- .../cloud/vm/snapshot/VMSnapshotManagerTest.java | 20 +- .../console-proxy/server/conf/agent.properties | 17 - .../server/conf/environment.properties | 2 + services/console-proxy/server/conf/log4j-cloud.xml | 2 +- services/console-proxy/server/pom.xml | 41 + services/console-proxy/server/scripts/_run.sh | 3 +- .../console-proxy/server/scripts/consoleproxy.sh | 33 + .../console-proxy/server/scripts/secstorage.sh | 33 + .../src/com/cloud/consoleproxy/ConsoleProxy.java | 16 +- services/pom.xml | 1 + services/secondary-storage/conf/agent.properties | 2 + .../secondary-storage/conf/environment.properties | 2 + services/secondary-storage/conf/log4j-cloud.xml | 102 + services/secondary-storage/pom.xml | 103 + services/secondary-storage/scripts/_run.sh | 64 + services/secondary-storage/scripts/config_auth.sh | 69 + services/secondary-storage/scripts/config_ssl.sh | 174 ++ services/secondary-storage/scripts/ipfirewall.sh | 50 + services/secondary-storage/scripts/run-proxy.sh | 48 + services/secondary-storage/scripts/run.bat | 18 + services/secondary-storage/scripts/run.sh | 45 + services/secondary-storage/scripts/ssvm-check.sh | 136 ++ .../resource/CifsSecondaryStorageResource.java | 755 ++++++ .../resource/LocalSecondaryStorageResource.java | 246 ++ .../resource/NfsSecondaryStorageResource.java | 1882 +++++++++++++++ .../resource/SecondaryStorageDiscoverer.java | 320 +++ .../storage/resource/SecondaryStorageResource.java | 28 + .../resource/SecondaryStorageResourceHandler.java | 24 + .../storage/template/DownloadManager.java | 105 + .../storage/template/DownloadManagerImpl.java | 1074 ++++++++ .../cloudstack/storage/template/UploadManager.java | 87 + .../storage/template/UploadManagerImpl.java | 648 +++++ setup/db/db/schema-40to410.sql | 29 - setup/db/db/schema-410to420.sql | 43 + setup/dev/basic.cfg | 6 +- setup/dev/local.cfg | 44 + tools/appliance/build.sh | 5 +- .../definitions/systemvmtemplate/postinstall.sh | 20 +- .../definitions/systemvmtemplate/preseed.cfg | 14 +- .../definitions/systemvmtemplate64/postinstall.sh | 20 +- .../definitions/systemvmtemplate64/preseed.cfg | 14 +- tools/devcloud/devcloud.cfg | 1 + tools/devcloud/pom.xml | 33 + tools/devcloud/quickcloud.cfg | 121 + tools/marvin/marvin/cloudstackConnection.py | 6 +- tools/marvin/marvin/deployDataCenter.py | 19 +- tools/marvin/pom.xml | 18 +- ui/scripts/instances.js | 6 +- ui/scripts/network.js | 398 +++- ui/scripts/system.js | 19 +- utils/src/com/cloud/utils/nio/NioClient.java | 3 +- utils/src/com/cloud/utils/nio/NioConnection.java | 2 +- .../vmware/util/VmwareGuestOsMapper.java | 5 + 151 files changed, 9065 insertions(+), 6397 deletions(-) ----------------------------------------------------------------------
