Merge branch 'master' into deps-ctrl
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1662f0ab Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1662f0ab Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1662f0ab Branch: refs/heads/deps-ctrl Commit: 1662f0ab84f5412d6d099d8142c65fa7a164dfd9 Parents: 6784a16 1fbf595 Author: David Nalley <[email protected]> Authored: Mon Jul 30 19:36:16 2012 -0400 Committer: David Nalley <[email protected]> Committed: Mon Jul 30 19:36:16 2012 -0400 ---------------------------------------------------------------------- .gitignore | 1 - .../com/cloud/agent/manager/MockVmManagerImpl.java | 4 +- .../com/cloud/resource/AgentRoutingResource.java | 4 +- .../ubuntu/SYSCONFDIR/init/cloud-cleanup.conf | 32 -- .../resource/computing/FakeComputingResource.java | 11 +- .../computing/LibvirtComputingResource.java | 105 ++++-- .../agent/resource/computing/LibvirtSecretDef.java | 106 +++++ .../resource/computing/LibvirtStoragePoolDef.java | 80 ++++- .../computing/LibvirtStoragePoolXMLParser.java | 35 ++- .../agent/resource/computing/LibvirtVMDef.java | 66 +++- .../com/cloud/agent/storage/KVMPhysicalDisk.java | 16 + .../com/cloud/agent/storage/KVMStoragePool.java | 10 + .../cloud/agent/storage/KVMStoragePoolManager.java | 21 +- .../cloud/agent/storage/LibvirtStorageAdaptor.java | 254 +++++++++++-- .../cloud/agent/storage/LibvirtStoragePool.java | 50 +++ .../com/cloud/agent/storage/StorageAdaptor.java | 4 +- api/src/com/cloud/agent/api/RebootAnswer.java | 33 +-- api/src/com/cloud/agent/api/StopAnswer.java | 8 +- api/src/com/cloud/agent/api/StopCommand.java | 10 - api/src/com/cloud/agent/api/to/StorageFilerTO.java | 6 + .../cloud/api/commands/CreateFirewallRuleCmd.java | 2 +- api/src/com/cloud/api/response/NicResponse.java | 7 + .../network/element/ConnectivityProvider.java | 21 + api/src/com/cloud/storage/Storage.java | 1 + api/src/com/cloud/storage/StoragePool.java | 5 + .../com/cloud/network/resource/XTrustProvider.java | 16 - core/src/com/cloud/storage/StoragePoolVO.java | 22 + docs/publican.cfg | 10 + docs/runbook/en-US/Environment.xml | 49 +-- patches/systemvm/debian/config/etc/sysctl.conf | 7 + .../user-concentrated-pod/build.xml | 2 +- .../com/cloud/ovm/hypervisor/OvmResourceBase.java | 10 +- .../hypervisor/vmware/resource/VmwareResource.java | 54 +-- .../xen/resource/CitrixResourceBase.java | 44 +-- .../network/lb/ElasticLoadBalancerManagerImpl.java | 5 + .../cloud/network/element/NiciraNvpElement.java | 2 +- .../network/guru/NiciraNvpGuestNetworkGuru.java | 6 +- .../cloud/network/resource/NiciraNvpResource.java | 2 +- scripts/vm/hypervisor/xenserver/setupxenserver.sh | 14 + server/src/com/cloud/api/ApiResponseHelper.java | 1 + .../com/cloud/baremetal/BareMetalResourceBase.java | 6 +- .../AgentBasedConsoleProxyManager.java | 4 + .../consoleproxy/ConsoleProxyManagerImpl.java | 4 + server/src/com/cloud/deploy/FirstFitPlanner.java | 43 ++- .../src/com/cloud/network/NetworkManagerImpl.java | 24 +- .../router/VirtualNetworkApplianceManagerImpl.java | 126 +++++-- .../src/com/cloud/network/rules/RulesManager.java | 9 + .../com/cloud/network/rules/RulesManagerImpl.java | 73 +++- server/src/com/cloud/storage/StorageManager.java | 4 +- .../src/com/cloud/storage/StorageManagerImpl.java | 108 +++++- .../allocator/AbstractStoragePoolAllocator.java | 77 +---- .../allocator/FirstFitStoragePoolAllocator.java | 13 + .../secondary/SecondaryStorageManagerImpl.java | 5 + .../storage/snapshot/SnapshotManagerImpl.java | 8 + .../com/cloud/upgrade/DatabaseUpgradeChecker.java | 13 +- .../src/com/cloud/upgrade/dao/Upgrade302to303.java | 11 - .../src/com/cloud/upgrade/dao/Upgrade303to40.java | 67 ++++ server/src/com/cloud/vm/UserVmManagerImpl.java | 6 +- server/src/com/cloud/vm/VirtualMachineGuru.java | 7 + .../com/cloud/vm/VirtualMachineManagerImpl.java | 9 +- .../test/com/cloud/vm/MockUserVmManagerImpl.java | 6 + setup/apidoc/generateadmincommands.xsl | 18 +- setup/apidoc/generatecommand.xsl | 19 +- setup/apidoc/generatedomainadmincommands.xsl | 17 +- setup/apidoc/generatetoc_footer.xsl | 17 +- setup/apidoc/generateusercommands.xsl | 17 +- setup/db/create-schema.sql | 2 +- setup/db/db/schema-303to40.sql | 63 +++ tools/devcloud/README | 6 + tools/devcloud/basebuild/Vagrantfile | 51 +++ .../basebuild/puppet-devcloudinitial/Modulefile | 8 + .../basebuild/puppet-devcloudinitial/files/grub | 34 ++ .../puppet-devcloudinitial/files/interfaces | 16 + .../puppet-devcloudinitial/files/network.conf | 1 + .../puppet-devcloudinitial/files/xen-defaults | 1 + .../basebuild/puppet-devcloudinitial/files/xend | 171 ++++++++ .../basebuild/puppet-devcloudinitial/init.pp | 18 + .../puppet-devcloudinitial/manifests/init.pp | 118 ++++++ tools/devcloud/devcloudbox/Vagrantfile | 51 +++ .../devcloudbox/puppet-devcloud/Modulefile | 8 + .../puppet-devcloud/files/configebtables.sh | 21 + .../puppet-devcloud/files/configlocalstorage.sh | 25 ++ .../devcloudbox/puppet-devcloud/files/configvnc.sh | 25 ++ .../devcloudbox/puppet-devcloud/files/exports | 1 + .../puppet-devcloud/files/iptables.save | 17 + .../puppet-devcloud/files/updatecode.sh | 27 ++ tools/devcloud/devcloudbox/puppet-devcloud/init.pp | 18 + .../devcloudbox/puppet-devcloud/manifests/init.pp | 304 +++++++++++++++ tools/devcloud/veewee/postinstall.sh | 42 ++ tools/marvin/marvin/NoseTestExecuteEngine.py | 102 ----- tools/marvin/marvin/TestCaseExecuteEngine.py | 6 +- tools/marvin/marvin/cloudstackConnection.py | 3 +- tools/marvin/marvin/cloudstackTestCase.py | 2 +- tools/marvin/marvin/deployAndRun.py | 33 +- tools/marvin/marvin/deployDataCenter.py | 45 ++- tools/marvin/marvin/marvinPlugin.py | 117 ++++++ tools/marvin/marvin/sandbox/basic/setup.properties | 41 ++ tools/marvin/marvin/setup.py | 46 +++ tools/marvin/marvin/testSetupSuccess.py | 81 ++++ tools/marvin/setup.py | 4 +- ui/css/cloudstack3.css | 6 +- ui/index.jsp | 1 + ui/scripts/instances.js | 32 +- ui/scripts/projects.js | 57 +++- ui/scripts/sharedFunctions.js | 25 ++ ui/scripts/system.js | 52 +++ ui/scripts/ui-custom/login.js | 30 ++- ui/scripts/ui/core.js | 2 +- ui/scripts/ui/widgets/detailView.js | 50 ++- ui/scripts/ui/widgets/multiEdit.js | 6 + ui/scripts/ui/widgets/tagger.js | 36 ++- usage/scripts/usageserver.sh | 45 --- 112 files changed, 2955 insertions(+), 742 deletions(-) ----------------------------------------------------------------------
