Merge branch 'master' into marvin_refactor
Conflicts:
tools/apidoc/gen_toc.py
Signed-off-by: Prasanna Santhanam <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/30e29713
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/30e29713
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/30e29713
Branch: refs/heads/marvin_refactor
Commit: 30e29713417aa9fb90f44474d6bcf7a1eb4ddfed
Parents: 8c169e0 4ae3e5d
Author: Prasanna Santhanam <[email protected]>
Authored: Fri Apr 12 17:26:54 2013 +0530
Committer: Prasanna Santhanam <[email protected]>
Committed: Fri Apr 12 17:26:54 2013 +0530
----------------------------------------------------------------------
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 -
api/src/com/cloud/async/AsyncJob.java | 3 +-
.../cloud/consoleproxy/ConsoleProxyService.java | 23 -
api/src/com/cloud/event/EventTypes.java | 8 +-
.../cloud/exception/AffinityConflictException.java | 34 +
api/src/com/cloud/offering/NetworkOffering.java | 1 +
api/src/com/cloud/server/ManagementService.java | 4 +-
api/src/com/cloud/vm/UserVmService.java | 183 +-
.../apache/cloudstack/affinity/AffinityGroup.java | 31 +
.../affinity/AffinityGroupProcessor.java | 49 +
.../cloudstack/affinity/AffinityGroupResponse.java | 155 ++
.../cloudstack/affinity/AffinityGroupService.java | 79 +
.../affinity/AffinityGroupTypeResponse.java | 48 +
.../cloudstack/affinity/AffinityProcessorBase.java | 44 +
.../org/apache/cloudstack/api/ApiConstants.java | 5 +-
api/src/org/apache/cloudstack/api/BaseCmd.java | 10 +-
.../apache/cloudstack/api/ResponseGenerator.java | 18 +-
.../command/admin/cluster/UpdateClusterCmd.java | 15 +-
.../admin/config/ListDeploymentPlannersCmd.java | 71 +
.../admin/offering/CreateServiceOfferingCmd.java | 7 +
.../user/affinitygroup/CreateAffinityGroupCmd.java | 167 ++
.../user/affinitygroup/DeleteAffinityGroupCmd.java | 154 ++
.../affinitygroup/ListAffinityGroupTypesCmd.java | 67 +
.../user/affinitygroup/ListAffinityGroupsCmd.java | 90 +
.../affinitygroup/UpdateVMAffinityGroupCmd.java | 164 ++
.../ha/gslb/ListGlobalLoadBalancerRuleCmd.java | 2 +-
.../api/command/user/vm/DeployVMCmd.java | 41 +-
.../user/vmsnapshot/CreateVMSnapshotCmd.java | 2 +-
.../user/vmsnapshot/DeleteVMSnapshotCmd.java | 2 +-
.../command/user/vmsnapshot/ListVMSnapshotCmd.java | 2 +-
.../user/vmsnapshot/RevertToSnapshotCmd.java | 2 +-
.../api/response/DeploymentPlannersResponse.java | 37 +
.../api/response/FirewallRuleResponse.java | 12 +
.../cloudstack/api/response/UserVmResponse.java | 14 +
.../org/apache/cloudstack/query/QueryService.java | 4 +
.../com/cloud/bridge/service/EC2RestServlet.java | 2 +-
client/pom.xml | 23 +-
client/tomcatconf/applicationContext.xml.in | 13 +-
client/tomcatconf/commands.properties.in | 7 +
client/tomcatconf/componentContext.xml.in | 11 +-
client/tomcatconf/nonossComponentContext.xml.in | 7 +-
client/tomcatconf/simulatorComponentContext.xml.in | 23 +-
.../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 -----
debian/cloudstack-management.install | 2 +
debian/rules | 2 +
deps/install-non-oss.sh | 13 -
docs/en-US/Book_Info.xml | 2 +-
docs/en-US/Release_Notes.xml | 85 +-
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 +-
docs/publican-cloudstack/defaults.cfg | 4 +-
.../cloud/entity/api/VMEntityManagerImpl.java | 84 +-
.../platform/orchestration/CloudOrchestrator.java | 63 +-
.../debian/config/etc/init.d/cloud-early-config | 56 +-
.../host-anti-affinity/pom.xml | 33 +
.../affinity/HostAntiAffinityProcessor.java | 93 +
.../cloudstack/syslog/AlertsSyslogAppender.java | 4 +-
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 ++-
plugins/pom.xml | 1 +
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/pom.xml | 2 -
server/src/com/cloud/api/ApiDBUtils.java | 28 +-
server/src/com/cloud/api/ApiResponseHelper.java | 70 +-
.../src/com/cloud/api/query/QueryManagerImpl.java | 108 +
.../com/cloud/api/query/ViewResponseHelper.java | 20 +-
.../cloud/api/query/dao/AffinityGroupJoinDao.java | 37 +
.../api/query/dao/AffinityGroupJoinDaoImpl.java | 142 ++
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 27 +
.../cloud/api/query/vo/AffinityGroupJoinVO.java | 248 ++
.../src/com/cloud/api/query/vo/UserVmJoinVO.java | 37 +
server/src/com/cloud/configuration/Config.java | 4 +-
.../cloud/configuration/ConfigurationManager.java | 3 +-
.../configuration/ConfigurationManagerImpl.java | 6 +-
.../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 +-
.../cloud/deploy/DeploymentPlanningManager.java | 45 +
.../deploy/DeploymentPlanningManagerImpl.java | 96 +
server/src/com/cloud/deploy/FirstFitPlanner.java | 95 +-
server/src/com/cloud/domain/dao/DomainDaoImpl.java | 11 +-
.../hypervisor/dao/HypervisorCapabilitiesDao.java | 2 +
.../dao/HypervisorCapabilitiesDaoImpl.java | 7 +
.../network/ExternalFirewallDeviceManagerImpl.java | 12 +-
.../src/com/cloud/network/NetworkManagerImpl.java | 16 +-
server/src/com/cloud/network/NetworkModelImpl.java | 21 +-
.../src/com/cloud/network/vpc/VpcManagerImpl.java | 7 +-
.../com/cloud/resource/ResourceManagerImpl.java | 22 +-
.../PremiumSecondaryStorageManagerImpl.java | 6 +-
.../com/cloud/server/ConfigurationServerImpl.java | 22 +-
.../src/com/cloud/server/ManagementServerImpl.java | 123 +-
.../src/com/cloud/service/ServiceOfferingVO.java | 81 +-
.../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 | 15 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 90 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 132 +-
.../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 13 +-
.../affinity/AffinityGroupServiceImpl.java | 346 +++
.../cloudstack/affinity/AffinityGroupVMMapVO.java | 66 +
.../cloudstack/affinity/AffinityGroupVO.java | 114 +
.../cloudstack/affinity/dao/AffinityGroupDao.java | 30 +
.../affinity/dao/AffinityGroupDaoImpl.java | 102 +
.../affinity/dao/AffinityGroupVMMapDao.java | 47 +
.../affinity/dao/AffinityGroupVMMapDaoImpl.java | 167 ++
.../test/com/cloud/vm/MockUserVmManagerImpl.java | 16 +-
.../cloud/vm/snapshot/VMSnapshotManagerTest.java | 20 +-
.../cloud/vpc/MockConfigurationManagerImpl.java | 2 +-
.../affinity/AffinityApiTestConfiguration.java | 344 +++
.../cloudstack/affinity/AffinityApiUnitTest.java | 187 ++
.../networkoffering/ChildTestConfiguration.java | 7 +-
.../networkoffering/CreateNetworkOfferingTest.java | 1 -
server/test/resources/affinityContext.xml | 47 +
.../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 | 283 +++-
setup/dev/basic.cfg | 6 +-
setup/dev/local.cfg | 44 +
test/integration/smoke/test_ScaleVm.py | 4 +-
test/integration/smoke/test_affinity_groups.py | 194 ++
tools/apidoc/build-apidoc.sh | 2 +-
tools/apidoc/gen_toc.py | 3 +-
tools/apidoc/pom.xml | 3 +-
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/marvin/integration/lib/oldbase.py | 42 +-
tools/marvin/pom.xml | 18 +-
ui/index.jsp | 2 +-
ui/scripts/cloudStack.js | 4 +-
ui/scripts/instances.js | 6 +-
ui/scripts/network.js | 410 ++++-
ui/scripts/regions.js | 169 ++-
ui/scripts/system.js | 19 +-
ui/scripts/ui-custom/regions.js | 2 +-
ui/scripts/ui/widgets/listView.js | 6 +-
ui/scripts/ui/widgets/multiEdit.js | 16 +-
utils/src/com/cloud/utils/SerialVersionUID.java | 1 +
utils/src/com/cloud/utils/nio/NioClient.java | 3 +-
utils/src/com/cloud/utils/nio/NioConnection.java | 2 +-
.../vmware/util/VmwareGuestOsMapper.java | 5 +
238 files changed, 14012 insertions(+), 6896 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/30e29713/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 5e5f624,dbc3907..c2bd83b
--- a/pom.xml
+++ b/pom.xml
@@@ -317,12 -317,14 +317,16 @@@
<exclude>deps/XenServerJava/Makefile</exclude>
<exclude>dist/console-proxy/js/jquery.js</exclude>
<exclude>scripts/vm/systemvm/id_rsa.cloud</exclude>
+
<exclude>services/console-proxy/server/conf/agent.properties</exclude>
+
<exclude>services/console-proxy/server/conf/environment.properties</exclude>
+
<exclude>services/secondary-storage/conf/agent.properties</exclude>
+
<exclude>services/secondary-storage/conf/environment.properties</exclude>
<exclude>tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf</exclude>
- <exclude>tools/appliance/definitions/devcloud/*</exclude>
-
<exclude>tools/appliance/definitions/systemvmtemplate/*</exclude>
-
<exclude>tools/appliance/definitions/systemvmtemplate64/*</exclude>
+
<exclude>tools/appliance/definitions/systemvmtemplate/base.sh</exclude>
+
<exclude>tools/appliance/definitions/systemvmtemplate/cleanup.sh</exclude>
+
<exclude>tools/appliance/definitions/systemvmtemplate/definition.rb</exclude>
+
<exclude>tools/appliance/definitions/systemvmtemplate/preseed.cfg</exclude>
+
<exclude>tools/appliance/definitions/systemvmtemplate/zerodisk.sh</exclude>
<exclude>tools/cli/cloudmonkey.egg-info/*</exclude>
<exclude>tools/devcloud/src/deps/boxes/basebox-build/definition.rb</exclude>
<exclude>tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg</exclude>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/30e29713/server/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/30e29713/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/30e29713/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/30e29713/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/30e29713/server/src/com/cloud/upgrade/dao/Upgrade410to420.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/30e29713/server/test/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/30e29713/test/integration/smoke/test_ScaleVm.py
----------------------------------------------------------------------
diff --cc test/integration/smoke/test_ScaleVm.py
index 8f48c6f,64fe4dc..1f20258
--- a/test/integration/smoke/test_ScaleVm.py
+++ b/test/integration/smoke/test_ScaleVm.py
@@@ -164,9 -164,9 +164,9 @@@ class TestScaleVm(cloudstackTestCase)
cleanup_resources(self.apiclient, self.cleanup)
return
- @attr(tags = ["advanced", "basic", "multicluster", "storagemotion",
"xenserver"])
+ @attr(tags = ["xenserver", "advanced", "basic"])
def test_01_scale_vm(self):
- """Test scale virtual machine
+ """Test scale virtual machine
"""
# Validate the following
# Scale up the vm and see if it scales to the new svc offering and is
finally in running state
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/30e29713/tools/apidoc/gen_toc.py
----------------------------------------------------------------------
diff --cc tools/apidoc/gen_toc.py
index e06582f,2d5292b..b452436
--- a/tools/apidoc/gen_toc.py
+++ b/tools/apidoc/gen_toc.py
@@@ -137,7 -137,7 +137,8 @@@ known_categories =
'addIpToNic': 'Nic',
'removeIpFromNic': 'Nic',
'listNics':'Nic',
+ 'Simulator': 'Simulator',
+ 'AffinityGroup': 'Affinity Group',
}
