You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ki...@apache.org on 2013/02/01 07:32:04 UTC
[20/40] git commit: refs/heads/master - Apply API refactoring
changes. Make changes to Regions API to work with new code
Apply API refactoring changes. Make changes to Regions API to work with new code
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/1f57d925
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/1f57d925
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/1f57d925
Branch: refs/heads/master
Commit: 1f57d925eb48596574f3c21f6db94bbe08f4958b
Parents: f365426 3bac7b8
Author: Kishan Kavala <ki...@cloud.com>
Authored: Fri Jan 25 18:41:59 2013 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Fri Jan 25 18:41:59 2013 +0530
----------------------------------------------------------------------
.gitignore | 16 +
CHANGES | 37 +
INSTALL.md | 171 +-
KEYS | 288 -
LICENSE | 3535 +++++-----
NOTICE | 161 +-
README.md | 74 +-
README.tools.md | 260 +
.../src/com/cloud/agent/MetricsCollector.java | 107 -
.../src/com/cloud/agent/MockVmMetrics.java | 205 -
.../src/com/cloud/agent/MultiCaster.java | 152 -
.../src/com/cloud/agent/MultiCasterListener.java | 22 -
.../src/com/cloud/agent/SimulatorCmd.java | 37 -
.../src/com/cloud/agent/SimulatorMigrateVmCmd.java | 83 -
.../com/cloud/agent/manager/MockAgentManager.java | 66 -
.../cloud/agent/manager/MockAgentManagerImpl.java | 468 --
.../cloud/agent/manager/MockStorageManager.java | 91 -
.../agent/manager/MockStorageManagerImpl.java | 1298 ----
.../src/com/cloud/agent/manager/MockVmManager.java | 83 -
.../com/cloud/agent/manager/MockVmManagerImpl.java | 615 --
.../src/com/cloud/agent/manager/SimulatorInfo.java | 59 -
.../com/cloud/agent/manager/SimulatorManager.java | 66 -
.../cloud/agent/manager/SimulatorManagerImpl.java | 336 -
.../com/cloud/api/commands/ConfigureSimulator.java | 82 -
.../configuration/SimulatorComponentLibrary.java | 50 -
.../src/com/cloud/resource/AgentResourceBase.java | 284 -
.../com/cloud/resource/AgentRoutingResource.java | 363 -
.../com/cloud/resource/AgentStorageResource.java | 117 -
.../com/cloud/resource/SimulatorDiscoverer.java | 336 -
.../resource/SimulatorSecondaryDiscoverer.java | 151 -
.../server/ManagementServerSimulatorImpl.java | 32 -
.../com/cloud/simulator/MockConfigurationVO.java | 121 -
.../src/com/cloud/simulator/MockHost.java | 62 -
.../src/com/cloud/simulator/MockHostVO.java | 276 -
.../src/com/cloud/simulator/MockSecStorageVO.java | 76 -
.../com/cloud/simulator/MockSecurityRulesVO.java | 104 -
.../src/com/cloud/simulator/MockStoragePoolVO.java | 102 -
.../src/com/cloud/simulator/MockVMVO.java | 130 -
.../src/com/cloud/simulator/MockVm.java | 45 -
.../src/com/cloud/simulator/MockVolumeVO.java | 118 -
.../src/com/cloud/simulator/SimulatorGuru.java | 59 -
.../cloud/simulator/SimulatorRuntimeException.java | 41 -
.../cloud/simulator/dao/MockConfigurationDao.java | 27 -
.../simulator/dao/MockConfigurationDaoImpl.java | 142 -
.../src/com/cloud/simulator/dao/MockHostDao.java | 27 -
.../com/cloud/simulator/dao/MockHostDaoImpl.java | 55 -
.../com/cloud/simulator/dao/MockSecStorageDao.java | 24 -
.../cloud/simulator/dao/MockSecStorageDaoImpl.java | 42 -
.../cloud/simulator/dao/MockSecurityRulesDao.java | 27 -
.../simulator/dao/MockSecurityRulesDaoImpl.java | 60 -
.../cloud/simulator/dao/MockStoragePoolDao.java | 25 -
.../simulator/dao/MockStoragePoolDaoImpl.java | 57 -
.../src/com/cloud/simulator/dao/MockVMDao.java | 29 -
.../src/com/cloud/simulator/dao/MockVMDaoImpl.java | 92 -
.../src/com/cloud/simulator/dao/MockVolumeDao.java | 30 -
.../com/cloud/simulator/dao/MockVolumeDaoImpl.java | 101 -
agent/bindir/cloud-ssh.in | 19 +
agent/pom.xml | 56 +-
agent/src/com/cloud/agent/Agent.java | 23 +-
agent/src/com/cloud/agent/AgentShell.java | 6 +-
api/pom.xml | 1 +
api/src/com/cloud/acl/ControlledEntity.java | 33 -
api/src/com/cloud/acl/SecurityChecker.java | 99 -
.../com/cloud/agent/api/AgentControlAnswer.java | 4 +-
.../com/cloud/agent/api/AgentControlCommand.java | 4 +-
api/src/com/cloud/agent/api/Answer.java | 18 +-
api/src/com/cloud/agent/api/AttachIsoCommand.java | 4 +-
.../com/cloud/agent/api/AttachVolumeAnswer.java | 16 +-
.../com/cloud/agent/api/AttachVolumeCommand.java | 24 +-
.../com/cloud/agent/api/BackupSnapshotAnswer.java | 8 +-
.../com/cloud/agent/api/BackupSnapshotCommand.java | 41 +-
api/src/com/cloud/agent/api/CancelCommand.java | 8 +-
api/src/com/cloud/agent/api/ChangeAgentAnswer.java | 2 +-
.../com/cloud/agent/api/ChangeAgentCommand.java | 8 +-
.../com/cloud/agent/api/CheckHealthCommand.java | 2 +-
.../com/cloud/agent/api/CheckNetworkAnswer.java | 4 +-
.../com/cloud/agent/api/CheckNetworkCommand.java | 8 +-
api/src/com/cloud/agent/api/CheckOnHostAnswer.java | 6 +-
.../com/cloud/agent/api/CheckOnHostCommand.java | 8 +-
api/src/com/cloud/agent/api/CheckRouterAnswer.java | 14 +-
.../agent/api/CheckS2SVpnConnectionsAnswer.java | 12 +-
.../agent/api/CheckS2SVpnConnectionsCommand.java | 8 +-
api/src/com/cloud/agent/api/CheckStateAnswer.java | 6 +-
api/src/com/cloud/agent/api/CheckStateCommand.java | 6 +-
.../cloud/agent/api/CheckVirtualMachineAnswer.java | 16 +-
.../agent/api/CheckVirtualMachineCommand.java | 10 +-
.../cloud/agent/api/CleanupNetworkRulesCmd.java | 10 +-
.../agent/api/CleanupSnapshotBackupCommand.java | 18 +-
api/src/com/cloud/agent/api/ClusterSyncAnswer.java | 14 +-
.../com/cloud/agent/api/ClusterSyncCommand.java | 10 +-
api/src/com/cloud/agent/api/Command.java | 6 +-
.../cloud/agent/api/ComputeChecksumCommand.java | 6 +-
.../api/ConsoleAccessAuthenticationAnswer.java | 62 +-
.../api/ConsoleAccessAuthenticationCommand.java | 32 +-
.../agent/api/ConsoleProxyLoadReportCommand.java | 10 +-
.../CreatePrivateTemplateFromSnapshotCommand.java | 25 +-
.../CreatePrivateTemplateFromVolumeCommand.java | 13 +-
.../cloud/agent/api/CreateStoragePoolCommand.java | 4 +-
.../agent/api/CreateVolumeFromSnapshotAnswer.java | 6 +-
.../agent/api/CreateVolumeFromSnapshotCommand.java | 21 +-
.../agent/api/DeleteObjectFromSwiftCommand.java | 10 +-
.../agent/api/DeleteSnapshotBackupAnswer.java | 10 +-
.../agent/api/DeleteSnapshotBackupCommand.java | 36 +-
.../cloud/agent/api/DeleteSnapshotsDirCommand.java | 10 +-
.../cloud/agent/api/DeleteStoragePoolCommand.java | 14 +-
.../agent/api/DeleteTemplateFromS3Command.java | 106 +
.../agent/api/DownloadSnapshotFromS3Command.java | 61 +
...oadTemplateFromS3ToSecondaryStorageCommand.java | 66 +
api/src/com/cloud/agent/api/FenceAnswer.java | 6 +-
api/src/com/cloud/agent/api/FenceCommand.java | 14 +-
.../com/cloud/agent/api/GetDomRVersionAnswer.java | 10 +-
api/src/com/cloud/agent/api/GetVncPortAnswer.java | 12 +-
api/src/com/cloud/agent/api/GetVncPortCommand.java | 8 +-
api/src/com/cloud/agent/api/HostStatsEntry.java | 26 +-
api/src/com/cloud/agent/api/MaintainAnswer.java | 12 +-
api/src/com/cloud/agent/api/MaintainCommand.java | 2 +-
.../com/cloud/agent/api/ManageSnapshotAnswer.java | 6 +-
.../com/cloud/agent/api/ManageSnapshotCommand.java | 22 +-
api/src/com/cloud/agent/api/MigrateAnswer.java | 6 +-
api/src/com/cloud/agent/api/MigrateCommand.java | 12 +-
.../cloud/agent/api/ModifyStoragePoolAnswer.java | 8 +-
.../cloud/agent/api/ModifyStoragePoolCommand.java | 16 +-
.../com/cloud/agent/api/NetworkUsageAnswer.java | 2 +-
.../com/cloud/agent/api/NetworkUsageCommand.java | 4 +-
api/src/com/cloud/agent/api/PingAnswer.java | 2 +-
api/src/com/cloud/agent/api/PingCommand.java | 10 +-
.../com/cloud/agent/api/PingRoutingCommand.java | 6 +-
.../cloud/agent/api/PingRoutingWithOvsCommand.java | 6 +-
.../com/cloud/agent/api/PingStorageCommand.java | 4 +-
api/src/com/cloud/agent/api/PlugNicCommand.java | 10 +-
api/src/com/cloud/agent/api/PoolEjectCommand.java | 8 +-
.../cloud/agent/api/PrepareForMigrationAnswer.java | 6 +-
.../agent/api/PrepareForMigrationCommand.java | 8 +-
.../cloud/agent/api/PrepareOCFS2NodesCommand.java | 6 +-
.../agent/api/PropagateResourceEventCommand.java | 12 +-
api/src/com/cloud/agent/api/ReadyAnswer.java | 4 +-
api/src/com/cloud/agent/api/ReadyCommand.java | 19 +-
api/src/com/cloud/agent/api/RebootAnswer.java | 10 +-
api/src/com/cloud/agent/api/RebootCommand.java | 12 +-
.../com/cloud/agent/api/RebootRouterCommand.java | 2 +-
.../agent/api/SecStorageFirewallCfgCommand.java | 20 +-
.../com/cloud/agent/api/SecStorageSetupAnswer.java | 4 +-
.../cloud/agent/api/SecStorageSetupCommand.java | 22 +-
.../cloud/agent/api/SecStorageVMSetupCommand.java | 4 +-
.../cloud/agent/api/SecurityGroupRuleAnswer.java | 10 +-
.../com/cloud/agent/api/SecurityGroupRulesCmd.java | 16 +-
api/src/com/cloud/agent/api/SetupAnswer.java | 2 +-
api/src/com/cloud/agent/api/SetupCommand.java | 10 +-
.../cloud/agent/api/SetupGuestNetworkCommand.java | 10 +-
api/src/com/cloud/agent/api/ShutdownCommand.java | 12 +-
api/src/com/cloud/agent/api/SnapshotCommand.java | 72 +-
api/src/com/cloud/agent/api/StartAnswer.java | 10 +-
api/src/com/cloud/agent/api/StartCommand.java | 4 +-
api/src/com/cloud/agent/api/StartupAnswer.java | 10 +-
api/src/com/cloud/agent/api/StartupCommand.java | 50 +-
.../agent/api/StartupExternalFirewallCommand.java | 2 +-
.../com/cloud/agent/api/StartupProxyCommand.java | 4 +-
.../com/cloud/agent/api/StartupRoutingCommand.java | 10 +-
.../agent/api/StartupSecondaryStorageCommand.java | 4 +-
.../com/cloud/agent/api/StartupStorageCommand.java | 14 +-
api/src/com/cloud/agent/api/StopAnswer.java | 12 +-
api/src/com/cloud/agent/api/StopCommand.java | 18 +-
api/src/com/cloud/agent/api/StoragePoolInfo.java | 8 +-
.../com/cloud/agent/api/TransferAgentCommand.java | 4 +-
api/src/com/cloud/agent/api/UnPlugNicCommand.java | 6 +-
api/src/com/cloud/agent/api/UnsupportedAnswer.java | 2 +-
api/src/com/cloud/agent/api/UpgradeAnswer.java | 2 +-
api/src/com/cloud/agent/api/UpgradeCommand.java | 8 +-
.../cloud/agent/api/UpgradeSnapshotCommand.java | 16 +-
...oadTemplateToS3FromSecondaryStorageCommand.java | 121 +
.../cloud/agent/api/ValidateSnapshotAnswer.java | 10 +-
.../cloud/agent/api/ValidateSnapshotCommand.java | 20 +-
api/src/com/cloud/agent/api/VmStatsEntry.java | 26 +-
.../agent/api/baremetal/IpmISetBootDevCommand.java | 10 +-
.../api/baremetal/PreparePxeServerAnswer.java | 4 +-
.../api/baremetal/PreparePxeServerCommand.java | 10 +-
.../baremetal/prepareCreateTemplateCommand.java | 14 +-
.../com/cloud/agent/api/check/CheckSshAnswer.java | 8 +-
.../com/cloud/agent/api/check/CheckSshCommand.java | 6 +-
.../api/downloadSnapshotFromSwiftCommand.java | 10 +-
...TemplateFromSwiftToSecondaryStorageCommand.java | 10 +-
.../api/proxy/CheckConsoleProxyLoadCommand.java | 14 +-
.../agent/api/proxy/ConsoleProxyLoadAnswer.java | 10 +-
.../StartConsoleProxyAgentHttpHandlerCommand.java | 8 +-
.../api/proxy/WatchConsoleProxyLoadCommand.java | 16 +-
.../CreateLoadBalancerApplianceCommand.java | 4 +-
.../cloud/agent/api/routing/DhcpEntryCommand.java | 26 +-
.../com/cloud/agent/api/routing/IpAssocAnswer.java | 8 +-
.../cloud/agent/api/routing/IpAssocCommand.java | 4 +-
.../cloud/agent/api/routing/IpAssocVpcCommand.java | 2 +-
.../api/routing/LoadBalancerConfigCommand.java | 10 +-
.../agent/api/routing/NetworkElementCommand.java | 10 +-
.../api/routing/RemoteAccessVpnCfgCommand.java | 12 +-
.../agent/api/routing/SavePasswordCommand.java | 18 +-
.../agent/api/routing/SetFirewallRulesAnswer.java | 6 +-
.../agent/api/routing/SetFirewallRulesCommand.java | 30 +-
.../agent/api/routing/SetNetworkACLAnswer.java | 8 +-
.../agent/api/routing/SetNetworkACLCommand.java | 26 +-
.../api/routing/SetPortForwardingRulesAnswer.java | 6 +-
.../api/routing/SetPortForwardingRulesCommand.java | 4 +-
.../routing/SetPortForwardingRulesVpcCommand.java | 2 +-
.../agent/api/routing/SetSourceNatCommand.java | 6 +-
.../agent/api/routing/SetStaticNatRulesAnswer.java | 6 +-
.../api/routing/SetStaticNatRulesCommand.java | 6 +-
.../agent/api/routing/SetStaticRouteAnswer.java | 6 +-
.../agent/api/routing/SetStaticRouteCommand.java | 6 +-
.../agent/api/routing/Site2SiteVpnCfgCommand.java | 12 +-
.../cloud/agent/api/routing/UserDataCommand.java | 16 +-
.../com/cloud/agent/api/routing/VmDataCommand.java | 20 +-
.../agent/api/routing/VpnUsersCfgCommand.java | 12 +-
.../agent/api/storage/AbstractDownloadCommand.java | 20 +-
.../agent/api/storage/AbstractUploadCommand.java | 16 +-
.../cloud/agent/api/storage/CopyVolumeAnswer.java | 8 +-
.../cloud/agent/api/storage/CopyVolumeCommand.java | 24 +-
.../com/cloud/agent/api/storage/CreateAnswer.java | 12 +-
.../com/cloud/agent/api/storage/CreateCommand.java | 22 +-
.../api/storage/CreateEntityDownloadURLAnswer.java | 10 +-
.../storage/CreateEntityDownloadURLCommand.java | 6 +-
.../api/storage/CreatePrivateTemplateAnswer.java | 14 +-
.../api/storage/CreatePrivateTemplateCommand.java | 16 +-
.../api/storage/DeleteEntityDownloadURLAnswer.java | 10 +-
.../storage/DeleteEntityDownloadURLCommand.java | 4 +-
.../agent/api/storage/DeleteTemplateCommand.java | 8 +-
.../agent/api/storage/DeleteVolumeCommand.java | 44 +-
.../com/cloud/agent/api/storage/DestroyAnswer.java | 2 +-
.../cloud/agent/api/storage/DestroyCommand.java | 14 +-
.../cloud/agent/api/storage/DownloadAnswer.java | 30 +-
.../cloud/agent/api/storage/DownloadCommand.java | 47 +-
.../agent/api/storage/DownloadProgressCommand.java | 2 +-
.../agent/api/storage/ListTemplateAnswer.java | 10 +-
.../agent/api/storage/ListTemplateCommand.java | 6 +-
.../cloud/agent/api/storage/ListVolumeAnswer.java | 74 +-
.../cloud/agent/api/storage/ListVolumeCommand.java | 54 +-
.../storage/ManageVolumeAvailabilityAnswer.java | 6 +-
.../storage/ManageVolumeAvailabilityCommand.java | 20 +-
.../api/storage/PrimaryStorageDownloadAnswer.java | 14 +-
.../api/storage/PrimaryStorageDownloadCommand.java | 34 +-
.../agent/api/storage/ResizeVolumeAnswer.java | 40 +
.../agent/api/storage/ResizeVolumeCommand.java | 86 +
.../com/cloud/agent/api/storage/UploadAnswer.java | 26 +-
.../com/cloud/agent/api/storage/UploadCommand.java | 15 +-
.../agent/api/storage/UploadProgressCommand.java | 6 +-
api/src/com/cloud/agent/api/storage/ssCommand.java | 10 +-
api/src/com/cloud/agent/api/to/FirewallRuleTO.java | 46 +-
api/src/com/cloud/agent/api/to/HostTO.java | 4 +-
api/src/com/cloud/agent/api/to/LoadBalancerTO.java | 351 +-
api/src/com/cloud/agent/api/to/NetworkACLTO.java | 33 +-
api/src/com/cloud/agent/api/to/NetworkTO.java | 4 +-
api/src/com/cloud/agent/api/to/NicTO.java | 20 +-
.../cloud/agent/api/to/PortForwardingRuleTO.java | 14 +-
api/src/com/cloud/agent/api/to/S3TO.java | 252 +
.../com/cloud/agent/api/to/StaticNatRuleTO.java | 19 +-
api/src/com/cloud/agent/api/to/StorageFilerTO.java | 8 +-
api/src/com/cloud/agent/api/to/SwiftTO.java | 10 +-
api/src/com/cloud/agent/api/to/TemplateTO.java | 9 +-
.../com/cloud/agent/api/to/VirtualMachineTO.java | 14 +-
api/src/com/cloud/agent/api/to/VolumeTO.java | 3 +-
...TemplateToSwiftFromSecondaryStorageCommand.java | 10 +-
api/src/com/cloud/alert/Alert.java | 6 +-
api/src/com/cloud/api/ApiConstants.java | 408 --
api/src/com/cloud/api/BaseAsyncCmd.java | 133 -
api/src/com/cloud/api/BaseAsyncCreateCmd.java | 55 -
api/src/com/cloud/api/BaseCmd.java | 533 --
.../com/cloud/api/BaseListAccountResourcesCmd.java | 27 -
api/src/com/cloud/api/BaseListCmd.java | 108 -
.../com/cloud/api/BaseListDomainResourcesCmd.java | 45 -
.../api/BaseListProjectAndAccountResourcesCmd.java | 28 -
.../com/cloud/api/BaseListTaggedResourcesCmd.java | 48 -
api/src/com/cloud/api/Identity.java | 21 -
api/src/com/cloud/api/IdentityMapper.java | 29 -
api/src/com/cloud/api/IdentityService.java | 25 -
api/src/com/cloud/api/Implementation.java | 39 -
api/src/com/cloud/api/Parameter.java | 47 -
api/src/com/cloud/api/PlugService.java | 31 -
api/src/com/cloud/api/ResponseGenerator.java | 356 -
api/src/com/cloud/api/ResponseObject.java | 78 -
api/src/com/cloud/api/ServerApiException.java | 52 -
api/src/com/cloud/api/commands/.gitignore | 4 +-
.../com/cloud/api/commands/ActivateProjectCmd.java | 100 -
.../cloud/api/commands/AddAccountToProjectCmd.java | 125 -
api/src/com/cloud/api/commands/AddClusterCmd.java | 181 -
api/src/com/cloud/api/commands/AddHostCmd.java | 161 -
.../api/commands/AddNetworkServiceProviderCmd.java | 138 -
.../cloud/api/commands/AddSecondaryStorageCmd.java | 97 -
api/src/com/cloud/api/commands/AddSwiftCmd.java | 106 -
.../com/cloud/api/commands/AddTrafficTypeCmd.java | 158 -
api/src/com/cloud/api/commands/AddVpnUserCmd.java | 150 -
.../api/commands/AssignToLoadBalancerRuleCmd.java | 121 -
api/src/com/cloud/api/commands/AssignVMCmd.java | 132 -
.../com/cloud/api/commands/AssociateIPAddrCmd.java | 273 -
api/src/com/cloud/api/commands/AttachIsoCmd.java | 112 -
.../com/cloud/api/commands/AttachVolumeCmd.java | 131 -
.../commands/AuthorizeSecurityGroupEgressCmd.java | 228 -
.../commands/AuthorizeSecurityGroupIngressCmd.java | 237 -
.../cloud/api/commands/CancelMaintenanceCmd.java | 113 -
.../CancelPrimaryStorageMaintenanceCmd.java | 114 -
.../commands/ConfigureVirtualRouterElementCmd.java | 128 -
.../com/cloud/api/commands/CopyTemplateCmd.java | 143 -
.../com/cloud/api/commands/CreateAccountCmd.java | 186 -
.../cloud/api/commands/CreateDiskOfferingCmd.java | 121 -
.../com/cloud/api/commands/CreateDomainCmd.java | 109 -
.../cloud/api/commands/CreateFirewallRuleCmd.java | 325 -
.../api/commands/CreateIpForwardingRuleCmd.java | 311 -
.../api/commands/CreateLBStickinessPolicyCmd.java | 161 -
.../api/commands/CreateLoadBalancerRuleCmd.java | 381 --
.../cloud/api/commands/CreateNetworkACLCmd.java | 328 -
.../com/cloud/api/commands/CreateNetworkCmd.java | 234 -
.../api/commands/CreateNetworkOfferingCmd.java | 234 -
.../api/commands/CreatePhysicalNetworkCmd.java | 175 -
api/src/com/cloud/api/commands/CreatePodCmd.java | 119 -
.../api/commands/CreatePortForwardingRuleCmd.java | 373 --
.../api/commands/CreatePrivateGatewayCmd.java | 182 -
.../api/commands/CreatePrivateNetworkCmd.java | 81 +-
.../com/cloud/api/commands/CreateProjectCmd.java | 149 -
.../api/commands/CreateRemoteAccessVpnCmd.java | 198 -
.../cloud/api/commands/CreateSSHKeyPairCmd.java | 102 -
.../cloud/api/commands/CreateSecurityGroupCmd.java | 123 -
.../api/commands/CreateServiceOfferingCmd.java | 168 -
.../com/cloud/api/commands/CreateSnapshotCmd.java | 164 -
.../api/commands/CreateSnapshotPolicyCmd.java | 135 -
.../cloud/api/commands/CreateStaticRouteCmd.java | 149 -
.../commands/CreateStorageNetworkIpRangeCmd.java | 127 -
.../cloud/api/commands/CreateStoragePoolCmd.java | 139 -
api/src/com/cloud/api/commands/CreateTagsCmd.java | 132 -
.../com/cloud/api/commands/CreateTemplateCmd.java | 286 -
api/src/com/cloud/api/commands/CreateUserCmd.java | 158 -
.../com/cloud/api/commands/CreateVMGroupCmd.java | 105 -
api/src/com/cloud/api/commands/CreateVPCCmd.java | 189 -
.../cloud/api/commands/CreateVPCOfferingCmd.java | 120 -
.../commands/CreateVirtualRouterElementCmd.java | 117 -
.../cloud/api/commands/CreateVlanIpRangeCmd.java | 180 -
.../com/cloud/api/commands/CreateVolumeCmd.java | 175 -
.../cloud/api/commands/CreateVpnConnectionCmd.java | 147 -
.../api/commands/CreateVpnCustomerGatewayCmd.java | 170 -
.../cloud/api/commands/CreateVpnGatewayCmd.java | 108 -
api/src/com/cloud/api/commands/CreateZoneCmd.java | 161 -
.../com/cloud/api/commands/DeleteAccountCmd.java | 121 -
.../api/commands/DeleteAccountFromProjectCmd.java | 107 -
.../com/cloud/api/commands/DeleteClusterCmd.java | 79 -
.../cloud/api/commands/DeleteDiskOfferingCmd.java | 76 -
.../com/cloud/api/commands/DeleteDomainCmd.java | 116 -
.../cloud/api/commands/DeleteFirewallRuleCmd.java | 120 -
api/src/com/cloud/api/commands/DeleteHostCmd.java | 90 -
.../api/commands/DeleteIpForwardingRuleCmd.java | 123 -
api/src/com/cloud/api/commands/DeleteIsoCmd.java | 117 -
.../api/commands/DeleteLBStickinessPolicyCmd.java | 116 -
.../api/commands/DeleteLoadBalancerRuleCmd.java | 118 -
.../cloud/api/commands/DeleteNetworkACLCmd.java | 121 -
.../com/cloud/api/commands/DeleteNetworkCmd.java | 108 -
.../api/commands/DeleteNetworkOfferingCmd.java | 77 -
.../commands/DeleteNetworkServiceProviderCmd.java | 108 -
.../api/commands/DeletePhysicalNetworkCmd.java | 98 -
api/src/com/cloud/api/commands/DeletePodCmd.java | 76 -
api/src/com/cloud/api/commands/DeletePoolCmd.java | 90 -
.../api/commands/DeletePortForwardingRuleCmd.java | 122 -
.../api/commands/DeletePrivateGatewayCmd.java | 114 -
.../com/cloud/api/commands/DeleteProjectCmd.java | 99 -
.../api/commands/DeleteProjectInvitationCmd.java | 89 -
.../api/commands/DeleteRemoteAccessVpnCmd.java | 99 -
.../cloud/api/commands/DeleteSSHKeyPairCmd.java | 109 -
.../cloud/api/commands/DeleteSecurityGroupCmd.java | 131 -
.../api/commands/DeleteServiceOfferingCmd.java | 77 -
.../com/cloud/api/commands/DeleteSnapshotCmd.java | 105 -
.../api/commands/DeleteSnapshotPoliciesCmd.java | 88 -
.../cloud/api/commands/DeleteStaticRouteCmd.java | 124 -
.../commands/DeleteStorageNetworkIpRangeCmd.java | 92 -
api/src/com/cloud/api/commands/DeleteTagsCmd.java | 122 -
.../com/cloud/api/commands/DeleteTemplateCmd.java | 118 -
.../cloud/api/commands/DeleteTrafficTypeCmd.java | 95 -
api/src/com/cloud/api/commands/DeleteUserCmd.java | 97 -
.../com/cloud/api/commands/DeleteVMGroupCmd.java | 81 -
api/src/com/cloud/api/commands/DeleteVPCCmd.java | 107 -
.../cloud/api/commands/DeleteVPCOfferingCmd.java | 92 -
.../cloud/api/commands/DeleteVlanIpRangeCmd.java | 76 -
.../com/cloud/api/commands/DeleteVolumeCmd.java | 90 -
.../cloud/api/commands/DeleteVpnConnectionCmd.java | 104 -
.../api/commands/DeleteVpnCustomerGatewayCmd.java | 97 -
.../cloud/api/commands/DeleteVpnGatewayCmd.java | 98 -
api/src/com/cloud/api/commands/DeleteZoneCmd.java | 80 -
api/src/com/cloud/api/commands/DeployVMCmd.java | 438 --
.../cloud/api/commands/DestroyConsoleProxyCmd.java | 20 +-
.../com/cloud/api/commands/DestroyRouterCmd.java | 109 -
.../com/cloud/api/commands/DestroySystemVmCmd.java | 106 -
api/src/com/cloud/api/commands/DestroyVMCmd.java | 115 -
api/src/com/cloud/api/commands/DetachIsoCmd.java | 96 -
.../com/cloud/api/commands/DetachVolumeCmd.java | 142 -
.../com/cloud/api/commands/DisableAccountCmd.java | 142 -
.../cloud/api/commands/DisableStaticNatCmd.java | 110 -
api/src/com/cloud/api/commands/DisableUserCmd.java | 119 -
.../cloud/api/commands/DisassociateIPAddrCmd.java | 141 -
.../com/cloud/api/commands/EnableAccountCmd.java | 114 -
.../com/cloud/api/commands/EnableStaticNatCmd.java | 125 -
api/src/com/cloud/api/commands/EnableUserCmd.java | 100 -
api/src/com/cloud/api/commands/ExtractIsoCmd.java | 139 -
.../com/cloud/api/commands/ExtractTemplateCmd.java | 139 -
.../com/cloud/api/commands/ExtractVolumeCmd.java | 155 -
.../cloud/api/commands/GetCloudIdentifierCmd.java | 83 -
api/src/com/cloud/api/commands/GetUserCmd.java | 76 -
.../com/cloud/api/commands/GetVMPasswordCmd.java | 84 -
api/src/com/cloud/api/commands/LDAPConfigCmd.java | 149 -
api/src/com/cloud/api/commands/LDAPRemoveCmd.java | 81 -
.../com/cloud/api/commands/ListAccountsCmd.java | 107 -
api/src/com/cloud/api/commands/ListAlertsCmd.java | 92 -
.../com/cloud/api/commands/ListAsyncJobsCmd.java | 72 -
.../cloud/api/commands/ListCapabilitiesCmd.java | 59 -
.../com/cloud/api/commands/ListCapacityCmd.java | 138 -
api/src/com/cloud/api/commands/ListCfgsByCmd.java | 94 -
.../com/cloud/api/commands/ListClustersCmd.java | 143 -
.../cloud/api/commands/ListDiskOfferingsCmd.java | 94 -
.../cloud/api/commands/ListDomainChildrenCmd.java | 100 -
api/src/com/cloud/api/commands/ListDomainsCmd.java | 100 -
.../com/cloud/api/commands/ListEventTypesCmd.java | 60 -
api/src/com/cloud/api/commands/ListEventsCmd.java | 120 -
.../cloud/api/commands/ListFirewallRulesCmd.java | 85 -
.../api/commands/ListGuestOsCategoriesCmd.java | 91 -
api/src/com/cloud/api/commands/ListGuestOsCmd.java | 99 -
api/src/com/cloud/api/commands/ListHostsCmd.java | 192 -
.../commands/ListHypervisorCapabilitiesCmd.java | 92 -
.../com/cloud/api/commands/ListHypervisorsCmd.java | 84 -
.../api/commands/ListIpForwardingRulesCmd.java | 100 -
.../cloud/api/commands/ListIsoPermissionsCmd.java | 42 -
api/src/com/cloud/api/commands/ListIsosCmd.java | 162 -
.../api/commands/ListLBStickinessPoliciesCmd.java | 90 -
.../commands/ListLoadBalancerRuleInstancesCmd.java | 83 -
.../api/commands/ListLoadBalancerRulesCmd.java | 112 -
.../com/cloud/api/commands/ListNetworkACLsCmd.java | 94 -
.../api/commands/ListNetworkOfferingsCmd.java | 191 -
.../commands/ListNetworkServiceProvidersCmd.java | 103 -
.../com/cloud/api/commands/ListNetworksCmd.java | 164 -
.../api/commands/ListPhysicalNetworksCmd.java | 104 -
api/src/com/cloud/api/commands/ListPodsByCmd.java | 109 -
.../api/commands/ListPortForwardingRulesCmd.java | 87 -
.../cloud/api/commands/ListPrivateGatewaysCmd.java | 106 -
.../cloud/api/commands/ListProjectAccountsCmd.java | 93 -
.../api/commands/ListProjectInvitationsCmd.java | 99 -
.../com/cloud/api/commands/ListProjectsCmd.java | 123 -
.../api/commands/ListPublicIpAddressesCmd.java | 178 -
.../commands/ListRecurringSnapshotScheduleCmd.java | 24 +-
.../api/commands/ListRemoteAccessVpnsCmd.java | 79 -
.../cloud/api/commands/ListResourceLimitsCmd.java | 88 -
api/src/com/cloud/api/commands/ListRoutersCmd.java | 145 -
.../com/cloud/api/commands/ListSSHKeyPairsCmd.java | 88 -
.../cloud/api/commands/ListSecurityGroupsCmd.java | 92 -
.../api/commands/ListServiceOfferingsCmd.java | 117 -
.../api/commands/ListSnapshotPoliciesCmd.java | 78 -
.../com/cloud/api/commands/ListSnapshotsCmd.java | 114 -
.../cloud/api/commands/ListStaticRoutesCmd.java | 85 -
.../cloud/api/commands/ListStoragePoolsCmd.java | 130 -
.../commands/ListSupportedNetworkServicesCmd.java | 115 -
api/src/com/cloud/api/commands/ListSwiftsCmd.java | 84 -
.../com/cloud/api/commands/ListSystemVMsCmd.java | 137 -
api/src/com/cloud/api/commands/ListTagsCmd.java | 95 -
.../commands/ListTemplateOrIsoPermissionsCmd.java | 95 -
.../api/commands/ListTemplatePermissionsCmd.java | 42 -
.../com/cloud/api/commands/ListTemplatesCmd.java | 134 -
.../commands/ListTrafficTypeImplementorsCmd.java | 86 -
.../cloud/api/commands/ListTrafficTypesCmd.java | 87 -
api/src/com/cloud/api/commands/ListUsersCmd.java | 99 -
.../com/cloud/api/commands/ListVMGroupsCmd.java | 86 -
api/src/com/cloud/api/commands/ListVMsCmd.java | 215 -
.../cloud/api/commands/ListVPCOfferingsCmd.java | 116 -
api/src/com/cloud/api/commands/ListVPCsCmd.java | 159 -
.../api/commands/ListVirtualRouterElementsCmd.java | 109 -
.../cloud/api/commands/ListVlanIpRangesCmd.java | 148 -
api/src/com/cloud/api/commands/ListVolumesCmd.java | 134 -
.../cloud/api/commands/ListVpnConnectionsCmd.java | 92 -
.../api/commands/ListVpnCustomerGatewaysCmd.java | 84 -
.../com/cloud/api/commands/ListVpnGatewaysCmd.java | 91 -
.../com/cloud/api/commands/ListVpnUsersCmd.java | 84 -
api/src/com/cloud/api/commands/ListZonesByCmd.java | 101 -
api/src/com/cloud/api/commands/LockAccountCmd.java | 89 -
api/src/com/cloud/api/commands/LockUserCmd.java | 84 -
.../api/commands/MarkDefaultZoneForAccountCmd.java | 114 -
.../com/cloud/api/commands/MigrateSystemVMCmd.java | 134 -
api/src/com/cloud/api/commands/MigrateVMCmd.java | 171 -
.../com/cloud/api/commands/MigrateVolumeCmd.java | 106 -
.../api/commands/PrepareForMaintenanceCmd.java | 111 -
.../PreparePrimaryStorageForMaintenanceCmd.java | 112 -
.../com/cloud/api/commands/PrepareTemplateCmd.java | 89 -
.../cloud/api/commands/QueryAsyncJobResultCmd.java | 71 -
.../com/cloud/api/commands/RebootRouterCmd.java | 109 -
.../com/cloud/api/commands/RebootSystemVmCmd.java | 112 -
api/src/com/cloud/api/commands/RebootVMCmd.java | 114 -
.../com/cloud/api/commands/ReconnectHostCmd.java | 115 -
api/src/com/cloud/api/commands/RecoverVMCmd.java | 85 -
api/src/com/cloud/api/commands/RegisterCmd.java | 80 -
api/src/com/cloud/api/commands/RegisterIsoCmd.java | 176 -
.../cloud/api/commands/RegisterSSHKeyPairCmd.java | 110 -
.../cloud/api/commands/RegisterTemplateCmd.java | 241 -
.../commands/RemoveFromLoadBalancerRuleCmd.java | 121 -
.../com/cloud/api/commands/RemoveVpnUserCmd.java | 122 -
.../com/cloud/api/commands/ResetVMPasswordCmd.java | 123 -
.../cloud/api/commands/ResetVpnConnectionCmd.java | 120 -
.../com/cloud/api/commands/RestartNetworkCmd.java | 130 -
api/src/com/cloud/api/commands/RestartVPCCmd.java | 110 -
api/src/com/cloud/api/commands/RestoreVMCmd.java | 90 -
.../api/commands/RevokeSecurityGroupEgressCmd.java | 109 -
.../commands/RevokeSecurityGroupIngressCmd.java | 109 -
api/src/com/cloud/api/commands/StartRouterCmd.java | 114 -
.../com/cloud/api/commands/StartSystemVMCmd.java | 116 -
api/src/com/cloud/api/commands/StartVMCmd.java | 145 -
api/src/com/cloud/api/commands/StopRouterCmd.java | 116 -
.../com/cloud/api/commands/StopSystemVmCmd.java | 123 -
api/src/com/cloud/api/commands/StopVMCmd.java | 130 -
.../com/cloud/api/commands/SuspendProjectCmd.java | 102 -
.../com/cloud/api/commands/UpdateAccountCmd.java | 144 -
api/src/com/cloud/api/commands/UpdateCfgCmd.java | 82 -
.../com/cloud/api/commands/UpdateClusterCmd.java | 119 -
.../cloud/api/commands/UpdateDiskOfferingCmd.java | 98 -
.../com/cloud/api/commands/UpdateDomainCmd.java | 109 -
api/src/com/cloud/api/commands/UpdateHostCmd.java | 115 -
.../cloud/api/commands/UpdateHostPasswordCmd.java | 95 -
.../commands/UpdateHypervisorCapabilitiesCmd.java | 98 -
api/src/com/cloud/api/commands/UpdateIsoCmd.java | 77 -
.../api/commands/UpdateIsoPermissionsCmd.java | 45 -
.../api/commands/UpdateLoadBalancerRuleCmd.java | 116 -
.../com/cloud/api/commands/UpdateNetworkCmd.java | 152 -
.../api/commands/UpdateNetworkOfferingCmd.java | 112 -
.../commands/UpdateNetworkServiceProviderCmd.java | 111 -
.../api/commands/UpdatePhysicalNetworkCmd.java | 119 -
api/src/com/cloud/api/commands/UpdatePodCmd.java | 119 -
.../api/commands/UpdatePortForwardingRuleCmd.java | 129 -
.../com/cloud/api/commands/UpdateProjectCmd.java | 114 -
.../api/commands/UpdateProjectInvitationCmd.java | 112 -
.../cloud/api/commands/UpdateResourceCountCmd.java | 132 -
.../cloud/api/commands/UpdateResourceLimitCmd.java | 109 -
.../api/commands/UpdateServiceOfferingCmd.java | 99 -
.../commands/UpdateStorageNetworkIpRangeCmd.java | 120 -
.../cloud/api/commands/UpdateStoragePoolCmd.java | 88 -
.../com/cloud/api/commands/UpdateTemplateCmd.java | 78 -
.../cloud/api/commands/UpdateTemplateOrIsoCmd.java | 95 -
.../UpdateTemplateOrIsoPermissionsCmd.java | 128 -
.../api/commands/UpdateTemplatePermissionsCmd.java | 50 -
.../cloud/api/commands/UpdateTrafficTypeCmd.java | 117 -
api/src/com/cloud/api/commands/UpdateUserCmd.java | 157 -
api/src/com/cloud/api/commands/UpdateVMCmd.java | 128 -
.../com/cloud/api/commands/UpdateVMGroupCmd.java | 90 -
api/src/com/cloud/api/commands/UpdateVPCCmd.java | 109 -
.../cloud/api/commands/UpdateVPCOfferingCmd.java | 111 -
.../api/commands/UpdateVpnCustomerGatewayCmd.java | 170 -
api/src/com/cloud/api/commands/UpdateZoneCmd.java | 174 -
.../com/cloud/api/commands/UpgradeRouterCmd.java | 90 -
.../com/cloud/api/commands/UpgradeSystemVMCmd.java | 103 -
api/src/com/cloud/api/commands/UpgradeVMCmd.java | 106 -
.../api/commands/UploadCustomCertificateCmd.java | 110 -
.../com/cloud/api/commands/UploadVolumeCmd.java | 147 -
.../api/commands/listStorageNetworkIpRangeCmd.java | 108 -
.../com/cloud/api/response/AccountResponse.java | 290 -
api/src/com/cloud/api/response/AlertResponse.java | 63 -
.../com/cloud/api/response/AsyncJobResponse.java | 148 -
api/src/com/cloud/api/response/BaseResponse.java | 75 -
.../cloud/api/response/CapabilitiesResponse.java | 76 -
.../com/cloud/api/response/CapabilityResponse.java | 57 -
.../com/cloud/api/response/CapacityResponse.java | 134 -
.../api/response/CloudIdentifierResponse.java | 59 -
.../com/cloud/api/response/ClusterResponse.java | 150 -
.../cloud/api/response/ConfigurationResponse.java | 67 -
.../api/response/ControlledEntityResponse.java | 30 -
.../com/cloud/api/response/CreateCmdResponse.java | 38 -
.../api/response/CustomCertificateResponse.java | 34 -
.../cloud/api/response/DiskOfferingResponse.java | 136 -
api/src/com/cloud/api/response/DomainResponse.java | 109 -
.../cloud/api/response/DomainRouterResponse.java | 324 -
api/src/com/cloud/api/response/EventResponse.java | 124 -
.../com/cloud/api/response/EventTypeResponse.java | 34 -
.../com/cloud/api/response/ExceptionResponse.java | 72 -
.../com/cloud/api/response/ExtractResponse.java | 207 -
.../com/cloud/api/response/FirewallResponse.java | 104 -
.../cloud/api/response/FirewallRuleResponse.java | 177 -
.../cloud/api/response/GetVMPasswordResponse.java | 43 -
.../api/response/GuestOSCategoryResponse.java | 46 -
.../com/cloud/api/response/GuestOSResponse.java | 57 -
api/src/com/cloud/api/response/HostResponse.java | 369 --
.../response/HypervisorCapabilitiesResponse.java | 86 -
.../com/cloud/api/response/HypervisorResponse.java | 34 -
.../com/cloud/api/response/IPAddressResponse.java | 236 -
.../cloud/api/response/InstanceGroupResponse.java | 88 -
.../api/response/IpForwardingRuleResponse.java | 134 -
api/src/com/cloud/api/response/IsoVmResponse.java | 145 -
.../api/response/LBStickinessPolicyResponse.java | 128 -
.../cloud/api/response/LBStickinessResponse.java | 127 -
.../com/cloud/api/response/LDAPConfigResponse.java | 103 -
.../com/cloud/api/response/LDAPRemoveResponse.java | 28 -
api/src/com/cloud/api/response/ListResponse.java | 41 -
.../cloud/api/response/LoadBalancerResponse.java | 162 -
.../com/cloud/api/response/NetworkACLResponse.java | 98 -
.../api/response/NetworkOfferingResponse.java | 152 -
.../com/cloud/api/response/NetworkResponse.java | 296 -
api/src/com/cloud/api/response/NicResponse.java | 140 -
.../api/response/PhysicalNetworkResponse.java | 118 -
api/src/com/cloud/api/response/PodResponse.java | 136 -
.../cloud/api/response/PrivateGatewayResponse.java | 140 -
.../cloud/api/response/ProjectAccountResponse.java | 99 -
.../api/response/ProjectInvitationResponse.java | 81 -
.../com/cloud/api/response/ProjectResponse.java | 85 -
.../com/cloud/api/response/ProviderResponse.java | 105 -
.../com/cloud/api/response/RegisterResponse.java | 44 -
.../api/response/RemoteAccessVpnResponse.java | 99 -
.../cloud/api/response/ResourceCountResponse.java | 81 -
.../cloud/api/response/ResourceLimitResponse.java | 79 -
.../cloud/api/response/ResourceTagResponse.java | 100 -
.../com/cloud/api/response/SSHKeyPairResponse.java | 70 -
.../cloud/api/response/SecurityGroupResponse.java | 140 -
.../api/response/SecurityGroupRuleResponse.java | 123 -
.../api/response/ServiceOfferingResponse.java | 224 -
.../com/cloud/api/response/ServiceResponse.java | 48 -
.../response/Site2SiteCustomerGatewayResponse.java | 152 -
.../response/Site2SiteVpnConnectionResponse.java | 173 -
.../api/response/Site2SiteVpnGatewayResponse.java | 96 -
.../cloud/api/response/SnapshotPolicyResponse.java | 89 -
.../com/cloud/api/response/SnapshotResponse.java | 165 -
.../api/response/SnapshotScheduleResponse.java | 69 -
.../cloud/api/response/StaticRouteResponse.java | 113 -
api/src/com/cloud/api/response/StatusResponse.java | 32 -
.../response/StorageNetworkIpRangeResponse.java | 87 -
.../cloud/api/response/StoragePoolResponse.java | 220 -
.../com/cloud/api/response/SuccessResponse.java | 50 -
api/src/com/cloud/api/response/SwiftResponse.java | 89 -
.../api/response/SystemVmInstanceResponse.java | 98 -
.../com/cloud/api/response/SystemVmResponse.java | 317 -
.../api/response/TemplatePermissionsResponse.java | 63 -
.../com/cloud/api/response/TemplateResponse.java | 288 -
.../response/TrafficTypeImplementorResponse.java | 37 -
.../cloud/api/response/TrafficTypeResponse.java | 91 -
.../com/cloud/api/response/UpgradeVmResponse.java | 297 -
api/src/com/cloud/api/response/UserResponse.java | 191 -
api/src/com/cloud/api/response/UserVmResponse.java | 358 -
.../response/VirtualRouterProviderResponse.java | 85 -
.../cloud/api/response/VlanIpRangeResponse.java | 157 -
api/src/com/cloud/api/response/VolumeResponse.java | 304 -
.../cloud/api/response/VpcOfferingResponse.java | 78 -
api/src/com/cloud/api/response/VpcResponse.java | 170 -
.../com/cloud/api/response/VpnUsersResponse.java | 78 -
api/src/com/cloud/api/response/ZoneResponse.java | 175 -
api/src/com/cloud/async/AsyncJob.java | 14 +-
api/src/com/cloud/async/SyncQueueItem.java | 2 +
api/src/com/cloud/capacity/Capacity.java | 13 +-
api/src/com/cloud/capacity/CapacityState.java | 6 +-
.../com/cloud/cluster/ManagementServerHost.java | 4 +-
.../cloud/configuration/ConfigurationService.java | 66 +-
api/src/com/cloud/configuration/ResourceCount.java | 4 +-
api/src/com/cloud/configuration/ResourceLimit.java | 4 +-
api/src/com/cloud/dao/EntityManager.java | 25 +-
api/src/com/cloud/dc/DataCenter.java | 7 +-
api/src/com/cloud/dc/Pod.java | 13 +-
api/src/com/cloud/dc/StorageNetworkIpRange.java | 11 +-
api/src/com/cloud/dc/Vlan.java | 8 +-
api/src/com/cloud/deploy/DataCenterDeployment.java | 4 +-
api/src/com/cloud/deploy/DeploymentPlanner.java | 8 +-
api/src/com/cloud/domain/Domain.java | 7 +-
api/src/com/cloud/event/Event.java | 10 +-
api/src/com/cloud/event/EventTypes.java | 34 +-
.../cloud/exception/AgentUnavailableException.java | 8 +-
.../exception/CloudAuthenticationException.java | 4 +-
api/src/com/cloud/exception/CloudException.java | 41 +-
.../cloud/exception/CloudExecutionException.java | 57 -
.../exception/ConcurrentOperationException.java | 4 +-
.../ConflictingNetworkSettingsException.java | 2 +-
.../com/cloud/exception/ConnectionException.java | 10 +-
.../exception/DiscoveredWithErrorException.java | 4 +-
.../com/cloud/exception/DiscoveryException.java | 4 +-
api/src/com/cloud/exception/ErrorCode.java | 52 -
api/src/com/cloud/exception/HAStateException.java | 4 +-
.../exception/InsufficientCapacityException.java | 2 +-
.../InsufficientNetworkCapacityException.java | 4 +-
.../InsufficientServerCapacityException.java | 6 +-
.../InsufficientStorageCapacityException.java | 6 +-
...InsufficientVirtualNetworkCapcityException.java | 4 +-
.../cloud/exception/PermissionDeniedException.java | 2 +-
.../com/cloud/exception/RequestLimitException.java | 43 +
.../exception/ResourceUnavailableException.java | 8 +-
.../exception/StorageUnavailableException.java | 8 +-
api/src/com/cloud/host/Host.java | 13 +-
api/src/com/cloud/host/HostEnvironment.java | 12 +-
api/src/com/cloud/host/HostStats.java | 6 +-
api/src/com/cloud/host/Status.java | 18 +-
api/src/com/cloud/hypervisor/Hypervisor.java | 2 +-
.../cloud/hypervisor/HypervisorCapabilities.java | 8 +-
api/src/com/cloud/hypervisor/HypervisorGuru.java | 14 +-
api/src/com/cloud/network/IpAddress.java | 18 +-
api/src/com/cloud/network/Network.java | 57 +-
api/src/com/cloud/network/NetworkModel.java | 252 +
api/src/com/cloud/network/NetworkProfile.java | 9 +
api/src/com/cloud/network/NetworkService.java | 70 +-
api/src/com/cloud/network/Networks.java | 2 +-
api/src/com/cloud/network/PhysicalNetwork.java | 11 +-
.../network/PhysicalNetworkServiceProvider.java | 5 +-
.../cloud/network/PhysicalNetworkTrafficType.java | 10 +-
api/src/com/cloud/network/PublicIpAddress.java | 15 +-
api/src/com/cloud/network/RemoteAccessVpn.java | 4 +-
.../cloud/network/Site2SiteCustomerGateway.java | 9 +-
.../com/cloud/network/Site2SiteVpnConnection.java | 8 +-
api/src/com/cloud/network/Site2SiteVpnGateway.java | 9 +-
.../com/cloud/network/StorageNetworkService.java | 10 +-
.../network/VirtualNetworkApplianceService.java | 15 +-
.../com/cloud/network/VirtualRouterProvider.java | 7 +-
.../network/VpcVirtualNetworkApplianceService.java | 4 +-
api/src/com/cloud/network/VpnUser.java | 8 +-
api/src/com/cloud/network/as/AutoScaleCounter.java | 122 +
api/src/com/cloud/network/as/AutoScalePolicy.java | 35 +
api/src/com/cloud/network/as/AutoScaleService.java | 73 +
api/src/com/cloud/network/as/AutoScaleVmGroup.java | 52 +
.../com/cloud/network/as/AutoScaleVmProfile.java | 49 +
api/src/com/cloud/network/as/Condition.java | 35 +
api/src/com/cloud/network/as/Counter.java | 35 +
api/src/com/cloud/network/element/IpDeployer.java | 6 +-
.../network/element/IpDeployingRequester.java | 28 +
.../element/LoadBalancingServiceProvider.java | 5 +-
.../com/cloud/network/element/NetworkElement.java | 43 +-
.../element/PortForwardingServiceProvider.java | 4 +-
.../element/RemoteAccessVPNServiceProvider.java | 7 +-
.../element/Site2SiteVpnServiceProvider.java | 8 +-
.../network/element/SourceNatServiceProvider.java | 5 +-
.../network/element/StaticNatServiceProvider.java | 4 +-
.../network/element/UserDataServiceProvider.java | 1 +
.../element/VirtualRouterElementService.java | 4 +-
api/src/com/cloud/network/element/VpcProvider.java | 11 +-
.../cloud/network/firewall/FirewallService.java | 8 +-
.../cloud/network/firewall/NetworkACLService.java | 10 +-
api/src/com/cloud/network/guru/NetworkGuru.java | 64 +-
.../com/cloud/network/lb/LoadBalancingRule.java | 241 +-
.../network/lb/LoadBalancingRulesService.java | 25 +-
api/src/com/cloud/network/rules/FirewallRule.java | 39 +-
.../cloud/network/rules/LbStickinessMethod.java | 20 +-
api/src/com/cloud/network/rules/LoadBalancer.java | 6 +-
.../cloud/network/rules/PortForwardingRule.java | 14 +-
api/src/com/cloud/network/rules/RulesService.java | 13 +-
api/src/com/cloud/network/rules/StaticNat.java | 8 +-
api/src/com/cloud/network/rules/StaticNatRule.java | 28 +-
.../com/cloud/network/rules/StickinessPolicy.java | 7 +-
.../com/cloud/network/security/SecurityGroup.java | 8 +-
.../cloud/network/security/SecurityGroupRules.java | 6 +-
.../network/security/SecurityGroupService.java | 19 +-
.../com/cloud/network/security/SecurityRule.java | 18 +-
api/src/com/cloud/network/vpc/PrivateGateway.java | 2 +-
api/src/com/cloud/network/vpc/PrivateIp.java | 2 +-
api/src/com/cloud/network/vpc/StaticRoute.java | 13 +-
.../com/cloud/network/vpc/StaticRouteProfile.java | 18 +-
api/src/com/cloud/network/vpc/Vpc.java | 16 +-
api/src/com/cloud/network/vpc/VpcGateway.java | 11 +-
api/src/com/cloud/network/vpc/VpcOffering.java | 13 +-
api/src/com/cloud/network/vpc/VpcService.java | 79 +-
.../cloud/network/vpn/RemoteAccessVpnService.java | 22 +-
.../com/cloud/network/vpn/Site2SiteVpnService.java | 30 +-
api/src/com/cloud/offering/DiskOffering.java | 9 +-
api/src/com/cloud/offering/NetworkOffering.java | 13 +-
api/src/com/cloud/offering/OfferingManager.java | 10 +-
api/src/com/cloud/offering/ServiceOffering.java | 8 +-
api/src/com/cloud/org/Cluster.java | 6 +-
api/src/com/cloud/projects/Project.java | 5 +-
api/src/com/cloud/projects/ProjectInvitation.java | 8 +-
api/src/com/cloud/projects/ProjectService.java | 17 +-
api/src/com/cloud/resource/ResourceService.java | 36 +-
api/src/com/cloud/resource/ResourceState.java | 1 +
api/src/com/cloud/serializer/Param.java | 2 +-
api/src/com/cloud/server/ManagementService.java | 229 +-
api/src/com/cloud/server/ResourceTag.java | 13 +-
.../com/cloud/server/TaggedResourceService.java | 10 +-
api/src/com/cloud/storage/GuestOS.java | 5 +-
api/src/com/cloud/storage/GuestOsCategory.java | 6 +-
api/src/com/cloud/storage/S3.java | 49 +
api/src/com/cloud/storage/Snapshot.java | 8 +-
api/src/com/cloud/storage/StoragePool.java | 15 +-
api/src/com/cloud/storage/StorageService.java | 54 +-
api/src/com/cloud/storage/StorageStats.java | 2 +-
api/src/com/cloud/storage/Swift.java | 5 +-
api/src/com/cloud/storage/Upload.java | 7 +-
.../storage/VMTemplateStorageResourceAssoc.java | 7 +-
api/src/com/cloud/storage/Volume.java | 25 +-
.../com/cloud/storage/snapshot/SnapshotPolicy.java | 6 +-
.../cloud/storage/snapshot/SnapshotSchedule.java | 2 +
.../cloud/storage/snapshot/SnapshotService.java | 34 +-
api/src/com/cloud/template/BasedOn.java | 2 +-
api/src/com/cloud/template/TemplateService.java | 30 +-
.../com/cloud/template/VirtualMachineTemplate.java | 11 +-
api/src/com/cloud/user/Account.java | 11 +-
api/src/com/cloud/user/AccountService.java | 48 +-
api/src/com/cloud/user/DomainService.java | 14 +-
api/src/com/cloud/user/ResourceLimitService.java | 30 +-
api/src/com/cloud/user/SSHKeyPair.java | 10 +-
api/src/com/cloud/user/User.java | 6 +-
api/src/com/cloud/user/UserAccount.java | 8 +-
api/src/com/cloud/user/UserContext.java | 4 +
api/src/com/cloud/uservm/UserVm.java | 2 +-
api/src/com/cloud/vm/InstanceGroup.java | 7 +-
api/src/com/cloud/vm/Nic.java | 11 +-
api/src/com/cloud/vm/NicProfile.java | 5 +-
api/src/com/cloud/vm/RunningOn.java | 2 +-
api/src/com/cloud/vm/UserVmService.java | 78 +-
api/src/com/cloud/vm/VirtualMachine.java | 18 +-
api/src/com/cloud/vm/VirtualMachineProfile.java | 2 +-
api/src/org/apache/cloudstack/acl/APIChecker.java | 31 +
.../org/apache/cloudstack/acl/APILimitChecker.java | 30 +
.../apache/cloudstack/acl/ControlledEntity.java | 33 +
.../cloudstack/acl/InfrastructureEntity.java | 20 +
api/src/org/apache/cloudstack/acl/Role.java | 33 +
api/src/org/apache/cloudstack/acl/RoleType.java | 37 +
.../org/apache/cloudstack/acl/SecurityChecker.java | 99 +
api/src/org/apache/cloudstack/api/ACL.java | 31 +
api/src/org/apache/cloudstack/api/APICommand.java | 39 +
.../org/apache/cloudstack/api/ApiConstants.java | 452 ++
.../org/apache/cloudstack/api/ApiErrorCode.java | 59 +
.../org/apache/cloudstack/api/BaseAsyncCmd.java | 135 +
.../apache/cloudstack/api/BaseAsyncCreateCmd.java | 65 +
api/src/org/apache/cloudstack/api/BaseCmd.java | 522 ++
.../api/BaseListAccountResourcesCmd.java | 27 +
api/src/org/apache/cloudstack/api/BaseListCmd.java | 108 +
.../cloudstack/api/BaseListDomainResourcesCmd.java | 46 +
.../api/BaseListProjectAndAccountResourcesCmd.java | 30 +
.../cloudstack/api/BaseListTaggedResourcesCmd.java | 48 +
.../api/BaseListTemplateOrIsoPermissionsCmd.java | 89 +
.../org/apache/cloudstack/api/BaseResponse.java | 78 +
.../cloudstack/api/BaseUpdateTemplateOrIsoCmd.java | 96 +
.../api/BaseUpdateTemplateOrIsoPermissionsCmd.java | 125 +
.../org/apache/cloudstack/api/EntityReference.java | 28 +
api/src/org/apache/cloudstack/api/Identity.java | 21 +
.../org/apache/cloudstack/api/IdentityService.java | 22 +
.../apache/cloudstack/api/InternalIdentity.java | 26 +
api/src/org/apache/cloudstack/api/Parameter.java | 51 +
api/src/org/apache/cloudstack/api/PlugService.java | 31 +
.../apache/cloudstack/api/ResponseGenerator.java | 387 ++
.../org/apache/cloudstack/api/ResponseObject.java | 79 +
.../apache/cloudstack/api/ServerApiException.java | 74 +
api/src/org/apache/cloudstack/api/Validate.java | 30 +
.../command/admin/account/CreateAccountCmd.java | 183 +
.../command/admin/account/DeleteAccountCmd.java | 116 +
.../command/admin/account/DisableAccountCmd.java | 138 +
.../command/admin/account/EnableAccountCmd.java | 115 +
.../api/command/admin/account/LockAccountCmd.java | 90 +
.../command/admin/account/UpdateAccountCmd.java | 145 +
.../command/admin/autoscale/CreateCounterCmd.java | 119 +
.../command/admin/autoscale/DeleteCounterCmd.java | 104 +
.../api/command/admin/cluster/AddClusterCmd.java | 178 +
.../command/admin/cluster/DeleteClusterCmd.java | 77 +
.../api/command/admin/cluster/ListClustersCmd.java | 147 +
.../command/admin/cluster/UpdateClusterCmd.java | 119 +
.../api/command/admin/config/ListCfgsByCmd.java | 95 +
.../config/ListHypervisorCapabilitiesCmd.java | 92 +
.../api/command/admin/config/UpdateCfgCmd.java | 83 +
.../config/UpdateHypervisorCapabilitiesCmd.java | 93 +
.../api/command/admin/domain/CreateDomainCmd.java | 104 +
.../api/command/admin/domain/DeleteDomainCmd.java | 111 +
.../admin/domain/ListDomainChildrenCmd.java | 100 +
.../api/command/admin/domain/ListDomainsCmd.java | 100 +
.../api/command/admin/domain/UpdateDomainCmd.java | 104 +
.../api/command/admin/host/AddHostCmd.java | 164 +
.../command/admin/host/AddSecondaryStorageCmd.java | 94 +
.../command/admin/host/CancelMaintenanceCmd.java | 111 +
.../api/command/admin/host/DeleteHostCmd.java | 91 +
.../api/command/admin/host/ListHostsCmd.java | 197 +
.../admin/host/PrepareForMaintenanceCmd.java | 111 +
.../api/command/admin/host/ReconnectHostCmd.java | 114 +
.../api/command/admin/host/UpdateHostCmd.java | 115 +
.../command/admin/host/UpdateHostPasswordCmd.java | 94 +
.../api/command/admin/ldap/LDAPConfigCmd.java | 149 +
.../api/command/admin/ldap/LDAPRemoveCmd.java | 71 +
.../command/admin/network/AddNetworkDeviceCmd.java | 96 +
.../network/AddNetworkServiceProviderCmd.java | 136 +
.../admin/network/CreateNetworkOfferingCmd.java | 231 +
.../admin/network/CreatePhysicalNetworkCmd.java | 174 +
.../network/CreateStorageNetworkIpRangeCmd.java | 128 +
.../admin/network/DeleteNetworkDeviceCmd.java | 90 +
.../admin/network/DeleteNetworkOfferingCmd.java | 77 +
.../network/DeleteNetworkServiceProviderCmd.java | 107 +
.../admin/network/DeletePhysicalNetworkCmd.java | 92 +
.../network/DeleteStorageNetworkIpRangeCmd.java | 87 +
.../admin/network/ListNetworkDeviceCmd.java | 100 +
.../network/ListNetworkServiceProvidersCmd.java | 104 +
.../admin/network/ListPhysicalNetworksCmd.java | 107 +
.../network/ListStorageNetworkIpRangeCmd.java | 105 +
.../network/ListSupportedNetworkServicesCmd.java | 115 +
.../admin/network/UpdateNetworkOfferingCmd.java | 108 +
.../network/UpdateNetworkServiceProviderCmd.java | 111 +
.../admin/network/UpdatePhysicalNetworkCmd.java | 118 +
.../network/UpdateStorageNetworkIpRangeCmd.java | 115 +
.../admin/offering/CreateDiskOfferingCmd.java | 122 +
.../admin/offering/CreateServiceOfferingCmd.java | 169 +
.../admin/offering/DeleteDiskOfferingCmd.java | 77 +
.../admin/offering/DeleteServiceOfferingCmd.java | 74 +
.../admin/offering/UpdateDiskOfferingCmd.java | 98 +
.../admin/offering/UpdateServiceOfferingCmd.java | 95 +
.../api/command/admin/pod/CreatePodCmd.java | 117 +
.../api/command/admin/pod/DeletePodCmd.java | 77 +
.../api/command/admin/pod/ListPodsByCmd.java | 110 +
.../api/command/admin/pod/UpdatePodCmd.java | 116 +
.../api/command/admin/resource/ListAlertsCmd.java | 92 +
.../command/admin/resource/ListCapacityCmd.java | 140 +
.../admin/resource/UploadCustomCertificateCmd.java | 106 +
.../router/ConfigureVirtualRouterElementCmd.java | 127 +
.../router/CreateVirtualRouterElementCmd.java | 109 +
.../api/command/admin/router/DestroyRouterCmd.java | 111 +
.../api/command/admin/router/ListRoutersCmd.java | 139 +
.../admin/router/ListVirtualRouterElementsCmd.java | 110 +
.../api/command/admin/router/RebootRouterCmd.java | 104 +
.../api/command/admin/router/StartRouterCmd.java | 108 +
.../api/command/admin/router/StopRouterCmd.java | 116 +
.../api/command/admin/router/UpgradeRouterCmd.java | 87 +
.../api/command/admin/storage/AddS3Cmd.java | 219 +
.../CancelPrimaryStorageMaintenanceCmd.java | 114 +
.../admin/storage/CreateStoragePoolCmd.java | 138 +
.../api/command/admin/storage/DeletePoolCmd.java | 87 +
.../api/command/admin/storage/ListS3sCmd.java | 75 +
.../command/admin/storage/ListStoragePoolsCmd.java | 124 +
.../PreparePrimaryStorageForMaintenanceCmd.java | 112 +
.../admin/storage/UpdateStoragePoolCmd.java | 84 +
.../api/command/admin/swift/AddSwiftCmd.java | 103 +
.../api/command/admin/swift/ListSwiftsCmd.java | 84 +
.../command/admin/systemvm/DestroySystemVmCmd.java | 101 +
.../command/admin/systemvm/ListSystemVMsCmd.java | 141 +
.../command/admin/systemvm/MigrateSystemVMCmd.java | 136 +
.../command/admin/systemvm/RebootSystemVmCmd.java | 112 +
.../command/admin/systemvm/StartSystemVMCmd.java | 116 +
.../command/admin/systemvm/StopSystemVmCmd.java | 118 +
.../command/admin/systemvm/UpgradeSystemVMCmd.java | 100 +
.../command/admin/template/PrepareTemplateCmd.java | 89 +
.../api/command/admin/usage/AddTrafficTypeCmd.java | 156 +
.../command/admin/usage/DeleteTrafficTypeCmd.java | 96 +
.../usage/ListTrafficTypeImplementorsCmd.java | 83 +
.../command/admin/usage/ListTrafficTypesCmd.java | 87 +
.../command/admin/usage/UpdateTrafficTypeCmd.java | 117 +
.../api/command/admin/user/CreateUserCmd.java | 158 +
.../api/command/admin/user/DeleteUserCmd.java | 96 +
.../api/command/admin/user/DisableUserCmd.java | 117 +
.../api/command/admin/user/EnableUserCmd.java | 95 +
.../api/command/admin/user/GetUserCmd.java | 76 +
.../api/command/admin/user/ListUsersCmd.java | 86 +
.../api/command/admin/user/LockUserCmd.java | 84 +
.../api/command/admin/user/RegisterCmd.java | 80 +
.../api/command/admin/user/UpdateUserCmd.java | 152 +
.../command/admin/vlan/CreateVlanIpRangeCmd.java | 182 +
.../command/admin/vlan/DeleteVlanIpRangeCmd.java | 77 +
.../command/admin/vlan/ListVlanIpRangesCmd.java | 154 +
.../api/command/admin/vm/AssignVMCmd.java | 126 +
.../api/command/admin/vm/MigrateVMCmd.java | 169 +
.../api/command/admin/vm/RecoverVMCmd.java | 85 +
.../command/admin/vpc/CreatePrivateGatewayCmd.java | 181 +
.../command/admin/vpc/CreateVPCOfferingCmd.java | 112 +
.../command/admin/vpc/DeletePrivateGatewayCmd.java | 115 +
.../command/admin/vpc/DeleteVPCOfferingCmd.java | 91 +
.../command/admin/vpc/UpdateVPCOfferingCmd.java | 106 +
.../api/command/admin/zone/CreateZoneCmd.java | 163 +
.../api/command/admin/zone/DeleteZoneCmd.java | 77 +
.../admin/zone/MarkDefaultZoneForAccountCmd.java | 117 +
.../api/command/admin/zone/UpdateZoneCmd.java | 170 +
.../user/account/AddAccountToProjectCmd.java | 120 +
.../user/account/DeleteAccountFromProjectCmd.java | 104 +
.../api/command/user/account/ListAccountsCmd.java | 100 +
.../user/account/ListProjectAccountsCmd.java | 93 +
.../command/user/address/AssociateIPAddrCmd.java | 273 +
.../user/address/DisassociateIPAddrCmd.java | 138 +
.../user/address/ListPublicIpAddressesCmd.java | 182 +
.../user/autoscale/CreateAutoScalePolicyCmd.java | 163 +
.../user/autoscale/CreateAutoScaleVmGroupCmd.java | 189 +
.../autoscale/CreateAutoScaleVmProfileCmd.java | 238 +
.../command/user/autoscale/CreateConditionCmd.java | 152 +
.../user/autoscale/DeleteAutoScalePolicyCmd.java | 104 +
.../user/autoscale/DeleteAutoScaleVmGroupCmd.java | 104 +
.../autoscale/DeleteAutoScaleVmProfileCmd.java | 103 +
.../command/user/autoscale/DeleteConditionCmd.java | 110 +
.../user/autoscale/DisableAutoScaleVmGroupCmd.java | 102 +
.../user/autoscale/EnableAutoScaleVmGroupCmd.java | 97 +
.../user/autoscale/ListAutoScalePoliciesCmd.java | 104 +
.../user/autoscale/ListAutoScaleVmGroupsCmd.java | 118 +
.../user/autoscale/ListAutoScaleVmProfilesCmd.java | 95 +
.../command/user/autoscale/ListConditionsCmd.java | 96 +
.../command/user/autoscale/ListCountersCmd.java | 98 +
.../user/autoscale/UpdateAutoScalePolicyCmd.java | 127 +
.../user/autoscale/UpdateAutoScaleVmGroupCmd.java | 139 +
.../autoscale/UpdateAutoScaleVmProfileCmd.java | 133 +
.../command/user/config/ListCapabilitiesCmd.java | 59 +
.../api/command/user/event/ListEventTypesCmd.java | 60 +
.../api/command/user/event/ListEventsCmd.java | 109 +
.../user/firewall/CreateFirewallRuleCmd.java | 331 +
.../user/firewall/CreatePortForwardingRuleCmd.java | 374 ++
.../user/firewall/DeleteFirewallRuleCmd.java | 117 +
.../user/firewall/DeletePortForwardingRuleCmd.java | 119 +
.../user/firewall/ListFirewallRulesCmd.java | 87 +
.../user/firewall/ListPortForwardingRulesCmd.java | 88 +
.../user/firewall/UpdatePortForwardingRuleCmd.java | 130 +
.../user/guest/ListGuestOsCategoriesCmd.java | 92 +
.../api/command/user/guest/ListGuestOsCmd.java | 96 +
.../api/command/user/iso/AttachIsoCmd.java | 114 +
.../api/command/user/iso/CopyIsoCmd.java | 30 +
.../api/command/user/iso/DeleteIsoCmd.java | 119 +
.../api/command/user/iso/DetachIsoCmd.java | 98 +
.../api/command/user/iso/ExtractIsoCmd.java | 136 +
.../command/user/iso/ListIsoPermissionsCmd.java | 46 +
.../api/command/user/iso/ListIsosCmd.java | 161 +
.../api/command/user/iso/RegisterIsoCmd.java | 173 +
.../api/command/user/iso/UpdateIsoCmd.java | 79 +
.../command/user/iso/UpdateIsoPermissionsCmd.java | 46 +
.../api/command/user/job/ListAsyncJobsCmd.java | 69 +
.../command/user/job/QueryAsyncJobResultCmd.java | 70 +
.../loadbalancer/AssignToLoadBalancerRuleCmd.java | 123 +
.../loadbalancer/CreateLBStickinessPolicyCmd.java | 161 +
.../loadbalancer/CreateLoadBalancerRuleCmd.java | 383 ++
.../loadbalancer/DeleteLBStickinessPolicyCmd.java | 117 +
.../loadbalancer/DeleteLoadBalancerRuleCmd.java | 114 +
.../loadbalancer/ListLBStickinessPoliciesCmd.java | 86 +
.../ListLoadBalancerRuleInstancesCmd.java | 83 +
.../loadbalancer/ListLoadBalancerRulesCmd.java | 116 +
.../RemoveFromLoadBalancerRuleCmd.java | 118 +
.../loadbalancer/UpdateLoadBalancerRuleCmd.java | 112 +
.../user/nat/CreateIpForwardingRuleCmd.java | 317 +
.../user/nat/DeleteIpForwardingRuleCmd.java | 124 +
.../api/command/user/nat/DisableStaticNatCmd.java | 112 +
.../api/command/user/nat/EnableStaticNatCmd.java | 127 +
.../command/user/nat/ListIpForwardingRulesCmd.java | 102 +
.../command/user/network/CreateNetworkACLCmd.java | 333 +
.../api/command/user/network/CreateNetworkCmd.java | 240 +
.../command/user/network/DeleteNetworkACLCmd.java | 123 +
.../api/command/user/network/DeleteNetworkCmd.java | 105 +
.../command/user/network/ListNetworkACLsCmd.java | 94 +
.../user/network/ListNetworkOfferingsCmd.java | 191 +
.../api/command/user/network/ListNetworksCmd.java | 165 +
.../command/user/network/RestartNetworkCmd.java | 125 +
.../api/command/user/network/UpdateNetworkCmd.java | 153 +
.../user/offering/ListDiskOfferingsCmd.java | 87 +
.../user/offering/ListServiceOfferingsCmd.java | 107 +
.../command/user/project/ActivateProjectCmd.java | 95 +
.../api/command/user/project/CreateProjectCmd.java | 143 +
.../api/command/user/project/DeleteProjectCmd.java | 100 +
.../user/project/DeleteProjectInvitationCmd.java | 90 +
.../user/project/ListProjectInvitationsCmd.java | 86 +
.../api/command/user/project/ListProjectsCmd.java | 115 +
.../command/user/project/SuspendProjectCmd.java | 97 +
.../api/command/user/project/UpdateProjectCmd.java | 114 +
.../user/project/UpdateProjectInvitationCmd.java | 108 +
.../user/resource/GetCloudIdentifierCmd.java | 82 +
.../command/user/resource/ListHypervisorsCmd.java | 85 +
.../user/resource/ListResourceLimitsCmd.java | 88 +
.../user/resource/UpdateResourceCountCmd.java | 129 +
.../user/resource/UpdateResourceLimitCmd.java | 106 +
.../AuthorizeSecurityGroupEgressCmd.java | 223 +
.../AuthorizeSecurityGroupIngressCmd.java | 236 +
.../user/securitygroup/CreateSecurityGroupCmd.java | 123 +
.../user/securitygroup/DeleteSecurityGroupCmd.java | 131 +
.../user/securitygroup/ListSecurityGroupsCmd.java | 85 +
.../RevokeSecurityGroupEgressCmd.java | 104 +
.../RevokeSecurityGroupIngressCmd.java | 109 +
.../command/user/snapshot/CreateSnapshotCmd.java | 188 +
.../user/snapshot/CreateSnapshotPolicyCmd.java | 132 +
.../command/user/snapshot/DeleteSnapshotCmd.java | 100 +
.../user/snapshot/DeleteSnapshotPoliciesCmd.java | 87 +
.../user/snapshot/ListSnapshotPoliciesCmd.java | 79 +
.../command/user/snapshot/ListSnapshotsCmd.java | 114 +
.../api/command/user/ssh/CreateSSHKeyPairCmd.java | 103 +
.../api/command/user/ssh/DeleteSSHKeyPairCmd.java | 109 +
.../api/command/user/ssh/ListSSHKeyPairsCmd.java | 88 +
.../command/user/ssh/RegisterSSHKeyPairCmd.java | 110 +
.../api/command/user/tag/CreateTagsCmd.java | 132 +
.../api/command/user/tag/DeleteTagsCmd.java | 123 +
.../api/command/user/tag/ListTagsCmd.java | 83 +
.../api/command/user/template/CopyTemplateCmd.java | 145 +
.../command/user/template/CreateTemplateCmd.java | 284 +
.../command/user/template/DeleteTemplateCmd.java | 115 +
.../command/user/template/ExtractTemplateCmd.java | 136 +
.../user/template/ListTemplatePermissionsCmd.java | 46 +
.../command/user/template/ListTemplatesCmd.java | 136 +
.../command/user/template/RegisterTemplateCmd.java | 244 +
.../command/user/template/UpdateTemplateCmd.java | 80 +
.../template/UpdateTemplatePermissionsCmd.java | 51 +
.../api/command/user/vm/DeployVMCmd.java | 471 ++
.../api/command/user/vm/DestroyVMCmd.java | 110 +
.../api/command/user/vm/GetVMPasswordCmd.java | 83 +
.../cloudstack/api/command/user/vm/ListVMsCmd.java | 218 +
.../api/command/user/vm/RebootVMCmd.java | 114 +
.../api/command/user/vm/ResetVMPasswordCmd.java | 123 +
.../api/command/user/vm/RestoreVMCmd.java | 89 +
.../cloudstack/api/command/user/vm/StartVMCmd.java | 142 +
.../cloudstack/api/command/user/vm/StopVMCmd.java | 126 +
.../api/command/user/vm/UpdateVMCmd.java | 133 +
.../api/command/user/vm/UpgradeVMCmd.java | 104 +
.../api/command/user/vmgroup/CreateVMGroupCmd.java | 105 +
.../api/command/user/vmgroup/DeleteVMGroupCmd.java | 79 +
.../api/command/user/vmgroup/ListVMGroupsCmd.java | 72 +
.../api/command/user/vmgroup/UpdateVMGroupCmd.java | 86 +
.../api/command/user/volume/AttachVolumeCmd.java | 132 +
.../api/command/user/volume/CreateVolumeCmd.java | 186 +
.../api/command/user/volume/DeleteVolumeCmd.java | 91 +
.../api/command/user/volume/DetachVolumeCmd.java | 138 +
.../api/command/user/volume/ExtractVolumeCmd.java | 159 +
.../api/command/user/volume/ListVolumesCmd.java | 118 +
.../api/command/user/volume/MigrateVolumeCmd.java | 107 +
.../api/command/user/volume/ResizeVolumeCmd.java | 154 +
.../api/command/user/volume/UploadVolumeCmd.java | 144 +
.../api/command/user/vpc/CreateStaticRouteCmd.java | 146 +
.../api/command/user/vpc/CreateVPCCmd.java | 188 +
.../api/command/user/vpc/DeleteStaticRouteCmd.java | 121 +
.../api/command/user/vpc/DeleteVPCCmd.java | 100 +
.../command/user/vpc/ListPrivateGatewaysCmd.java | 107 +
.../api/command/user/vpc/ListStaticRoutesCmd.java | 87 +
.../api/command/user/vpc/ListVPCOfferingsCmd.java | 115 +
.../api/command/user/vpc/ListVPCsCmd.java | 161 +
.../api/command/user/vpc/RestartVPCCmd.java | 105 +
.../api/command/user/vpc/UpdateVPCCmd.java | 109 +
.../api/command/user/vpn/AddVpnUserCmd.java | 153 +
.../command/user/vpn/CreateRemoteAccessVpnCmd.java | 195 +
.../command/user/vpn/CreateVpnConnectionCmd.java | 137 +
.../user/vpn/CreateVpnCustomerGatewayCmd.java | 167 +
.../api/command/user/vpn/CreateVpnGatewayCmd.java | 103 +
.../command/user/vpn/DeleteRemoteAccessVpnCmd.java | 100 +
.../command/user/vpn/DeleteVpnConnectionCmd.java | 96 +
.../user/vpn/DeleteVpnCustomerGatewayCmd.java | 90 +
.../api/command/user/vpn/DeleteVpnGatewayCmd.java | 91 +
.../command/user/vpn/ListRemoteAccessVpnsCmd.java | 79 +
.../command/user/vpn/ListVpnConnectionsCmd.java | 91 +
.../user/vpn/ListVpnCustomerGatewaysCmd.java | 83 +
.../api/command/user/vpn/ListVpnGatewaysCmd.java | 90 +
.../api/command/user/vpn/ListVpnUsersCmd.java | 84 +
.../api/command/user/vpn/RemoveVpnUserCmd.java | 123 +
.../command/user/vpn/ResetVpnConnectionCmd.java | 114 +
.../user/vpn/UpdateVpnCustomerGatewayCmd.java | 161 +
.../api/command/user/zone/ListZonesByCmd.java | 102 +
.../cloudstack/api/response/AccountResponse.java | 300 +
.../cloudstack/api/response/AlertResponse.java | 65 +
.../cloudstack/api/response/AsyncJobResponse.java | 110 +
.../api/response/AutoScalePolicyResponse.java | 118 +
.../api/response/AutoScaleVmGroupResponse.java | 154 +
.../api/response/AutoScaleVmProfileResponse.java | 170 +
.../api/response/CapabilitiesResponse.java | 77 +
.../api/response/CapabilityResponse.java | 58 +
.../cloudstack/api/response/CapacityResponse.java | 134 +
.../api/response/CloudIdentifierResponse.java | 59 +
.../cloudstack/api/response/ClusterResponse.java | 152 +
.../cloudstack/api/response/ConditionResponse.java | 126 +
.../api/response/ConfigurationResponse.java | 68 +
.../api/response/ControlledEntityResponse.java | 30 +
.../api/response/ControlledViewEntityResponse.java | 31 +
.../cloudstack/api/response/CounterResponse.java | 72 +
.../cloudstack/api/response/CreateCmdResponse.java | 31 +
.../api/response/CustomCertificateResponse.java | 35 +
.../api/response/DiskOfferingResponse.java | 139 +
.../cloudstack/api/response/DomainResponse.java | 112 +
.../api/response/DomainRouterResponse.java | 341 +
.../cloudstack/api/response/EventResponse.java | 126 +
.../cloudstack/api/response/EventTypeResponse.java | 35 +
.../cloudstack/api/response/ExceptionResponse.java | 72 +
.../api/response/ExternalFirewallResponse.java | 146 +
.../api/response/ExternalLoadBalancerResponse.java | 103 +
.../cloudstack/api/response/ExtractResponse.java | 204 +
.../cloudstack/api/response/FirewallResponse.java | 104 +
.../api/response/FirewallRuleResponse.java | 186 +
.../api/response/GetVMPasswordResponse.java | 44 +
.../api/response/GuestOSCategoryResponse.java | 49 +
.../cloudstack/api/response/GuestOSResponse.java | 60 +
.../cloudstack/api/response/HostResponse.java | 360 +
.../response/HypervisorCapabilitiesResponse.java | 85 +
.../api/response/HypervisorResponse.java | 35 +
.../cloudstack/api/response/IPAddressResponse.java | 241 +
.../api/response/InstanceGroupResponse.java | 91 +
.../api/response/IpForwardingRuleResponse.java | 134 +
.../cloudstack/api/response/IsoVmResponse.java | 150 +
.../api/response/LBStickinessPolicyResponse.java | 128 +
.../api/response/LBStickinessResponse.java | 130 +
.../api/response/LDAPConfigResponse.java | 104 +
.../api/response/LDAPRemoveResponse.java | 26 +
.../cloudstack/api/response/ListResponse.java | 53 +
.../api/response/LoadBalancerResponse.java | 163 +
.../api/response/NetworkACLResponse.java | 98 +
.../api/response/NetworkDeviceResponse.java | 36 +
.../api/response/NetworkOfferingResponse.java | 152 +
.../cloudstack/api/response/NetworkResponse.java | 301 +
.../cloudstack/api/response/NicResponse.java | 143 +
.../api/response/PhysicalNetworkResponse.java | 128 +
.../cloudstack/api/response/PodResponse.java | 140 +
.../api/response/PrivateGatewayResponse.java | 148 +
.../api/response/ProjectAccountResponse.java | 102 +
.../api/response/ProjectInvitationResponse.java | 84 +
.../cloudstack/api/response/ProjectResponse.java | 93 +
.../cloudstack/api/response/ProviderResponse.java | 108 +
.../cloudstack/api/response/RegisterResponse.java | 45 +
.../api/response/RemoteAccessVpnResponse.java | 103 +
.../api/response/ResourceCountResponse.java | 81 +
.../api/response/ResourceLimitResponse.java | 82 +
.../api/response/ResourceTagResponse.java | 103 +
.../apache/cloudstack/api/response/S3Response.java | 209 +
.../api/response/SSHKeyPairResponse.java | 71 +
.../api/response/SecurityGroupResponse.java | 169 +
.../api/response/SecurityGroupRuleResponse.java | 153 +
.../api/response/ServiceOfferingResponse.java | 227 +
.../cloudstack/api/response/ServiceResponse.java | 49 +
.../response/Site2SiteCustomerGatewayResponse.java | 155 +
.../response/Site2SiteVpnConnectionResponse.java | 176 +
.../api/response/Site2SiteVpnGatewayResponse.java | 99 +
.../api/response/SnapshotPolicyResponse.java | 92 +
.../cloudstack/api/response/SnapshotResponse.java | 169 +
.../api/response/SnapshotScheduleResponse.java | 69 +
.../api/response/StaticRouteResponse.java | 122 +
.../cloudstack/api/response/StatusResponse.java | 33 +
.../response/StorageNetworkIpRangeResponse.java | 90 +
.../api/response/StoragePoolResponse.java | 225 +
.../cloudstack/api/response/SuccessResponse.java | 51 +
.../cloudstack/api/response/SwiftResponse.java | 85 +
.../api/response/SystemVmInstanceResponse.java | 95 +
.../cloudstack/api/response/SystemVmResponse.java | 320 +
.../api/response/TemplatePermissionsResponse.java | 66 +
.../cloudstack/api/response/TemplateResponse.java | 298 +
.../api/response/TrafficMonitorResponse.java | 80 +
.../response/TrafficTypeImplementorResponse.java | 38 +
.../api/response/TrafficTypeResponse.java | 100 +
.../cloudstack/api/response/UpgradeVmResponse.java | 297 +
.../api/response/UsageRecordResponse.java | 199 +
.../cloudstack/api/response/UsageTypeResponse.java | 55 +
.../cloudstack/api/response/UserResponse.java | 209 +
.../cloudstack/api/response/UserVmResponse.java | 382 ++
.../response/VirtualRouterProviderResponse.java | 88 +
.../api/response/VlanIpRangeResponse.java | 160 +
.../cloudstack/api/response/VolumeResponse.java | 317 +
.../api/response/VpcOfferingResponse.java | 81 +
.../cloudstack/api/response/VpcResponse.java | 173 +
.../cloudstack/api/response/VpnUsersResponse.java | 82 +
.../cloudstack/api/response/ZoneResponse.java | 178 +
.../network/ExternalNetworkDeviceManager.java | 79 +
.../org/apache/cloudstack/query/QueryService.java | 103 +
api/test/integration/api/__init__.py | 16 +
api/test/integration/api/setup.py | 16 +
api/test/integration/api/test/__init__.py | 16 +
api/test/integration/api/test/account/__init__.py | 16 +
.../api/test/account/testCreateAccount.py | 61 +
.../api/agent/test/AgentControlAnswerTest.java | 35 +
.../api/agent/test/AgentControlCommandTest.java | 33 +
.../cloudstack/api/agent/test/AnswerTest.java | 73 +
.../api/agent/test/AttachIsoCommandTest.java | 80 +
.../api/agent/test/AttachVolumeAnswerTest.java | 65 +
.../api/agent/test/AttachVolumeCommandTest.java | 120 +
.../api/agent/test/BackupSnapshotAnswerTest.java | 75 +
.../api/agent/test/BackupSnapshotCommandTest.java | 271 +
.../api/agent/test/BumpUpPriorityCommandTest.java | 83 +
.../api/agent/test/CancelCommandTest.java | 46 +
.../api/agent/test/ChangeAgentAnswerTest.java | 44 +
.../api/agent/test/ChangeAgentCommandTest.java | 50 +
.../api/agent/test/CheckHealthAnswerTest.java | 49 +
.../api/agent/test/CheckHealthCommandTest.java | 40 +
.../api/agent/test/CheckNetworkAnswerTest.java | 62 +
.../api/agent/test/CheckNetworkCommandTest.java | 53 +
.../api/agent/test/CheckOnHostCommandTest.java | 483 ++
.../api/agent/test/SnapshotCommandTest.java | 197 +
.../api/command/test/ActivateProjectCmdTest.java | 87 +
.../command/test/AddAccountToProjectCmdTest.java | 175 +
.../api/command/test/AddClusterCmdTest.java | 120 +
.../api/command/test/AddHostCmdTest.java | 165 +
.../test/AddNetworkServiceProviderCmdTest.java | 122 +
.../command/test/AddSecondaryStorageCmdTest.java | 124 +
.../api/command/test/AddSwiftCmdTest.java | 97 +
.../api/command/test/AddVpnUserCmdTest.java | 148 +
.../agent/api/test/ResizeVolumeCommandTest.java | 199 +
awsapi/README.txt | 75 -
awsapi/pom.xml | 106 +-
.../cloud/bridge/io/DimeDelimitedInputStream.java | 15 -
.../com/cloud/bridge/io/S3CAStorBucketAdapter.java | 58 +-
build/build-aws-api.xml | 24 +-
build/build-cloud.xml | 2 -
build/developer.xml | 3 +-
build/package.xml | 4 +
build/replace.properties | 2 +-
.../WEB-INF/classes/resources/messages.properties | 42 +-
.../classes/resources/messages_fr_FR.properties | 1512 +++++
.../classes/resources/messages_ja.properties | 2 -
.../classes/resources/messages_pt_BR.properties | 1512 +++++
.../classes/resources/messages_ru_RU.properties | 1512 +++++
.../classes/resources/messages_zh_CN.properties | 2 -
client/bindir/cloud-setup-management.in | 10 +-
.../ubuntu/SYSCONFDIR/init.d/cloud-management.in | 5 +
client/pom.xml | 353 +-
.../cisconexusvsm_commands.properties.in | 25 -
client/tomcatconf/commands-ext.properties.in | 35 -
client/tomcatconf/commands.properties.in | 671 ++-
client/tomcatconf/components-nonoss.xml.in | 97 +
client/tomcatconf/components.xml.in | 67 +-
client/tomcatconf/db-enc.properties.in | 3 -
client/tomcatconf/db.properties.in | 3 -
client/tomcatconf/f5bigip_commands.properties.in | 32 -
.../tomcatconf/junipersrx_commands.properties.in | 30 -
client/tomcatconf/log4j-cloud.xml.in | 4 +
client/tomcatconf/netapp_commands.properties.in | 33 -
.../netscalerloadbalancer_commands.properties.in | 26 -
.../tomcatconf/nicira-nvp_commands.properties.in | 29 -
client/tomcatconf/server-nonssl.xml | 231 -
client/tomcatconf/server-nonssl.xml.in | 231 +
client/tomcatconf/server-ssl.xml.in | 2 +-
client/tomcatconf/server.xml.in | 4 +-
client/tomcatconf/simulator.properties.in | 31 -
.../virtualrouter_commands.properties.in | 24 -
cloud.spec | 60 +-
console-proxy/js/ajaxkeys.js | 77 +
console-proxy/js/ajaxviewer.js | 51 +-
console-proxy/pom.xml | 71 +-
.../cloud/consoleproxy/ConsoleProxyClientBase.java | 1 +
console-proxy/systemvm-descriptor.xml | 1 +
console-proxy/ui/viewer.ftl | 1 +
core/pom.xml | 5 +
.../cloud/agent/api/DirectNetworkUsageCommand.java | 23 +-
.../virtualnetwork/VirtualRoutingResource.java | 101 +-
core/src/com/cloud/alert/AlertVO.java | 5 +-
core/src/com/cloud/async/AsyncJobVO.java | 34 +-
core/src/com/cloud/async/SyncQueueItemVO.java | 173 +-
core/src/com/cloud/async/SyncQueueVO.java | 188 +-
core/src/com/cloud/capacity/CapacityVO.java | 8 +-
core/src/com/cloud/certificate/CertificateVO.java | 6 +-
.../com/cloud/configuration/ResourceCountVO.java | 4 +-
.../com/cloud/configuration/ResourceLimitVO.java | 4 +-
core/src/com/cloud/event/EventVO.java | 5 +-
core/src/com/cloud/event/UsageEvent.java | 5 +-
core/src/com/cloud/event/UsageEventVO.java | 1 +
core/src/com/cloud/host/DetailVO.java | 4 +-
core/src/com/cloud/host/HostTagVO.java | 4 +-
core/src/com/cloud/host/HostVO.java | 25 +-
.../cloud/hypervisor/HypervisorCapabilitiesVO.java | 5 +-
core/src/com/cloud/network/VpnUserVO.java | 5 +-
.../network/resource/TrafficSentinelResource.java | 41 +-
.../network/security/SecurityGroupRuleVO.java | 2 +-
.../network/security/SecurityGroupRulesVO.java | 1 +
.../network/security/SecurityGroupVMMapVO.java | 5 +-
.../cloud/network/security/SecurityGroupVO.java | 5 +-
.../cloud/network/security/SecurityGroupWork.java | 2 +
.../network/security/SecurityGroupWorkVO.java | 5 +-
.../com/cloud/network/security/VmRulesetLogVO.java | 5 +-
core/src/com/cloud/storage/DiskOfferingVO.java | 75 +-
core/src/com/cloud/storage/GuestOSCategoryVO.java | 19 +-
core/src/com/cloud/storage/GuestOSVO.java | 35 +-
core/src/com/cloud/storage/LaunchPermissionVO.java | 6 +-
core/src/com/cloud/storage/S3VO.java | 209 +
core/src/com/cloud/storage/SnapshotPolicyVO.java | 31 +-
core/src/com/cloud/storage/SnapshotScheduleVO.java | 31 +-
core/src/com/cloud/storage/SnapshotVO.java | 73 +-
.../src/com/cloud/storage/StoragePoolDetailVO.java | 4 +-
.../com/cloud/storage/StoragePoolHostAssoc.java | 4 +-
core/src/com/cloud/storage/StoragePoolHostVO.java | 3 +-
core/src/com/cloud/storage/StoragePoolVO.java | 5 +-
core/src/com/cloud/storage/StoragePoolWorkVO.java | 6 +-
core/src/com/cloud/storage/SwiftVO.java | 19 +-
core/src/com/cloud/storage/UploadVO.java | 50 +-
core/src/com/cloud/storage/VMTemplateDetailVO.java | 4 +-
core/src/com/cloud/storage/VMTemplateHostVO.java | 1 +
core/src/com/cloud/storage/VMTemplateS3VO.java | 204 +
.../com/cloud/storage/VMTemplateStoragePoolVO.java | 3 +-
core/src/com/cloud/storage/VMTemplateSwiftVO.java | 3 +-
core/src/com/cloud/storage/VMTemplateVO.java | 37 +-
core/src/com/cloud/storage/VMTemplateZoneVO.java | 5 +-
core/src/com/cloud/storage/VolumeHostVO.java | 3 +-
core/src/com/cloud/storage/VolumeVO.java | 5 +-
.../resource/NfsSecondaryStorageResource.java | 436 ++-
.../cloud/storage/snapshot/SnapshotSchedule.java | 18 +-
.../storage/template/HttpTemplateDownloader.java | 4 +-
core/src/com/cloud/user/AccountVO.java | 41 +-
core/src/com/cloud/user/SSHKeyPairVO.java | 2 +
core/src/com/cloud/user/UserAccountVO.java | 5 +-
core/src/com/cloud/user/UserStatisticsVO.java | 6 +-
core/src/com/cloud/user/UserVO.java | 5 +-
core/src/com/cloud/vm/InstanceGroupVMMapVO.java | 6 +-
core/src/com/cloud/vm/InstanceGroupVO.java | 5 +-
core/src/com/cloud/vm/UserVmDetailVO.java | 4 +-
core/src/com/cloud/vm/VMInstanceVO.java | 5 +-
debian/changelog | 12 +
debian/cloud-agent.install | 1 +
debian/cloud-scripts.postinst | 34 -
debian/cloud-system-iso.postinst | 34 -
debian/cloud-utils.install | 2 -
debian/control | 2 +-
debian/rules | 108 +-
deps/XenServerJava/BSD | 26 -
deps/XenServerJava/LICENSE.Apache-2.0.txt | 201 -
deps/XenServerJava/LICENSE.txt | 26 -
deps/XenServerJava/README.txt | 46 -
.../src/com/xensource/xenapi/APIVersion.java | 32 +-
.../src/com/xensource/xenapi/Auth.java | 14 +-
.../src/com/xensource/xenapi/Blob.java | 67 +-
.../src/com/xensource/xenapi/Bond.java | 199 +-
.../src/com/xensource/xenapi/Connection.java | 36 +-
.../src/com/xensource/xenapi/Console.java | 19 +-
.../src/com/xensource/xenapi/Crashdump.java | 19 +-
.../src/com/xensource/xenapi/DRTask.java | 303 +
.../src/com/xensource/xenapi/DataSource.java | 21 +-
.../src/com/xensource/xenapi/Event.java | 64 +-
.../src/com/xensource/xenapi/GPUGroup.java | 445 ++
.../src/com/xensource/xenapi/Host.java | 186 +-
.../src/com/xensource/xenapi/HostCpu.java | 19 +-
.../src/com/xensource/xenapi/HostCrashdump.java | 19 +-
.../src/com/xensource/xenapi/HostMetrics.java | 19 +-
.../src/com/xensource/xenapi/HostPatch.java | 21 +-
.../src/com/xensource/xenapi/Marshalling.java | 8 +-
.../src/com/xensource/xenapi/Message.java | 37 +-
.../src/com/xensource/xenapi/Network.java | 88 +-
.../src/com/xensource/xenapi/PBD.java | 19 +-
.../src/com/xensource/xenapi/PCI.java | 418 ++
.../src/com/xensource/xenapi/PGPU.java | 349 +
.../src/com/xensource/xenapi/PIF.java | 271 +-
.../src/com/xensource/xenapi/PIFMetrics.java | 19 +-
.../src/com/xensource/xenapi/Pool.java | 64 +-
.../src/com/xensource/xenapi/PoolPatch.java | 91 +-
.../src/com/xensource/xenapi/Role.java | 19 +-
.../XenServerJava/src/com/xensource/xenapi/SM.java | 21 +-
.../XenServerJava/src/com/xensource/xenapi/SR.java | 230 +-
.../src/com/xensource/xenapi/Secret.java | 91 +-
.../src/com/xensource/xenapi/Session.java | 19 +-
.../src/com/xensource/xenapi/Subject.java | 19 +-
.../src/com/xensource/xenapi/Task.java | 23 +-
.../src/com/xensource/xenapi/Tunnel.java | 19 +-
.../src/com/xensource/xenapi/Types.java | 2393 ++++++-
.../src/com/xensource/xenapi/User.java | 19 +-
.../src/com/xensource/xenapi/VBD.java | 19 +-
.../src/com/xensource/xenapi/VBDMetrics.java | 19 +-
.../src/com/xensource/xenapi/VDI.java | 343 +-
.../src/com/xensource/xenapi/VGPU.java | 446 ++
.../src/com/xensource/xenapi/VIF.java | 358 +-
.../src/com/xensource/xenapi/VIFMetrics.java | 19 +-
.../src/com/xensource/xenapi/VLAN.java | 19 +-
.../XenServerJava/src/com/xensource/xenapi/VM.java | 665 ++-
.../src/com/xensource/xenapi/VMAppliance.java | 655 ++
.../src/com/xensource/xenapi/VMGuestMetrics.java | 19 +-
.../src/com/xensource/xenapi/VMMetrics.java | 19 +-
.../src/com/xensource/xenapi/VMPP.java | 51 +-
.../src/com/xensource/xenapi/VTPM.java | 19 +-
.../src/com/xensource/xenapi/XenAPIObject.java | 8 +-
deps/install-non-oss.sh | 14 +-
deps/pom.xml | 201 -
developer/developer-prefill.sql | 54 +
developer/pom.xml | 679 ++-
docs/README.txt | 46 +-
docs/en-US/Admin_Guide.ent | 22 +
docs/en-US/Admin_Guide.xml | 74 +
docs/en-US/Book_Info.xml | 2 +-
docs/en-US/Book_Info_Admin.xml | 46 -
docs/en-US/Book_Info_Build_All.xml | 44 -
docs/en-US/Book_Info_Release_Notes_4-0.xml | 39 +
docs/en-US/CloudStack_Nicira_NVP_Guide.ent | 22 +
docs/en-US/CloudStack_Nicira_NVP_Guide.xml | 54 +
docs/en-US/Developers_Guide.ent | 21 +
docs/en-US/Developers_Guide.xml | 58 +
docs/en-US/Installation_Guide.ent | 22 +
docs/en-US/Installation_Guide.xml | 61 +
docs/en-US/Release_Notes.ent | 22 +
docs/en-US/Release_Notes.xml | 2923 +++++++++
docs/en-US/Revision_History_Install_Guide.xml | 55 +
docs/en-US/about-clusters.xml | 34 +-
docs/en-US/about-hosts.xml | 3 +-
docs/en-US/about-password-encryption.xml | 65 +
docs/en-US/about-security-groups.xml | 35 +
docs/en-US/about-virtual-networks.xml | 10 +-
docs/en-US/accessing-vms.xml | 2 +-
docs/en-US/accounts.xml | 5 +-
docs/en-US/acquire-new-ip-for-vpc.xml | 73 +
docs/en-US/add-clusters-kvm-xenserver.xml | 53 +
docs/en-US/add-clusters-ovm.xml | 43 +
docs/en-US/add-clusters-vsphere.xml | 110 +
docs/en-US/add-gateway-vpc.xml | 104 +
docs/en-US/add-loadbalancer-rule-vpc.xml | 123 +
docs/en-US/add-more-clusters.xml | 2 +-
docs/en-US/add-portforward-rule-vpc.xml | 103 +
docs/en-US/add-primary-storage.xml | 2 +-
docs/en-US/add-tier.xml | 89 +
docs/en-US/add-vm-to-tier.xml | 45 +
docs/en-US/add-vpc.xml | 75 +
docs/en-US/added-API-commands-4-0.xml | 164 +
docs/en-US/added-API-commands.xml | 348 +-
docs/en-US/added-cloudPlatform-error-codes.xml | 138 -
docs/en-US/added-error-codes.xml | 138 +
docs/en-US/additional-installation-options.xml | 31 +
docs/en-US/admin-guide.xml | 2 +-
docs/en-US/adv-zone-topology-req.xml | 25 +
docs/en-US/advanced-zone-configuration.xml | 10 +-
docs/en-US/alerts.xml | 12 +-
docs/en-US/api-calls.xml | 32 +
docs/en-US/api-overview.xml | 38 +
docs/en-US/api-reference.xml | 6 +-
docs/en-US/appendix-a-time-zones.xml | 143 -
docs/en-US/attaching-volume.xml | 3 +-
docs/en-US/autoscale.xml | 284 +
docs/en-US/aws-api-examples.xml | 145 +
docs/en-US/aws-ec2-configuration.xml | 122 +-
docs/en-US/aws-ec2-introduction.xml | 22 +-
docs/en-US/aws-ec2-requirements.xml | 14 +-
docs/en-US/aws-ec2-supported-commands.xml | 37 +-
docs/en-US/aws-ec2-timeouts.xml | 51 +
docs/en-US/aws-ec2-user-setup.xml | 114 +-
docs/en-US/aws-interface-compatibility.xml | 34 +
docs/en-US/aws-interface-guide.xml | 32 -
docs/en-US/basic-adv-networking.xml | 113 +
docs/en-US/basic-zone-configuration.xml | 7 +-
docs/en-US/basic-zone-guest-ip-addresses.xml | 2 +-
.../basic-zone-physical-network-configuration.xml | 2 +-
docs/en-US/best-practices-for-vms.xml | 26 +-
docs/en-US/best-practices-primary-storage.xml | 2 +-
docs/en-US/best-practices-secondary-storage.xml | 2 +-
docs/en-US/build-deb.xml | 123 +
docs/en-US/build-rpm.xml | 82 +
docs/en-US/building-devcloud.xml | 32 +
docs/en-US/building-marvin.xml | 46 +
docs/en-US/building-prerequisites.xml | 66 +
docs/en-US/building-with-maven-deploy.xml | 39 +
docs/en-US/building-with-maven-steps.xml | 33 +
docs/en-US/building-with-maven.xml | 32 +
docs/en-US/castor-with-cs.xml | 87 +
docs/en-US/change-database-config.xml | 28 +
docs/en-US/change-database-password.xml | 76 +
docs/en-US/change-to-behavior-of-list-commands.xml | 183 +-
docs/en-US/changed-apicommands-4-0.xml | 268 +
docs/en-US/changing-secondary-storage-servers.xml | 2 +-
docs/en-US/changing-secondary-storage-serversp.xml | 36 -
docs/en-US/choosing-a-deployment-architecture.xml | 29 +
docs/en-US/choosing_a_deployment_architecture.xml | 29 -
docs/en-US/cisco3750-hardware.xml | 52 +
docs/en-US/cisco3750-layer2.xml | 45 +
docs/en-US/citrix-xenserver-installation.xml | 993 ++--
docs/en-US/cloud-infrastructure-concepts.xml | 2 +-
docs/en-US/cloud-infrastructure-overview.xml | 47 +-
docs/en-US/cloudplatform-api.xml | 31 -
docs/en-US/cloudstack-api.xml | 31 +
docs/en-US/cloudstack.xml | 105 +-
docs/en-US/cloudstack_admin.ent | 4 -
docs/en-US/cloudstack_admin.xml | 51 -
docs/en-US/cloudstack_developers.ent | 22 -
docs/en-US/cloudstack_developers.xml | 52 -
docs/en-US/cloudstack_installation.ent | 22 -
docs/en-US/cloudstack_installation.xml | 50 -
docs/en-US/cluster-add.xml | 39 +-
docs/en-US/configure-acl.xml | 139 +
docs/en-US/configure-package-repository.xml | 39 +-
docs/en-US/configure-snmp-rhel.xml | 86 +
docs/en-US/configure-usage-server.xml | 4 +-
docs/en-US/configure-vpc.xml | 36 +
docs/en-US/configure-xenserver-dom-memory.xml | 29 -
docs/en-US/configuring-projects.xml | 19 +-
docs/en-US/create-template-from-snapshot.xml | 2 +-
docs/en-US/create-vpn-customer-gateway.xml | 2 +-
docs/en-US/create-vr-network-offering.xml | 108 +
docs/en-US/creating-vms.xml | 2 +-
docs/en-US/database-replication.xml | 136 +
docs/en-US/delete-reset-vpn.xml | 89 +
docs/en-US/dell62xx-hardware.xml | 53 +
docs/en-US/dell62xx-layer2.xml | 49 +
docs/en-US/deployment-architecture-overview.xml | 19 +-
docs/en-US/detach-move-volumes.xml | 2 +-
docs/en-US/devcloud-usage-mode.xml | 60 +
docs/en-US/devcloud.xml | 38 +
docs/en-US/developer-guide.xml | 38 -
docs/en-US/developer-introduction.xml | 6 +-
docs/en-US/developer_guide.xml | 39 -
docs/en-US/enable-disable-static-nat-vpc.xml | 97 +
docs/en-US/event-types.xml | 392 +-
.../external-firewalls-and-load-balancers.xml | 43 +-
docs/en-US/external-fw-topology-req.xml | 25 +
docs/en-US/external-guest-firewall-integration.xml | 201 +
docs/en-US/external-guest-lb-integration.xml | 109 +
docs/en-US/extracting-source.xml | 36 +
docs/en-US/feature-overview.xml | 28 +-
docs/en-US/first_ms_node_install.xml | 55 +-
docs/en-US/generic-firewall-provisions.xml | 37 +
docs/en-US/getting-release.xml | 63 +
docs/en-US/global-config.xml | 54 +
docs/en-US/globally-configured-limit.xml | 100 -
docs/en-US/globally-configured-limits.xml | 2 +-
.../en-US/guest-nw-usage-with-traffic-sentinel.xml | 73 +
docs/en-US/guest-traffic.xml | 7 -
docs/en-US/hardware-config-eg.xml | 29 +
docs/en-US/hardware-firewall.xml | 29 +
docs/en-US/host-add-vsphere.xml | 28 +
docs/en-US/host-add-xenserver-kvm-ovm.xml | 152 +
docs/en-US/host-add.xml | 48 +-
docs/en-US/hypervisor-host-install-agent.xml | 4 +-
docs/en-US/hypervisor-host-install-finish.xml | 28 +
docs/en-US/hypervisor-host-install-firewall.xml | 24 +-
docs/en-US/hypervisor-host-install-flow.xml | 34 -
docs/en-US/hypervisor-host-install-libvirt.xml | 25 +-
docs/en-US/hypervisor-host-install-overview.xml | 6 +-
docs/en-US/hypervisor-host-install-prepare-os.xml | 8 +-
.../hypervisor-host-install-security-policies.xml | 16 +-
docs/en-US/hypervisor-installation.xml | 31 +
docs/en-US/hypervisor-kvm-install-flow.xml | 36 +
docs/en-US/hypervisor-kvm-requirements.xml | 48 +
.../hypervisor-support-for-primarystorage.xml | 11 +-
docs/en-US/images/DevCloud-hostonly.png | Bin 0 -> 39311 bytes
docs/en-US/images/DevCloud.png | Bin 0 -> 33529 bytes
docs/en-US/images/compute-service-offerings.png | Bin 0 -> 75482 bytes
docs/en-US/images/large-scale-redundant-setup.png | Bin 0 -> 109117 bytes
docs/en-US/images/multi-node-management-server.png | Bin 0 -> 26912 bytes
docs/en-US/images/multi-site-deployment.png | Bin 0 -> 68190 bytes
docs/en-US/images/nic-bonding-and-multipath-io.png | Bin 0 -> 42030 bytes
docs/en-US/images/parallel-mode.png | Bin 0 -> 11520 bytes
docs/en-US/images/remove-vpc.png | Bin 0 -> 815 bytes
docs/en-US/images/remove-vpn.png | Bin 0 -> 735 bytes
docs/en-US/images/reset-vpn.png | Bin 0 -> 860 bytes
docs/en-US/images/separate-storage-network.png | Bin 0 -> 44556 bytes
docs/en-US/images/small-scale-deployment.png | Bin 0 -> 50772 bytes
docs/en-US/images/view-console-button.png | Bin 0 -> 59996 bytes
docs/en-US/images/vmware-increase-ports.png | Bin 0 -> 66143 bytes
docs/en-US/images/vmware-iscsi-datastore.png | Bin 0 -> 54352 bytes
docs/en-US/images/vmware-iscsi-general.png | Bin 0 -> 15723 bytes
.../images/vmware-iscsi-initiator-properties.png | Bin 0 -> 45592 bytes
docs/en-US/images/vmware-iscsi-initiator.png | Bin 0 -> 105201 bytes
docs/en-US/images/vmware-iscsi-target-add.png | Bin 0 -> 18509 bytes
.../en-US/images/vmware-mgt-network-properties.png | Bin 0 -> 42767 bytes
docs/en-US/images/vmware-nexus-add-cluster.png | Bin 0 -> 37083 bytes
docs/en-US/images/vmware-nexus-port-profile.png | Bin 0 -> 118083 bytes
docs/en-US/images/vmware-physical-network.png | Bin 0 -> 136848 bytes
docs/en-US/images/vmware-vswitch-properties.png | Bin 0 -> 32376 bytes
docs/en-US/install-usage-server.xml | 61 +
docs/en-US/installation-steps-overview.xml | 35 +-
docs/en-US/installation.xml | 1 -
docs/en-US/inter-vlan-routing.xml | 107 +
docs/en-US/kvm-topology-req.xml | 24 +
docs/en-US/large_scale_redundant_setup.xml | 4 +-
docs/en-US/layer2-switch.xml | 41 +
.../lb-policy-pfwd-rule-usage-record-format.xml | 40 +
...cy-port-forwarding-rule-usage-record-format.xml | 40 -
docs/en-US/log-in-root-admin.xml | 4 +-
docs/en-US/log-in.xml | 44 +-
docs/en-US/manage-cloud.xml | 16 +-
docs/en-US/management-server-install-client.xml | 45 +-
.../management-server-install-db-external.xml | 182 +-
docs/en-US/management-server-install-db-local.xml | 135 +-
docs/en-US/management-server-install-db.xml | 10 +-
docs/en-US/management-server-install-flow.xml | 1 +
.../en-US/management-server-install-multi-node.xml | 98 +-
.../en-US/management-server-install-nfs-shares.xml | 8 +-
docs/en-US/management-server-install-overview.xml | 29 +-
docs/en-US/management-server-install-systemvm.xml | 72 +-
docs/en-US/management-server-lb.xml | 61 +
docs/en-US/management-server-overview.xml | 82 +-
docs/en-US/manual-live-migration.xml | 6 +-
docs/en-US/marvin.xml | 33 +
docs/en-US/minimum-system-requirements.xml | 40 +-
docs/en-US/multi_node_management_server.xml | 4 +-
docs/en-US/multi_site_deployment.xml | 8 +-
docs/en-US/network-offerings.xml | 10 +-
docs/en-US/network-service-providers.xml | 6 +-
docs/en-US/network-setup.xml | 35 +
docs/en-US/networks-for-users-overview.xml | 35 +
docs/en-US/networks.xml | 48 +
docs/en-US/nfs-shares-on-management-server.xml | 7 +-
docs/en-US/offerings.xml | 31 +
docs/en-US/ongoing-config-of-ext-firewalls-lb.xml | 34 +
...guration-of-external-firewalls-loadbalancer.xml | 62 +-
docs/en-US/ovm-install.xml | 29 +
docs/en-US/ovm-requirements.xml | 28 +
docs/en-US/plugin-niciranvp-about.xml | 28 +
docs/en-US/plugin-niciranvp-devicemanagement.xml | 47 +
docs/en-US/plugin-niciranvp-features.xml | 29 +
docs/en-US/plugin-niciranvp-guide.xml | 31 +
docs/en-US/plugin-niciranvp-introduction.xml | 26 +
docs/en-US/plugin-niciranvp-preparations.xml | 36 +
docs/en-US/plugin-niciranvp-provider.xml | 42 +
docs/en-US/plugin-niciranvp-revisions.xml | 45 +
docs/en-US/plugin-niciranvp-tables.xml | 51 +
docs/en-US/plugin-niciranvp-troubleshooting.xml | 28 +
docs/en-US/plugin-niciranvp-usage.xml | 29 +
docs/en-US/plugin-niciranvp-uuidreferences.xml | 30 +
docs/en-US/pod-add.xml | 51 +-
docs/en-US/port-forwarding.xml | 6 +-
docs/en-US/prepare-system-vm-template.xml | 83 +-
docs/en-US/primary-storage.xml | 12 +-
docs/en-US/query-filter.xml | 8 +-
docs/en-US/re-install-hosts.xml | 26 +
docs/en-US/release-ip-address.xml | 2 +-
docs/en-US/release-ip-for-vpc.xml | 80 +
docs/en-US/release-notes-3.0.4.ent | 22 -
docs/en-US/remove-tier.xml | 55 +
docs/en-US/remove-vpc.xml | 68 +
docs/en-US/removing-hosts.xml | 30 +
docs/en-US/roles.xml | 2 +-
docs/en-US/runtime-behavior-of-primary-storage.xml | 2 +-
docs/en-US/runtime-internal-comm-req.xml | 39 +
docs/en-US/secondary-storage.xml | 3 +-
docs/en-US/security-groups.xml | 1 +
docs/en-US/security-req.xml | 24 +
docs/en-US/set-global-project-resource-limits.xml | 92 +-
docs/en-US/set-per-project-resource-limits.xml | 65 +-
docs/en-US/set-projects-creator-permissions.xml | 91 +-
docs/en-US/set-resource-limits-for-projects.xml | 44 +-
docs/en-US/set-up-network-for-users.xml | 16 +-
docs/en-US/set-zone-vlan-run-vm-max.xml | 65 +
docs/en-US/small_scale_deployment.xml | 4 +-
docs/en-US/source-build.xml | 49 +
docs/en-US/source-prereqs.xml | 42 +
docs/en-US/source.xml | 47 +
docs/en-US/ssl.xml | 29 +
docs/en-US/storage-nw-topology-req.xml | 28 +
docs/en-US/storage-overview.xml | 27 +
docs/en-US/storage.xml | 14 +-
docs/en-US/sys-reliability-and-ha.xml | 15 +-
docs/en-US/system-reserved-ip-addresses.xml | 9 +-
docs/en-US/system-service-offerings.xml | 1 +
docs/en-US/tagging-resources.xml | 69 +
docs/en-US/time-zones.xml | 6 +-
docs/en-US/tools.xml | 29 +
docs/en-US/topology-req.xml | 31 +
...ooting-dataloss-on-exported-primary-storage.xml | 45 -
docs/en-US/troubleshooting-lb-rules-fails.xml | 2 +-
...ing-maintenance-mode-not-working-on-vCenter.xml | 43 -
docs/en-US/troubleshooting.xml | 21 +-
.../troublesht-dataloss-on-exp-primary-storage.xml | 45 +
.../troublesht-mtn-mode-not-working-on-vCenter.xml | 43 +
docs/en-US/tuning.xml | 4 +-
docs/en-US/upload-existing-volume-to-vm.xml | 4 +-
docs/en-US/upload-template.xml | 4 +-
docs/en-US/usage-record-format.xml | 2 +-
docs/en-US/user-services-overview.xml | 91 +-
docs/en-US/using-multiple-guest-networks.xml | 2 +
docs/en-US/using-netscaler-load-balancers.xml | 2 +-
docs/en-US/using-sshkeys.xml | 51 +-
docs/en-US/using-swift-for-secondary-storage.xml | 2 +-
docs/en-US/vcenter-maintenance-mode.xml | 2 +-
docs/en-US/verifying-source.xml | 82 +
docs/en-US/virtual-machines.xml | 34 +
docs/en-US/vlan-allocation-eg.xml | 71 +
docs/en-US/vm-lifecycle.xml | 4 +-
docs/en-US/vmware-install.xml | 631 ++
docs/en-US/vmware-requirements.xml | 80 +
docs/en-US/vmware-topology-req.xml | 38 +
docs/en-US/volume-status.xml | 13 +-
docs/en-US/vpn.xml | 4 +
docs/en-US/whats-new.xml | 28 +-
docs/en-US/windows-installation.xml | 7 +-
docs/en-US/work-with-usage.xml | 16 +-
docs/en-US/working-with-hosts.xml | 19 +-
docs/en-US/working-with-snapshots.xml | 4 +-
docs/en-US/working-with-system-vm.xml | 13 +-
docs/en-US/working-with-templates.xml | 6 +-
docs/en-US/working-with-usage-data.xml | 4 +-
docs/en-US/working-with-volumes.xml | 24 +-
docs/en-US/xenserver-topology-req.xml | 24 +
docs/publican-adminguide.cfg | 2 +-
docs/publican-cloudstack/en-US/images/dot.png | Bin 341 -> 173 bytes
docs/publican-devguide.cfg | 2 +-
docs/publican-install.cfg | 27 -
docs/publican-installation.cfg | 3 +-
docs/publican-plugin-niciranvp.cfg | 28 +
docs/publican-release-notes-4_0.cfg | 27 -
docs/publican-release-notes.cfg | 27 +
docs/publican-trial-install.cfg | 29 -
packaging/centos63/cloud-agent.rc | 121 +
packaging/centos63/cloud-ipallocator.rc | 98 +
packaging/centos63/cloud-management.rc | 107 +
packaging/centos63/cloud-management.sysconfig | 23 +
packaging/centos63/cloud.spec | 312 +
packaging/centos63/package.sh | 45 +
packaging/centos63/replace.properties | 61 +
packaging/debian/replace.properties | 62 +
patches/pom.xml | 122 +-
.../debian/config/etc/init.d/cloud-early-config | 19 +-
.../debian/config/etc/init.d/cloud-passwd-srvr | 50 +-
.../debian/config/etc/iptables/iptables-router | 2 +-
patches/systemvm/debian/config/etc/iptables/rules | 1 +
patches/systemvm/debian/config/etc/sysctl.conf | 2 +-
.../config/opt/cloud/bin/checkbatchs2svpn.sh | 25 +
.../debian/config/opt/cloud/bin/ipassoc.sh | 4 +-
.../debian/config/opt/cloud/bin/passwd_server | 2 +-
.../debian/config/opt/cloud/bin/patchsystemvm.sh | 16 +-
.../debian/config/opt/cloud/bin/vpc_guestnw.sh | 3 +
patches/systemvm/debian/config/root/edithosts.sh | 2 +-
.../config/root/redundant_router/disable_pubip.sh | 2 -
.../root/redundant_router/enable_pubip.sh.templ | 4 +-
.../config/root/redundant_router/master.sh.templ | 6 +
.../config/root/redundant_router/services.sh | 68 +
.../systemvm/debian/config/root/savepassword.sh | 2 +-
.../debian/vpn/opt/cloud/bin/vpc_vpn_l2tp.sh | 2 +
.../systemvm/debian/vpn/opt/cloud/bin/vpn_l2tp.sh | 3 +-
plugins/acl/static-role-based/pom.xml | 32 +
.../acl/StaticRoleBasedAPIAccessChecker.java | 100 +
plugins/api/discovery/pom.xml | 44 +
.../api/command/user/discovery/ListApisCmd.java | 69 +
.../api/response/ApiDiscoveryResponse.java | 95 +
.../api/response/ApiParameterResponse.java | 81 +
.../api/response/ApiResponseResponse.java | 45 +
.../cloudstack/discovery/ApiDiscoveryService.java | 26 +
.../discovery/ApiDiscoveryServiceImpl.java | 217 +
plugins/api/rate-limit/pom.xml | 51 +
.../command/admin/ratelimit/ResetApiLimitCmd.java | 99 +
.../api/command/user/ratelimit/GetApiLimitCmd.java | 89 +
.../cloudstack/api/response/ApiLimitResponse.java | 82 +
.../cloudstack/ratelimit/ApiRateLimitService.java | 37 +
.../ratelimit/ApiRateLimitServiceImpl.java | 196 +
.../cloudstack/ratelimit/EhcacheLimitStore.java | 99 +
.../apache/cloudstack/ratelimit/LimitStore.java | 51 +
.../apache/cloudstack/ratelimit/StoreEntry.java | 33 +
.../cloudstack/ratelimit/StoreEntryImpl.java | 64 +
.../cloudstack/ratelimit/ApiRateLimitTest.java | 226 +
.../cloudstack/ratelimit/integration/APITest.java | 211 +
.../ratelimit/integration/LoginResponse.java | 142 +
.../integration/RateLimitIntegrationTest.java | 214 +
.../user-concentrated-pod/build.xml | 128 -
.../deployment-planners/user-dispersing/build.xml | 128 -
plugins/file-systems/netapp/build.xml | 129 -
plugins/file-systems/netapp/pom.xml | 2 +-
.../cloud/api/commands/netapp/AssociateLunCmd.java | 39 +-
.../cloud/api/commands/netapp/CreateLunCmd.java | 33 +-
.../commands/netapp/CreateVolumeOnFilerCmd.java | 61 +-
.../api/commands/netapp/CreateVolumePoolCmd.java | 25 +-
.../api/commands/netapp/DeleteVolumePoolCmd.java | 21 +-
.../cloud/api/commands/netapp/DestroyLunCmd.java | 22 +-
.../commands/netapp/DestroyVolumeOnFilerCmd.java | 29 +-
.../api/commands/netapp/DissociateLunCmd.java | 17 +-
.../com/cloud/api/commands/netapp/ListLunsCmd.java | 21 +-
.../api/commands/netapp/ListVolumePoolsCmd.java | 17 +-
.../api/commands/netapp/ListVolumesOnFilerCmd.java | 19 +-
.../api/commands/netapp/ModifyVolumePoolCmd.java | 12 +-
.../netapp/src/com/cloud/netapp/LunVO.java | 6 +-
.../src/com/cloud/netapp/NetappManagerImpl.java | 2 +-
.../src/com/cloud/netapp/NetappVolumeVO.java | 6 +-
.../netapp/src/com/cloud/netapp/PoolVO.java | 6 +-
plugins/host-allocators/random/build.xml | 128 -
plugins/hypervisors/kvm/build.xml | 137 -
plugins/hypervisors/kvm/pom.xml | 18 +
.../hypervisor/kvm/resource/BridgeVifDriver.java | 17 +-
.../hypervisor/kvm/resource/KVMGuestOsMapper.java | 2 +
.../kvm/resource/LibvirtComputingResource.java | 395 +-
.../kvm/storage/KVMStoragePoolManager.java | 87 +-
.../kvm/storage/LibvirtStorageAdaptor.java | 48 +-
.../hypervisor/kvm/storage/StorageAdaptor.java | 4 -
plugins/hypervisors/ovm/build.xml | 136 -
plugins/hypervisors/simulator/pom.xml | 44 +
.../simulator/resources/components-simulator.xml | 66 +
.../src/com/cloud/agent/MetricsCollector.java | 107 +
.../src/com/cloud/agent/MockVmMetrics.java | 204 +
.../simulator/src/com/cloud/agent/MultiCaster.java | 152 +
.../src/com/cloud/agent/MultiCasterListener.java | 22 +
.../src/com/cloud/agent/SimulatorCmd.java | 37 +
.../src/com/cloud/agent/SimulatorMigrateVmCmd.java | 83 +
.../com/cloud/agent/manager/MockAgentManager.java | 64 +
.../cloud/agent/manager/MockAgentManagerImpl.java | 459 ++
.../cloud/agent/manager/MockStorageManager.java | 82 +
.../agent/manager/MockStorageManagerImpl.java | 1328 ++++
.../src/com/cloud/agent/manager/MockVmManager.java | 84 +
.../com/cloud/agent/manager/MockVmManagerImpl.java | 642 ++
.../src/com/cloud/agent/manager/SimulatorInfo.java | 59 +
.../com/cloud/agent/manager/SimulatorManager.java | 65 +
.../cloud/agent/manager/SimulatorManagerImpl.java | 318 +
.../com/cloud/api/commands/ConfigureSimulator.java | 83 +
.../configuration/SimulatorComponentLibrary.java | 50 +
.../src/com/cloud/resource/AgentResourceBase.java | 284 +
.../com/cloud/resource/AgentRoutingResource.java | 363 +
.../com/cloud/resource/AgentStorageResource.java | 117 +
.../com/cloud/resource/SimulatorDiscoverer.java | 336 +
.../resource/SimulatorSecondaryDiscoverer.java | 178 +
.../server/ManagementServerSimulatorImpl.java | 33 +
.../com/cloud/simulator/MockConfigurationVO.java | 122 +
.../src/com/cloud/simulator/MockHost.java | 62 +
.../src/com/cloud/simulator/MockHostVO.java | 278 +
.../src/com/cloud/simulator/MockSecStorageVO.java | 78 +
.../com/cloud/simulator/MockSecurityRulesVO.java | 106 +
.../src/com/cloud/simulator/MockStoragePoolVO.java | 103 +
.../src/com/cloud/simulator/MockVMVO.java | 141 +
.../simulator/src/com/cloud/simulator/MockVm.java | 47 +
.../src/com/cloud/simulator/MockVolumeVO.java | 119 +
.../src/com/cloud/simulator/SimulatorGuru.java | 59 +
.../cloud/simulator/SimulatorRuntimeException.java | 41 +
.../cloud/simulator/dao/MockConfigurationDao.java | 27 +
.../simulator/dao/MockConfigurationDaoImpl.java | 142 +
.../src/com/cloud/simulator/dao/MockHostDao.java | 27 +
.../com/cloud/simulator/dao/MockHostDaoImpl.java | 55 +
.../com/cloud/simulator/dao/MockSecStorageDao.java | 24 +
.../cloud/simulator/dao/MockSecStorageDaoImpl.java | 42 +
.../cloud/simulator/dao/MockSecurityRulesDao.java | 27 +
.../simulator/dao/MockSecurityRulesDaoImpl.java | 60 +
.../cloud/simulator/dao/MockStoragePoolDao.java | 25 +
.../simulator/dao/MockStoragePoolDaoImpl.java | 57 +
.../src/com/cloud/simulator/dao/MockVMDao.java | 29 +
.../src/com/cloud/simulator/dao/MockVMDaoImpl.java | 92 +
.../src/com/cloud/simulator/dao/MockVolumeDao.java | 30 +
.../com/cloud/simulator/dao/MockVolumeDaoImpl.java | 101 +
plugins/hypervisors/vmware/build.xml | 135 -
plugins/hypervisors/vmware/pom.xml | 33 +-
.../cloud/api/commands/DeleteCiscoNexusVSMCmd.java | 28 +-
.../api/commands/DisableCiscoNexusVSMCmd.java | 24 +-
.../cloud/api/commands/EnableCiscoNexusVSMCmd.java | 17 +-
.../cloud/api/commands/ListCiscoNexusVSMsCmd.java | 42 +-
.../cloud/api/response/CiscoNexusVSMResponse.java | 50 +-
.../src/com/cloud/hypervisor/guru/VMwareGuru.java | 4 +-
.../hypervisor/vmware/VmwareServerDiscoverer.java | 4 +-
.../vmware/manager/VmwareManagerImpl.java | 12 +-
.../hypervisor/vmware/resource/VmwareResource.java | 55 +-
.../src/com/cloud/network/CiscoNexusVSMDevice.java | 39 +-
.../network/CiscoNexusVSMDeviceManagerImpl.java | 99 +-
.../com/cloud/network/CiscoNexusVSMDeviceVO.java | 13 +-
.../network/element/CiscoNexusVSMElement.java | 67 +-
plugins/hypervisors/xen/build.xml | 135 -
.../xen/discoverer/XcpServerDiscoverer.java | 27 +-
.../hypervisor/xen/resource/CitrixHelper.java | 143 +
.../xen/resource/CitrixResourceBase.java | 145 +-
.../xen/resource/XenServer56Resource.java | 5 -
.../xen/resource/XenServer610Resource.java | 58 +
plugins/network-elements/dns-notifier/pom.xml | 49 +
.../dns-notifier/resources/components-example.xml | 220 +
.../cloudstack/network/element/DnsNotifier.java | 143 +
.../elastic-loadbalancer/build.xml | 129 -
.../src/com/cloud/network/ElasticLbVmMapVO.java | 5 +-
.../element/ElasticLoadBalancerElement.java | 6 +-
.../network/lb/ElasticLoadBalancerManager.java | 2 +-
.../network/lb/ElasticLoadBalancerManagerImpl.java | 136 +-
plugins/network-elements/f5/build.xml | 129 -
.../api/commands/AddExternalLoadBalancerCmd.java | 39 +-
.../cloud/api/commands/AddF5LoadBalancerCmd.java | 27 +-
.../api/commands/ConfigureF5LoadBalancerCmd.java | 22 +-
.../commands/DeleteExternalLoadBalancerCmd.java | 34 +-
.../api/commands/DeleteF5LoadBalancerCmd.java | 31 +-
.../api/commands/ListExternalLoadBalancersCmd.java | 21 +-
.../commands/ListF5LoadBalancerNetworksCmd.java | 31 +-
.../cloud/api/commands/ListF5LoadBalancersCmd.java | 27 +-
.../cloud/api/response/F5LoadBalancerResponse.java | 34 +-
.../element/F5ExternalLoadBalancerElement.java | 56 +-
.../F5ExternalLoadBalancerElementService.java | 2 +-
.../cloud/network/resource/F5BigIpResource.java | 96 +-
plugins/network-elements/juniper-srx/build.xml | 129 -
.../cloud/api/commands/AddExternalFirewallCmd.java | 59 +-
.../com/cloud/api/commands/AddSrxFirewallCmd.java | 35 +-
.../api/commands/ConfigureSrxFirewallCmd.java | 30 +-
.../api/commands/DeleteExternalFirewallCmd.java | 43 +-
.../cloud/api/commands/DeleteSrxFirewallCmd.java | 33 +-
.../api/commands/ListExternalFirewallsCmd.java | 23 +-
.../api/commands/ListSrxFirewallNetworksCmd.java | 27 +-
.../cloud/api/commands/ListSrxFirewallsCmd.java | 29 +-
.../cloud/api/response/SrxFirewallResponse.java | 27 +-
.../element/JuniperSRXExternalFirewallElement.java | 61 +-
.../element/JuniperSRXFirewallElementService.java | 2 +-
.../cloud/network/resource/JuniperSrxResource.java | 241 +-
.../network-elements/midokura-midonet/build.xml | 17 -
.../network/element/MidokuraMidonetElement.java | 9 +-
plugins/network-elements/netscaler/build.xml | 129 -
.../api/commands/AddNetscalerLoadBalancerCmd.java | 27 +-
.../ConfigureNetscalerLoadBalancerCmd.java | 28 +-
.../commands/DeleteNetscalerLoadBalancerCmd.java | 31 +-
.../ListNetscalerLoadBalancerNetworksCmd.java | 31 +-
.../commands/ListNetscalerLoadBalancersCmd.java | 33 +-
.../response/NetscalerLoadBalancerResponse.java | 38 +-
.../src/com/cloud/network/NetScalerPodVO.java | 4 +-
.../cloud/network/element/NetscalerElement.java | 132 +-
.../cloud/network/resource/NetscalerResource.java | 940 +++-
.../nicira-nvp/README.NiciraIntegration | 87 -
plugins/network-elements/nicira-nvp/build.xml | 129 -
...rePortForwardingRulesOnLogicalRouterAnswer.java | 34 +
...ePortForwardingRulesOnLogicalRouterCommand.java | 60 +
.../ConfigurePublicIpsOnLogicalRouterAnswer.java | 30 +
.../ConfigurePublicIpsOnLogicalRouterCommand.java | 65 +
...nfigureStaticNatRulesOnLogicalRouterAnswer.java | 43 +
...figureStaticNatRulesOnLogicalRouterCommand.java | 63 +
.../cloud/agent/api/CreateLogicalRouterAnswer.java | 40 +
.../agent/api/CreateLogicalRouterCommand.java | 115 +
.../cloud/agent/api/DeleteLogicalRouterAnswer.java | 32 +
.../agent/api/DeleteLogicalRouterCommand.java | 41 +
.../cloud/api/commands/AddNiciraNvpDeviceCmd.java | 59 +-
.../api/commands/DeleteNiciraNvpDeviceCmd.java | 45 +-
.../commands/ListNiciraNvpDeviceNetworksCmd.java | 33 +-
.../api/commands/ListNiciraNvpDevicesCmd.java | 37 +-
.../api/response/NiciraNvpDeviceResponse.java | 52 +-
.../src/com/cloud/network/NiciraNvpDeviceVO.java | 4 +-
.../com/cloud/network/NiciraNvpNicMappingVO.java | 4 +-
.../cloud/network/NiciraNvpRouterMappingVO.java | 81 +
.../network/dao/NiciraNvpRouterMappingDao.java | 25 +
.../network/dao/NiciraNvpRouterMappingDaoImpl.java | 46 +
.../cloud/network/element/NiciraNvpElement.java | 1280 +++--
.../network/guru/NiciraNvpGuestNetworkGuru.java | 41 +-
.../src/com/cloud/network/nicira/Attachment.java | 17 -
.../cloud/network/nicira/L3GatewayAttachment.java | 52 +
.../cloud/network/nicira/LogicalRouterConfig.java | 64 +
.../cloud/network/nicira/LogicalRouterPort.java | 90 +
.../com/cloud/network/nicira/LogicalSwitch.java | 17 -
.../cloud/network/nicira/LogicalSwitchPort.java | 17 -
.../src/com/cloud/network/nicira/Match.java | 253 +
.../src/com/cloud/network/nicira/NatRule.java | 282 +
.../src/com/cloud/network/nicira/NiciraNvpApi.java | 255 +-
.../com/cloud/network/nicira/NiciraNvpList.java | 10 +-
.../src/com/cloud/network/nicira/NiciraNvpTag.java | 17 -
.../com/cloud/network/nicira/PatchAttachment.java | 39 +
.../com/cloud/network/nicira/RouterNextHop.java | 38 +
.../com/cloud/network/nicira/RoutingConfig.java | 21 +
.../SingleDefaultRouteImplictRoutingConfig.java | 38 +
.../cloud/network/nicira/TransportZoneBinding.java | 17 -
.../com/cloud/network/nicira/VifAttachment.java | 17 -
.../cloud/network/resource/NiciraNvpResource.java | 501 ++-
.../network/element/NiciraNvpElementTest.java | 122 +
.../guru/NiciraNvpGuestNetworkGuruTest.java | 460 ++
.../test/com/cloud/network/nicira/NatRuleTest.java | 47 +
.../com/cloud/network/nicira/NiciraNvpApiTest.java | 306 +
.../network/resource/NiciraNvpResourceTest.java | 830 +++
plugins/network-elements/ovs/build.xml | 129 -
.../src/com/cloud/network/element/OvsElement.java | 17 +-
.../cloud/network/guru/OvsGuestNetworkGuru.java | 19 +-
.../network/ovs/dao/OvsTunnelInterfaceVO.java | 4 +-
.../cloud/network/ovs/dao/OvsTunnelNetworkVO.java | 4 +-
plugins/pom.xml | 17 +
plugins/storage-allocators/random/build.xml | 128 -
plugins/user-authenticators/ldap/build.xml | 128 -
.../cloud/server/auth/LDAPUserAuthenticator.java | 23 +-
plugins/user-authenticators/md5/build.xml | 128 -
.../cloud/server/auth/MD5UserAuthenticator.java | 53 +-
plugins/user-authenticators/plain-text/build.xml | 128 -
.../server/auth/PlainTextUserAuthenticator.java | 6 +
plugins/user-authenticators/sha256salted/pom.xml | 29 +
.../server/auth/SHA256SaltedUserAuthenticator.java | 122 +
.../cloud/server/auth/test/AuthenticatorTest.java | 63 +
pom.xml | 179 +-
python/lib/cloudutils/serviceConfig.py | 2 +-
python/lib/cloudutils/utilities.py | 8 +-
.../network/juniper/firewall-filter-term-add.xml | 43 +
.../juniper/firewall-filter-term-getone.xml | 32 +
scripts/network/juniper/template-entry.xml | 21 +
scripts/storage/qcow2/create_private_template.sh | 8 +-
scripts/storage/qcow2/createtmplt.sh | 6 +
scripts/storage/qcow2/createvolume.sh | 8 +-
scripts/storage/qcow2/resizevolume.sh | 253 +
scripts/vm/hypervisor/kvm/rundomrpre.sh | 2 +-
scripts/vm/hypervisor/xenserver/s3xen | 297 +
scripts/vm/hypervisor/xenserver/xcposs/NFSSR.py | 4 +-
scripts/vm/hypervisor/xenserver/xcposs/patch | 1 +
scripts/vm/hypervisor/xenserver/xcposs/vmops | 17 +
scripts/vm/hypervisor/xenserver/xcpserver/NFSSR.py | 4 +-
.../vm/hypervisor/xenserver/xenserver56/NFSSR.py | 4 +-
scripts/vm/hypervisor/xenserver/xenserver56/patch | 2 +
.../hypervisor/xenserver/xenserver56fp1/NFSSR.py | 4 +-
.../vm/hypervisor/xenserver/xenserver56fp1/patch | 2 +
.../vm/hypervisor/xenserver/xenserver60/NFSSR.py | 4 +-
scripts/vm/hypervisor/xenserver/xenserver60/patch | 2 +
scripts/vm/network/security_group.py | 8 +-
scripts/vm/network/vnet/modifyvlan.sh | 2 +
server/pom.xml | 19 +-
server/src/com/cloud/acl/DomainChecker.java | 303 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 247 +-
.../agent/manager/ClusteredAgentManagerImpl.java | 174 +-
.../cloud/agent/manager/DirectAgentAttache.java | 13 +-
server/src/com/cloud/alert/AlertManagerImpl.java | 23 +-
server/src/com/cloud/api/ApiDBUtils.java | 772 ++-
server/src/com/cloud/api/ApiDispatcher.java | 623 +-
server/src/com/cloud/api/ApiGsonHelper.java | 4 +-
.../src/com/cloud/api/ApiResponseGsonHelper.java | 5 +-
server/src/com/cloud/api/ApiResponseHelper.java | 2463 +++-----
server/src/com/cloud/api/ApiSerializerHelper.java | 1 +
server/src/com/cloud/api/ApiServer.java | 694 +--
server/src/com/cloud/api/ApiServlet.java | 119 +-
server/src/com/cloud/api/IdentityTypeAdapter.java | 81 -
.../com/cloud/api/ResponseObjectTypeAdapter.java | 5 +-
.../cloud/api/commands/AddNetworkDeviceCmd.java | 95 -
.../cloud/api/commands/AddTrafficMonitorCmd.java | 41 +-
.../cloud/api/commands/DeleteNetworkDeviceCmd.java | 90 -
.../api/commands/DeleteTrafficMonitorCmd.java | 43 +-
.../api/commands/GenerateUsageRecordsCmd.java | 19 +-
.../com/cloud/api/commands/GetUsageRecordsCmd.java | 115 +-
.../cloud/api/commands/ListNetworkDeviceCmd.java | 99 -
.../cloud/api/commands/ListTrafficMonitorsCmd.java | 23 +-
.../com/cloud/api/commands/ListUsageTypesCmd.java | 10 +-
server/src/com/cloud/api/doc/ApiXmlDocWriter.java | 111 +-
.../src/com/cloud/api/query/QueryManagerImpl.java | 2217 +++++++
.../com/cloud/api/query/ViewResponseHelper.java | 297 +
.../com/cloud/api/query/dao/AccountJoinDao.java | 32 +
.../cloud/api/query/dao/AccountJoinDaoImpl.java | 185 +
.../com/cloud/api/query/dao/AsyncJobJoinDao.java | 33 +
.../cloud/api/query/dao/AsyncJobJoinDaoImpl.java | 114 +
.../cloud/api/query/dao/DiskOfferingJoinDao.java | 29 +
.../api/query/dao/DiskOfferingJoinDaoImpl.java | 101 +
.../cloud/api/query/dao/DomainRouterJoinDao.java | 37 +
.../api/query/dao/DomainRouterJoinDaoImpl.java | 249 +
.../src/com/cloud/api/query/dao/HostJoinDao.java | 38 +
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 270 +
.../cloud/api/query/dao/InstanceGroupJoinDao.java | 32 +
.../api/query/dao/InstanceGroupJoinDaoImpl.java | 82 +
.../cloud/api/query/dao/ProjectAccountJoinDao.java | 32 +
.../api/query/dao/ProjectAccountJoinDaoImpl.java | 86 +
.../api/query/dao/ProjectInvitationJoinDao.java | 30 +
.../query/dao/ProjectInvitationJoinDaoImpl.java | 84 +
.../com/cloud/api/query/dao/ProjectJoinDao.java | 37 +
.../cloud/api/query/dao/ProjectJoinDaoImpl.java | 153 +
.../cloud/api/query/dao/ResourceTagJoinDao.java | 34 +
.../api/query/dao/ResourceTagJoinDaoImpl.java | 146 +
.../cloud/api/query/dao/SecurityGroupJoinDao.java | 38 +
.../api/query/dao/SecurityGroupJoinDaoImpl.java | 225 +
.../api/query/dao/ServiceOfferingJoinDao.java | 30 +
.../api/query/dao/ServiceOfferingJoinDaoImpl.java | 91 +
.../cloud/api/query/dao/StoragePoolJoinDao.java | 37 +
.../api/query/dao/StoragePoolJoinDaoImpl.java | 185 +
.../cloud/api/query/dao/UserAccountJoinDao.java | 38 +
.../api/query/dao/UserAccountJoinDaoImpl.java | 129 +
.../src/com/cloud/api/query/dao/UserVmJoinDao.java | 39 +
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 331 +
.../src/com/cloud/api/query/dao/VolumeJoinDao.java | 37 +
.../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 279 +
.../src/com/cloud/api/query/vo/AccountJoinVO.java | 571 ++
.../src/com/cloud/api/query/vo/AsyncJobJoinVO.java | 333 +
server/src/com/cloud/api/query/vo/BaseViewVO.java | 47 +
.../cloud/api/query/vo/ControlledViewEntity.java | 48 +
.../com/cloud/api/query/vo/DiskOfferingJoinVO.java | 233 +
.../com/cloud/api/query/vo/DomainRouterJoinVO.java | 923 +++
server/src/com/cloud/api/query/vo/EventJoinVO.java | 317 +
server/src/com/cloud/api/query/vo/HostJoinVO.java | 509 ++
.../cloud/api/query/vo/InstanceGroupJoinVO.java | 233 +
.../cloud/api/query/vo/ProjectAccountJoinVO.java | 216 +
.../api/query/vo/ProjectInvitationJoinVO.java | 235 +
.../src/com/cloud/api/query/vo/ProjectJoinVO.java | 304 +
.../com/cloud/api/query/vo/ResourceTagJoinVO.java | 268 +
.../cloud/api/query/vo/SecurityGroupJoinVO.java | 452 ++
.../cloud/api/query/vo/ServiceOfferingJoinVO.java | 311 +
.../com/cloud/api/query/vo/StoragePoolJoinVO.java | 341 +
.../com/cloud/api/query/vo/UserAccountJoinVO.java | 350 +
.../src/com/cloud/api/query/vo/UserVmJoinVO.java | 1614 +++++
.../src/com/cloud/api/query/vo/VolumeJoinVO.java | 1034 +++
.../cloud/api/response/ApiResponseSerializer.java | 133 +-
.../api/response/SecurityGroupResultObject.java | 7 +-
server/src/com/cloud/async/AsyncCommandQueued.java | 4 +-
.../com/cloud/async/AsyncJobExecutorContext.java | 4 +-
.../cloud/async/AsyncJobExecutorContextImpl.java | 9 +-
server/src/com/cloud/async/AsyncJobManager.java | 9 +-
.../src/com/cloud/async/AsyncJobManagerImpl.java | 896 ++--
server/src/com/cloud/async/SyncQueueManager.java | 16 +-
.../src/com/cloud/async/SyncQueueManagerImpl.java | 384 +-
server/src/com/cloud/async/dao/SyncQueueDao.java | 3 +-
.../src/com/cloud/async/dao/SyncQueueDaoImpl.java | 60 +-
.../src/com/cloud/async/dao/SyncQueueItemDao.java | 3 +-
.../com/cloud/async/dao/SyncQueueItemDaoImpl.java | 143 +-
.../com/cloud/baremetal/BareMetalDiscoverer.java | 2 +-
.../com/cloud/baremetal/BareMetalResourceBase.java | 2 +-
.../cloud/baremetal/BareMetalTemplateAdapter.java | 6 +-
.../cloud/baremetal/BareMetalVmManagerImpl.java | 14 +-
.../com/cloud/baremetal/DhcpServerResponse.java | 19 +-
.../cloud/baremetal/ExternalDhcpManagerImpl.java | 40 +-
.../cloud/baremetal/ExternalDhcpResourceBase.java | 2 +-
.../com/cloud/baremetal/PxeServerManagerImpl.java | 12 +-
.../com/cloud/baremetal/PxeServerResourceBase.java | 2 +-
.../src/com/cloud/baremetal/PxeServerResponse.java | 19 +-
server/src/com/cloud/cluster/CheckPointVO.java | 3 +-
.../src/com/cloud/cluster/ClusterManagerImpl.java | 20 +-
.../cloud/cluster/ClusterServiceServletImpl.java | 20 +-
.../cloud/cluster/ManagementServerHostPeerVO.java | 3 +-
.../com/cloud/cluster/ManagementServerHostVO.java | 3 +-
.../cloud/cluster/agentlb/HostTransferMapVO.java | 3 +-
server/src/com/cloud/configuration/Config.java | 112 +-
.../configuration/ConfigurationManagerImpl.java | 200 +-
.../configuration/DefaultComponentLibrary.java | 67 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 52 +-
server/src/com/cloud/dao/EntityManagerImpl.java | 9 +-
server/src/com/cloud/dc/AccountVlanMapVO.java | 7 +-
server/src/com/cloud/dc/ClusterDetailsVO.java | 4 +-
server/src/com/cloud/dc/ClusterVO.java | 49 +-
server/src/com/cloud/dc/DataCenterIpAddressVO.java | 6 +-
.../cloud/dc/DataCenterLinkLocalIpAddressVO.java | 6 +-
server/src/com/cloud/dc/DataCenterVO.java | 127 +-
server/src/com/cloud/dc/DataCenterVnetVO.java | 4 +-
server/src/com/cloud/dc/DcDetailVO.java | 4 +-
server/src/com/cloud/dc/HostPodVO.java | 35 +-
server/src/com/cloud/dc/PodVlanMapVO.java | 4 +-
server/src/com/cloud/dc/PodVlanVO.java | 6 +-
.../com/cloud/dc/StorageNetworkIpAddressVO.java | 6 +-
.../src/com/cloud/dc/StorageNetworkIpRangeVO.java | 2 +
server/src/com/cloud/dc/VlanVO.java | 57 +-
server/src/com/cloud/dc/dao/HostPodDao.java | 7 +-
server/src/com/cloud/dc/dao/HostPodDaoImpl.java | 28 +-
server/src/com/cloud/deploy/FirstFitPlanner.java | 2 -
server/src/com/cloud/domain/DomainVO.java | 55 +-
server/src/com/cloud/event/dao/EventJoinDao.java | 40 +
.../src/com/cloud/event/dao/EventJoinDaoImpl.java | 124 +
server/src/com/cloud/ha/HaWorkVO.java | 5 +-
.../cloud/ha/ManagementIPSystemVMInvestigator.java | 4 +-
.../src/com/cloud/ha/UserVmDomRInvestigator.java | 4 +-
server/src/com/cloud/host/dao/HostDaoImpl.java | 2 +-
.../com/cloud/hypervisor/HypervisorGuruBase.java | 1 +
.../kvm/discoverer/KvmServerDiscoverer.java | 45 +-
server/src/com/cloud/keystore/KeystoreVO.java | 6 +-
server/src/com/cloud/maint/AgentUpgradeVO.java | 4 +-
server/src/com/cloud/maint/UpgradeManagerImpl.java | 6 +-
.../src/com/cloud/migration/DiskOffering20VO.java | 5 +-
.../src/com/cloud/migration/DiskOffering21VO.java | 3 +-
.../com/cloud/migration/ServiceOffering20VO.java | 5 +-
.../com/cloud/migration/ServiceOffering21VO.java | 56 +-
.../network/ExternalFirewallDeviceManager.java | 9 +
.../network/ExternalFirewallDeviceManagerImpl.java | 266 +-
.../cloud/network/ExternalFirewallDeviceVO.java | 5 +-
.../ExternalLoadBalancerDeviceManagerImpl.java | 351 +-
.../network/ExternalLoadBalancerDeviceVO.java | 24 +-
.../ExternalLoadBalancerUsageManagerImpl.java | 2 +-
.../network/ExternalNetworkDeviceManager.java | 77 -
.../network/ExternalNetworkDeviceManagerImpl.java | 61 +-
.../com/cloud/network/FirewallRulesCidrsVO.java | 6 +-
server/src/com/cloud/network/IPAddressVO.java | 81 +-
.../cloud/network/InlineLoadBalancerNicMapVO.java | 14 +-
.../com/cloud/network/LBStickinessPolicyVO.java | 1 +
.../src/com/cloud/network/LoadBalancerVMMapVO.java | 4 +-
server/src/com/cloud/network/NetworkAccountVO.java | 10 +-
server/src/com/cloud/network/NetworkDomainVO.java | 10 +-
.../cloud/network/NetworkExternalFirewallVO.java | 3 +-
.../network/NetworkExternalLoadBalancerVO.java | 3 +-
server/src/com/cloud/network/NetworkManager.java | 241 +-
.../src/com/cloud/network/NetworkManagerImpl.java | 5083 ++-------------
server/src/com/cloud/network/NetworkModelImpl.java | 1839 ++++++
.../src/com/cloud/network/NetworkRuleApplier.java | 28 +
.../src/com/cloud/network/NetworkRuleConfigVO.java | 5 +-
.../src/com/cloud/network/NetworkServiceImpl.java | 2885 ++++++++
.../src/com/cloud/network/NetworkServiceMapVO.java | 3 +-
.../src/com/cloud/network/NetworkUsageManager.java | 2 +-
.../com/cloud/network/NetworkUsageManagerImpl.java | 44 +-
server/src/com/cloud/network/NetworkVO.java | 37 +-
.../src/com/cloud/network/PhysicalNetworkVO.java | 1 +
server/src/com/cloud/network/PortProfileVO.java | 3 +-
server/src/com/cloud/network/RouterNetworkVO.java | 3 +-
.../cloud/network/Site2SiteCustomerGatewayVO.java | 1 +
.../cloud/network/Site2SiteVpnConnectionVO.java | 3 +-
.../com/cloud/network/Site2SiteVpnGatewayVO.java | 1 +
.../cloud/network/StorageNetworkManagerImpl.java | 14 +-
server/src/com/cloud/network/addr/PublicIp.java | 44 +-
.../src/com/cloud/network/as/AutoScaleManager.java | 22 +
.../com/cloud/network/as/AutoScaleManagerImpl.java | 1180 ++++
.../network/as/AutoScalePolicyConditionMapVO.java | 61 +
.../com/cloud/network/as/AutoScalePolicyVO.java | 134 +
.../network/as/AutoScaleVmGroupPolicyMapVO.java | 64 +
.../com/cloud/network/as/AutoScaleVmGroupVO.java | 191 +
.../com/cloud/network/as/AutoScaleVmProfileVO.java | 218 +
server/src/com/cloud/network/as/ConditionVO.java | 129 +
server/src/com/cloud/network/as/CounterVO.java | 111 +
.../as/dao/AutoScalePolicyConditionMapDao.java | 28 +
.../as/dao/AutoScalePolicyConditionMapDaoImpl.java | 58 +
.../cloud/network/as/dao/AutoScalePolicyDao.java | 24 +
.../network/as/dao/AutoScalePolicyDaoImpl.java | 35 +
.../cloud/network/as/dao/AutoScaleVmGroupDao.java | 28 +
.../network/as/dao/AutoScaleVmGroupDaoImpl.java | 62 +
.../as/dao/AutoScaleVmGroupPolicyMapDao.java | 30 +
.../as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java | 74 +
.../network/as/dao/AutoScaleVmProfileDao.java | 25 +
.../network/as/dao/AutoScaleVmProfileDaoImpl.java | 35 +
.../src/com/cloud/network/as/dao/ConditionDao.java | 28 +
.../com/cloud/network/as/dao/ConditionDaoImpl.java | 53 +
.../src/com/cloud/network/as/dao/CounterDao.java | 29 +
.../com/cloud/network/as/dao/CounterDaoImpl.java | 67 +
.../com/cloud/network/dao/FirewallRulesDao.java | 4 +-
.../cloud/network/dao/FirewallRulesDaoImpl.java | 15 +
.../cloud/network/dao/LoadBalancerVMMapDao.java | 2 +-
.../network/dao/LoadBalancerVMMapDaoImpl.java | 15 +-
server/src/com/cloud/network/dao/NetworkDao.java | 3 +
.../src/com/cloud/network/dao/NetworkDaoImpl.java | 38 +-
server/src/com/cloud/network/dao/NetworkOpVO.java | 4 +-
.../dao/PhysicalNetworkIsolationMethodVO.java | 4 +-
.../dao/PhysicalNetworkServiceProviderVO.java | 3 +-
.../cloud/network/dao/PhysicalNetworkTagVO.java | 4 +-
.../network/dao/PhysicalNetworkTrafficTypeDao.java | 4 +-
.../dao/PhysicalNetworkTrafficTypeDaoImpl.java | 5 +-
.../network/dao/PhysicalNetworkTrafficTypeVO.java | 1 +
.../cloud/network/element/BareMetalElement.java | 2 +-
.../network/element/CloudZonesNetworkElement.java | 12 +-
.../cloud/network/element/ExternalDhcpElement.java | 2 +-
.../network/element/SecurityGroupElement.java | 2 +-
.../network/element/VirtualRouterElement.java | 53 +-
.../network/element/VirtualRouterProviderVO.java | 1 +
.../network/element/VpcVirtualRouterElement.java | 21 +-
.../network/firewall/FirewallManagerImpl.java | 89 +-
.../com/cloud/network/guru/ControlNetworkGuru.java | 4 +-
.../com/cloud/network/guru/DirectNetworkGuru.java | 5 +-
.../network/guru/DirectPodBasedNetworkGuru.java | 2 +-
.../network/guru/ExternalGuestNetworkGuru.java | 14 +-
.../com/cloud/network/guru/GuestNetworkGuru.java | 39 +-
.../com/cloud/network/guru/PrivateNetworkGuru.java | 4 +-
.../network/lb/LoadBalancingRulesManager.java | 12 +-
.../network/lb/LoadBalancingRulesManagerImpl.java | 416 +-
.../router/VirtualNetworkApplianceManager.java | 5 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 490 +-
.../VpcVirtualNetworkApplianceManagerImpl.java | 63 +-
.../com/cloud/network/rules/FirewallRuleVO.java | 81 +-
.../com/cloud/network/rules/RulesManagerImpl.java | 82 +-
.../com/cloud/network/rules/StaticNatRuleImpl.java | 28 +-
.../network/security/SecurityGroupManagerImpl.java | 156 +-
.../security/dao/SecurityGroupVMMapDao.java | 3 +
.../security/dao/SecurityGroupVMMapDaoImpl.java | 9 +
.../cloud/network/vpc/NetworkACLManagerImpl.java | 19 +-
.../cloud/network/vpc/PrivateGatewayProfile.java | 2 +-
server/src/com/cloud/network/vpc/PrivateIpVO.java | 4 +-
.../src/com/cloud/network/vpc/StaticRouteVO.java | 27 +-
server/src/com/cloud/network/vpc/VpcGatewayVO.java | 3 +-
server/src/com/cloud/network/vpc/VpcManager.java | 6 +-
.../src/com/cloud/network/vpc/VpcManagerImpl.java | 88 +-
.../cloud/network/vpc/VpcOfferingServiceMapVO.java | 3 +-
.../src/com/cloud/network/vpc/VpcOfferingVO.java | 3 +-
server/src/com/cloud/network/vpc/VpcVO.java | 5 +-
.../network/vpn/RemoteAccessVpnManagerImpl.java | 51 +-
.../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 57 +-
.../offerings/NetworkOfferingServiceMapVO.java | 3 +-
.../src/com/cloud/offerings/NetworkOfferingVO.java | 38 +-
.../src/com/cloud/projects/ProjectAccountVO.java | 3 +-
.../com/cloud/projects/ProjectInvitationVO.java | 5 +-
server/src/com/cloud/projects/ProjectManager.java | 2 +
.../src/com/cloud/projects/ProjectManagerImpl.java | 616 +--
server/src/com/cloud/projects/ProjectVO.java | 5 +-
server/src/com/cloud/projects/dao/ProjectDao.java | 2 +
.../src/com/cloud/projects/dao/ProjectDaoImpl.java | 8 +
server/src/com/cloud/resource/DiscovererBase.java | 4 +-
.../cloud/resource/DummyHostServerResource.java | 2 +-
.../com/cloud/resource/ResourceManagerImpl.java | 88 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 32 +-
.../src/com/cloud/secstorage/CommandExecLogVO.java | 3 +-
.../com/cloud/server/ConfigurationServerImpl.java | 185 +-
server/src/com/cloud/server/ManagementServer.java | 9 +-
.../src/com/cloud/server/ManagementServerExt.java | 2 +-
.../com/cloud/server/ManagementServerExtImpl.java | 8 +-
.../src/com/cloud/server/ManagementServerImpl.java | 1448 ++---
.../api/response/BaremetalTemplateResponse.java | 17 +-
.../api/response/ExternalFirewallResponse.java | 147 -
.../api/response/ExternalLoadBalancerResponse.java | 104 -
.../server/api/response/NetworkDeviceResponse.java | 37 -
.../server/api/response/NwDeviceDhcpResponse.java | 3 +-
.../api/response/NwDevicePxeServerResponse.java | 38 +-
.../cloud/server/api/response/PxePingResponse.java | 2 +-
.../api/response/TrafficMonitorResponse.java | 81 -
.../server/api/response/UsageRecordResponse.java | 200 -
.../server/api/response/UsageTypeResponse.java | 55 -
.../response/netapp/AssociateLunCmdResponse.java | 4 +-
.../api/response/netapp/CreateLunCmdResponse.java | 4 +-
.../netapp/CreateVolumeOnFilerCmdResponse.java | 2 +-
.../netapp/CreateVolumePoolCmdResponse.java | 2 +-
.../api/response/netapp/DeleteLUNCmdResponse.java | 5 +-
.../netapp/DeleteVolumeOnFilerCmdResponse.java | 5 +-
.../netapp/DeleteVolumePoolCmdResponse.java | 2 +-
.../response/netapp/DissociateLunCmdResponse.java | 5 +-
.../api/response/netapp/ListLunsCmdResponse.java | 4 +-
.../netapp/ListVolumePoolsCmdResponse.java | 4 +-
.../netapp/ListVolumesOnFilerCmdResponse.java | 4 +-
.../netapp/ModifyVolumePoolCmdResponse.java | 5 +-
.../com/cloud/server/auth/UserAuthenticator.java | 6 +
.../src/com/cloud/servlet/CloudStartupServlet.java | 3 +-
.../src/com/cloud/servlet/ConsoleProxyServlet.java | 2 +-
server/src/com/cloud/storage/StorageManager.java | 40 +-
.../src/com/cloud/storage/StorageManagerImpl.java | 526 +-
server/src/com/cloud/storage/dao/S3Dao.java | 29 +
server/src/com/cloud/storage/dao/S3DaoImpl.java | 47 +
.../com/cloud/storage/dao/SnapshotPolicyDao.java | 3 +
.../cloud/storage/dao/SnapshotPolicyDaoImpl.java | 30 +-
.../com/cloud/storage/dao/SnapshotScheduleDao.java | 1 -
.../src/com/cloud/storage/dao/VMTemplateDao.java | 6 +
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 175 +-
.../src/com/cloud/storage/dao/VMTemplateS3Dao.java | 36 +
.../com/cloud/storage/dao/VMTemplateS3DaoImpl.java | 101 +
.../src/com/cloud/storage/dao/VolumeHostDao.java | 1 -
.../com/cloud/storage/dao/VolumeHostDaoImpl.java | 2 -
.../cloud/storage/listener/StoragePoolMonitor.java | 6 +-
server/src/com/cloud/storage/s3/S3Manager.java | 63 +
server/src/com/cloud/storage/s3/S3ManagerImpl.java | 664 ++
.../secondary/SecondaryStorageManagerImpl.java | 12 +-
.../cloud/storage/snapshot/SnapshotManager.java | 2 +
.../storage/snapshot/SnapshotManagerImpl.java | 238 +-
.../storage/snapshot/SnapshotSchedulerImpl.java | 23 +-
.../src/com/cloud/storage/swift/SwiftManager.java | 8 +-
.../com/cloud/storage/swift/SwiftManagerImpl.java | 8 +-
.../com/cloud/storage/upload/UploadListener.java | 128 +-
server/src/com/cloud/tags/ResourceTagVO.java | 5 +-
.../com/cloud/tags/TaggedResourceManagerImpl.java | 156 +-
.../cloud/template/HyervisorTemplateAdapter.java | 8 +-
server/src/com/cloud/template/S3SyncTask.java | 94 +
server/src/com/cloud/template/TemplateAdapter.java | 8 +-
.../com/cloud/template/TemplateAdapterBase.java | 10 +-
.../com/cloud/template/TemplateManagerImpl.java | 115 +-
server/src/com/cloud/test/DatabaseConfig.java | 3 +-
.../src/com/cloud/upgrade/dao/Upgrade2214to30.java | 24 +-
.../src/com/cloud/upgrade/dao/Upgrade30xBase.java | 7 +-
.../src/com/cloud/upgrade/dao/Upgrade40to41.java | 15 +-
server/src/com/cloud/upgrade/dao/VersionVO.java | 4 +-
.../cloud/usage/ExternalPublicIpStatisticsVO.java | 6 +-
server/src/com/cloud/usage/UsageIPAddressVO.java | 4 +-
server/src/com/cloud/usage/UsageJobVO.java | 6 +-
.../com/cloud/usage/UsageLoadBalancerPolicyVO.java | 4 +-
.../com/cloud/usage/UsagePortForwardingRuleVO.java | 4 +-
server/src/com/cloud/usage/UsageStorageVO.java | 4 +-
server/src/com/cloud/usage/UsageTypes.java | 2 +-
server/src/com/cloud/usage/UsageVO.java | 6 +-
server/src/com/cloud/usage/UsageVolumeVO.java | 4 +-
server/src/com/cloud/user/AccountDetailVO.java | 3 +-
server/src/com/cloud/user/AccountManager.java | 12 +-
server/src/com/cloud/user/AccountManagerImpl.java | 457 +-
server/src/com/cloud/user/DomainManagerImpl.java | 27 +-
.../cloud/uuididentity/IdentityServiceImpl.java | 7 +-
.../com/cloud/uuididentity/dao/IdentityDao.java | 6 +-
.../cloud/uuididentity/dao/IdentityDaoImpl.java | 7 -
server/src/com/cloud/vm/NicVO.java | 5 +-
server/src/com/cloud/vm/UserVmManager.java | 5 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 537 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 22 +-
server/src/com/cloud/vm/dao/DomainRouterDao.java | 19 +-
.../src/com/cloud/vm/dao/DomainRouterDaoImpl.java | 17 +
server/src/com/cloud/vm/dao/UserVmData.java | 2 +-
server/src/com/cloud/vm/dao/VMInstanceDao.java | 13 +-
server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 12 +-
.../test/com/cloud/alert/MockAlertManagerImpl.java | 87 +
server/test/com/cloud/api/APITest.java | 210 +
server/test/com/cloud/api/ListPerfTest.java | 173 +
server/test/com/cloud/api/LoginResponse.java | 142 +
.../test/com/cloud/async/TestSyncQueueManager.java | 332 +-
server/test/com/cloud/keystore/KeystoreTest.java | 72 +-
.../com/cloud/network/MockFirewallManagerImpl.java | 202 +
.../com/cloud/network/MockNetworkManagerImpl.java | 647 +--
.../com/cloud/network/MockNetworkModelImpl.java | 809 +++
.../com/cloud/network/MockRulesManagerImpl.java | 312 +
.../test/com/cloud/network/NetworkManagerTest.java | 66 +
.../NetworkManagerTestComponentLibrary.java | 104 +
.../test/com/cloud/network/NetworkModelTest.java | 88 +
.../network/firewall/FirewallManagerTest.java | 177 +
.../security/SecurityGroupManagerImpl2Test.java | 4 +
.../vpn/MockRemoteAccessVPNServiceProvider.java | 78 +
.../com/cloud/network/vpn/RemoteAccessVpnTest.java | 109 +
.../com/cloud/projects/MockProjectManagerImpl.java | 37 +-
.../cloud/resource/MockResourceManagerImpl.java | 601 ++
.../com/cloud/user/MockAccountManagerImpl.java | 52 +-
.../test/com/cloud/user/MockDomainManagerImpl.java | 22 +-
.../test/com/cloud/vm/MockUserVmManagerImpl.java | 44 +-
.../cloud/vpc/MockConfigurationManagerImpl.java | 78 +-
.../test/com/cloud/vpc/MockNetworkManagerImpl.java | 1201 ++--
.../cloud/vpc/MockResourceLimitManagerImpl.java | 13 +-
.../com/cloud/vpc/MockSite2SiteVpnManagerImpl.java | 50 +-
.../cloud/vpc/MockSite2SiteVpnServiceProvider.java | 86 +
server/test/com/cloud/vpc/MockVpcManagerImpl.java | 19 +-
.../vpc/MockVpcVirtualNetworkApplianceManager.java | 391 ++
server/test/com/cloud/vpc/Site2SiteVpnTest.java | 98 +
server/test/com/cloud/vpc/VpcApiUnitTest.java | 2 +-
.../test/com/cloud/vpc/dao/MockNetworkDaoImpl.java | 15 +
.../cloud/vpc/dao/MockVpcVirtualRouterElement.java | 3 +-
server/test/resources/network-mgr-component.xml | 184 +
setup/apidoc/XmlToHtmlConverter.java | 143 -
setup/apidoc/build-apidoc.sh | 90 -
setup/apidoc/gen_toc.py | 269 -
setup/apidoc/generateadmincommands.xsl | 138 -
setup/apidoc/generatecommand.xsl | 177 -
setup/apidoc/generatecustomcommand.xsl | 65 -
setup/apidoc/generatedomainadmincommands.xsl | 141 -
setup/apidoc/generategenericcommand.xsl | 57 -
setup/apidoc/generatetoc.xsl | 1146 ----
setup/apidoc/generatetoc_footer.xsl | 21 -
setup/apidoc/generatetoc_header.xsl | 70 -
setup/apidoc/generateusercommands.xsl | 139 -
setup/apidoc/images/api_bullets.gif | Bin 45 -> 0 bytes
setup/apidoc/images/back_button.gif | Bin 870 -> 0 bytes
setup/apidoc/images/back_button_hover.gif | Bin 868 -> 0 bytes
setup/apidoc/images/cloudstack.png | Bin 3893 -> 0 bytes
setup/apidoc/images/ins_buttonshadow.gif | Bin 1683 -> 0 bytes
setup/apidoc/images/insdownload_button.gif | Bin 2531 -> 0 bytes
setup/apidoc/images/insdownload_button_hover.gif | Bin 2569 -> 0 bytes
setup/apidoc/images/insjoincomm_button.gif | Bin 2627 -> 0 bytes
setup/apidoc/images/insjoincomm_button_hover.gif | Bin 2620 -> 0 bytes
setup/apidoc/includes/main.css | 1092 ----
setup/bindir/cloud-set-guest-password.in | 6 +-
setup/bindir/cloud-set-guest-sshkey.in | 2 +-
setup/bindir/cloud-setup-databases.in | 186 +-
setup/bindir/cloud-setup-encryption.in | 4 +-
setup/db/clouddev.sql | 33 -
setup/db/create-schema-premium.sql | 1 +
setup/db/create-schema-simulator.sql | 2 +
setup/db/create-schema-view.sql | 875 +++
setup/db/create-schema.sql | 195 +-
setup/db/db/schema-2214to30.sql | 16 +
setup/db/db/schema-301to302.sql | 2 +
setup/db/db/schema-302to40.sql | 3 +
setup/db/db/schema-30to301.sql | 2 +
setup/db/db/schema-40to410.sql | 1240 ++++
setup/db/deploy-db-dev.sh | 11 +
setup/db/deploy-db-simulator.sh | 12 +
setup/db/server-setup.sql | 2 +-
setup/db/templates.kvm.sql | 101 +-
setup/db/templates.simulator.sql | 441 +--
setup/db/templates.sql | 391 +-
setup/db/templates.vmware.sql | 146 +-
setup/db/templates.xenserver.sql | 162 +-
test/conf/README | 8 -
test/integration/README | 8 -
test/integration/component/README | 41 -
test/integration/component/test_accounts.py | 6 +-
.../component/test_allocation_states.py | 36 +-
test/integration/component/test_blocker_bugs.py | 7 +-
test/integration/component/test_egress_rules.py | 17 +-
test/integration/component/test_eip_elb.py | 8 +-
.../integration/component/test_network_offering.py | 6 +-
test/integration/component/test_project_configs.py | 6 +-
test/integration/component/test_project_limits.py | 6 +-
.../component/test_project_resources.py | 7 +-
test/integration/component/test_project_usage.py | 6 +-
test/integration/component/test_projects.py | 6 +-
test/integration/component/test_resource_limits.py | 6 +-
test/integration/component/test_routers.py | 6 +-
test/integration/component/test_security_groups.py | 13 +-
test/integration/component/test_snapshots.py | 1122 ++++-
test/integration/component/test_templates.py | 44 +-
test/integration/component/test_usage.py | 6 +-
test/integration/component/test_volumes.py | 6 +-
test/integration/lib/__init__.py | 16 -
test/integration/lib/base.py | 2146 ------
test/integration/lib/common.py | 515 --
test/integration/lib/utils.py | 179 -
test/integration/smoke/README | 41 -
test/integration/smoke/test_disk_offerings.py | 10 +-
test/integration/smoke/test_hosts.py | 11 +-
test/integration/smoke/test_iso.py | 79 +-
test/integration/smoke/test_network.py | 21 +-
test/integration/smoke/test_primary_storage.py | 9 +-
test/integration/smoke/test_routers.py | 13 +-
test/integration/smoke/test_secondary_storage.py | 314 +-
test/integration/smoke/test_service_offerings.py | 11 +-
test/integration/smoke/test_snapshots.py | 1177 ----
test/integration/smoke/test_ssvm.py | 7 +-
test/integration/smoke/test_templates.py | 70 +-
test/integration/smoke/test_vm_life_cycle.py | 66 +-
test/integration/smoke/test_volumes.py | 142 +-
test/setup-test-data.sh | 12 +-
tools/apidoc/XmlToHtmlConverter.java | 143 +
tools/apidoc/build-apidoc.sh | 90 +
tools/apidoc/gen_toc.py | 275 +
tools/apidoc/generateadmincommands.xsl | 156 +
tools/apidoc/generatecommand.xsl | 195 +
tools/apidoc/generatecustomcommand.xsl | 65 +
tools/apidoc/generatedomainadmincommands.xsl | 159 +
tools/apidoc/generategenericcommand.xsl | 57 +
tools/apidoc/generatetoc.xsl | 1146 ++++
tools/apidoc/generatetoc_footer.xsl | 39 +
tools/apidoc/generatetoc_header.xsl | 70 +
tools/apidoc/generateusercommands.xsl | 157 +
tools/apidoc/images/api_bullets.gif | Bin 0 -> 45 bytes
tools/apidoc/images/back_button.gif | Bin 0 -> 870 bytes
tools/apidoc/images/back_button_hover.gif | Bin 0 -> 868 bytes
tools/apidoc/images/cloudstack.png | Bin 0 -> 3893 bytes
tools/apidoc/images/ins_buttonshadow.gif | Bin 0 -> 1683 bytes
tools/apidoc/images/insdownload_button.gif | Bin 0 -> 2531 bytes
tools/apidoc/images/insdownload_button_hover.gif | Bin 0 -> 2569 bytes
tools/apidoc/images/insjoincomm_button.gif | Bin 0 -> 2627 bytes
tools/apidoc/images/insjoincomm_button_hover.gif | Bin 0 -> 2620 bytes
tools/apidoc/includes/main.css | 1092 ++++
tools/apidoc/pom.xml | 84 +
tools/build/build_asf.sh | 29 +-
tools/build/build_docs.sh | 2 +-
tools/build/installer/rpminstall_full.sh | 1 +
tools/cli/cloudmonkey/__init__.py | 21 +
tools/cli/cloudmonkey/cachegen.py | 92 +
tools/cli/cloudmonkey/cloudmonkey.py | 537 ++
tools/cli/cloudmonkey/common.py | 50 +
tools/cli/pom.xml | 107 +
tools/cli/setup.py | 70 +
tools/devcloud-kvm/README.md | 21 +
tools/devcloud-kvm/devcloud-kvm-advanced.cfg | 134 +
tools/devcloud-kvm/devcloud-kvm.cfg | 117 +
tools/devcloud-kvm/devcloud-kvm.py | 157 +
tools/devcloud-kvm/devcloud-kvm.sql | 41 +
tools/devcloud-kvm/kvm.properties | 62 +
tools/devcloud-kvm/pom.xml | 138 +
tools/devcloud/README | 56 -
tools/devcloud/README.md | 102 +
tools/devcloud/basebuild/Vagrantfile | 51 -
.../basebuild/puppet-devcloudinitial/Modulefile | 8 -
.../basebuild/puppet-devcloudinitial/files/grub | 52 -
.../puppet-devcloudinitial/files/interfaces | 33 -
.../puppet-devcloudinitial/files/network.conf | 1 -
.../puppet-devcloudinitial/files/xen-defaults | 18 -
.../basebuild/puppet-devcloudinitial/files/xend | 188 -
.../basebuild/puppet-devcloudinitial/init.pp | 18 -
.../puppet-devcloudinitial/manifests/init.pp | 106 -
tools/devcloud/build_vagrant_basebox.sh | 99 -
tools/devcloud/devcloud-advanced.cfg | 135 +
tools/devcloud/devcloud-advanced_internal-mgt.cfg | 141 +
tools/devcloud/devcloud.cfg | 98 +-
tools/devcloud/devcloud.sql | 40 +
tools/devcloud/devcloudbox/Vagrantfile | 51 -
.../devcloudbox/puppet-devcloud/Modulefile | 8 -
.../puppet-devcloud/files/builddevcloud.sh | 28 -
.../puppet-devcloud/files/configebtables.sh | 21 -
.../puppet-devcloud/files/configlocalstorage.sh | 25 -
.../devcloudbox/puppet-devcloud/files/configvnc.sh | 25 -
.../devcloudbox/puppet-devcloud/files/exports | 18 -
.../puppet-devcloud/files/installmaven.sh | 22 -
.../puppet-devcloud/files/iptables.save | 30 -
.../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 | 348 -
tools/devcloud/devcloudsetup.sh | 151 -
tools/devcloud/pom.xml | 138 +
tools/devcloud/src/.rvmrc | 24 +
tools/devcloud/src/Gemfile | 19 +
tools/devcloud/src/Vagrantfile | 58 +
tools/devcloud/src/boxit.sh | 21 +
tools/devcloud/src/deps/boxer.sh | 184 +
tools/devcloud/src/deps/boxes/basebox-build/.rvmrc | 24 +
.../devcloud/src/deps/boxes/basebox-build/Gemfile | 20 +
.../src/deps/boxes/basebox-build/Vagrantfile | 17 +
.../src/deps/boxes/basebox-build/definition.rb | 59 +
.../src/deps/boxes/basebox-build/postinstall.sh | 42 +
.../src/deps/boxes/basebox-build/preseed.cfg | 122 +
tools/devcloud/src/deps/boxes/xenbox-build/.rvmrc | 24 +
tools/devcloud/src/deps/boxes/xenbox-build/Gemfile | 19 +
.../src/deps/boxes/xenbox-build/Vagrantfile | 52 +
.../boxes/xenbox-build/puppet/manifests/site.pp | 16 +
.../puppet/manifests/vagrant-devcloudinitial.pp | 18 +
.../puppet/modules/devcloudinitial/Modulefile | 8 +
.../puppet/modules/devcloudinitial/files/grub | 52 +
.../modules/devcloudinitial/files/interfaces | 45 +
.../modules/devcloudinitial/files/iptables.save | 30 +
.../modules/devcloudinitial/files/xen-defaults | 18 +
.../puppet/modules/devcloudinitial/files/xend | 188 +
.../modules/devcloudinitial/manifests/init.pp | 119 +
.../src/puppet/manifests/vagrant-devcloud.pp | 18 +
.../src/puppet/modules/devcloud/Modulefile | 8 +
.../src/puppet/modules/devcloud/files/compare.sh | 22 +
.../modules/devcloud/files/configebtables.sh | 21 +
.../modules/devcloud/files/configlocalstorage.sh | 25 +
.../src/puppet/modules/devcloud/files/configvnc.sh | 25 +
.../src/puppet/modules/devcloud/files/exports | 19 +
.../puppet/modules/devcloud/files/installmaven.sh | 22 +
.../puppet/modules/devcloud/files/startdevcloud.sh | 23 +
.../puppet/modules/devcloud/files/updatecode.sh | 27 +
.../puppet/modules/devcloud/lib/facter/xeninfo.rb | 22 +
.../devcloud/manifests/functions/httpdownload.pp | 37 +
.../src/puppet/modules/devcloud/manifests/init.pp | 255 +
.../puppet/modules/devcloud/manifests/params.pp | 78 +
.../devcloud/templates/buildcloudstack.sh.erb | 28 +
.../devcloud/templates/startcloudstack.sh.erb | 26 +
tools/devcloud/src/waitforxe.sh | 39 +
tools/devcloud/veewee/README | 5 -
tools/devcloud/veewee/definition.rb | 56 -
tools/devcloud/veewee/postinstall.sh | 43 -
tools/devcloud/veewee/preseed.cfg | 122 -
tools/git/prepare-commit-msg | 105 +
tools/guest_password/cloud-set-guest-password | 116 -
tools/marvin/DISCLAIMER.txt | 7 +
tools/marvin/LICENSE.txt | 191 +-
tools/marvin/README | 18 -
tools/marvin/marvin/TestCaseExecuteEngine.py | 10 +-
tools/marvin/marvin/cloudstackConnection.py | 41 +-
tools/marvin/marvin/cloudstackTestCase.py | 2 +-
tools/marvin/marvin/cloudstackTestClient.py | 25 +-
tools/marvin/marvin/configGenerator.py | 14 +-
tools/marvin/marvin/dbConnection.py | 60 +-
tools/marvin/marvin/deployAndRun.py | 17 +-
tools/marvin/marvin/deployDataCenter.py | 43 +-
tools/marvin/marvin/integration/__init__.py | 18 +
tools/marvin/marvin/integration/lib/__init__.py | 16 +
tools/marvin/marvin/integration/lib/base.py | 2403 +++++++
tools/marvin/marvin/integration/lib/common.py | 569 ++
tools/marvin/marvin/integration/lib/utils.py | 176 +
tools/marvin/marvin/jsonHelper.py | 2 +-
tools/marvin/marvin/marvinPlugin.py | 12 +-
tools/marvin/marvin/remoteSSHClient.py | 20 +-
tools/marvin/marvin/sandbox/README.txt | 30 -
.../marvin/marvin/sandbox/advanced/advanced_env.py | 20 +-
.../marvin/sandbox/advanced/setup.properties | 18 +-
tools/marvin/marvin/sandbox/basic/basic_env.py | 2 +
tools/marvin/marvin/sandbox/basic/setup.properties | 2 +
tools/marvin/marvin/sandbox/demo/live/README | 8 -
tools/marvin/marvin/sandbox/demo/simulator/README | 12 -
.../marvin/sandbox/demo/simulator/simulator.cfg | 7 +-
.../sandbox/demo/simulator/simulator_setup.py | 2 +
.../demo/simulator/simulatordemo.properties | 2 +
tools/marvin/marvin/settings.py | 28 +
tools/marvin/marvin/setup.py | 8 +-
tools/marvin/pom.xml | 100 +
tools/marvin/setup.py | 14 +-
tools/whisker/descriptor.xml | 65 +-
ui/css/cloudstack3-ie7.css | 51 +-
ui/css/cloudstack3.css | 1173 +++-
ui/dictionary.jsp | 29 +-
ui/images/bg-what-is-cloudplatform.png | Bin 32250 -> 0 bytes
ui/images/citrix-logo-darkbg.png | Bin 2799 -> 0 bytes
ui/images/icons.png | Bin 49385 -> 50745 bytes
ui/images/infrastructure-icons.png | Bin 0 -> 40266 bytes
ui/images/logo-cloudplatform.png | Bin 1726 -> 0 bytes
ui/images/logo-login.png | Bin 8923 -> 0 bytes
ui/images/minus.png | Bin 0 -> 1544 bytes
ui/images/sprites.png | Bin 180100 -> 180485 bytes
ui/index.jsp | 73 +-
ui/scripts/accounts.js | 456 +-
ui/scripts/autoscaler.js | 1431 ++++
ui/scripts/cloudStack.js | 70 +-
ui/scripts/configuration.js | 612 ++-
ui/scripts/dashboard.js | 3 +
ui/scripts/docs.js | 898 +++
ui/scripts/domains.js | 22 +-
ui/scripts/events.js | 127 +-
ui/scripts/globalSettings.js | 47 +-
ui/scripts/installWizard.js | 7 -
ui/scripts/instanceWizard.js | 139 +-
ui/scripts/instances.js | 396 +-
ui/scripts/network.js | 1894 ++++--
ui/scripts/projects.js | 96 +-
ui/scripts/sharedFunctions.js | 77 +-
ui/scripts/storage.js | 293 +-
ui/scripts/system.js | 1237 +++-
ui/scripts/templates.js | 451 +-
ui/scripts/ui-custom/autoscaler.js | 396 ++
ui/scripts/ui-custom/enableStaticNAT.js | 2 +
ui/scripts/ui-custom/installWizard.js | 61 +-
ui/scripts/ui-custom/instanceWizard.js | 50 +-
ui/scripts/ui-custom/projects.js | 7 +-
ui/scripts/ui-custom/zoneChart.js | 1 +
ui/scripts/ui-custom/zoneWizard.js | 17 +-
ui/scripts/ui/dialog.js | 142 +-
ui/scripts/ui/widgets/cloudBrowser.js | 58 +-
ui/scripts/ui/widgets/detailView.js | 125 +-
ui/scripts/ui/widgets/listView.js | 307 +-
ui/scripts/ui/widgets/multiEdit.js | 59 +-
ui/scripts/ui/widgets/notifications.js | 1 +
ui/scripts/ui/widgets/toolTip.js | 164 +
ui/scripts/vpc.js | 73 +-
ui/scripts/zoneWizard.js | 633 ++-
.../centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in | 2 +-
.../fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in | 2 +-
.../rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in | 2 +-
utils/conf/db.properties | 18 +-
utils/pom.xml | 26 +-
utils/src/com/cloud/utils/DateUtil.java | 4 +
utils/src/com/cloud/utils/IdentityProxy.java | 60 -
utils/src/com/cloud/utils/PropertiesUtil.java | 40 +
utils/src/com/cloud/utils/ReflectUtil.java | 63 +
utils/src/com/cloud/utils/S3Utils.java | 495 ++
utils/src/com/cloud/utils/StringUtils.java | 27 +-
.../cloud/utils/component/ComponentLocator.java | 38 +-
.../cloud/utils/component/PluggableService.java | 16 +-
utils/src/com/cloud/utils/db/DbUtil.java | 59 +
utils/src/com/cloud/utils/db/GenericDao.java | 12 +
utils/src/com/cloud/utils/db/GenericDaoBase.java | 95 +
utils/src/com/cloud/utils/db/GlobalLock.java | 40 +
utils/src/com/cloud/utils/db/SqlGenerator.java | 7 +
utils/src/com/cloud/utils/db/Transaction.java | 50 +-
.../utils/exception/CSExceptionErrorCode.java | 186 +-
.../utils/exception/CloudRuntimeException.java | 48 +-
.../HypervisorVersionChangedException.java | 4 +-
.../utils/exception/RuntimeCloudException.java | 76 -
utils/src/com/cloud/utils/net/NetUtils.java | 10 +-
utils/src/com/cloud/utils/script/Script.java | 32 +-
utils/test/com/cloud/utils/StringUtilsTest.java | 106 +
utils/test/com/cloud/utils/db/DbTestDao.java | 66 +
utils/test/com/cloud/utils/db/DbTestVO.java | 56 +
utils/test/com/cloud/utils/db/TransactionTest.java | 218 +
.../utils/log/CglibThrowableRendererTest.java | 38 +-
vmware-base/pom.xml | 21 +-
.../src/com/cloud/hypervisor/vmware/mo/HostMO.java | 13 +-
wscript_build | 5 +-
wscript_configure | 4 +-
2721 files changed, 175003 insertions(+), 98246 deletions(-)
----------------------------------------------------------------------