Updated Branches:
refs/heads/vpc 9644a6201 -> 7706a9c32
Merge branch 'master' into vpc
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7706a9c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7706a9c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7706a9c3
Branch: refs/heads/vpc
Commit: 7706a9c32f52390e27d78eb3cb9e1586a577ea9d
Parents: 9644a62 cc08eee
Author: Alena Prokharchyk <[email protected]>
Authored: Tue Jul 31 13:37:28 2012 -0700
Committer: Alena Prokharchyk <[email protected]>
Committed: Tue Jul 31 13:37:28 2012 -0700
----------------------------------------------------------------------
.gitignore | 1 -
agent/.classpath | 18 +
agent/.project | 18 +
agent/conf/agent.properties | 2 +-
agent/conf/dummy.agent.properties | 17 +
agent/conf/environment.properties.in | 2 +-
agent/conf/log4j-cloud.xml.in | 18 +
agent/doc/README-iscsi.txt | 17 +
agent/doc/README.txt | 17 +
agent/scripts/run.sh | 2 +-
.../resource/computing/FakeComputingResource.java | 642 ---
.../agent/resource/computing/KVMGuestOsMapper.java | 169 -
.../cloud/agent/resource/computing/KVMHABase.java | 220 -
.../agent/resource/computing/KVMHAChecker.java | 85 -
.../agent/resource/computing/KVMHAMonitor.java | 119 -
.../resource/computing/LibvirtCapXMLParser.java | 194 -
.../computing/LibvirtComputingResource.java | 4120 ---------------
.../resource/computing/LibvirtConnection.java | 48 -
.../resource/computing/LibvirtDomainXMLParser.java | 253 -
.../resource/computing/LibvirtNetworkDef.java | 193 -
.../agent/resource/computing/LibvirtSecretDef.java | 106 -
.../resource/computing/LibvirtStoragePoolDef.java | 162 -
.../computing/LibvirtStoragePoolXMLParser.java | 128 -
.../computing/LibvirtStorageVolumeDef.java | 91 -
.../computing/LibvirtStorageVolumeXMLParser.java | 104 -
.../agent/resource/computing/LibvirtVMDef.java | 964 ----
.../agent/resource/computing/LibvirtXMLParser.java | 72 -
.../com/cloud/agent/storage/KVMPhysicalDisk.java | 98 -
.../com/cloud/agent/storage/KVMStoragePool.java | 65 -
.../cloud/agent/storage/KVMStoragePoolManager.java | 109 -
.../com/cloud/agent/storage/KVMVirtualDisk.java | 21 -
.../cloud/agent/storage/LibvirtStorageAdaptor.java | 901 ----
.../cloud/agent/storage/LibvirtStoragePool.java | 208 -
.../com/cloud/agent/storage/StorageAdaptor.java | 70 -
api/src/com/cloud/api/response/NicResponse.java | 7 +
.../network/element/ConnectivityProvider.java | 21 +
build/build-cloud-plugins.xml | 9 +-
build/build-marvin.xml | 4 +-
build/developer.xml | 6 +-
build/package.xml | 15 +-
cloud.spec | 1 +
.../kvm/resource/KvmDummyResourceBase.java | 89 -
debian/cloud-agent-libs.install | 1 +
docs/publican.cfg | 10 +
docs/runbook/en-US/Environment.xml | 49 +-
patches/systemvm/debian/config/etc/sysctl.conf | 7 +
plugins/hypervisors/kvm/.classpath | 11 +
plugins/hypervisors/kvm/.project | 23 +
plugins/hypervisors/kvm/.pydevproject | 7 +
plugins/hypervisors/kvm/build.xml | 137 +
.../kvm/resource/FakeComputingResource.java | 641 +++
.../hypervisor/kvm/resource/KVMGuestOsMapper.java | 169 +
.../cloud/hypervisor/kvm/resource/KVMHABase.java | 219 +
.../hypervisor/kvm/resource/KVMHAChecker.java | 84 +
.../hypervisor/kvm/resource/KVMHAMonitor.java | 119 +
.../kvm/resource/LibvirtCapXMLParser.java | 194 +
.../kvm/resource/LibvirtComputingResource.java | 4120 +++++++++++++++
.../hypervisor/kvm/resource/LibvirtConnection.java | 48 +
.../kvm/resource/LibvirtDomainXMLParser.java | 250 +
.../hypervisor/kvm/resource/LibvirtNetworkDef.java | 193 +
.../hypervisor/kvm/resource/LibvirtSecretDef.java | 106 +
.../kvm/resource/LibvirtStoragePoolDef.java | 162 +
.../kvm/resource/LibvirtStoragePoolXMLParser.java | 128 +
.../kvm/resource/LibvirtStorageVolumeDef.java | 91 +
.../resource/LibvirtStorageVolumeXMLParser.java | 104 +
.../hypervisor/kvm/resource/LibvirtVMDef.java | 963 ++++
.../hypervisor/kvm/resource/LibvirtXMLParser.java | 72 +
.../hypervisor/kvm/storage/KVMPhysicalDisk.java | 98 +
.../hypervisor/kvm/storage/KVMStoragePool.java | 65 +
.../kvm/storage/KVMStoragePoolManager.java | 109 +
.../hypervisor/kvm/storage/KVMVirtualDisk.java | 21 +
.../kvm/storage/LibvirtStorageAdaptor.java | 901 ++++
.../hypervisor/kvm/storage/LibvirtStoragePool.java | 208 +
.../hypervisor/kvm/storage/StorageAdaptor.java | 68 +
.../cloud/network/element/NiciraNvpElement.java | 2 +-
.../network/guru/NiciraNvpGuestNetworkGuru.java | 6 +-
.../cloud/network/resource/NiciraNvpResource.java | 2 +-
python/lib/cloudutils/serviceConfig.py | 190 +-
scripts/vm/hypervisor/xenserver/setupxenserver.sh | 14 +
.../com/cloud/agent/manager/AgentManagerImpl.java | 2 +-
server/src/com/cloud/api/ApiResponseHelper.java | 1 +
.../com/cloud/baremetal/BareMetalResourceBase.java | 1 -
.../kvm/discoverer/KvmDummyResourceBase.java | 88 +
.../kvm/discoverer/KvmServerDiscoverer.java | 7 +-
.../src/com/cloud/network/NetworkManagerImpl.java | 42 +-
.../src/com/cloud/network/rules/RulesManager.java | 9 +
.../com/cloud/network/rules/RulesManagerImpl.java | 65 +-
.../com/cloud/resource/ResourceManagerImpl.java | 2 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 3 +-
.../test/com/cloud/vm/MockUserVmManagerImpl.java | 6 +
setup/apidoc/gen_toc.py | 1 +
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 | 3 +-
setup/db/db/schema-303to40.sql | 24 +-
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/startdevcloud.sh | 23 +
.../puppet-devcloud/files/updatecode.sh | 27 +
tools/devcloud/devcloudbox/puppet-devcloud/init.pp | 18 +
.../devcloudbox/puppet-devcloud/manifests/init.pp | 320 ++
tools/devcloud/devcloudsetup.sh | 2 +-
tools/devcloud/puppet/README | 12 -
.../puppet/puppet-devcloudinitial/Modulefile | 8 -
.../puppet/puppet-devcloudinitial/files/grub | 34 -
.../puppet/puppet-devcloudinitial/files/interfaces | 16 -
.../puppet-devcloudinitial/files/network.conf | 1 -
.../puppet-devcloudinitial/files/xen-defaults | 1 -
.../puppet/puppet-devcloudinitial/files/xend | 171 -
.../devcloud/puppet/puppet-devcloudinitial/init.pp | 1 -
.../puppet-devcloudinitial/manifests/init.pp | 101 -
tools/devcloud/ubuntu_install/README | 1 -
tools/devcloud/vagrant/Vagrantfile | 72 -
tools/devcloud/vagrant/vagrant.pp | 43 -
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 | 7 +-
ui/css/cloudstack3.css | 4 +-
ui/scripts/instances.js | 34 +-
ui/scripts/ui/widgets/tagger.js | 36 +-
ui/scripts/zoneWizard.js | 9 +-
usage/scripts/usageserver.sh | 45 -
148 files changed, 11268 insertions(+), 10142 deletions(-)
----------------------------------------------------------------------
