You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/01/19 01:00:14 UTC
[4/51] [abbrv] git commit: Merge branch 'master' into
network-refactor-merge2
Merge branch 'master' into network-refactor-merge2
Conflicts:
api/src/com/cloud/network/NetworkService.java
api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java
server/src/com/cloud/acl/DomainChecker.java
server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
server/src/com/cloud/network/NetworkManager.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/test/com/cloud/network/MockNetworkManagerImpl.java
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/cadca5fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/cadca5fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/cadca5fc
Branch: refs/heads/javelin
Commit: cadca5fc0cfdbdcdf6cd193b02f097155f3a7377
Parents: 7fad27b 975021d
Author: Chiradeep Vittal <ch...@apache.org>
Authored: Wed Jan 16 19:17:14 2013 -0800
Committer: Chiradeep Vittal <ch...@apache.org>
Committed: Wed Jan 16 19:17:14 2013 -0800
----------------------------------------------------------------------
LICENSE | 2 +-
agent/pom.xml | 51 +
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 | 16 +-
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 +-
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 | 16 +-
.../cloud/agent/api/CreateStoragePoolCommand.java | 4 +-
.../agent/api/CreateVolumeFromSnapshotAnswer.java | 6 +-
.../agent/api/CreateVolumeFromSnapshotCommand.java | 12 +-
.../agent/api/DeleteObjectFromSwiftCommand.java | 10 +-
.../agent/api/DeleteSnapshotBackupAnswer.java | 10 +-
.../agent/api/DeleteSnapshotBackupCommand.java | 28 +-
.../cloud/agent/api/DeleteSnapshotsDirCommand.java | 10 +-
.../cloud/agent/api/DeleteStoragePoolCommand.java | 14 +-
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 | 12 +-
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/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 | 10 +-
.../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 | 6 +-
...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 | 21 +-
.../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 | 12 +-
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 | 10 +-
.../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 | 443 ---
api/src/com/cloud/api/BaseAsyncCmd.java | 134 -
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 | 369 ---
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 | 101 -
.../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 -
api/src/com/cloud/api/commands/AddS3Cmd.java | 218 --
.../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 | 274 --
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 | 159 -
.../api/commands/CreateAutoScalePolicyCmd.java | 170 --
.../api/commands/CreateAutoScaleVmGroupCmd.java | 194 --
.../api/commands/CreateAutoScaleVmProfileCmd.java | 236 --
.../com/cloud/api/commands/CreateConditionCmd.java | 152 -
.../com/cloud/api/commands/CreateCounterCmd.java | 120 -
.../cloud/api/commands/CreateDiskOfferingCmd.java | 121 -
.../com/cloud/api/commands/CreateDomainCmd.java | 94 -
.../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 | 73 +-
.../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 | 193 --
.../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 | 143 -
.../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 | 109 -
.../api/commands/DeleteAccountFromProjectCmd.java | 107 -
.../api/commands/DeleteAutoScalePolicyCmd.java | 103 -
.../api/commands/DeleteAutoScaleVmGroupCmd.java | 103 -
.../api/commands/DeleteAutoScaleVmProfileCmd.java | 102 -
.../com/cloud/api/commands/DeleteClusterCmd.java | 79 -
.../com/cloud/api/commands/DeleteConditionCmd.java | 109 -
.../com/cloud/api/commands/DeleteCounterCmd.java | 103 -
.../cloud/api/commands/DeleteDiskOfferingCmd.java | 76 -
.../com/cloud/api/commands/DeleteDomainCmd.java | 103 -
.../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 | 100 -
.../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 | 84 -
.../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 | 18 +-
.../com/cloud/api/commands/DestroyRouterCmd.java | 111 -
.../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 | 129 -
.../api/commands/DisableAutoScaleVmGroupCmd.java | 102 -
.../cloud/api/commands/DisableStaticNatCmd.java | 110 -
api/src/com/cloud/api/commands/DisableUserCmd.java | 104 -
.../cloud/api/commands/DisassociateIPAddrCmd.java | 141 -
.../com/cloud/api/commands/EnableAccountCmd.java | 100 -
.../api/commands/EnableAutoScaleVmGroupCmd.java | 102 -
.../com/cloud/api/commands/EnableStaticNatCmd.java | 125 -
api/src/com/cloud/api/commands/EnableUserCmd.java | 86 -
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 | 108 -
api/src/com/cloud/api/commands/ListAlertsCmd.java | 93 -
.../com/cloud/api/commands/ListAsyncJobsCmd.java | 73 -
.../api/commands/ListAutoScalePoliciesCmd.java | 103 -
.../api/commands/ListAutoScaleVmGroupsCmd.java | 115 -
.../api/commands/ListAutoScaleVmProfilesCmd.java | 95 -
.../cloud/api/commands/ListCapabilitiesCmd.java | 59 -
.../com/cloud/api/commands/ListCapacityCmd.java | 138 -
api/src/com/cloud/api/commands/ListCfgsByCmd.java | 95 -
.../com/cloud/api/commands/ListClustersCmd.java | 144 -
.../com/cloud/api/commands/ListConditionsCmd.java | 96 -
.../com/cloud/api/commands/ListCountersCmd.java | 99 -
.../cloud/api/commands/ListDiskOfferingsCmd.java | 94 -
.../cloud/api/commands/ListDomainChildrenCmd.java | 101 -
api/src/com/cloud/api/commands/ListDomainsCmd.java | 101 -
.../com/cloud/api/commands/ListEventTypesCmd.java | 60 -
api/src/com/cloud/api/commands/ListEventsCmd.java | 120 -
.../cloud/api/commands/ListFirewallRulesCmd.java | 86 -
.../api/commands/ListGuestOsCategoriesCmd.java | 92 -
api/src/com/cloud/api/commands/ListGuestOsCmd.java | 100 -
api/src/com/cloud/api/commands/ListHostsCmd.java | 192 --
.../commands/ListHypervisorCapabilitiesCmd.java | 94 -
.../com/cloud/api/commands/ListHypervisorsCmd.java | 84 -
.../api/commands/ListIpForwardingRulesCmd.java | 101 -
.../cloud/api/commands/ListIsoPermissionsCmd.java | 42 -
api/src/com/cloud/api/commands/ListIsosCmd.java | 161 -
.../api/commands/ListLBStickinessPoliciesCmd.java | 90 -
.../commands/ListLoadBalancerRuleInstancesCmd.java | 83 -
.../api/commands/ListLoadBalancerRulesCmd.java | 113 -
.../com/cloud/api/commands/ListNetworkACLsCmd.java | 95 -
.../api/commands/ListNetworkOfferingsCmd.java | 191 --
.../commands/ListNetworkServiceProvidersCmd.java | 105 -
.../com/cloud/api/commands/ListNetworksCmd.java | 164 --
.../api/commands/ListPhysicalNetworksCmd.java | 106 -
api/src/com/cloud/api/commands/ListPodsByCmd.java | 109 -
.../api/commands/ListPortForwardingRulesCmd.java | 88 -
.../cloud/api/commands/ListPrivateGatewaysCmd.java | 107 -
.../cloud/api/commands/ListProjectAccountsCmd.java | 95 -
.../api/commands/ListProjectInvitationsCmd.java | 101 -
.../com/cloud/api/commands/ListProjectsCmd.java | 124 -
.../api/commands/ListPublicIpAddressesCmd.java | 179 --
.../commands/ListRecurringSnapshotScheduleCmd.java | 24 +-
.../api/commands/ListRemoteAccessVpnsCmd.java | 80 -
.../cloud/api/commands/ListResourceLimitsCmd.java | 88 -
api/src/com/cloud/api/commands/ListRoutersCmd.java | 146 -
api/src/com/cloud/api/commands/ListS3sCmd.java | 75 -
.../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 | 115 -
.../cloud/api/commands/ListStaticRoutesCmd.java | 86 -
.../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 | 138 -
api/src/com/cloud/api/commands/ListTagsCmd.java | 96 -
.../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 | 88 -
api/src/com/cloud/api/commands/ListUsersCmd.java | 100 -
.../com/cloud/api/commands/ListVMGroupsCmd.java | 87 -
api/src/com/cloud/api/commands/ListVMsCmd.java | 217 --
.../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 | 149 -
api/src/com/cloud/api/commands/ListVolumesCmd.java | 135 -
.../cloud/api/commands/ListVpnConnectionsCmd.java | 92 -
.../api/commands/ListVpnCustomerGatewaysCmd.java | 84 -
.../com/cloud/api/commands/ListVpnGatewaysCmd.java | 91 -
.../com/cloud/api/commands/ListVpnUsersCmd.java | 85 -
api/src/com/cloud/api/commands/ListZonesByCmd.java | 100 -
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 | 130 -
.../api/commands/UpdateAutoScalePolicyCmd.java | 126 -
.../api/commands/UpdateAutoScaleVmGroupCmd.java | 143 -
.../api/commands/UpdateAutoScaleVmProfileCmd.java | 136 -
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 | 93 -
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 | 142 -
api/src/com/cloud/api/commands/UpdateVMCmd.java | 131 -
.../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 | 159 -
.../api/response/AutoScalePolicyResponse.java | 107 -
.../api/response/AutoScaleVmGroupResponse.java | 143 -
.../api/response/AutoScaleVmProfileResponse.java | 160 -
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 -
.../com/cloud/api/response/ConditionResponse.java | 117 -
.../cloud/api/response/ConfigurationResponse.java | 67 -
.../api/response/ControlledEntityResponse.java | 30 -
.../com/cloud/api/response/CounterResponse.java | 62 -
.../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 | 237 --
.../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 | 52 -
.../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 -
api/src/com/cloud/api/response/S3Response.java | 209 --
.../com/cloud/api/response/SSHKeyPairResponse.java | 69 -
.../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 | 201 --
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 | 7 +-
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 | 13 +-
.../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 +-
.../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 | 19 +-
api/src/com/cloud/network/NetworkProfile.java | 9 +
api/src/com/cloud/network/NetworkService.java | 35 +-
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 | 12 +-
.../com/cloud/network/VirtualRouterProvider.java | 7 +-
.../network/VpcVirtualNetworkApplianceService.java | 4 +-
api/src/com/cloud/network/VpnUser.java | 8 +-
api/src/com/cloud/network/as/AutoScalePolicy.java | 7 +-
api/src/com/cloud/network/as/AutoScaleService.java | 56 +-
api/src/com/cloud/network/as/AutoScaleVmGroup.java | 5 +-
.../com/cloud/network/as/AutoScaleVmProfile.java | 43 +-
api/src/com/cloud/network/as/Condition.java | 10 +-
api/src/com/cloud/network/as/Counter.java | 9 +-
api/src/com/cloud/network/element/IpDeployer.java | 3 +
.../network/element/IpDeployingRequester.java | 28 +
.../element/LoadBalancingServiceProvider.java | 5 +-
.../com/cloud/network/element/NetworkElement.java | 40 +-
.../element/PortForwardingServiceProvider.java | 4 +-
.../element/RemoteAccessVPNServiceProvider.java | 2 +-
.../element/Site2SiteVpnServiceProvider.java | 4 +-
.../network/element/SourceNatServiceProvider.java | 5 +-
.../network/element/StaticNatServiceProvider.java | 4 +-
.../element/VirtualRouterElementService.java | 4 +-
api/src/com/cloud/network/element/VpcProvider.java | 8 +-
.../cloud/network/firewall/FirewallService.java | 4 +-
.../cloud/network/firewall/NetworkACLService.java | 6 +-
api/src/com/cloud/network/guru/NetworkGuru.java | 64 +-
.../com/cloud/network/lb/LoadBalancingRule.java | 3 +-
.../network/lb/LoadBalancingRulesService.java | 23 +-
api/src/com/cloud/network/rules/FirewallRule.java | 39 +-
.../cloud/network/rules/LbStickinessMethod.java | 20 +-
api/src/com/cloud/network/rules/LoadBalancer.java | 1 -
.../cloud/network/rules/PortForwardingRule.java | 14 +-
api/src/com/cloud/network/rules/RulesService.java | 8 +-
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 | 74 +-
.../cloud/network/vpn/RemoteAccessVpnService.java | 12 +-
.../com/cloud/network/vpn/Site2SiteVpnService.java | 22 +-
api/src/com/cloud/offering/DiskOffering.java | 9 +-
api/src/com/cloud/offering/NetworkOffering.java | 15 +-
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 | 18 +-
api/src/com/cloud/resource/ResourceService.java | 32 +-
api/src/com/cloud/serializer/Param.java | 2 +-
api/src/com/cloud/server/ManagementService.java | 189 +-
api/src/com/cloud/server/ResourceTag.java | 13 +-
.../com/cloud/server/TaggedResourceService.java | 11 +-
api/src/com/cloud/storage/GuestOS.java | 5 +-
api/src/com/cloud/storage/GuestOsCategory.java | 6 +-
api/src/com/cloud/storage/S3.java | 8 +-
api/src/com/cloud/storage/Snapshot.java | 8 +-
api/src/com/cloud/storage/StoragePool.java | 15 +-
api/src/com/cloud/storage/StorageService.java | 51 +-
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 | 22 +-
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 | 12 +-
api/src/com/cloud/user/AccountService.java | 48 +-
api/src/com/cloud/user/DomainService.java | 8 +-
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 | 6 +-
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 | 77 +-
api/src/com/cloud/vm/VirtualMachine.java | 18 +-
api/src/com/cloud/vm/VirtualMachineProfile.java | 2 +-
api/src/org/apache/cloudstack/acl/APIChecker.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 | 449 +++
.../org/apache/cloudstack/api/BaseAsyncCmd.java | 135 +
.../apache/cloudstack/api/BaseAsyncCreateCmd.java | 65 +
api/src/org/apache/cloudstack/api/BaseCmd.java | 536 ++++
.../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 | 375 +++
.../org/apache/cloudstack/api/ResponseObject.java | 79 +
.../apache/cloudstack/api/ServerApiException.java | 51 +
api/src/org/apache/cloudstack/api/Validate.java | 30 +
.../command/admin/account/CreateAccountCmd.java | 157 +
.../command/admin/account/DeleteAccountCmd.java | 102 +
.../command/admin/account/DisableAccountCmd.java | 126 +
.../command/admin/account/EnableAccountCmd.java | 101 +
.../api/command/admin/account/LockAccountCmd.java | 90 +
.../command/admin/account/UpdateAccountCmd.java | 131 +
.../command/admin/autoscale/CreateCounterCmd.java | 118 +
.../command/admin/autoscale/DeleteCounterCmd.java | 103 +
.../api/command/admin/cluster/AddClusterCmd.java | 178 ++
.../command/admin/cluster/DeleteClusterCmd.java | 76 +
.../api/command/admin/cluster/ListClustersCmd.java | 147 +
.../command/admin/cluster/UpdateClusterCmd.java | 118 +
.../api/command/admin/config/ListCfgsByCmd.java | 95 +
.../config/ListHypervisorCapabilitiesCmd.java | 92 +
.../api/command/admin/config/UpdateCfgCmd.java | 82 +
.../config/UpdateHypervisorCapabilitiesCmd.java | 92 +
.../api/command/admin/domain/CreateDomainCmd.java | 90 +
.../api/command/admin/domain/DeleteDomainCmd.java | 99 +
.../admin/domain/ListDomainChildrenCmd.java | 100 +
.../api/command/admin/domain/ListDomainsCmd.java | 100 +
.../api/command/admin/domain/UpdateDomainCmd.java | 89 +
.../api/command/admin/host/AddHostCmd.java | 163 +
.../command/admin/host/AddSecondaryStorageCmd.java | 94 +
.../command/admin/host/CancelMaintenanceCmd.java | 110 +
.../api/command/admin/host/DeleteHostCmd.java | 90 +
.../api/command/admin/host/ListHostsCmd.java | 198 ++
.../admin/host/PrepareForMaintenanceCmd.java | 110 +
.../api/command/admin/host/ReconnectHostCmd.java | 113 +
.../api/command/admin/host/UpdateHostCmd.java | 114 +
.../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 | 95 +
.../network/AddNetworkServiceProviderCmd.java | 135 +
.../admin/network/CreateNetworkOfferingCmd.java | 231 ++
.../admin/network/CreatePhysicalNetworkCmd.java | 173 ++
.../network/CreateStorageNetworkIpRangeCmd.java | 127 +
.../admin/network/DeleteNetworkDeviceCmd.java | 89 +
.../admin/network/DeleteNetworkOfferingCmd.java | 76 +
.../network/DeleteNetworkServiceProviderCmd.java | 106 +
.../admin/network/DeletePhysicalNetworkCmd.java | 92 +
.../network/DeleteStorageNetworkIpRangeCmd.java | 87 +
.../admin/network/ListNetworkDeviceCmd.java | 99 +
.../network/ListNetworkServiceProvidersCmd.java | 104 +
.../admin/network/ListPhysicalNetworksCmd.java | 106 +
.../network/ListStorageNetworkIpRangeCmd.java | 105 +
.../network/ListSupportedNetworkServicesCmd.java | 115 +
.../admin/network/UpdateNetworkOfferingCmd.java | 108 +
.../network/UpdateNetworkServiceProviderCmd.java | 110 +
.../admin/network/UpdatePhysicalNetworkCmd.java | 118 +
.../network/UpdateStorageNetworkIpRangeCmd.java | 115 +
.../admin/offering/CreateDiskOfferingCmd.java | 121 +
.../admin/offering/CreateServiceOfferingCmd.java | 168 ++
.../admin/offering/DeleteDiskOfferingCmd.java | 76 +
.../admin/offering/DeleteServiceOfferingCmd.java | 74 +
.../admin/offering/UpdateDiskOfferingCmd.java | 97 +
.../admin/offering/UpdateServiceOfferingCmd.java | 95 +
.../api/command/admin/pod/CreatePodCmd.java | 117 +
.../api/command/admin/pod/DeletePodCmd.java | 76 +
.../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 | 126 +
.../router/CreateVirtualRouterElementCmd.java | 109 +
.../api/command/admin/router/DestroyRouterCmd.java | 110 +
.../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 | 115 +
.../api/command/admin/router/UpgradeRouterCmd.java | 87 +
.../api/command/admin/storage/AddS3Cmd.java | 218 ++
.../CancelPrimaryStorageMaintenanceCmd.java | 113 +
.../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 | 111 +
.../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 | 135 +
.../command/admin/systemvm/RebootSystemVmCmd.java | 111 +
.../command/admin/systemvm/StartSystemVMCmd.java | 115 +
.../command/admin/systemvm/StopSystemVmCmd.java | 118 +
.../command/admin/systemvm/UpgradeSystemVMCmd.java | 100 +
.../command/admin/template/PrepareTemplateCmd.java | 89 +
.../api/command/admin/usage/AddTrafficTypeCmd.java | 155 +
.../command/admin/usage/DeleteTrafficTypeCmd.java | 95 +
.../usage/ListTrafficTypeImplementorsCmd.java | 83 +
.../command/admin/usage/ListTrafficTypesCmd.java | 87 +
.../command/admin/usage/UpdateTrafficTypeCmd.java | 116 +
.../api/command/admin/user/CreateUserCmd.java | 143 +
.../api/command/admin/user/DeleteUserCmd.java | 82 +
.../api/command/admin/user/DisableUserCmd.java | 103 +
.../api/command/admin/user/EnableUserCmd.java | 82 +
.../api/command/admin/user/GetUserCmd.java | 76 +
.../api/command/admin/user/ListUsersCmd.java | 86 +
.../api/command/admin/user/LockUserCmd.java | 83 +
.../api/command/admin/user/RegisterCmd.java | 80 +
.../api/command/admin/user/UpdateUserCmd.java | 138 +
.../command/admin/vlan/CreateVlanIpRangeCmd.java | 182 ++
.../command/admin/vlan/DeleteVlanIpRangeCmd.java | 76 +
.../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 | 84 +
.../command/admin/vpc/CreatePrivateGatewayCmd.java | 180 ++
.../command/admin/vpc/CreateVPCOfferingCmd.java | 112 +
.../command/admin/vpc/DeletePrivateGatewayCmd.java | 114 +
.../command/admin/vpc/DeleteVPCOfferingCmd.java | 90 +
.../command/admin/vpc/UpdateVPCOfferingCmd.java | 106 +
.../api/command/admin/zone/CreateZoneCmd.java | 162 +
.../api/command/admin/zone/DeleteZoneCmd.java | 77 +
.../admin/zone/MarkDefaultZoneForAccountCmd.java | 116 +
.../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 | 272 ++
.../user/address/DisassociateIPAddrCmd.java | 138 +
.../user/address/ListPublicIpAddressesCmd.java | 182 ++
.../user/autoscale/CreateAutoScalePolicyCmd.java | 163 +
.../user/autoscale/CreateAutoScaleVmGroupCmd.java | 189 ++
.../autoscale/CreateAutoScaleVmProfileCmd.java | 237 ++
.../command/user/autoscale/CreateConditionCmd.java | 151 +
.../user/autoscale/DeleteAutoScalePolicyCmd.java | 103 +
.../user/autoscale/DeleteAutoScaleVmGroupCmd.java | 103 +
.../autoscale/DeleteAutoScaleVmProfileCmd.java | 102 +
.../command/user/autoscale/DeleteConditionCmd.java | 109 +
.../user/autoscale/DisableAutoScaleVmGroupCmd.java | 101 +
.../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 | 126 +
.../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 | 330 +++
.../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 | 113 +
.../api/command/user/iso/CopyIsoCmd.java | 30 +
.../api/command/user/iso/DeleteIsoCmd.java | 118 +
.../api/command/user/iso/DetachIsoCmd.java | 97 +
.../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 | 78 +
.../command/user/iso/UpdateIsoPermissionsCmd.java | 46 +
.../api/command/user/job/ListAsyncJobsCmd.java | 69 +
.../command/user/job/QueryAsyncJobResultCmd.java | 70 +
.../loadbalancer/AssignToLoadBalancerRuleCmd.java | 122 +
.../loadbalancer/CreateLBStickinessPolicyCmd.java | 160 +
.../loadbalancer/CreateLoadBalancerRuleCmd.java | 382 +++
.../loadbalancer/DeleteLBStickinessPolicyCmd.java | 116 +
.../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 | 316 ++
.../user/nat/DeleteIpForwardingRuleCmd.java | 123 +
.../api/command/user/nat/DisableStaticNatCmd.java | 111 +
.../api/command/user/nat/EnableStaticNatCmd.java | 126 +
.../command/user/nat/ListIpForwardingRulesCmd.java | 102 +
.../command/user/network/CreateNetworkACLCmd.java | 332 +++
.../api/command/user/network/CreateNetworkCmd.java | 239 ++
.../command/user/network/DeleteNetworkACLCmd.java | 122 +
.../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 | 152 +
.../user/offering/ListDiskOfferingsCmd.java | 94 +
.../user/offering/ListServiceOfferingsCmd.java | 118 +
.../command/user/project/ActivateProjectCmd.java | 95 +
.../api/command/user/project/CreateProjectCmd.java | 143 +
.../api/command/user/project/DeleteProjectCmd.java | 99 +
.../user/project/DeleteProjectInvitationCmd.java | 89 +
.../user/project/ListProjectInvitationsCmd.java | 86 +
.../api/command/user/project/ListProjectsCmd.java | 115 +
.../command/user/project/SuspendProjectCmd.java | 97 +
.../api/command/user/project/UpdateProjectCmd.java | 113 +
.../user/project/UpdateProjectInvitationCmd.java | 108 +
.../user/resource/GetCloudIdentifierCmd.java | 81 +
.../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 | 235 ++
.../user/securitygroup/CreateSecurityGroupCmd.java | 122 +
.../user/securitygroup/DeleteSecurityGroupCmd.java | 130 +
.../user/securitygroup/ListSecurityGroupsCmd.java | 85 +
.../RevokeSecurityGroupEgressCmd.java | 104 +
.../RevokeSecurityGroupIngressCmd.java | 108 +
.../command/user/snapshot/CreateSnapshotCmd.java | 188 ++
.../user/snapshot/CreateSnapshotPolicyCmd.java | 132 +
.../command/user/snapshot/DeleteSnapshotCmd.java | 100 +
.../user/snapshot/DeleteSnapshotPoliciesCmd.java | 86 +
.../user/snapshot/ListSnapshotPoliciesCmd.java | 78 +
.../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 | 131 +
.../api/command/user/tag/DeleteTagsCmd.java | 122 +
.../api/command/user/tag/ListTagsCmd.java | 83 +
.../api/command/user/template/CopyTemplateCmd.java | 144 +
.../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 | 243 ++
.../command/user/template/UpdateTemplateCmd.java | 79 +
.../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 | 113 +
.../api/command/user/vm/ResetVMPasswordCmd.java | 122 +
.../api/command/user/vm/RestoreVMCmd.java | 88 +
.../cloudstack/api/command/user/vm/StartVMCmd.java | 142 +
.../cloudstack/api/command/user/vm/StopVMCmd.java | 126 +
.../api/command/user/vm/UpdateVMCmd.java | 132 +
.../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 | 131 +
.../api/command/user/volume/CreateVolumeCmd.java | 185 ++
.../api/command/user/volume/DeleteVolumeCmd.java | 90 +
.../api/command/user/volume/DetachVolumeCmd.java | 138 +
.../api/command/user/volume/ExtractVolumeCmd.java | 158 +
.../api/command/user/volume/ListVolumesCmd.java | 118 +
.../api/command/user/volume/MigrateVolumeCmd.java | 106 +
.../api/command/user/volume/ResizeVolumeCmd.java | 153 +
.../api/command/user/volume/UploadVolumeCmd.java | 144 +
.../api/command/user/vpc/CreateStaticRouteCmd.java | 145 +
.../api/command/user/vpc/CreateVPCCmd.java | 187 ++
.../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 | 108 +
.../api/command/user/vpn/AddVpnUserCmd.java | 152 +
.../command/user/vpn/CreateRemoteAccessVpnCmd.java | 195 ++
.../command/user/vpn/CreateVpnConnectionCmd.java | 137 +
.../user/vpn/CreateVpnCustomerGatewayCmd.java | 166 ++
.../api/command/user/vpn/CreateVpnGatewayCmd.java | 102 +
.../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 | 122 +
.../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 | 95 +
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/AgentControlAnswerTest.java | 35 -
.../agent/api/test/AgentControlCommandTest.java | 33 -
.../src/com/cloud/agent/api/test/AnswerTest.java | 73 -
.../cloud/agent/api/test/AttachIsoCommandTest.java | 80 -
.../agent/api/test/AttachVolumeAnswerTest.java | 65 -
.../agent/api/test/AttachVolumeCommandTest.java | 120 -
.../agent/api/test/BackupSnapshotAnswerTest.java | 75 -
.../agent/api/test/BackupSnapshotCommandTest.java | 271 --
.../agent/api/test/BumpUpPriorityCommandTest.java | 83 -
.../cloud/agent/api/test/CancelCommandTest.java | 46 -
.../agent/api/test/ChangeAgentAnswerTest.java | 44 -
.../agent/api/test/ChangeAgentCommandTest.java | 50 -
.../agent/api/test/CheckHealthAnswerTest.java | 49 -
.../agent/api/test/CheckHealthCommandTest.java | 40 -
.../agent/api/test/CheckNetworkAnswerTest.java | 62 -
.../agent/api/test/CheckNetworkCommandTest.java | 53 -
.../agent/api/test/CheckOnHostCommandTest.java | 477 ---
.../agent/api/test/ResizeVolumeCommandTest.java | 199 ++
.../cloud/agent/api/test/SnapshotCommandTest.java | 197 --
.../api/commands/test/ActivateProjectCmdTest.java | 87 -
.../commands/test/AddAccountToProjectCmdTest.java | 175 --
.../cloud/api/commands/test/AddClusterCmdTest.java | 120 -
.../cloud/api/commands/test/AddHostCmdTest.java | 165 --
.../test/AddNetworkServiceProviderCmdTest.java | 122 -
.../commands/test/AddSecondaryStorageCmdTest.java | 124 -
.../cloud/api/commands/test/AddSwiftCmdTest.java | 97 -
.../cloud/api/commands/test/AddVpnUserCmdTest.java | 148 -
awsapi/pom.xml | 1 +
client/bindir/cloud-setup-management.in | 10 +-
.../ubuntu/SYSCONFDIR/init.d/cloud-management.in | 5 +
client/pom.xml | 11 +
.../cisconexusvsm_commands.properties.in | 25 -
client/tomcatconf/commands-ext.properties.in | 35 -
client/tomcatconf/commands.properties.in | 669 +++--
client/tomcatconf/components.xml.in | 6 +-
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.in | 4 +-
client/tomcatconf/server-ssl.xml.in | 2 +-
client/tomcatconf/server.xml.in | 4 +-
client/tomcatconf/simulator_commands.properties.in | 19 -
.../virtualrouter_commands.properties.in | 24 -
core/src/com/cloud/alert/AlertVO.java | 5 +-
core/src/com/cloud/async/AsyncJobVO.java | 33 +-
core/src/com/cloud/async/SyncQueueItemVO.java | 6 +-
core/src/com/cloud/async/SyncQueueVO.java | 6 +-
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/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 | 5 +-
core/src/com/cloud/storage/SnapshotPolicyVO.java | 31 +-
core/src/com/cloud/storage/SnapshotScheduleVO.java | 31 +-
core/src/com/cloud/storage/SnapshotVO.java | 61 +-
.../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 | 3 +-
.../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 | 1 -
.../cloud/storage/snapshot/SnapshotSchedule.java | 18 +-
core/src/com/cloud/user/AccountVO.java | 45 +-
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 +-
developer/developer-prefill.sql | 20 +-
developer/pom.xml | 1 +
docs/en-US/accessing-vms.xml | 2 +-
docs/en-US/added-error-codes.xml | 2 +-
docs/en-US/autoscale.xml | 284 ++
docs/en-US/aws-api-examples.xml | 145 +
docs/en-US/aws-ec2-configuration.xml | 104 +-
docs/en-US/aws-ec2-introduction.xml | 13 +-
docs/en-US/aws-ec2-requirements.xml | 9 +-
docs/en-US/aws-ec2-supported-commands.xml | 2 +-
docs/en-US/aws-ec2-timeouts.xml | 5 +-
docs/en-US/aws-ec2-user-setup.xml | 108 +-
docs/en-US/aws-interface-compatibility.xml | 3 +-
docs/en-US/build-deb.xml | 2 +-
docs/en-US/building-marvin.xml | 46 +
docs/en-US/configure-snmp-rhel.xml | 86 +
.../external-firewalls-and-load-balancers.xml | 43 +-
docs/en-US/images/compute-service-offerings.png | Bin 0 -> 75482 bytes
docs/en-US/images/view-console-button.png | Bin 0 -> 59996 bytes
docs/en-US/marvin.xml | 1 +
...guration-of-external-firewalls-loadbalancer.xml | 46 +
docs/en-US/system-service-offerings.xml | 1 +
packaging/centos63/cloud-agent.rc | 121 +
packaging/centos63/cloud.spec | 36 +-
plugins/acl/static-role-based/pom.xml | 32 +
.../acl/StaticRoleBasedAPIAccessChecker.java | 100 +
plugins/api/discovery/pom.xml | 44 +
.../api/command/user/discovery/ListApisCmd.java | 68 +
.../api/response/ApiDiscoveryResponse.java | 95 +
.../api/response/ApiParameterResponse.java | 81 +
.../api/response/ApiResponseResponse.java | 45 +
.../cloudstack/discovery/ApiDiscoveryService.java | 26 +
.../discovery/ApiDiscoveryServiceImpl.java | 217 ++
.../cloud/api/commands/netapp/AssociateLunCmd.java | 12 +-
.../cloud/api/commands/netapp/CreateLunCmd.java | 12 +-
.../commands/netapp/CreateVolumeOnFilerCmd.java | 12 +-
.../api/commands/netapp/CreateVolumePoolCmd.java | 12 +-
.../api/commands/netapp/DeleteVolumePoolCmd.java | 12 +-
.../cloud/api/commands/netapp/DestroyLunCmd.java | 13 +-
.../commands/netapp/DestroyVolumeOnFilerCmd.java | 9 +-
.../api/commands/netapp/DissociateLunCmd.java | 9 +-
.../com/cloud/api/commands/netapp/ListLunsCmd.java | 14 +-
.../api/commands/netapp/ListVolumePoolsCmd.java | 10 +-
.../api/commands/netapp/ListVolumesOnFilerCmd.java | 11 +-
.../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/hypervisors/kvm/pom.xml | 18 +
.../hypervisor/kvm/resource/KVMGuestOsMapper.java | 2 +
.../kvm/resource/LibvirtComputingResource.java | 82 +-
plugins/hypervisors/simulator/pom.xml | 3 +-
.../cloud/agent/manager/SimulatorManagerImpl.java | 65 +-
.../com/cloud/api/commands/ConfigureSimulator.java | 14 +-
.../server/ManagementServerSimulatorImpl.java | 19 +-
.../com/cloud/simulator/MockConfigurationVO.java | 4 +-
.../src/com/cloud/simulator/MockHostVO.java | 4 +-
.../src/com/cloud/simulator/MockSecStorageVO.java | 4 +-
.../com/cloud/simulator/MockSecurityRulesVO.java | 4 +-
.../src/com/cloud/simulator/MockStoragePoolVO.java | 3 +-
.../src/com/cloud/simulator/MockVMVO.java | 3 +-
.../src/com/cloud/simulator/MockVolumeVO.java | 3 +-
.../cloud/simulator/SimulatorRuntimeException.java | 4 +-
.../cloud/api/commands/DeleteCiscoNexusVSMCmd.java | 23 +-
.../api/commands/DisableCiscoNexusVSMCmd.java | 19 +-
.../cloud/api/commands/EnableCiscoNexusVSMCmd.java | 15 +-
.../cloud/api/commands/ListCiscoNexusVSMsCmd.java | 27 +-
.../cloud/api/response/CiscoNexusVSMResponse.java | 50 +-
.../hypervisor/vmware/resource/VmwareResource.java | 49 +-
.../src/com/cloud/network/CiscoNexusVSMDevice.java | 39 +-
.../network/CiscoNexusVSMDeviceManagerImpl.java | 99 +-
.../com/cloud/network/CiscoNexusVSMDeviceVO.java | 13 +-
.../network/element/CiscoNexusVSMElement.java | 65 +-
.../xen/resource/CitrixResourceBase.java | 28 +-
plugins/network-elements/dns-notifier/pom.xml | 3 +-
.../dns-notifier/resources/components-example.xml | 2 +-
.../src/com/cloud/network/ElasticLbVmMapVO.java | 5 +-
.../network/lb/ElasticLoadBalancerManager.java | 2 +-
.../network/lb/ElasticLoadBalancerManagerImpl.java | 4 +-
.../api/commands/AddExternalLoadBalancerCmd.java | 22 +-
.../cloud/api/commands/AddF5LoadBalancerCmd.java | 17 +-
.../api/commands/ConfigureF5LoadBalancerCmd.java | 16 +-
.../commands/DeleteExternalLoadBalancerCmd.java | 18 +-
.../api/commands/DeleteF5LoadBalancerCmd.java | 24 +-
.../api/commands/ListExternalLoadBalancersCmd.java | 21 +-
.../commands/ListF5LoadBalancerNetworksCmd.java | 26 +-
.../cloud/api/commands/ListF5LoadBalancersCmd.java | 23 +-
.../cloud/api/response/F5LoadBalancerResponse.java | 34 +-
.../element/F5ExternalLoadBalancerElement.java | 49 +-
.../F5ExternalLoadBalancerElementService.java | 2 +-
.../cloud/network/resource/F5BigIpResource.java | 94 +-
.../cloud/api/commands/AddExternalFirewallCmd.java | 22 +-
.../com/cloud/api/commands/AddSrxFirewallCmd.java | 22 +-
.../api/commands/ConfigureSrxFirewallCmd.java | 21 +-
.../api/commands/DeleteExternalFirewallCmd.java | 22 +-
.../cloud/api/commands/DeleteSrxFirewallCmd.java | 24 +-
.../api/commands/ListExternalFirewallsCmd.java | 23 +-
.../api/commands/ListSrxFirewallNetworksCmd.java | 21 +-
.../cloud/api/commands/ListSrxFirewallsCmd.java | 23 +-
.../cloud/api/response/SrxFirewallResponse.java | 27 +-
.../element/JuniperSRXExternalFirewallElement.java | 54 +-
.../element/JuniperSRXFirewallElementService.java | 2 +-
.../cloud/network/resource/JuniperSrxResource.java | 239 ++-
.../network/element/MidokuraMidonetElement.java | 9 +-
.../api/commands/AddNetscalerLoadBalancerCmd.java | 17 +-
.../ConfigureNetscalerLoadBalancerCmd.java | 22 +-
.../commands/DeleteNetscalerLoadBalancerCmd.java | 24 +-
.../ListNetscalerLoadBalancerNetworksCmd.java | 26 +-
.../commands/ListNetscalerLoadBalancersCmd.java | 28 +-
.../response/NetscalerLoadBalancerResponse.java | 38 +-
.../src/com/cloud/network/NetScalerPodVO.java | 4 +-
.../cloud/network/element/NetscalerElement.java | 68 +-
.../cloud/network/resource/NetscalerResource.java | 2 +-
.../cloud/api/commands/AddNiciraNvpDeviceCmd.java | 20 +-
.../api/commands/DeleteNiciraNvpDeviceCmd.java | 24 +-
.../commands/ListNiciraNvpDeviceNetworksCmd.java | 28 +-
.../api/commands/ListNiciraNvpDevicesCmd.java | 28 +-
.../api/response/NiciraNvpDeviceResponse.java | 43 +-
.../src/com/cloud/network/NiciraNvpDeviceVO.java | 4 +-
.../com/cloud/network/NiciraNvpNicMappingVO.java | 4 +-
.../cloud/network/NiciraNvpRouterMappingVO.java | 4 +-
.../cloud/network/element/NiciraNvpElement.java | 80 +-
.../network/ovs/dao/OvsTunnelInterfaceVO.java | 4 +-
.../cloud/network/ovs/dao/OvsTunnelNetworkVO.java | 4 +-
plugins/pom.xml | 2 +
.../cloud/server/auth/LDAPUserAuthenticator.java | 6 +-
pom.xml | 6 +-
python/lib/cloudutils/utilities.py | 6 +-
.../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/resizevolume.sh | 253 ++
server/pom.xml | 7 +
server/src/com/cloud/acl/DomainChecker.java | 299 +-
.../agent/manager/ClusteredAgentManagerImpl.java | 125 +-
server/src/com/cloud/alert/AlertManagerImpl.java | 1 -
server/src/com/cloud/api/ApiDBUtils.java | 544 ++++-
server/src/com/cloud/api/ApiDispatcher.java | 445 ++-
server/src/com/cloud/api/ApiGsonHelper.java | 4 +-
.../src/com/cloud/api/ApiResponseGsonHelper.java | 5 +-
server/src/com/cloud/api/ApiResponseHelper.java | 2273 +++++----------
server/src/com/cloud/api/ApiSerializerHelper.java | 1 +
server/src/com/cloud/api/ApiServer.java | 462 ++--
server/src/com/cloud/api/ApiServlet.java | 46 +-
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 | 23 +-
.../cloud/api/commands/DeleteNetworkDeviceCmd.java | 90 -
.../api/commands/DeleteTrafficMonitorCmd.java | 20 +-
.../api/commands/GenerateUsageRecordsCmd.java | 17 +-
.../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 | 108 +-
.../src/com/cloud/api/query/QueryManagerImpl.java | 1892 ++++++++++++
.../com/cloud/api/query/ViewResponseHelper.java | 277 ++
.../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/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 ++
.../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/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 +++
.../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 | 96 +-
.../api/response/SecurityGroupResultObject.java | 7 +-
server/src/com/cloud/async/AsyncCommandQueued.java | 4 +-
server/src/com/cloud/async/AsyncJobManager.java | 2 +-
.../src/com/cloud/async/AsyncJobManagerImpl.java | 430 ++--
.../com/cloud/baremetal/BareMetalDiscoverer.java | 2 +-
.../com/cloud/baremetal/BareMetalResourceBase.java | 2 +-
.../cloud/baremetal/BareMetalTemplateAdapter.java | 6 +-
.../cloud/baremetal/BareMetalVmManagerImpl.java | 12 +-
.../com/cloud/baremetal/DhcpServerResponse.java | 19 +-
.../cloud/baremetal/ExternalDhcpManagerImpl.java | 40 +-
.../com/cloud/baremetal/PxeServerManagerImpl.java | 12 +-
.../src/com/cloud/baremetal/PxeServerResponse.java | 19 +-
server/src/com/cloud/cluster/CheckPointVO.java | 3 +-
.../cloud/cluster/ManagementServerHostPeerVO.java | 3 +-
.../com/cloud/cluster/ManagementServerHostVO.java | 3 +-
.../cloud/cluster/agentlb/HostTransferMapVO.java | 3 +-
server/src/com/cloud/configuration/Config.java | 102 +-
.../configuration/ConfigurationManagerImpl.java | 151 +-
.../configuration/DefaultComponentLibrary.java | 37 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 37 +-
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/deploy/FirstFitPlanner.java | 2 -
server/src/com/cloud/domain/DomainVO.java | 59 +-
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 +-
server/src/com/cloud/host/dao/HostDaoImpl.java | 2 +-
.../com/cloud/hypervisor/HypervisorGuruBase.java | 1 +
server/src/com/cloud/keystore/KeystoreVO.java | 6 +-
server/src/com/cloud/maint/AgentUpgradeVO.java | 4 +-
.../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 | 260 ++-
.../cloud/network/ExternalFirewallDeviceVO.java | 5 +-
.../ExternalLoadBalancerDeviceManagerImpl.java | 336 ++-
.../network/ExternalLoadBalancerDeviceVO.java | 24 +-
.../network/ExternalNetworkDeviceManager.java | 77 -
.../network/ExternalNetworkDeviceManagerImpl.java | 59 +-
.../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 | 15 +-
.../src/com/cloud/network/NetworkManagerImpl.java | 421 ++--
.../src/com/cloud/network/NetworkRuleConfigVO.java | 5 +-
.../src/com/cloud/network/NetworkServiceMapVO.java | 3 +-
.../src/com/cloud/network/NetworkUsageManager.java | 2 +-
.../com/cloud/network/NetworkUsageManagerImpl.java | 16 +-
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 +-
.../com/cloud/network/as/AutoScaleManagerImpl.java | 37 +-
.../network/as/AutoScalePolicyConditionMapVO.java | 36 +-
.../com/cloud/network/as/AutoScalePolicyVO.java | 35 +-
.../network/as/AutoScaleVmGroupPolicyMapVO.java | 36 +-
.../com/cloud/network/as/AutoScaleVmGroupVO.java | 35 +-
.../com/cloud/network/as/AutoScaleVmProfileVO.java | 37 +-
server/src/com/cloud/network/as/ConditionVO.java | 5 +-
server/src/com/cloud/network/as/CounterVO.java | 5 +-
.../com/cloud/network/dao/FirewallRulesDao.java | 4 +-
.../cloud/network/dao/FirewallRulesDaoImpl.java | 15 +
server/src/com/cloud/network/dao/NetworkDao.java | 1 +
.../src/com/cloud/network/dao/NetworkDaoImpl.java | 11 +-
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/PhysicalNetworkTrafficTypeVO.java | 1 +
.../network/element/VirtualRouterElement.java | 14 +-
.../network/element/VirtualRouterProviderVO.java | 1 +
.../network/firewall/FirewallManagerImpl.java | 3 +-
.../network/lb/LoadBalancingRulesManager.java | 2 +-
.../network/lb/LoadBalancingRulesManagerImpl.java | 28 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 170 +-
.../com/cloud/network/rules/FirewallRuleVO.java | 81 +-
.../com/cloud/network/rules/RulesManagerImpl.java | 17 +-
.../com/cloud/network/rules/StaticNatRuleImpl.java | 28 +-
.../network/security/SecurityGroupManagerImpl.java | 147 +-
.../security/dao/SecurityGroupVMMapDao.java | 3 +
.../security/dao/SecurityGroupVMMapDaoImpl.java | 9 +
.../cloud/network/vpc/NetworkACLManagerImpl.java | 5 +-
.../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 | 2 +-
.../src/com/cloud/network/vpc/VpcManagerImpl.java | 10 +-
.../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 | 4 +-
.../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 22 +-
.../offerings/NetworkOfferingServiceMapVO.java | 3 +-
.../src/com/cloud/offerings/NetworkOfferingVO.java | 30 +-
.../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 | 626 ++---
server/src/com/cloud/projects/ProjectVO.java | 5 +-
.../com/cloud/resource/ResourceManagerImpl.java | 74 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 32 +-
.../src/com/cloud/secstorage/CommandExecLogVO.java | 3 +-
.../com/cloud/server/ConfigurationServerImpl.java | 38 +-
server/src/com/cloud/server/ManagementServer.java | 5 +-
.../src/com/cloud/server/ManagementServerExt.java | 2 +-
.../com/cloud/server/ManagementServerExtImpl.java | 8 +-
.../src/com/cloud/server/ManagementServerImpl.java | 1059 +++-----
.../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 +-
.../src/com/cloud/servlet/CloudStartupServlet.java | 2 +-
.../src/com/cloud/servlet/ConsoleProxyServlet.java | 2 +-
server/src/com/cloud/storage/StorageManager.java | 36 +-
.../src/com/cloud/storage/StorageManagerImpl.java | 453 ++--
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 20 +-
server/src/com/cloud/storage/s3/S3Manager.java | 4 +-
server/src/com/cloud/storage/s3/S3ManagerImpl.java | 4 +-
.../storage/snapshot/SnapshotManagerImpl.java | 8 +-
.../storage/snapshot/SnapshotSchedulerImpl.java | 5 +-
.../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 | 158 +-
.../cloud/template/HyervisorTemplateAdapter.java | 8 +-
server/src/com/cloud/template/TemplateAdapter.java | 8 +-
.../com/cloud/template/TemplateAdapterBase.java | 10 +-
.../com/cloud/template/TemplateManagerImpl.java | 25 +-
.../src/com/cloud/upgrade/dao/Upgrade40to41.java | 41 +-
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 | 361 +--
server/src/com/cloud/user/DomainManagerImpl.java | 9 +-
.../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 | 3 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 286 +--
.../com/cloud/vm/VirtualMachineManagerImpl.java | 2 +-
server/src/com/cloud/vm/dao/NicDao.java | 2 -
server/src/com/cloud/vm/dao/NicDaoImpl.java | 8 -
server/src/com/cloud/vm/dao/UserVmData.java | 2 +-
server/test/com/cloud/api/APITest.java | 189 ++
server/test/com/cloud/api/ListPerfTest.java | 168 ++
server/test/com/cloud/api/LoginResponse.java | 142 +
server/test/com/cloud/keystore/KeystoreTest.java | 72 +-
.../com/cloud/network/MockNetworkManagerImpl.java | 69 +-
.../security/SecurityGroupManagerImpl2Test.java | 2 +
.../com/cloud/projects/MockProjectManagerImpl.java | 33 +-
.../com/cloud/user/MockAccountManagerImpl.java | 51 +-
.../test/com/cloud/user/MockDomainManagerImpl.java | 10 +-
.../test/com/cloud/vm/MockUserVmManagerImpl.java | 44 +-
.../cloud/vpc/MockConfigurationManagerImpl.java | 78 +-
.../test/com/cloud/vpc/MockNetworkManagerImpl.java | 51 +-
.../cloud/vpc/MockResourceLimitManagerImpl.java | 13 +-
.../com/cloud/vpc/MockSite2SiteVpnManagerImpl.java | 43 +-
server/test/com/cloud/vpc/MockVpcManagerImpl.java | 12 +-
.../test/com/cloud/vpc/dao/MockNetworkDaoImpl.java | 6 +
setup/bindir/cloud-setup-databases.in | 4 +-
setup/db/create-schema-view.sql | 821 ++++++
setup/db/create-schema.sql | 18 +-
setup/db/db/schema-40to410.sql | 881 ++++++-
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 | 8 +-
setup/db/templates.sql | 391 ++--
setup/db/templates.vmware.sql | 146 +-
setup/db/templates.xenserver.sql | 162 +-
test/integration/smoke/test_iso.py | 8 +-
test/integration/smoke/test_routers.py | 2 +-
test/integration/smoke/test_service_offerings.py | 2 +-
test/integration/smoke/test_templates.py | 2 +-
test/integration/smoke/test_vm_life_cycle.py | 8 +-
test/integration/smoke/test_volumes.py | 127 +-
tools/apidoc/gen_toc.py | 3 +-
tools/apidoc/pom.xml | 2 +-
tools/cli/cloudmonkey/cloudmonkey.py | 69 +-
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/devcloud-advanced.cfg | 135 +
tools/devcloud/devcloud-advanced_internal-mgt.cfg | 141 +
tools/devcloud/devcloud.cfg | 18 +
tools/marvin/marvin/configGenerator.py | 3 +-
tools/marvin/marvin/deployDataCenter.py | 10 +-
tools/marvin/marvin/integration/lib/base.py | 9 +
.../marvin/marvin/sandbox/advanced/advanced_env.py | 18 +-
.../marvin/sandbox/advanced/setup.properties | 16 +-
ui/css/cloudstack3.css | 6 -
ui/scripts/accounts.js | 2 +
ui/scripts/instanceWizard.js | 5 +-
ui/scripts/network.js | 14 +-
ui/scripts/sharedFunctions.js | 3 +-
ui/scripts/system.js | 1 +
ui/scripts/ui/widgets/listView.js | 4 +-
utils/pom.xml | 11 +
utils/src/com/cloud/utils/IdentityProxy.java | 60 -
utils/src/com/cloud/utils/PropertiesUtil.java | 40 +
utils/src/com/cloud/utils/ReflectUtil.java | 63 +
.../cloud/utils/component/PluggableService.java | 16 +-
utils/src/com/cloud/utils/db/GenericDao.java | 3 +
utils/src/com/cloud/utils/db/GenericDaoBase.java | 21 +-
.../utils/exception/CSExceptionErrorCode.java | 217 +-
.../utils/exception/CloudRuntimeException.java | 48 +-
.../HypervisorVersionChangedException.java | 4 +-
.../utils/exception/RuntimeCloudException.java | 76 -
utils/src/com/cloud/utils/script/Script.java | 7 +-
.../utils/log/CglibThrowableRendererTest.java | 38 +-
.../src/com/cloud/hypervisor/vmware/mo/HostMO.java | 13 +-
1781 files changed, 83768 insertions(+), 65092 deletions(-)
----------------------------------------------------------------------