You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2012/12/04 11:02:56 UTC
[25/55] [abbrv] git commit: api_refactor: refactor project apis
api_refactor: refactor project apis
- Fix refactored apis in commands*.in
- Fix comments etc.
- Expand tabs, remove trailing whitespace
- Fix trailing whitespaces for all *.java
Signed-off-by: Rohit Yadav <bh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5e0501d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5e0501d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5e0501d1
Branch: refs/heads/api_refactoring
Commit: 5e0501d116e03d69fa4f50dcfae0f618730b4984
Parents: ac1ea76
Author: Rohit Yadav <bh...@apache.org>
Authored: Mon Dec 3 22:06:41 2012 -0800
Committer: Rohit Yadav <bh...@apache.org>
Committed: Mon Dec 3 22:10:32 2012 -0800
----------------------------------------------------------------------
api/src/com/cloud/acl/APIAccessChecker.java | 28 +-
api/src/com/cloud/acl/ControlledEntity.java | 2 +-
api/src/com/cloud/acl/Role.java | 40 +-
api/src/com/cloud/acl/SecurityChecker.java | 8 +-
.../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 | 20 +-
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 | 18 +-
.../cloud/agent/api/CreateStoragePoolCommand.java | 4 +-
.../agent/api/CreateVolumeFromSnapshotAnswer.java | 6 +-
.../agent/api/CreateVolumeFromSnapshotCommand.java | 14 +-
.../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/SnapshotCommand.java | 2 +-
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 | 8 +-
...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 | 44 +-
.../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 | 20 +-
.../com/cloud/agent/api/storage/UploadAnswer.java | 26 +-
.../com/cloud/agent/api/storage/UploadCommand.java | 12 +-
.../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 | 42 +-
api/src/com/cloud/agent/api/to/HostTO.java | 4 +-
api/src/com/cloud/agent/api/to/NetworkACLTO.java | 30 +-
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 | 14 +-
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 | 6 +-
.../com/cloud/agent/api/to/VirtualMachineTO.java | 14 +-
...TemplateToSwiftFromSecondaryStorageCommand.java | 10 +-
api/src/com/cloud/api/commands/.gitignore | 4 +-
.../com/cloud/api/commands/ActivateProjectCmd.java | 100 ----
.../cloud/api/commands/AddAccountToProjectCmd.java | 28 +-
api/src/com/cloud/api/commands/AddClusterCmd.java | 362 +++++++-------
api/src/com/cloud/api/commands/AddHostCmd.java | 28 +-
.../api/commands/AddNetworkServiceProviderCmd.java | 18 +-
.../cloud/api/commands/AddSecondaryStorageCmd.java | 8 +-
api/src/com/cloud/api/commands/AddSwiftCmd.java | 8 +-
.../com/cloud/api/commands/AddTrafficTypeCmd.java | 30 +-
api/src/com/cloud/api/commands/AddVpnUserCmd.java | 86 ++--
.../api/commands/AssignToLoadBalancerRuleCmd.java | 12 +-
.../com/cloud/api/commands/AssociateIPAddrCmd.java | 74 ++--
api/src/com/cloud/api/commands/AttachIsoCmd.java | 12 +-
.../com/cloud/api/commands/AttachVolumeCmd.java | 34 +-
.../commands/AuthorizeSecurityGroupEgressCmd.java | 18 +-
.../commands/AuthorizeSecurityGroupIngressCmd.java | 20 +-
.../cloud/api/commands/CancelMaintenanceCmd.java | 14 +-
.../CancelPrimaryStorageMaintenanceCmd.java | 14 +-
.../commands/ConfigureVirtualRouterElementCmd.java | 20 +-
.../com/cloud/api/commands/CopyTemplateCmd.java | 20 +-
.../com/cloud/api/commands/CreateAccountCmd.java | 30 +-
.../cloud/api/commands/CreateDiskOfferingCmd.java | 16 +-
.../com/cloud/api/commands/CreateDomainCmd.java | 6 +-
.../cloud/api/commands/CreateFirewallRuleCmd.java | 54 ++--
.../api/commands/CreateIpForwardingRuleCmd.java | 74 ++--
.../api/commands/CreateLBStickinessPolicyCmd.java | 8 +-
.../api/commands/CreateLoadBalancerRuleCmd.java | 116 +++---
.../cloud/api/commands/CreateNetworkACLCmd.java | 44 +-
.../com/cloud/api/commands/CreateNetworkCmd.java | 72 ++--
.../api/commands/CreateNetworkOfferingCmd.java | 60 ++--
.../api/commands/CreatePhysicalNetworkCmd.java | 32 +-
api/src/com/cloud/api/commands/CreatePodCmd.java | 16 +-
.../api/commands/CreatePortForwardingRuleCmd.java | 70 ++--
.../api/commands/CreatePrivateGatewayCmd.java | 38 +-
.../api/commands/CreatePrivateNetworkCmd.java | 40 +-
.../com/cloud/api/commands/CreateProjectCmd.java | 149 ------
.../cloud/api/commands/CreateSSHKeyPairCmd.java | 70 ++--
.../api/commands/CreateServiceOfferingCmd.java | 28 +-
.../com/cloud/api/commands/CreateSnapshotCmd.java | 24 +-
.../api/commands/CreateSnapshotPolicyCmd.java | 24 +-
.../commands/CreateStorageNetworkIpRangeCmd.java | 96 ++--
.../cloud/api/commands/CreateStoragePoolCmd.java | 4 +-
api/src/com/cloud/api/commands/CreateTagsCmd.java | 24 +-
.../com/cloud/api/commands/CreateTemplateCmd.java | 38 +-
api/src/com/cloud/api/commands/CreateUserCmd.java | 6 +-
.../cloud/api/commands/CreateVPCOfferingCmd.java | 16 +-
.../commands/CreateVirtualRouterElementCmd.java | 14 +-
.../cloud/api/commands/CreateVlanIpRangeCmd.java | 18 +-
.../com/cloud/api/commands/CreateVolumeCmd.java | 28 +-
api/src/com/cloud/api/commands/CreateZoneCmd.java | 28 +-
.../com/cloud/api/commands/DeleteAccountCmd.java | 20 +-
.../api/commands/DeleteAccountFromProjectCmd.java | 21 +-
.../com/cloud/api/commands/DeleteClusterCmd.java | 4 +-
.../cloud/api/commands/DeleteDiskOfferingCmd.java | 4 +-
.../com/cloud/api/commands/DeleteDomainCmd.java | 2 +-
.../cloud/api/commands/DeleteFirewallRuleCmd.java | 16 +-
api/src/com/cloud/api/commands/DeleteHostCmd.java | 6 +-
.../api/commands/DeleteIpForwardingRuleCmd.java | 10 +-
api/src/com/cloud/api/commands/DeleteIsoCmd.java | 16 +-
.../api/commands/DeleteLBStickinessPolicyCmd.java | 4 +-
.../api/commands/DeleteLoadBalancerRuleCmd.java | 16 +-
.../cloud/api/commands/DeleteNetworkACLCmd.java | 16 +-
.../com/cloud/api/commands/DeleteNetworkCmd.java | 12 +-
.../api/commands/DeleteNetworkOfferingCmd.java | 4 +-
.../commands/DeleteNetworkServiceProviderCmd.java | 8 +-
.../api/commands/DeletePhysicalNetworkCmd.java | 6 +-
api/src/com/cloud/api/commands/DeletePodCmd.java | 2 +-
api/src/com/cloud/api/commands/DeletePoolCmd.java | 4 +-
.../api/commands/DeletePortForwardingRuleCmd.java | 18 +-
.../api/commands/DeletePrivateGatewayCmd.java | 20 +-
.../com/cloud/api/commands/DeleteProjectCmd.java | 99 ----
.../api/commands/DeleteProjectInvitationCmd.java | 89 ----
.../cloud/api/commands/DeleteSSHKeyPairCmd.java | 66 ++--
.../cloud/api/commands/DeleteSecurityGroupCmd.java | 18 +-
.../api/commands/DeleteServiceOfferingCmd.java | 4 +-
.../com/cloud/api/commands/DeleteSnapshotCmd.java | 8 +-
.../api/commands/DeleteSnapshotPoliciesCmd.java | 4 +-
.../commands/DeleteStorageNetworkIpRangeCmd.java | 64 ++--
api/src/com/cloud/api/commands/DeleteTagsCmd.java | 18 +-
.../com/cloud/api/commands/DeleteTemplateCmd.java | 16 +-
.../cloud/api/commands/DeleteTrafficTypeCmd.java | 12 +-
api/src/com/cloud/api/commands/DeleteUserCmd.java | 6 +-
.../com/cloud/api/commands/DeleteVMGroupCmd.java | 4 +-
.../cloud/api/commands/DeleteVPCOfferingCmd.java | 10 +-
.../cloud/api/commands/DeleteVlanIpRangeCmd.java | 8 +-
.../com/cloud/api/commands/DeleteVolumeCmd.java | 8 +-
api/src/com/cloud/api/commands/DeleteZoneCmd.java | 6 +-
.../cloud/api/commands/DestroyConsoleProxyCmd.java | 6 +-
.../com/cloud/api/commands/DestroySystemVmCmd.java | 16 +-
api/src/com/cloud/api/commands/DetachIsoCmd.java | 8 +-
.../com/cloud/api/commands/DetachVolumeCmd.java | 16 +-
.../com/cloud/api/commands/DisableAccountCmd.java | 20 +-
.../cloud/api/commands/DisableStaticNatCmd.java | 16 +-
api/src/com/cloud/api/commands/DisableUserCmd.java | 8 +-
.../cloud/api/commands/DisassociateIPAddrCmd.java | 18 +-
.../com/cloud/api/commands/EnableAccountCmd.java | 6 +-
.../com/cloud/api/commands/EnableStaticNatCmd.java | 20 +-
api/src/com/cloud/api/commands/EnableUserCmd.java | 6 +-
api/src/com/cloud/api/commands/ExtractIsoCmd.java | 16 +-
.../com/cloud/api/commands/ExtractTemplateCmd.java | 30 +-
.../com/cloud/api/commands/ExtractVolumeCmd.java | 28 +-
.../cloud/api/commands/GetCloudIdentifierCmd.java | 8 +-
api/src/com/cloud/api/commands/GetUserCmd.java | 26 +-
api/src/com/cloud/api/commands/LDAPConfigCmd.java | 12 +-
api/src/com/cloud/api/commands/LDAPRemoveCmd.java | 10 +-
.../com/cloud/api/commands/ListAccountsCmd.java | 8 +-
.../cloud/api/commands/ListCapabilitiesCmd.java | 6 +-
.../com/cloud/api/commands/ListCapacityCmd.java | 50 +-
.../com/cloud/api/commands/ListClustersCmd.java | 26 +-
.../cloud/api/commands/ListDomainChildrenCmd.java | 12 +-
api/src/com/cloud/api/commands/ListDomainsCmd.java | 8 +-
api/src/com/cloud/api/commands/ListEventsCmd.java | 4 +-
.../cloud/api/commands/ListFirewallRulesCmd.java | 12 +-
.../api/commands/ListGuestOsCategoriesCmd.java | 4 +-
api/src/com/cloud/api/commands/ListGuestOsCmd.java | 6 +-
api/src/com/cloud/api/commands/ListHostsCmd.java | 36 +-
.../api/commands/ListIpForwardingRulesCmd.java | 20 +-
.../cloud/api/commands/ListIsoPermissionsCmd.java | 8 +-
api/src/com/cloud/api/commands/ListIsosCmd.java | 30 +-
.../api/commands/ListLBStickinessPoliciesCmd.java | 14 +-
.../commands/ListLoadBalancerRuleInstancesCmd.java | 4 +-
.../api/commands/ListLoadBalancerRulesCmd.java | 2 +-
.../com/cloud/api/commands/ListNetworkACLsCmd.java | 16 +-
.../api/commands/ListNetworkOfferingsCmd.java | 54 ++--
.../commands/ListNetworkServiceProvidersCmd.java | 24 +-
.../com/cloud/api/commands/ListNetworksCmd.java | 52 +-
.../api/commands/ListPhysicalNetworksCmd.java | 16 +-
api/src/com/cloud/api/commands/ListPodsByCmd.java | 20 +-
.../api/commands/ListPortForwardingRulesCmd.java | 14 +-
.../cloud/api/commands/ListProjectAccountsCmd.java | 12 +-
.../api/commands/ListProjectInvitationsCmd.java | 101 ----
.../com/cloud/api/commands/ListProjectsCmd.java | 124 -----
.../api/commands/ListPublicIpAddressesCmd.java | 44 +-
.../commands/ListRecurringSnapshotScheduleCmd.java | 2 +-
.../cloud/api/commands/ListResourceLimitsCmd.java | 16 +-
api/src/com/cloud/api/commands/ListRoutersCmd.java | 20 +-
.../com/cloud/api/commands/ListSSHKeyPairsCmd.java | 72 ++--
.../cloud/api/commands/ListSecurityGroupsCmd.java | 10 +-
.../api/commands/ListServiceOfferingsCmd.java | 12 +-
.../api/commands/ListSnapshotPoliciesCmd.java | 2 +-
.../com/cloud/api/commands/ListSnapshotsCmd.java | 10 +-
.../cloud/api/commands/ListStoragePoolsCmd.java | 8 +-
.../commands/ListSupportedNetworkServicesCmd.java | 22 +-
api/src/com/cloud/api/commands/ListSwiftsCmd.java | 8 +-
.../com/cloud/api/commands/ListSystemVMsCmd.java | 10 +-
api/src/com/cloud/api/commands/ListTagsCmd.java | 20 +-
.../commands/ListTemplateOrIsoPermissionsCmd.java | 18 +-
.../api/commands/ListTemplatePermissionsCmd.java | 8 +-
.../com/cloud/api/commands/ListTemplatesCmd.java | 18 +-
.../commands/ListTrafficTypeImplementorsCmd.java | 62 ++--
.../cloud/api/commands/ListTrafficTypesCmd.java | 6 +-
api/src/com/cloud/api/commands/ListUsersCmd.java | 4 +-
.../com/cloud/api/commands/ListVMGroupsCmd.java | 2 +-
.../api/commands/ListVirtualRouterElementsCmd.java | 12 +-
.../cloud/api/commands/ListVlanIpRangesCmd.java | 30 +-
api/src/com/cloud/api/commands/ListVolumesCmd.java | 10 +-
.../com/cloud/api/commands/ListVpnUsersCmd.java | 4 +-
api/src/com/cloud/api/commands/ListZonesByCmd.java | 18 +-
api/src/com/cloud/api/commands/LockAccountCmd.java | 4 +-
api/src/com/cloud/api/commands/LockUserCmd.java | 4 +-
.../api/commands/MarkDefaultZoneForAccountCmd.java | 36 +-
.../com/cloud/api/commands/MigrateSystemVMCmd.java | 30 +-
.../com/cloud/api/commands/MigrateVolumeCmd.java | 42 +-
.../api/commands/PrepareForMaintenanceCmd.java | 18 +-
.../PreparePrimaryStorageForMaintenanceCmd.java | 10 +-
.../com/cloud/api/commands/PrepareTemplateCmd.java | 20 +-
.../cloud/api/commands/QueryAsyncJobResultCmd.java | 4 +-
.../com/cloud/api/commands/RebootRouterCmd.java | 14 +-
.../com/cloud/api/commands/RebootSystemVmCmd.java | 16 +-
.../com/cloud/api/commands/ReconnectHostCmd.java | 16 +-
api/src/com/cloud/api/commands/RegisterCmd.java | 4 +-
api/src/com/cloud/api/commands/RegisterIsoCmd.java | 42 +-
.../cloud/api/commands/RegisterSSHKeyPairCmd.java | 84 ++--
.../cloud/api/commands/RegisterTemplateCmd.java | 36 +-
.../commands/RemoveFromLoadBalancerRuleCmd.java | 12 +-
.../com/cloud/api/commands/RemoveVpnUserCmd.java | 64 ++--
.../com/cloud/api/commands/RestartNetworkCmd.java | 16 +-
api/src/com/cloud/api/commands/StartRouterCmd.java | 18 +-
.../com/cloud/api/commands/StartSystemVMCmd.java | 18 +-
.../com/cloud/api/commands/StopSystemVmCmd.java | 14 +-
.../com/cloud/api/commands/SuspendProjectCmd.java | 102 ----
.../com/cloud/api/commands/UpdateAccountCmd.java | 34 +-
api/src/com/cloud/api/commands/UpdateCfgCmd.java | 4 +-
.../com/cloud/api/commands/UpdateClusterCmd.java | 40 +-
.../cloud/api/commands/UpdateDiskOfferingCmd.java | 12 +-
.../com/cloud/api/commands/UpdateDomainCmd.java | 8 +-
api/src/com/cloud/api/commands/UpdateHostCmd.java | 14 +-
.../cloud/api/commands/UpdateHostPasswordCmd.java | 8 +-
api/src/com/cloud/api/commands/UpdateIsoCmd.java | 8 +-
.../api/commands/UpdateIsoPermissionsCmd.java | 10 +-
.../api/commands/UpdateLoadBalancerRuleCmd.java | 2 +-
.../com/cloud/api/commands/UpdateNetworkCmd.java | 34 +-
.../api/commands/UpdateNetworkOfferingCmd.java | 22 +-
.../commands/UpdateNetworkServiceProviderCmd.java | 20 +-
.../api/commands/UpdatePhysicalNetworkCmd.java | 18 +-
api/src/com/cloud/api/commands/UpdatePodCmd.java | 12 +-
.../com/cloud/api/commands/UpdateProjectCmd.java | 114 -----
.../api/commands/UpdateProjectInvitationCmd.java | 112 -----
.../cloud/api/commands/UpdateResourceCountCmd.java | 20 +-
.../cloud/api/commands/UpdateResourceLimitCmd.java | 20 +-
.../api/commands/UpdateServiceOfferingCmd.java | 16 +-
.../commands/UpdateStorageNetworkIpRangeCmd.java | 92 ++--
.../cloud/api/commands/UpdateStoragePoolCmd.java | 6 +-
.../com/cloud/api/commands/UpdateTemplateCmd.java | 12 +-
.../cloud/api/commands/UpdateTemplateOrIsoCmd.java | 14 +-
.../UpdateTemplateOrIsoPermissionsCmd.java | 18 +-
.../api/commands/UpdateTemplatePermissionsCmd.java | 20 +-
.../cloud/api/commands/UpdateTrafficTypeCmd.java | 24 +-
api/src/com/cloud/api/commands/UpdateUserCmd.java | 6 +-
.../com/cloud/api/commands/UpdateVMGroupCmd.java | 4 +-
.../cloud/api/commands/UpdateVPCOfferingCmd.java | 18 +-
api/src/com/cloud/api/commands/UpdateZoneCmd.java | 32 +-
.../com/cloud/api/commands/UpgradeRouterCmd.java | 16 +-
.../com/cloud/api/commands/UpgradeSystemVMCmd.java | 10 +-
.../api/commands/UploadCustomCertificateCmd.java | 30 +-
.../com/cloud/api/commands/UploadVolumeCmd.java | 294 ++++++------
.../api/commands/listStorageNetworkIpRangeCmd.java | 86 ++--
.../com/cloud/api/response/AccountResponse.java | 26 +-
.../com/cloud/api/response/AsyncJobResponse.java | 62 ++--
api/src/com/cloud/api/response/BaseResponse.java | 28 +-
.../cloud/api/response/CapabilitiesResponse.java | 24 +-
.../com/cloud/api/response/CapabilityResponse.java | 2 +-
.../com/cloud/api/response/CapacityResponse.java | 26 +-
.../api/response/CloudIdentifierResponse.java | 12 +-
.../com/cloud/api/response/ClusterResponse.java | 46 +-
.../api/response/ControlledEntityResponse.java | 6 +-
.../com/cloud/api/response/CreateCmdResponse.java | 4 +-
.../cloud/api/response/DiskOfferingResponse.java | 2 +-
api/src/com/cloud/api/response/DomainResponse.java | 18 +-
.../cloud/api/response/DomainRouterResponse.java | 46 +-
api/src/com/cloud/api/response/EventResponse.java | 4 +-
.../com/cloud/api/response/ExceptionResponse.java | 4 +-
.../com/cloud/api/response/ExtractResponse.java | 36 +-
.../com/cloud/api/response/FirewallResponse.java | 6 +-
.../cloud/api/response/FirewallRuleResponse.java | 42 +-
.../cloud/api/response/GetVMPasswordResponse.java | 8 +-
.../api/response/GuestOSCategoryResponse.java | 2 +-
api/src/com/cloud/api/response/HostResponse.java | 10 +-
.../com/cloud/api/response/IPAddressResponse.java | 56 ++--
.../cloud/api/response/InstanceGroupResponse.java | 6 +-
.../api/response/IpForwardingRuleResponse.java | 34 +-
api/src/com/cloud/api/response/IsoVmResponse.java | 2 +-
.../api/response/LBStickinessPolicyResponse.java | 14 +-
.../cloud/api/response/LBStickinessResponse.java | 12 +-
.../com/cloud/api/response/LDAPConfigResponse.java | 2 +-
api/src/com/cloud/api/response/ListResponse.java | 8 +-
.../cloud/api/response/LoadBalancerResponse.java | 12 +-
.../com/cloud/api/response/NetworkACLResponse.java | 8 +-
.../api/response/NetworkOfferingResponse.java | 42 +-
.../com/cloud/api/response/NetworkResponse.java | 128 +++---
api/src/com/cloud/api/response/NicResponse.java | 30 +-
.../api/response/PhysicalNetworkResponse.java | 36 +-
api/src/com/cloud/api/response/PodResponse.java | 26 +-
.../cloud/api/response/PrivateGatewayResponse.java | 40 +-
.../api/response/ProjectInvitationResponse.java | 16 +-
.../com/cloud/api/response/ProjectResponse.java | 18 +-
.../com/cloud/api/response/ProviderResponse.java | 26 +-
.../api/response/RemoteAccessVpnResponse.java | 54 ++--
.../cloud/api/response/ResourceCountResponse.java | 8 +-
.../cloud/api/response/ResourceLimitResponse.java | 12 +-
.../cloud/api/response/ResourceTagResponse.java | 28 +-
.../com/cloud/api/response/SSHKeyPairResponse.java | 56 ++--
.../cloud/api/response/SecurityGroupResponse.java | 16 +-
.../api/response/ServiceOfferingResponse.java | 76 ++--
.../com/cloud/api/response/ServiceResponse.java | 6 +-
.../response/Site2SiteCustomerGatewayResponse.java | 54 ++--
.../response/Site2SiteVpnConnectionResponse.java | 70 ++--
.../api/response/Site2SiteVpnGatewayResponse.java | 36 +-
.../com/cloud/api/response/SnapshotResponse.java | 14 +-
.../cloud/api/response/StaticRouteResponse.java | 22 +-
api/src/com/cloud/api/response/StatusResponse.java | 2 +-
.../response/StorageNetworkIpRangeResponse.java | 36 +-
.../cloud/api/response/StoragePoolResponse.java | 16 +-
.../com/cloud/api/response/SuccessResponse.java | 8 +-
api/src/com/cloud/api/response/SwiftResponse.java | 2 +-
.../api/response/SystemVmInstanceResponse.java | 10 +-
.../com/cloud/api/response/SystemVmResponse.java | 14 +-
.../api/response/TemplatePermissionsResponse.java | 4 +-
.../com/cloud/api/response/TemplateResponse.java | 32 +-
.../response/TrafficTypeImplementorResponse.java | 26 +-
.../cloud/api/response/TrafficTypeResponse.java | 20 +-
.../com/cloud/api/response/UpgradeVmResponse.java | 4 +-
api/src/com/cloud/api/response/UserResponse.java | 2 +-
api/src/com/cloud/api/response/UserVmResponse.java | 36 +-
.../response/VirtualRouterProviderResponse.java | 10 +-
.../cloud/api/response/VlanIpRangeResponse.java | 18 +-
api/src/com/cloud/api/response/VolumeResponse.java | 22 +-
.../cloud/api/response/VpcOfferingResponse.java | 14 +-
api/src/com/cloud/api/response/VpcResponse.java | 44 +-
.../com/cloud/api/response/VpnUsersResponse.java | 14 +-
api/src/com/cloud/api/response/ZoneResponse.java | 32 +-
api/src/com/cloud/capacity/Capacity.java | 4 +-
api/src/com/cloud/capacity/CapacityState.java | 6 +-
.../cloud/configuration/ConfigurationService.java | 28 +-
api/src/com/cloud/dao/EntityManager.java | 14 +-
api/src/com/cloud/dc/Pod.java | 2 +-
api/src/com/cloud/dc/StorageNetworkIpRange.java | 4 +-
api/src/com/cloud/deploy/DataCenterDeployment.java | 4 +-
api/src/com/cloud/deploy/DeploymentPlanner.java | 8 +-
api/src/com/cloud/event/Event.java | 2 +-
api/src/com/cloud/event/EventTypes.java | 12 +-
.../cloud/exception/AgentUnavailableException.java | 8 +-
api/src/com/cloud/exception/CloudException.java | 24 +-
.../cloud/exception/CloudExecutionException.java | 10 +-
.../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 | 12 +-
api/src/com/cloud/exception/HAStateException.java | 4 +-
.../exception/InsufficientCapacityException.java | 2 +-
.../InsufficientNetworkCapacityException.java | 4 +-
.../InsufficientServerCapacityException.java | 6 +-
.../InsufficientStorageCapacityException.java | 6 +-
...InsufficientVirtualNetworkCapcityException.java | 4 +-
.../exception/ResourceUnavailableException.java | 8 +-
.../exception/StorageUnavailableException.java | 8 +-
api/src/com/cloud/host/Host.java | 4 +-
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 +-
api/src/com/cloud/hypervisor/HypervisorGuru.java | 14 +-
api/src/com/cloud/network/IpAddress.java | 6 +-
api/src/com/cloud/network/Network.java | 6 +-
api/src/com/cloud/network/NetworkService.java | 30 +-
api/src/com/cloud/network/Networks.java | 2 +-
api/src/com/cloud/network/PhysicalNetwork.java | 2 +-
.../network/PhysicalNetworkServiceProvider.java | 2 +-
.../cloud/network/PhysicalNetworkTrafficType.java | 2 +-
api/src/com/cloud/network/PublicIpAddress.java | 10 +-
api/src/com/cloud/network/RemoteAccessVpn.java | 2 +-
.../cloud/network/Site2SiteCustomerGateway.java | 2 +-
.../com/cloud/network/Site2SiteVpnConnection.java | 2 +-
api/src/com/cloud/network/Site2SiteVpnGateway.java | 2 +-
.../network/VirtualNetworkApplianceService.java | 10 +-
.../network/VpcVirtualNetworkApplianceService.java | 4 +-
.../com/cloud/network/as/AutoScaleVmProfile.java | 36 +-
.../element/LoadBalancingServiceProvider.java | 2 +-
.../com/cloud/network/element/NetworkElement.java | 40 +-
.../element/RemoteAccessVPNServiceProvider.java | 4 +-
.../element/Site2SiteVpnServiceProvider.java | 4 +-
api/src/com/cloud/network/element/VpcProvider.java | 8 +-
.../cloud/network/firewall/FirewallService.java | 2 +-
.../cloud/network/firewall/NetworkACLService.java | 4 +-
api/src/com/cloud/network/guru/NetworkGuru.java | 64 ++--
.../com/cloud/network/lb/LoadBalancingRule.java | 2 +-
.../network/lb/LoadBalancingRulesService.java | 14 +-
api/src/com/cloud/network/rules/FirewallRule.java | 26 +-
.../cloud/network/rules/LbStickinessMethod.java | 20 +-
.../cloud/network/rules/PortForwardingRule.java | 14 +-
api/src/com/cloud/network/rules/RulesService.java | 6 +-
api/src/com/cloud/network/rules/StaticNat.java | 8 +-
.../cloud/network/security/SecurityGroupRules.java | 2 +-
.../network/security/SecurityGroupService.java | 4 +-
.../com/cloud/network/security/SecurityRule.java | 12 +-
api/src/com/cloud/network/vpc/PrivateIp.java | 2 +-
api/src/com/cloud/network/vpc/StaticRoute.java | 2 +-
.../com/cloud/network/vpc/StaticRouteProfile.java | 6 +-
api/src/com/cloud/network/vpc/Vpc.java | 8 +-
api/src/com/cloud/network/vpc/VpcGateway.java | 4 +-
api/src/com/cloud/network/vpc/VpcOffering.java | 4 +-
api/src/com/cloud/network/vpc/VpcService.java | 70 ++--
.../cloud/network/vpn/RemoteAccessVpnService.java | 8 +-
api/src/com/cloud/offering/DiskOffering.java | 2 +-
api/src/com/cloud/offering/NetworkOffering.java | 4 +-
api/src/com/cloud/offering/OfferingManager.java | 10 +-
api/src/com/cloud/projects/ProjectService.java | 10 +-
api/src/com/cloud/resource/ResourceService.java | 12 +-
api/src/com/cloud/serializer/Param.java | 2 +-
api/src/com/cloud/server/ManagementService.java | 78 ++--
api/src/com/cloud/server/ResourceTag.java | 2 +-
.../com/cloud/server/TaggedResourceService.java | 4 +-
api/src/com/cloud/storage/StoragePool.java | 2 +-
api/src/com/cloud/storage/StorageService.java | 24 +-
api/src/com/cloud/storage/StorageStats.java | 2 +-
api/src/com/cloud/storage/Volume.java | 10 +-
.../cloud/storage/snapshot/SnapshotService.java | 14 +-
api/src/com/cloud/template/BasedOn.java | 2 +-
api/src/com/cloud/template/TemplateService.java | 8 +-
api/src/com/cloud/user/Account.java | 6 +-
api/src/com/cloud/user/AccountService.java | 26 +-
api/src/com/cloud/user/DomainService.java | 2 +-
api/src/com/cloud/user/ResourceLimitService.java | 20 +-
api/src/com/cloud/vm/Nic.java | 2 +-
api/src/com/cloud/vm/NicProfile.java | 2 +-
api/src/com/cloud/vm/RunningOn.java | 2 +-
api/src/com/cloud/vm/UserVmService.java | 38 +-
api/src/com/cloud/vm/VirtualMachine.java | 6 +-
api/src/com/cloud/vm/VirtualMachineProfile.java | 2 +-
.../user/project/command/ActivateProjectCmd.java | 100 ++++
.../api/user/project/command/CreateProjectCmd.java | 149 ++++++
.../api/user/project/command/DeleteProjectCmd.java | 99 ++++
.../command/DeleteProjectInvitationCmd.java | 89 ++++
.../project/command/ListProjectInvitationsCmd.java | 101 ++++
.../api/user/project/command/ListProjectsCmd.java | 124 +++++
.../user/project/command/SuspendProjectCmd.java | 102 ++++
.../api/user/project/command/UpdateProjectCmd.java | 114 +++++
.../command/UpdateProjectInvitationCmd.java | 112 +++++
.../api/commands/test/ActivateProjectCmdTest.java | 2 +-
client/tomcatconf/commands.properties.in | 18 +-
590 files changed, 6062 insertions(+), 6061 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/acl/APIAccessChecker.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/acl/APIAccessChecker.java b/api/src/com/cloud/acl/APIAccessChecker.java
index c0f8fd4..e54e036 100644
--- a/api/src/com/cloud/acl/APIAccessChecker.java
+++ b/api/src/com/cloud/acl/APIAccessChecker.java
@@ -1,14 +1,14 @@
-package com.cloud.acl;
-
-import com.cloud.exception.PermissionDeniedException;
-import com.cloud.user.Account;
-import com.cloud.user.User;
-import com.cloud.utils.component.Adapter;
-
-/**
- * APIAccessChecker checks the ownership and access control to API requests
- */
-public interface APIAccessChecker extends Adapter {
-
- boolean canAccessAPI(User user, String apiCommandName) throws PermissionDeniedException;
-}
+package com.cloud.acl;
+
+import com.cloud.exception.PermissionDeniedException;
+import com.cloud.user.Account;
+import com.cloud.user.User;
+import com.cloud.utils.component.Adapter;
+
+/**
+ * APIAccessChecker checks the ownership and access control to API requests
+ */
+public interface APIAccessChecker extends Adapter {
+
+ boolean canAccessAPI(User user, String apiCommandName) throws PermissionDeniedException;
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/acl/ControlledEntity.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/acl/ControlledEntity.java b/api/src/com/cloud/acl/ControlledEntity.java
index 190dd41..5ccd8fb 100644
--- a/api/src/com/cloud/acl/ControlledEntity.java
+++ b/api/src/com/cloud/acl/ControlledEntity.java
@@ -22,7 +22,7 @@ import com.cloud.user.OwnedBy;
/**
* ControlledEntity defines an object for which the access from an
* access must inherit this interface.
- *
+ *
*/
public interface ControlledEntity extends OwnedBy, PartOf {
public enum ACLType {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/acl/Role.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/acl/Role.java b/api/src/com/cloud/acl/Role.java
index 932a43b..0ab69e9 100644
--- a/api/src/com/cloud/acl/Role.java
+++ b/api/src/com/cloud/acl/Role.java
@@ -1,20 +1,20 @@
-package com.cloud.acl;
-
-//metadata - consists of default dynamic roles in CS + any custom roles added by user
-public interface Role {
-
- public static final short ROOT_ADMIN = 0;
- public static final short DOMAIN_ADMIN = 1;
- public static final short DOMAIN_USER = 2;
- public static final short OWNER = 3;
- public static final short PARENT_DOMAIN_ADMIN = 4;
- public static final short PARENT_DOMAIN_USER = 5;
- public static final short CHILD_DOMAIN_ADMIN = 6;
- public static final short CHILD_DOMAIN_USER = 7;
-
- public long getId();
-
- public short getRoleType();
-
-
- }
+package com.cloud.acl;
+
+//metadata - consists of default dynamic roles in CS + any custom roles added by user
+public interface Role {
+
+ public static final short ROOT_ADMIN = 0;
+ public static final short DOMAIN_ADMIN = 1;
+ public static final short DOMAIN_USER = 2;
+ public static final short OWNER = 3;
+ public static final short PARENT_DOMAIN_ADMIN = 4;
+ public static final short PARENT_DOMAIN_USER = 5;
+ public static final short CHILD_DOMAIN_ADMIN = 6;
+ public static final short CHILD_DOMAIN_USER = 7;
+
+ public long getId();
+
+ public short getRoleType();
+
+
+ }
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/acl/SecurityChecker.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/acl/SecurityChecker.java b/api/src/com/cloud/acl/SecurityChecker.java
index 3f76da9..4559641 100644
--- a/api/src/com/cloud/acl/SecurityChecker.java
+++ b/api/src/com/cloud/acl/SecurityChecker.java
@@ -39,7 +39,7 @@ public interface SecurityChecker extends Adapter {
/**
* Checks if the account owns the object.
- *
+ *
* @param caller
* account to check against.
* @param object
@@ -52,7 +52,7 @@ public interface SecurityChecker extends Adapter {
/**
* Checks if the user belongs to an account that owns the object.
- *
+ *
* @param user
* user to check against.
* @param object
@@ -65,7 +65,7 @@ public interface SecurityChecker extends Adapter {
/**
* Checks if the account can access the object.
- *
+ *
* @param caller
* account to check against.
* @param entity
@@ -80,7 +80,7 @@ public interface SecurityChecker extends Adapter {
/**
* Checks if the user belongs to an account that can access the object.
- *
+ *
* @param user
* user to check against.
* @param entity
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/AgentControlAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/AgentControlAnswer.java b/api/src/com/cloud/agent/api/AgentControlAnswer.java
index 1cdcc1e..7dbf7b5 100644
--- a/api/src/com/cloud/agent/api/AgentControlAnswer.java
+++ b/api/src/com/cloud/agent/api/AgentControlAnswer.java
@@ -19,11 +19,11 @@ package com.cloud.agent.api;
public class AgentControlAnswer extends Answer {
public AgentControlAnswer() {
}
-
+
public AgentControlAnswer(Command command) {
super(command);
}
-
+
public AgentControlAnswer(Command command, boolean success, String details) {
super(command, success, details);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/AgentControlCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/AgentControlCommand.java b/api/src/com/cloud/agent/api/AgentControlCommand.java
index 6cc8e6f..da187ac 100644
--- a/api/src/com/cloud/agent/api/AgentControlCommand.java
+++ b/api/src/com/cloud/agent/api/AgentControlCommand.java
@@ -17,10 +17,10 @@
package com.cloud.agent.api;
public class AgentControlCommand extends Command {
-
+
public AgentControlCommand() {
}
-
+
public boolean executeInSequence() {
return false;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/Answer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/Answer.java b/api/src/com/cloud/agent/api/Answer.java
index 932da23..655f447 100755
--- a/api/src/com/cloud/agent/api/Answer.java
+++ b/api/src/com/cloud/agent/api/Answer.java
@@ -21,40 +21,40 @@ import com.cloud.utils.exception.ExceptionUtil;
public class Answer extends Command {
protected boolean result;
protected String details;
-
+
protected Answer() {
}
-
+
public Answer(Command command) {
this(command, true, null);
}
-
+
public Answer(Command command, boolean success, String details) {
result = success;
this.details = details;
}
-
+
public Answer(Command command, Exception e) {
this(command, false, ExceptionUtil.toString(e));
}
-
+
public boolean getResult() {
return result;
}
-
+
public String getDetails() {
return details;
}
-
+
@Override
public boolean executeInSequence() {
return false;
}
-
+
public static UnsupportedAnswer createUnsupportedCommandAnswer(Command cmd) {
return new UnsupportedAnswer(cmd, "Unsupported command issued:" + cmd.toString() + ". Are you sure you got the right type of server?");
}
-
+
public static UnsupportedAnswer createUnsupportedVersionAnswer(Command cmd) {
return new UnsupportedAnswer(cmd, "Unsuppored Version.");
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/AttachIsoCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/AttachIsoCommand.java b/api/src/com/cloud/agent/api/AttachIsoCommand.java
index ff9da83..c6f0b61 100644
--- a/api/src/com/cloud/agent/api/AttachIsoCommand.java
+++ b/api/src/com/cloud/agent/api/AttachIsoCommand.java
@@ -48,11 +48,11 @@ public class AttachIsoCommand extends Command {
public boolean isAttach() {
return attach;
}
-
+
public String getStoreUrl() {
return storeUrl;
}
-
+
public void setStoreUrl(String url) {
storeUrl = url;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/AttachVolumeAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/AttachVolumeAnswer.java b/api/src/com/cloud/agent/api/AttachVolumeAnswer.java
index 253b444..b377b7c 100644
--- a/api/src/com/cloud/agent/api/AttachVolumeAnswer.java
+++ b/api/src/com/cloud/agent/api/AttachVolumeAnswer.java
@@ -20,38 +20,38 @@ package com.cloud.agent.api;
public class AttachVolumeAnswer extends Answer {
private Long deviceId;
private String chainInfo;
-
+
protected AttachVolumeAnswer() {
-
+
}
-
+
public AttachVolumeAnswer(AttachVolumeCommand cmd, String result) {
super(cmd, false, result);
this.deviceId = null;
}
-
+
public AttachVolumeAnswer(AttachVolumeCommand cmd, Long deviceId) {
super(cmd);
this.deviceId = deviceId;
}
-
+
public AttachVolumeAnswer(AttachVolumeCommand cmd) {
super(cmd);
this.deviceId = null;
}
-
+
/**
* @return the deviceId
*/
public Long getDeviceId() {
return deviceId;
}
-
+
public void setChainInfo(String chainInfo) {
this.chainInfo = chainInfo;
}
-
+
public String getChainInfo() {
return chainInfo;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/AttachVolumeCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/AttachVolumeCommand.java b/api/src/com/cloud/agent/api/AttachVolumeCommand.java
index 98bfb2e..302b8f8 100644
--- a/api/src/com/cloud/agent/api/AttachVolumeCommand.java
+++ b/api/src/com/cloud/agent/api/AttachVolumeCommand.java
@@ -19,7 +19,7 @@ package com.cloud.agent.api;
import com.cloud.storage.Storage.StoragePoolType;
public class AttachVolumeCommand extends Command {
-
+
boolean attach;
String vmName;
StoragePoolType pooltype;
@@ -29,10 +29,10 @@ public class AttachVolumeCommand extends Command {
String volumeName;
Long deviceId;
String chainInfo;
-
+
protected AttachVolumeCommand() {
}
-
+
public AttachVolumeCommand(boolean attach, String vmName, StoragePoolType pooltype, String volumeFolder, String volumePath, String volumeName, Long deviceId, String chainInfo) {
this.attach = attach;
this.vmName = vmName;
@@ -43,20 +43,20 @@ public class AttachVolumeCommand extends Command {
this.deviceId = deviceId;
this.chainInfo = chainInfo;
}
-
+
@Override
public boolean executeInSequence() {
return true;
}
-
+
public boolean getAttach() {
return attach;
}
-
+
public String getVmName() {
return vmName;
}
-
+
public StoragePoolType getPooltype() {
return pooltype;
}
@@ -68,11 +68,11 @@ public class AttachVolumeCommand extends Command {
public String getVolumeFolder() {
return volumeFolder;
}
-
+
public String getVolumePath() {
return volumePath;
}
-
+
public String getVolumeName() {
return volumeName;
}
@@ -84,15 +84,15 @@ public class AttachVolumeCommand extends Command {
public void setDeviceId(Long deviceId) {
this.deviceId = deviceId;
}
-
+
public String getPoolUuid() {
return poolUuid;
}
-
+
public void setPoolUuid(String poolUuid) {
this.poolUuid = poolUuid;
}
-
+
public String getChainInfo() {
return chainInfo;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/BackupSnapshotAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/BackupSnapshotAnswer.java b/api/src/com/cloud/agent/api/BackupSnapshotAnswer.java
index 707092f..9e35db6 100644
--- a/api/src/com/cloud/agent/api/BackupSnapshotAnswer.java
+++ b/api/src/com/cloud/agent/api/BackupSnapshotAnswer.java
@@ -20,11 +20,11 @@ package com.cloud.agent.api;
public class BackupSnapshotAnswer extends Answer {
private String backupSnapshotName;
private boolean full;
-
+
protected BackupSnapshotAnswer() {
-
+
}
-
+
public BackupSnapshotAnswer(BackupSnapshotCommand cmd, boolean success, String result, String backupSnapshotName, boolean full) {
super(cmd, success, result);
this.backupSnapshotName = backupSnapshotName;
@@ -37,7 +37,7 @@ public class BackupSnapshotAnswer extends Answer {
public String getBackupSnapshotName() {
return backupSnapshotName;
}
-
+
public boolean isFull() {
return full;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/BackupSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/BackupSnapshotCommand.java b/api/src/com/cloud/agent/api/BackupSnapshotCommand.java
index 9476d7d..f6c0233 100644
--- a/api/src/com/cloud/agent/api/BackupSnapshotCommand.java
+++ b/api/src/com/cloud/agent/api/BackupSnapshotCommand.java
@@ -22,7 +22,7 @@ import com.cloud.agent.api.to.SwiftTO;
import com.cloud.storage.StoragePool;
/**
- * This currently assumes that both primary and secondary storage are mounted on the XenServer.
+ * This currently assumes that both primary and secondary storage are mounted on the XenServer.
*/
public class BackupSnapshotCommand extends SnapshotCommand {
private String prevSnapshotUuid;
@@ -35,18 +35,18 @@ public class BackupSnapshotCommand extends SnapshotCommand {
StorageFilerTO pool;
protected BackupSnapshotCommand() {
-
+
}
-
+
/**
* @param primaryStoragePoolNameLabel The UUID of the primary storage Pool
* @param secondaryStoragePoolURL This is what shows up in the UI when you click on Secondary storage.
* @param snapshotUuid The UUID of the snapshot which is going to be backed up
* @param prevSnapshotUuid The UUID of the previous snapshot for this volume. This will be destroyed on the primary storage.
* @param prevBackupUuid This is the UUID of the vhd file which was last backed up on secondary storage.
- * @param firstBackupUuid This is the backup of the first ever snapshot taken by the volume.
+ * @param firstBackupUuid This is the backup of the first ever snapshot taken by the volume.
* @param isFirstSnapshotOfRootVolume true if this is the first snapshot of a root volume. Set the parent of the backup to null.
- * @param isVolumeInactive True if the volume belongs to a VM that is not running or is detached.
+ * @param isVolumeInactive True if the volume belongs to a VM that is not running or is detached.
*/
public BackupSnapshotCommand(String primaryStoragePoolNameLabel,
String secondaryStoragePoolURL,
@@ -62,7 +62,7 @@ public class BackupSnapshotCommand extends SnapshotCommand {
String prevBackupUuid,
boolean isVolumeInactive,
String vmName,
- int wait)
+ int wait)
{
super(primaryStoragePoolNameLabel, secondaryStoragePoolURL, snapshotUuid, snapshotName, dcId, accountId, volumeId);
this.snapshotId = snapshotId;
@@ -74,7 +74,7 @@ public class BackupSnapshotCommand extends SnapshotCommand {
setVolumePath(volumePath);
setWait(wait);
}
-
+
public String getPrevSnapshotUuid() {
return prevSnapshotUuid;
}
@@ -82,11 +82,11 @@ public class BackupSnapshotCommand extends SnapshotCommand {
public String getPrevBackupUuid() {
return prevBackupUuid;
}
-
+
public boolean isVolumeInactive() {
return isVolumeInactive;
}
-
+
public String getVmName() {
return vmName;
}
@@ -106,4 +106,4 @@ public class BackupSnapshotCommand extends SnapshotCommand {
public StorageFilerTO getPool() {
return pool;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/CancelCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CancelCommand.java b/api/src/com/cloud/agent/api/CancelCommand.java
index 7638273..0692055 100644
--- a/api/src/com/cloud/agent/api/CancelCommand.java
+++ b/api/src/com/cloud/agent/api/CancelCommand.java
@@ -21,19 +21,19 @@ package com.cloud.agent.api;
public class CancelCommand extends Command {
protected long sequence;
protected String reason;
-
+
protected CancelCommand() {
}
-
+
public CancelCommand(long sequence, String reason) {
this.sequence = sequence;
this.reason = reason;
}
-
+
public long getSequence() {
return sequence;
}
-
+
public String getReason() {
return reason;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/ChangeAgentAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ChangeAgentAnswer.java b/api/src/com/cloud/agent/api/ChangeAgentAnswer.java
index 4b3f103..537eabe 100644
--- a/api/src/com/cloud/agent/api/ChangeAgentAnswer.java
+++ b/api/src/com/cloud/agent/api/ChangeAgentAnswer.java
@@ -19,7 +19,7 @@ package com.cloud.agent.api;
public class ChangeAgentAnswer extends Answer {
protected ChangeAgentAnswer() {
}
-
+
public ChangeAgentAnswer(ChangeAgentCommand cmd, boolean result) {
super(cmd, result, null);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/ChangeAgentCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ChangeAgentCommand.java b/api/src/com/cloud/agent/api/ChangeAgentCommand.java
index 1b7f8c8..abdb60a 100644
--- a/api/src/com/cloud/agent/api/ChangeAgentCommand.java
+++ b/api/src/com/cloud/agent/api/ChangeAgentCommand.java
@@ -21,19 +21,19 @@ import com.cloud.host.Status.Event;
public class ChangeAgentCommand extends Command {
long agentId;
Event event;
-
+
protected ChangeAgentCommand() {
}
-
+
public ChangeAgentCommand(long agentId, Event event) {
this.agentId = agentId;
this.event = event;
}
-
+
public long getAgentId() {
return agentId;
}
-
+
public Event getEvent() {
return event;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/CheckHealthCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CheckHealthCommand.java b/api/src/com/cloud/agent/api/CheckHealthCommand.java
index 5298f5a..ff42276 100644
--- a/api/src/com/cloud/agent/api/CheckHealthCommand.java
+++ b/api/src/com/cloud/agent/api/CheckHealthCommand.java
@@ -22,7 +22,7 @@ public class CheckHealthCommand extends Command {
setWait(50);
}
-
+
@Override
public boolean executeInSequence() {
return false;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/CheckNetworkAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CheckNetworkAnswer.java b/api/src/com/cloud/agent/api/CheckNetworkAnswer.java
index 2188fa6..52825fd 100644
--- a/api/src/com/cloud/agent/api/CheckNetworkAnswer.java
+++ b/api/src/com/cloud/agent/api/CheckNetworkAnswer.java
@@ -20,7 +20,7 @@ public class CheckNetworkAnswer extends Answer {
// indicate if agent reconnect is needed after setupNetworkNames command
private boolean _reconnect;
public CheckNetworkAnswer() {}
-
+
public CheckNetworkAnswer(CheckNetworkCommand cmd, boolean result, String details, boolean reconnect) {
super(cmd, result, details);
@@ -34,5 +34,5 @@ public class CheckNetworkAnswer extends Answer {
public boolean needReconnect() {
return _reconnect;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/CheckOnHostAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CheckOnHostAnswer.java b/api/src/com/cloud/agent/api/CheckOnHostAnswer.java
index 2a053fd..e5325e3 100644
--- a/api/src/com/cloud/agent/api/CheckOnHostAnswer.java
+++ b/api/src/com/cloud/agent/api/CheckOnHostAnswer.java
@@ -19,10 +19,10 @@ package com.cloud.agent.api;
public class CheckOnHostAnswer extends Answer {
boolean determined;
boolean alive;
-
+
protected CheckOnHostAnswer() {
}
-
+
public CheckOnHostAnswer(CheckOnHostCommand cmd, Boolean alive, String details) {
super(cmd, true, details);
if (alive == null) {
@@ -32,7 +32,7 @@ public class CheckOnHostAnswer extends Answer {
this.alive = alive;
}
}
-
+
public CheckOnHostAnswer(CheckOnHostCommand cmd, String details) {
super(cmd, false, details);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/CheckOnHostCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CheckOnHostCommand.java b/api/src/com/cloud/agent/api/CheckOnHostCommand.java
index 3aadebd..596a532 100644
--- a/api/src/com/cloud/agent/api/CheckOnHostCommand.java
+++ b/api/src/com/cloud/agent/api/CheckOnHostCommand.java
@@ -24,17 +24,17 @@ public class CheckOnHostCommand extends Command {
protected CheckOnHostCommand() {
}
-
-
+
+
public CheckOnHostCommand(Host host) {
this.host = new HostTO(host);
setWait(20);
}
-
+
public HostTO getHost() {
return host;
}
-
+
@Override
public boolean executeInSequence() {
return false;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/CheckRouterAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CheckRouterAnswer.java b/api/src/com/cloud/agent/api/CheckRouterAnswer.java
index 7240ba1..da8189f 100644
--- a/api/src/com/cloud/agent/api/CheckRouterAnswer.java
+++ b/api/src/com/cloud/agent/api/CheckRouterAnswer.java
@@ -23,10 +23,10 @@ public class CheckRouterAnswer extends Answer {
public static final String ROUTER_IP = "router.ip";
RedundantState state;
boolean isBumped;
-
+
protected CheckRouterAnswer() {
}
-
+
public CheckRouterAnswer(CheckRouterCommand cmd, String details, boolean parse) {
super(cmd, true, details);
if (parse) {
@@ -35,7 +35,7 @@ public class CheckRouterAnswer extends Answer {
}
}
}
-
+
public CheckRouterAnswer(CheckRouterCommand cmd, String details) {
super(cmd, false, details);
}
@@ -61,11 +61,11 @@ public class CheckRouterAnswer extends Answer {
}
return true;
}
-
+
public void setState(RedundantState state) {
this.state = state;
}
-
+
public RedundantState getState() {
return state;
}
@@ -73,9 +73,9 @@ public class CheckRouterAnswer extends Answer {
public boolean isBumped() {
return isBumped;
}
-
+
public void setIsBumped(boolean isBumped) {
this.isBumped = isBumped;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java b/api/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
index ef3be81..0e9db96 100644
--- a/api/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
+++ b/api/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
@@ -5,7 +5,7 @@
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
-//
+//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
@@ -23,12 +23,12 @@ public class CheckS2SVpnConnectionsAnswer extends Answer {
Map<String, Boolean> ipToConnected;
Map<String, String> ipToDetail;
String details;
-
+
protected CheckS2SVpnConnectionsAnswer() {
ipToConnected = new HashMap<String, Boolean>();
ipToDetail = new HashMap<String, String>();
}
-
+
public CheckS2SVpnConnectionsAnswer(CheckS2SVpnConnectionsCommand cmd, boolean result, String details) {
super(cmd, result, details);
ipToConnected = new HashMap<String, Boolean>();
@@ -38,7 +38,7 @@ public class CheckS2SVpnConnectionsAnswer extends Answer {
parseDetails(details);
}
}
-
+
protected void parseDetails(String details) {
String[] lines = details.split("&");
for (String line : lines) {
@@ -54,14 +54,14 @@ public class CheckS2SVpnConnectionsAnswer extends Answer {
ipToDetail.put(ip, detail);
}
}
-
+
public boolean isConnected(String ip) {
if (this.getResult()) {
return ipToConnected.get(ip);
}
return false;
}
-
+
public String getDetail(String ip) {
if (this.getResult()) {
return ipToDetail.get(ip);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java b/api/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java
index a736eab..9cfb53b 100644
--- a/api/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java
+++ b/api/src/com/cloud/agent/api/CheckS2SVpnConnectionsCommand.java
@@ -5,7 +5,7 @@
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
-//
+//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
@@ -22,17 +22,17 @@ import com.cloud.agent.api.routing.NetworkElementCommand;
public class CheckS2SVpnConnectionsCommand extends NetworkElementCommand {
List<String> vpnIps;
-
+
@Override
public boolean executeInSequence() {
return true;
}
-
+
public CheckS2SVpnConnectionsCommand(List<String> vpnIps) {
super();
this.vpnIps = vpnIps;
}
-
+
public List<String> getVpnIps() {
return vpnIps;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/CheckStateAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CheckStateAnswer.java b/api/src/com/cloud/agent/api/CheckStateAnswer.java
index 4864e39..bf8ae0f 100755
--- a/api/src/com/cloud/agent/api/CheckStateAnswer.java
+++ b/api/src/com/cloud/agent/api/CheckStateAnswer.java
@@ -28,17 +28,17 @@ public class CheckStateAnswer extends Answer {
public CheckStateAnswer(CheckStateCommand cmd, State state) {
this(cmd, state, null);
}
-
+
public CheckStateAnswer(CheckStateCommand cmd, String details) {
super(cmd, false, details);
this.state = null;
}
-
+
public CheckStateAnswer(CheckStateCommand cmd, State state, String details) {
super(cmd, true, details);
this.state = state;
}
-
+
public State getState() {
return state;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/CheckStateCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CheckStateCommand.java b/api/src/com/cloud/agent/api/CheckStateCommand.java
index 31c341d..89fc773 100755
--- a/api/src/com/cloud/agent/api/CheckStateCommand.java
+++ b/api/src/com/cloud/agent/api/CheckStateCommand.java
@@ -17,7 +17,7 @@
package com.cloud.agent.api;
/**
- *
+ *
*
*/
public class CheckStateCommand extends Command {
@@ -28,12 +28,12 @@ public class CheckStateCommand extends Command {
public CheckStateCommand(String vmName) {
this.vmName = vmName;
}
-
+
@Override
public boolean executeInSequence() {
return true;
}
-
+
public String getVmName() {
return vmName;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/CheckVirtualMachineAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CheckVirtualMachineAnswer.java b/api/src/com/cloud/agent/api/CheckVirtualMachineAnswer.java
index 555b0ff..3f0ffdb 100644
--- a/api/src/com/cloud/agent/api/CheckVirtualMachineAnswer.java
+++ b/api/src/com/cloud/agent/api/CheckVirtualMachineAnswer.java
@@ -19,33 +19,33 @@ package com.cloud.agent.api;
import com.cloud.vm.VirtualMachine.State;
public class CheckVirtualMachineAnswer extends Answer {
-
+
Integer vncPort;
State state;
-
-
+
+
protected CheckVirtualMachineAnswer() {
}
-
+
public CheckVirtualMachineAnswer(CheckVirtualMachineCommand cmd, State state, Integer vncPort, String detail) {
super(cmd, true, detail);
this.state = state;
this.vncPort = vncPort;
}
-
+
public CheckVirtualMachineAnswer(CheckVirtualMachineCommand cmd, State state, Integer vncPort) {
this(cmd, state, vncPort, null);
}
-
+
public CheckVirtualMachineAnswer(CheckVirtualMachineCommand cmd, String detail) {
super(cmd, false, detail);
}
-
+
public Integer getVncPort() {
return vncPort;
}
-
+
public State getState() {
return state;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/CheckVirtualMachineCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CheckVirtualMachineCommand.java b/api/src/com/cloud/agent/api/CheckVirtualMachineCommand.java
index 9e63a93..62f4420 100644
--- a/api/src/com/cloud/agent/api/CheckVirtualMachineCommand.java
+++ b/api/src/com/cloud/agent/api/CheckVirtualMachineCommand.java
@@ -17,18 +17,18 @@
package com.cloud.agent.api;
public class CheckVirtualMachineCommand extends Command {
-
+
private String vmName;
-
+
protected CheckVirtualMachineCommand() {
-
+
}
-
+
public CheckVirtualMachineCommand(String vmName) {
this.vmName = vmName;
setWait(20);
}
-
+
public String getVmName() {
return vmName;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java b/api/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java
index 6302443..8b5172d 100644
--- a/api/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java
+++ b/api/src/com/cloud/agent/api/CleanupNetworkRulesCmd.java
@@ -20,22 +20,22 @@ package com.cloud.agent.api;
public class CleanupNetworkRulesCmd extends Command implements CronCommand {
private int interval = 10*60;
-
+
@Override
public boolean executeInSequence() {
return false;
}
-
-
+
+
public CleanupNetworkRulesCmd(int intervalSecs) {
super();
interval = intervalSecs;
}
-
+
public CleanupNetworkRulesCmd() {
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/CleanupSnapshotBackupCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CleanupSnapshotBackupCommand.java b/api/src/com/cloud/agent/api/CleanupSnapshotBackupCommand.java
index aa85c3d..ae65a52 100644
--- a/api/src/com/cloud/agent/api/CleanupSnapshotBackupCommand.java
+++ b/api/src/com/cloud/agent/api/CleanupSnapshotBackupCommand.java
@@ -26,20 +26,20 @@ public class CleanupSnapshotBackupCommand extends Command {
private List<String> validBackupUUIDs;
protected CleanupSnapshotBackupCommand() {
-
+
}
-
- /*
- * @param secondaryStoragePoolURL This is what shows up in the UI when you click on Secondary storage.
+
+ /*
+ * @param secondaryStoragePoolURL This is what shows up in the UI when you click on Secondary storage.
* In the code, it is present as: In the vmops.host_details table, there is a field mount.parent. This is the value of that field
- * If you have better ideas on how to get it, you are welcome.
- * @param validBackupUUID The VHD which are valid
+ * If you have better ideas on how to get it, you are welcome.
+ * @param validBackupUUID The VHD which are valid
*/
public CleanupSnapshotBackupCommand(String secondaryStoragePoolURL,
Long dcId,
Long accountId,
Long volumeId,
- List<String> validBackupUUIDs)
+ List<String> validBackupUUIDs)
{
this.secondaryStoragePoolURL = secondaryStoragePoolURL;
this.dcId = dcId;
@@ -67,9 +67,9 @@ public class CleanupSnapshotBackupCommand extends Command {
public List<String> getValidBackupUUIDs() {
return validBackupUUIDs;
}
-
+
@Override
public boolean executeInSequence() {
return false;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/ClusterSyncAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ClusterSyncAnswer.java b/api/src/com/cloud/agent/api/ClusterSyncAnswer.java
index ea83109..99fee2a 100644
--- a/api/src/com/cloud/agent/api/ClusterSyncAnswer.java
+++ b/api/src/com/cloud/agent/api/ClusterSyncAnswer.java
@@ -25,31 +25,31 @@ public class ClusterSyncAnswer extends Answer {
private long _clusterId;
private HashMap<String, Pair<String, State>> _newStates;
private boolean _isExecuted=false;
-
+
// this is here because a cron command answer is being sent twice
// AgentAttache.processAnswers
// AgentManagerImpl.notifyAnswersToMonitors
public boolean isExceuted(){
return _isExecuted;
}
-
+
public void setExecuted(){
_isExecuted = true;
}
-
+
public ClusterSyncAnswer(long clusterId, HashMap<String, Pair<String, State>> newStates){
_clusterId = clusterId;
_newStates = newStates;
result = true;
}
-
+
public long getClusterId() {
return _clusterId;
}
-
+
public HashMap<String, Pair<String, State>> getNewStates() {
return _newStates;
- }
+ }
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/ClusterSyncCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ClusterSyncCommand.java b/api/src/com/cloud/agent/api/ClusterSyncCommand.java
index e3a0da5..17dbbd8 100644
--- a/api/src/com/cloud/agent/api/ClusterSyncCommand.java
+++ b/api/src/com/cloud/agent/api/ClusterSyncCommand.java
@@ -21,10 +21,10 @@ public class ClusterSyncCommand extends Command implements CronCommand {
int _interval;
long _clusterId;
-
+
public ClusterSyncCommand() {
}
-
+
public ClusterSyncCommand(int interval, long clusterId){
_interval = interval;
_clusterId = clusterId;
@@ -34,7 +34,7 @@ public class ClusterSyncCommand extends Command implements CronCommand {
public int getInterval() {
return _interval;
}
-
+
public long getClusterId() {
return _clusterId;
}
@@ -43,5 +43,5 @@ public class ClusterSyncCommand extends Command implements CronCommand {
public boolean executeInSequence() {
return false;
}
-
-}
\ No newline at end of file
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/Command.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/Command.java b/api/src/com/cloud/agent/api/Command.java
index 4c3810e..9cd6749 100755
--- a/api/src/com/cloud/agent/api/Command.java
+++ b/api/src/com/cloud/agent/api/Command.java
@@ -23,9 +23,9 @@ import com.cloud.agent.api.LogLevel.Log4jLevel;
/**
* implemented by classes that extends the Command class. Command specifies
- *
+ *
*/
-public abstract class Command {
+public abstract class Command {
// allow command to carry over hypervisor or other environment related context info
@LogLevel(Log4jLevel.Trace)
@@ -63,7 +63,7 @@ public abstract class Command {
public String getContextParam(String name) {
return contextMap.get(name);
}
-
+
public boolean allowCaching() {
return true;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/ComputeChecksumCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ComputeChecksumCommand.java b/api/src/com/cloud/agent/api/ComputeChecksumCommand.java
index f0771a8..a2c88c4 100755
--- a/api/src/com/cloud/agent/api/ComputeChecksumCommand.java
+++ b/api/src/com/cloud/agent/api/ComputeChecksumCommand.java
@@ -26,12 +26,12 @@ public class ComputeChecksumCommand extends ssCommand {
public ComputeChecksumCommand() {
super();
}
-
+
public ComputeChecksumCommand(String secUrl, String templatePath) {
super(secUrl);
this.templatePath = templatePath;
- }
-
+ }
+
public String getTemplatePath() {
return templatePath;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java b/api/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java
index 53a975f..9f50a2f 100644
--- a/api/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java
+++ b/api/src/com/cloud/agent/api/ConsoleAccessAuthenticationAnswer.java
@@ -14,75 +14,75 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
-package com.cloud.agent.api;
-
-public class ConsoleAccessAuthenticationAnswer extends AgentControlAnswer {
-
+package com.cloud.agent.api;
+
+public class ConsoleAccessAuthenticationAnswer extends AgentControlAnswer {
+
private boolean _success;
-
+
private boolean _isReauthenticating;
private String _host;
private int _port;
-
+
private String _tunnelUrl;
private String _tunnelSession;
-
+
public ConsoleAccessAuthenticationAnswer() {
_success = false;
_isReauthenticating = false;
- _port = 0;
- }
-
- public ConsoleAccessAuthenticationAnswer(Command cmd, boolean success) {
- super(cmd);
- _success = success;
- }
-
- public boolean succeeded() {
- return _success;
+ _port = 0;
}
-
+
+ public ConsoleAccessAuthenticationAnswer(Command cmd, boolean success) {
+ super(cmd);
+ _success = success;
+ }
+
+ public boolean succeeded() {
+ return _success;
+ }
+
public void setSuccess(boolean value) {
_success = value;
}
-
+
public boolean isReauthenticating() {
return _isReauthenticating;
}
-
+
public void setReauthenticating(boolean value) {
_isReauthenticating = value;
}
-
+
public String getHost() {
return _host;
}
-
+
public void setHost(String host) {
_host = host;
}
-
+
public int getPort() {
return _port;
}
-
+
public void setPort(int port) {
_port = port;
}
-
+
public String getTunnelUrl() {
return _tunnelUrl;
}
-
+
public void setTunnelUrl(String tunnelUrl) {
- _tunnelUrl = tunnelUrl;
+ _tunnelUrl = tunnelUrl;
}
-
+
public String getTunnelSession() {
return _tunnelSession;
}
-
+
public void setTunnelSession(String tunnelSession) {
_tunnelSession = tunnelSession;
- }
-}
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java b/api/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java
index acbc181..bd8093c 100644
--- a/api/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java
+++ b/api/src/com/cloud/agent/api/ConsoleAccessAuthenticationCommand.java
@@ -17,19 +17,19 @@
package com.cloud.agent.api;
public class ConsoleAccessAuthenticationCommand extends AgentControlCommand {
-
+
private String _host;
private String _port;
private String _vmId;
private String _sid;
private String _ticket;
-
- private boolean _isReauthenticating;
-
+
+ private boolean _isReauthenticating;
+
public ConsoleAccessAuthenticationCommand() {
- _isReauthenticating = false;
- }
-
+ _isReauthenticating = false;
+ }
+
public ConsoleAccessAuthenticationCommand(String host, String port, String vmId, String sid, String ticket) {
_host = host;
_port = port;
@@ -37,32 +37,32 @@ public class ConsoleAccessAuthenticationCommand extends AgentControlCommand {
_sid = sid;
_ticket = ticket;
}
-
+
public String getHost() {
return _host;
}
-
+
public String getPort() {
return _port;
}
-
+
public String getVmId() {
return _vmId;
}
-
+
public String getSid() {
return _sid;
}
-
+
public String getTicket() {
return _ticket;
}
-
+
public boolean isReauthenticating() {
return _isReauthenticating;
}
-
+
public void setReauthenticating(boolean value) {
_isReauthenticating = value;
- }
-}
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java b/api/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java
index d4b101a..ebb06b6 100644
--- a/api/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java
+++ b/api/src/com/cloud/agent/api/ConsoleProxyLoadReportCommand.java
@@ -17,22 +17,22 @@
package com.cloud.agent.api;
public class ConsoleProxyLoadReportCommand extends AgentControlCommand {
-
+
private long _proxyVmId;
private String _loadInfo;
-
+
public ConsoleProxyLoadReportCommand() {
}
-
+
public ConsoleProxyLoadReportCommand(long proxyVmId, String loadInfo) {
_proxyVmId = proxyVmId;
_loadInfo = loadInfo;
}
-
+
public long getProxyVmId() {
return _proxyVmId;
}
-
+
public String getLoadInfo() {
return _loadInfo;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java b/api/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java
index bf6f260..504198c 100644
--- a/api/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java
+++ b/api/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java
@@ -17,28 +17,28 @@
package com.cloud.agent.api;
/**
- * This currently assumes that both primary and secondary storage are mounted on the XenServer.
+ * This currently assumes that both primary and secondary storage are mounted on the XenServer.
*/
public class CreatePrivateTemplateFromSnapshotCommand extends SnapshotCommand {
private String origTemplateInstallPath;
private Long newTemplateId;
private String templateName;
-
+
protected CreatePrivateTemplateFromSnapshotCommand() {
-
+
}
-
+
/**
* Given the UUID of a backed up snapshot VHD file on the secondary storage, the execute of this command does
* 1) Get the parent chain of this VHD all the way up to the root, say VHDList
* 2) Copy all the files in the VHDlist to some temp location
* 3) Coalesce all the VHDs to one VHD which contains all the data of the volume. This invokes the DeletePreviousBackupCommand for each VHD
* 4) Rename the UUID of this VHD
- * @param secondaryStoragePoolURL This is what shows up in the UI when you click on Secondary storage.
+ * @param secondaryStoragePoolURL This is what shows up in the UI when you click on Secondary storage.
* In the code, it is present as: In the vmops.host_details table, there is a field mount.parent. This is the value of that field
* If you have better ideas on how to get it, you are welcome.
* It may not be the UUID of the base copy of the snapshot, if no data was written since last snapshot.
- * @param origTemplateInstallPath The install path of the original template VHD on the secondary
+ * @param origTemplateInstallPath The install path of the original template VHD on the secondary
*/
public CreatePrivateTemplateFromSnapshotCommand(String primaryStoragePoolNameLabel,
String secondaryStoragePoolURL,
@@ -50,7 +50,7 @@ public class CreatePrivateTemplateFromSnapshotCommand extends SnapshotCommand {
String origTemplateInstallPath,
Long newTemplateId,
String templateName,
- int wait)
+ int wait)
{
super(primaryStoragePoolNameLabel, secondaryStoragePoolURL, backedUpSnapshotUuid, backedUpSnapshotName, dcId, accountId, volumeId);
this.origTemplateInstallPath = origTemplateInstallPath;
@@ -65,7 +65,7 @@ public class CreatePrivateTemplateFromSnapshotCommand extends SnapshotCommand {
public String getOrigTemplateInstallPath() {
return origTemplateInstallPath;
}
-
+
public Long getNewTemplateId() {
return newTemplateId;
}
@@ -76,4 +76,4 @@ public class CreatePrivateTemplateFromSnapshotCommand extends SnapshotCommand {
public String getTemplateName() {
return templateName;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/CreateStoragePoolCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CreateStoragePoolCommand.java b/api/src/com/cloud/agent/api/CreateStoragePoolCommand.java
index ecba6c2..7a4d768 100644
--- a/api/src/com/cloud/agent/api/CreateStoragePoolCommand.java
+++ b/api/src/com/cloud/agent/api/CreateStoragePoolCommand.java
@@ -20,10 +20,10 @@ import com.cloud.storage.StoragePool;
public class CreateStoragePoolCommand extends ModifyStoragePoolCommand {
-
+
public CreateStoragePoolCommand() {
}
-
+
public CreateStoragePoolCommand(boolean add, StoragePool pool) {
super(add, pool);
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e0501d1/api/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java b/api/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java
index a57d6fa..2f7cd94 100644
--- a/api/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java
+++ b/api/src/com/cloud/agent/api/CreateVolumeFromSnapshotAnswer.java
@@ -19,11 +19,11 @@ package com.cloud.agent.api;
public class CreateVolumeFromSnapshotAnswer extends Answer {
private String vdiUUID;
-
+
protected CreateVolumeFromSnapshotAnswer() {
-
+
}
-
+
public CreateVolumeFromSnapshotAnswer(CreateVolumeFromSnapshotCommand cmd, boolean success, String result, String vdiUUID) {
super(cmd, success, result);
this.vdiUUID = vdiUUID;