You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mu...@apache.org on 2013/02/07 08:43:57 UTC
[47/50] [abbrv] git commit: refs/heads/gslb - Merge javelin into
master
Merge javelin into master
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/296c2033
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/296c2033
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/296c2033
Branch: refs/heads/gslb
Commit: 296c20332df4c82725fb12431a44b0b47357dba5
Parents: 77e3aad 7b75f0d
Author: Kelven Yang <ke...@gmail.com>
Authored: Fri Feb 1 14:40:45 2013 -0800
Committer: Kelven Yang <ke...@gmail.com>
Committed: Fri Feb 1 14:40:45 2013 -0800
----------------------------------------------------------------------
.gitignore | 2 +-
agent/src/com/cloud/agent/AgentShell.java | 39 +-
agent/src/com/cloud/agent/VmmAgentShell.java | 436 +-
.../configuration/AgentComponentLibraryBase.java | 76 -
.../cloud/agent/dao/impl/PropertiesStorage.java | 30 +
.../src/com/cloud/agent/dhcp/FakeDhcpSnooper.java | 30 +
.../com/cloud/agent/resource/DummyResource.java | 30 +
.../consoleproxy/ConsoleProxyResource.java | 2 +-
agent/test/com/cloud/agent/TestAgentShell.java | 13 +-
.../StartConsoleProxyAgentHttpHandlerCommand.java | 2 +-
.../storage/CreateEntityDownloadURLCommand.java | 1 -
.../cloud/agent/api/storage/DownloadCommand.java | 5 +-
.../agent/api/storage/ListTemplateAnswer.java | 1 -
.../cloud/agent/api/storage/ListVolumeCommand.java | 3 -
.../api/storage/PrimaryStorageDownloadCommand.java | 2 +-
.../agent/api/storage/ResizeVolumeCommand.java | 1 -
.../com/cloud/agent/api/storage/UploadCommand.java | 3 +-
api/src/com/cloud/agent/api/to/FirewallRuleTO.java | 5 +-
api/src/com/cloud/agent/api/to/NetworkACLTO.java | 3 +-
api/src/com/cloud/agent/api/to/S3TO.java | 4 +-
api/src/com/cloud/agent/api/to/TemplateTO.java | 3 +-
api/src/com/cloud/agent/api/to/VolumeTO.java | 3 +-
api/src/com/cloud/alert/Alert.java | 4 +-
.../api/commands/CreatePrivateNetworkCmd.java | 9 +-
.../cloud/api/commands/DestroyConsoleProxyCmd.java | 9 +-
.../commands/ListRecurringSnapshotScheduleCmd.java | 2 +-
.../cloud/configuration/ConfigurationService.java | 23 +-
api/src/com/cloud/dc/DataCenter.java | 3 +-
api/src/com/cloud/dc/Pod.java | 3 +-
api/src/com/cloud/domain/Domain.java | 3 +-
api/src/com/cloud/exception/CloudException.java | 1 +
.../cloud/exception/PermissionDeniedException.java | 1 +
api/src/com/cloud/host/Host.java | 5 +-
.../cloud/hypervisor/HypervisorCapabilities.java | 3 +-
api/src/com/cloud/network/IpAddress.java | 3 +-
api/src/com/cloud/network/Network.java | 21 +-
api/src/com/cloud/network/NetworkProfile.java | 1 -
api/src/com/cloud/network/NetworkService.java | 3 +-
api/src/com/cloud/network/PhysicalNetwork.java | 4 +-
.../network/PhysicalNetworkServiceProvider.java | 3 +-
.../cloud/network/PhysicalNetworkTrafficType.java | 3 +-
api/src/com/cloud/network/PublicIpAddress.java | 3 +-
.../com/cloud/network/StorageNetworkService.java | 7 +-
.../network/VirtualNetworkApplianceService.java | 1 +
api/src/com/cloud/network/as/AutoScaleService.java | 10 +-
.../com/cloud/network/as/AutoScaleVmProfile.java | 3 +-
.../com/cloud/network/element/NetworkElement.java | 19 +-
.../element/VirtualRouterElementService.java | 1 +
api/src/com/cloud/network/element/VpcProvider.java | 1 -
.../cloud/network/firewall/FirewallService.java | 1 +
.../cloud/network/firewall/NetworkACLService.java | 1 +
.../com/cloud/network/lb/LoadBalancingRule.java | 1 -
.../network/lb/LoadBalancingRulesService.java | 6 +-
.../cloud/network/rules/LbStickinessMethod.java | 3 +-
api/src/com/cloud/network/rules/RulesService.java | 1 +
.../com/cloud/network/rules/StickinessPolicy.java | 3 +-
.../cloud/network/security/SecurityGroupRules.java | 3 +-
.../network/security/SecurityGroupService.java | 7 +-
.../com/cloud/network/security/SecurityRule.java | 3 +-
.../com/cloud/network/vpc/StaticRouteProfile.java | 1 -
api/src/com/cloud/network/vpc/Vpc.java | 3 +-
api/src/com/cloud/network/vpc/VpcService.java | 1 +
.../cloud/network/vpn/RemoteAccessVpnService.java | 3 +-
.../com/cloud/network/vpn/Site2SiteVpnService.java | 3 +-
api/src/com/cloud/offering/DiskOffering.java | 4 +-
api/src/com/cloud/offering/NetworkOffering.java | 5 +-
api/src/com/cloud/offering/ServiceOffering.java | 4 +-
api/src/com/cloud/org/Cluster.java | 5 +-
api/src/com/cloud/projects/Project.java | 3 +-
api/src/com/cloud/resource/ResourceService.java | 13 +-
api/src/com/cloud/server/ManagementService.java | 38 +-
api/src/com/cloud/storage/S3.java | 5 +-
api/src/com/cloud/storage/Snapshot.java | 5 +-
api/src/com/cloud/storage/StoragePool.java | 13 +-
api/src/com/cloud/storage/StoragePoolStatus.java | 1 +
api/src/com/cloud/storage/StorageService.java | 6 +-
api/src/com/cloud/storage/Swift.java | 3 +-
api/src/com/cloud/storage/Upload.java | 4 +-
.../storage/VMTemplateStorageResourceAssoc.java | 7 +-
api/src/com/cloud/storage/Volume.java | 26 +-
.../cloud/storage/snapshot/SnapshotService.java | 5 +-
api/src/com/cloud/template/TemplateService.java | 3 +-
.../com/cloud/template/VirtualMachineTemplate.java | 6 +-
api/src/com/cloud/user/AccountService.java | 4 +
api/src/com/cloud/user/User.java | 6 +-
api/src/com/cloud/user/UserAccount.java | 4 +-
api/src/com/cloud/user/UserContext.java | 17 +-
api/src/com/cloud/user/UserContextInitializer.java | 40 +
api/src/com/cloud/uservm/UserVm.java | 1 +
api/src/com/cloud/vm/DiskProfile.java | 17 +
api/src/com/cloud/vm/Nic.java | 5 +-
api/src/com/cloud/vm/NicProfile.java | 3 +-
api/src/com/cloud/vm/UserVmService.java | 16 +-
api/src/com/cloud/vm/VirtualMachine.java | 14 +-
.../org/apache/cloudstack/api/ApiConstants.java | 2 +-
.../org/apache/cloudstack/api/BaseAsyncCmd.java | 1 +
api/src/org/apache/cloudstack/api/BaseCmd.java | 110 +-
api/src/org/apache/cloudstack/api/BaseListCmd.java | 15 +-
.../api/BaseListTemplateOrIsoPermissionsCmd.java | 2 +-
.../org/apache/cloudstack/api/BaseResponse.java | 2 -
.../cloudstack/api/BaseUpdateTemplateOrIsoCmd.java | 4 -
.../api/BaseUpdateTemplateOrIsoPermissionsCmd.java | 2 +-
api/src/org/apache/cloudstack/api/PlugService.java | 31 -
.../apache/cloudstack/api/ResponseGenerator.java | 2 +-
.../command/admin/account/CreateAccountCmd.java | 14 +-
.../command/admin/account/DeleteAccountCmd.java | 17 +-
.../command/admin/account/DisableAccountCmd.java | 14 +-
.../command/admin/account/EnableAccountCmd.java | 8 +-
.../api/command/admin/account/LockAccountCmd.java | 5 +-
.../command/admin/account/UpdateAccountCmd.java | 8 +-
.../command/admin/autoscale/CreateCounterCmd.java | 7 +-
.../command/admin/autoscale/DeleteCounterCmd.java | 7 +-
.../api/command/admin/cluster/AddClusterCmd.java | 9 +-
.../command/admin/cluster/DeleteClusterCmd.java | 6 +-
.../api/command/admin/cluster/ListClustersCmd.java | 9 +-
.../command/admin/cluster/UpdateClusterCmd.java | 6 +-
.../api/command/admin/config/ListCfgsByCmd.java | 4 +-
.../config/ListHypervisorCapabilitiesCmd.java | 4 +-
.../api/command/admin/config/UpdateCfgCmd.java | 6 +-
.../config/UpdateHypervisorCapabilitiesCmd.java | 6 +-
.../api/command/admin/domain/CreateDomainCmd.java | 10 +-
.../api/command/admin/domain/DeleteDomainCmd.java | 15 +-
.../admin/domain/ListDomainChildrenCmd.java | 6 +-
.../api/command/admin/domain/ListDomainsCmd.java | 6 +-
.../api/command/admin/domain/UpdateDomainCmd.java | 13 +-
.../api/command/admin/host/AddHostCmd.java | 6 +-
.../command/admin/host/AddSecondaryStorageCmd.java | 10 +-
.../command/admin/host/CancelMaintenanceCmd.java | 7 +-
.../api/command/admin/host/DeleteHostCmd.java | 8 +-
.../api/command/admin/host/ListHostsCmd.java | 4 +-
.../admin/host/PrepareForMaintenanceCmd.java | 7 +-
.../api/command/admin/host/ReconnectHostCmd.java | 7 +-
.../api/command/admin/host/UpdateHostCmd.java | 6 +-
.../command/admin/host/UpdateHostPasswordCmd.java | 6 +-
.../api/command/admin/ldap/LDAPConfigCmd.java | 6 +-
.../api/command/admin/ldap/LDAPRemoveCmd.java | 4 +-
.../command/admin/network/AddNetworkDeviceCmd.java | 18 +-
.../network/AddNetworkServiceProviderCmd.java | 7 +-
.../admin/network/CreateNetworkOfferingCmd.java | 11 +-
.../admin/network/CreatePhysicalNetworkCmd.java | 9 +-
.../network/CreateStorageNetworkIpRangeCmd.java | 7 +-
.../admin/network/DeleteNetworkDeviceCmd.java | 17 +-
.../admin/network/DeleteNetworkOfferingCmd.java | 6 +-
.../network/DeleteNetworkServiceProviderCmd.java | 7 +-
.../admin/network/DeletePhysicalNetworkCmd.java | 10 +-
.../network/DeleteStorageNetworkIpRangeCmd.java | 10 +-
.../admin/network/ListNetworkDeviceCmd.java | 19 +-
.../network/ListNetworkServiceProvidersCmd.java | 6 +-
.../admin/network/ListPhysicalNetworksCmd.java | 9 +-
.../network/ListStorageNetworkIpRangeCmd.java | 14 +-
.../network/ListSupportedNetworkServicesCmd.java | 4 +-
.../admin/network/UpdateNetworkOfferingCmd.java | 10 +-
.../network/UpdateNetworkServiceProviderCmd.java | 7 +-
.../admin/network/UpdatePhysicalNetworkCmd.java | 4 +-
.../network/UpdateStorageNetworkIpRangeCmd.java | 10 +-
.../admin/offering/CreateDiskOfferingCmd.java | 8 +-
.../admin/offering/CreateServiceOfferingCmd.java | 8 +-
.../admin/offering/DeleteDiskOfferingCmd.java | 8 +-
.../admin/offering/DeleteServiceOfferingCmd.java | 10 +-
.../admin/offering/UpdateDiskOfferingCmd.java | 6 +-
.../admin/offering/UpdateServiceOfferingCmd.java | 10 +-
.../api/command/admin/pod/CreatePodCmd.java | 9 +-
.../api/command/admin/pod/DeletePodCmd.java | 5 +-
.../api/command/admin/pod/ListPodsByCmd.java | 3 +-
.../api/command/admin/pod/UpdatePodCmd.java | 9 +-
.../api/command/admin/region/AddRegionCmd.java | 5 +
.../api/command/admin/region/RemoveRegionCmd.java | 5 +
.../api/command/admin/region/UpdateRegionCmd.java | 5 +
.../api/command/admin/resource/ListAlertsCmd.java | 6 +-
.../command/admin/resource/ListCapacityCmd.java | 6 +-
.../admin/resource/UploadCustomCertificateCmd.java | 10 +-
.../router/ConfigureVirtualRouterElementCmd.java | 20 +-
.../router/CreateVirtualRouterElementCmd.java | 22 +-
.../api/command/admin/router/DestroyRouterCmd.java | 7 +-
.../api/command/admin/router/ListRoutersCmd.java | 7 +-
.../admin/router/ListVirtualRouterElementsCmd.java | 18 +-
.../api/command/admin/router/RebootRouterCmd.java | 10 +-
.../api/command/admin/router/StartRouterCmd.java | 10 +-
.../api/command/admin/router/StopRouterCmd.java | 7 +-
.../api/command/admin/router/UpgradeRouterCmd.java | 10 +-
.../api/command/admin/storage/AddS3Cmd.java | 9 +-
.../CancelPrimaryStorageMaintenanceCmd.java | 7 +-
.../admin/storage/CreateStoragePoolCmd.java | 10 +-
.../api/command/admin/storage/DeletePoolCmd.java | 10 +-
.../api/command/admin/storage/ListS3sCmd.java | 3 +-
.../command/admin/storage/ListStoragePoolsCmd.java | 10 +-
.../PreparePrimaryStorageForMaintenanceCmd.java | 7 +-
.../admin/storage/UpdateStoragePoolCmd.java | 10 +-
.../api/command/admin/swift/AddSwiftCmd.java | 10 +-
.../api/command/admin/swift/ListSwiftsCmd.java | 4 +-
.../command/admin/systemvm/DestroySystemVmCmd.java | 10 +-
.../command/admin/systemvm/ListSystemVMsCmd.java | 4 +-
.../command/admin/systemvm/MigrateSystemVMCmd.java | 9 +-
.../command/admin/systemvm/RebootSystemVmCmd.java | 7 +-
.../command/admin/systemvm/StartSystemVMCmd.java | 7 +-
.../command/admin/systemvm/StopSystemVmCmd.java | 10 +-
.../command/admin/systemvm/UpgradeSystemVMCmd.java | 10 +-
.../command/admin/template/PrepareTemplateCmd.java | 8 +-
.../api/command/admin/usage/AddTrafficTypeCmd.java | 9 +-
.../command/admin/usage/DeleteTrafficTypeCmd.java | 9 +-
.../usage/ListTrafficTypeImplementorsCmd.java | 9 +-
.../command/admin/usage/ListTrafficTypesCmd.java | 6 +-
.../command/admin/usage/UpdateTrafficTypeCmd.java | 7 +-
.../api/command/admin/user/CreateUserCmd.java | 6 +-
.../api/command/admin/user/DeleteUserCmd.java | 9 +-
.../api/command/admin/user/DisableUserCmd.java | 8 +-
.../api/command/admin/user/EnableUserCmd.java | 13 +-
.../api/command/admin/user/GetUserCmd.java | 6 +-
.../api/command/admin/user/ListUsersCmd.java | 5 +-
.../api/command/admin/user/LockUserCmd.java | 6 +-
.../api/command/admin/user/RegisterCmd.java | 6 +-
.../api/command/admin/user/UpdateUserCmd.java | 13 +-
.../command/admin/vlan/CreateVlanIpRangeCmd.java | 14 +-
.../command/admin/vlan/DeleteVlanIpRangeCmd.java | 8 +-
.../command/admin/vlan/ListVlanIpRangesCmd.java | 10 +-
.../api/command/admin/vm/AssignVMCmd.java | 13 +-
.../api/command/admin/vm/MigrateVMCmd.java | 11 +-
.../api/command/admin/vm/RecoverVMCmd.java | 6 +-
.../command/admin/vpc/CreatePrivateGatewayCmd.java | 11 +-
.../command/admin/vpc/CreateVPCOfferingCmd.java | 10 +-
.../command/admin/vpc/DeletePrivateGatewayCmd.java | 9 +-
.../command/admin/vpc/DeleteVPCOfferingCmd.java | 9 +-
.../command/admin/vpc/UpdateVPCOfferingCmd.java | 10 +-
.../api/command/admin/zone/CreateZoneCmd.java | 7 +-
.../api/command/admin/zone/DeleteZoneCmd.java | 10 +-
.../admin/zone/MarkDefaultZoneForAccountCmd.java | 16 +-
.../api/command/admin/zone/UpdateZoneCmd.java | 10 +-
.../user/account/AddAccountToProjectCmd.java | 10 +-
.../user/account/DeleteAccountFromProjectCmd.java | 10 +-
.../api/command/user/account/ListAccountsCmd.java | 12 +-
.../user/account/ListProjectAccountsCmd.java | 3 +-
.../command/user/address/AssociateIPAddrCmd.java | 9 +-
.../user/address/DisassociateIPAddrCmd.java | 10 +-
.../user/address/ListPublicIpAddressesCmd.java | 8 +-
.../user/autoscale/CreateAutoScalePolicyCmd.java | 10 +-
.../user/autoscale/CreateAutoScaleVmGroupCmd.java | 12 +-
.../autoscale/CreateAutoScaleVmProfileCmd.java | 7 +-
.../command/user/autoscale/CreateConditionCmd.java | 11 +-
.../user/autoscale/DeleteAutoScalePolicyCmd.java | 9 +-
.../user/autoscale/DeleteAutoScaleVmGroupCmd.java | 9 +-
.../autoscale/DeleteAutoScaleVmProfileCmd.java | 9 +-
.../command/user/autoscale/DeleteConditionCmd.java | 9 +-
.../user/autoscale/DisableAutoScaleVmGroupCmd.java | 7 +-
.../user/autoscale/EnableAutoScaleVmGroupCmd.java | 10 +-
.../user/autoscale/ListAutoScalePoliciesCmd.java | 10 +-
.../user/autoscale/ListAutoScaleVmGroupsCmd.java | 4 +-
.../user/autoscale/ListAutoScaleVmProfilesCmd.java | 6 +-
.../command/user/autoscale/ListConditionsCmd.java | 8 +-
.../command/user/autoscale/ListCountersCmd.java | 4 +-
.../user/autoscale/UpdateAutoScalePolicyCmd.java | 9 +-
.../user/autoscale/UpdateAutoScaleVmGroupCmd.java | 10 +-
.../autoscale/UpdateAutoScaleVmProfileCmd.java | 10 +-
.../command/user/config/ListCapabilitiesCmd.java | 6 +-
.../api/command/user/event/ListEventTypesCmd.java | 4 +-
.../api/command/user/event/ListEventsCmd.java | 4 +-
.../user/firewall/CreateFirewallRuleCmd.java | 9 +-
.../user/firewall/CreatePortForwardingRuleCmd.java | 11 +-
.../user/firewall/DeleteFirewallRuleCmd.java | 10 +-
.../user/firewall/DeletePortForwardingRuleCmd.java | 10 +-
.../user/firewall/ListFirewallRulesCmd.java | 10 +-
.../user/firewall/ListPortForwardingRulesCmd.java | 8 +-
.../user/firewall/UpdatePortForwardingRuleCmd.java | 10 +-
.../user/guest/ListGuestOsCategoriesCmd.java | 8 +-
.../api/command/user/guest/ListGuestOsCmd.java | 8 +-
.../api/command/user/iso/AttachIsoCmd.java | 11 +-
.../api/command/user/iso/CopyIsoCmd.java | 5 +-
.../api/command/user/iso/DeleteIsoCmd.java | 7 +-
.../api/command/user/iso/DetachIsoCmd.java | 11 +-
.../api/command/user/iso/ExtractIsoCmd.java | 10 +-
.../command/user/iso/ListIsoPermissionsCmd.java | 2 +-
.../api/command/user/iso/ListIsosCmd.java | 6 +-
.../api/command/user/iso/RegisterIsoCmd.java | 10 +-
.../api/command/user/iso/UpdateIsoCmd.java | 9 +-
.../command/user/iso/UpdateIsoPermissionsCmd.java | 4 +-
.../api/command/user/job/ListAsyncJobsCmd.java | 5 -
.../command/user/job/QueryAsyncJobResultCmd.java | 6 +-
.../loadbalancer/AssignToLoadBalancerRuleCmd.java | 11 +-
.../loadbalancer/CreateLBStickinessPolicyCmd.java | 13 +-
.../loadbalancer/CreateLoadBalancerRuleCmd.java | 7 +-
.../loadbalancer/DeleteLBStickinessPolicyCmd.java | 11 +-
.../loadbalancer/DeleteLoadBalancerRuleCmd.java | 10 +-
.../loadbalancer/ListLBStickinessPoliciesCmd.java | 6 +-
.../ListLoadBalancerRuleInstancesCmd.java | 8 +-
.../loadbalancer/ListLoadBalancerRulesCmd.java | 6 +-
.../RemoveFromLoadBalancerRuleCmd.java | 12 +-
.../loadbalancer/UpdateLoadBalancerRuleCmd.java | 10 +-
.../user/nat/CreateIpForwardingRuleCmd.java | 9 +-
.../user/nat/DeleteIpForwardingRuleCmd.java | 11 +-
.../api/command/user/nat/DisableStaticNatCmd.java | 11 +-
.../api/command/user/nat/EnableStaticNatCmd.java | 8 +-
.../command/user/nat/ListIpForwardingRulesCmd.java | 4 +-
.../command/user/network/CreateNetworkACLCmd.java | 9 +-
.../api/command/user/network/CreateNetworkCmd.java | 10 +-
.../command/user/network/DeleteNetworkACLCmd.java | 9 +-
.../api/command/user/network/DeleteNetworkCmd.java | 10 +-
.../command/user/network/ListNetworkACLsCmd.java | 8 +-
.../user/network/ListNetworkOfferingsCmd.java | 6 +-
.../api/command/user/network/ListNetworksCmd.java | 6 +-
.../command/user/network/RestartNetworkCmd.java | 12 +-
.../api/command/user/network/UpdateNetworkCmd.java | 9 +-
.../user/offering/ListDiskOfferingsCmd.java | 6 +-
.../user/offering/ListServiceOfferingsCmd.java | 6 +-
.../command/user/project/ActivateProjectCmd.java | 10 +-
.../api/command/user/project/CreateProjectCmd.java | 10 +-
.../api/command/user/project/DeleteProjectCmd.java | 9 +-
.../user/project/DeleteProjectInvitationCmd.java | 9 +-
.../user/project/ListProjectInvitationsCmd.java | 7 +-
.../api/command/user/project/ListProjectsCmd.java | 5 +-
.../command/user/project/SuspendProjectCmd.java | 10 +-
.../api/command/user/project/UpdateProjectCmd.java | 7 +-
.../user/project/UpdateProjectInvitationCmd.java | 10 +-
.../api/command/user/region/ListRegionsCmd.java | 5 +
.../user/resource/GetCloudIdentifierCmd.java | 6 +-
.../command/user/resource/ListHypervisorsCmd.java | 8 +-
.../user/resource/ListResourceLimitsCmd.java | 6 +-
.../user/resource/UpdateResourceCountCmd.java | 12 +-
.../user/resource/UpdateResourceLimitCmd.java | 10 +-
.../AuthorizeSecurityGroupEgressCmd.java | 11 +-
.../AuthorizeSecurityGroupIngressCmd.java | 7 +-
.../user/securitygroup/CreateSecurityGroupCmd.java | 6 +-
.../user/securitygroup/DeleteSecurityGroupCmd.java | 6 +-
.../user/securitygroup/ListSecurityGroupsCmd.java | 5 +-
.../RevokeSecurityGroupEgressCmd.java | 10 +-
.../RevokeSecurityGroupIngressCmd.java | 7 +-
.../command/user/snapshot/CreateSnapshotCmd.java | 13 +-
.../user/snapshot/CreateSnapshotPolicyCmd.java | 10 +-
.../command/user/snapshot/DeleteSnapshotCmd.java | 10 +-
.../user/snapshot/DeleteSnapshotPoliciesCmd.java | 6 +-
.../user/snapshot/ListSnapshotPoliciesCmd.java | 4 +-
.../command/user/snapshot/ListSnapshotsCmd.java | 6 +-
.../api/command/user/ssh/CreateSSHKeyPairCmd.java | 4 +-
.../api/command/user/ssh/DeleteSSHKeyPairCmd.java | 6 +-
.../api/command/user/ssh/ListSSHKeyPairsCmd.java | 4 +-
.../command/user/ssh/RegisterSSHKeyPairCmd.java | 6 +-
.../api/command/user/tag/CreateTagsCmd.java | 7 +-
.../api/command/user/tag/DeleteTagsCmd.java | 7 +-
.../api/command/user/template/CopyTemplateCmd.java | 7 +-
.../command/user/template/CreateTemplateCmd.java | 38 +-
.../command/user/template/DeleteTemplateCmd.java | 11 +-
.../command/user/template/ExtractTemplateCmd.java | 11 +-
.../user/template/ListTemplatePermissionsCmd.java | 2 +-
.../command/user/template/ListTemplatesCmd.java | 10 +-
.../command/user/template/RegisterTemplateCmd.java | 8 +-
.../command/user/template/UpdateTemplateCmd.java | 9 +-
.../template/UpdateTemplatePermissionsCmd.java | 4 +-
.../api/command/user/vm/DeployVMCmd.java | 54 +-
.../api/command/user/vm/DestroyVMCmd.java | 16 +-
.../api/command/user/vm/GetVMPasswordCmd.java | 4 +-
.../cloudstack/api/command/user/vm/ListVMsCmd.java | 6 +-
.../api/command/user/vm/RebootVMCmd.java | 13 +-
.../api/command/user/vm/ResetVMPasswordCmd.java | 7 +-
.../api/command/user/vm/RestoreVMCmd.java | 7 +-
.../cloudstack/api/command/user/vm/StartVMCmd.java | 17 +-
.../cloudstack/api/command/user/vm/StopVMCmd.java | 17 +-
.../api/command/user/vm/UpdateVMCmd.java | 7 +-
.../api/command/user/vm/UpgradeVMCmd.java | 12 +-
.../api/command/user/vmgroup/CreateVMGroupCmd.java | 11 +-
.../api/command/user/vmgroup/DeleteVMGroupCmd.java | 11 +-
.../api/command/user/vmgroup/ListVMGroupsCmd.java | 5 +-
.../api/command/user/vmgroup/UpdateVMGroupCmd.java | 10 +-
.../api/command/user/volume/AttachVolumeCmd.java | 9 +-
.../api/command/user/volume/CreateVolumeCmd.java | 14 +-
.../api/command/user/volume/DeleteVolumeCmd.java | 8 +-
.../api/command/user/volume/DetachVolumeCmd.java | 10 +-
.../api/command/user/volume/ExtractVolumeCmd.java | 11 +-
.../api/command/user/volume/ListVolumesCmd.java | 13 +-
.../api/command/user/volume/MigrateVolumeCmd.java | 4 +-
.../api/command/user/volume/ResizeVolumeCmd.java | 20 +-
.../api/command/user/volume/UploadVolumeCmd.java | 10 +-
.../api/command/user/vpc/CreateStaticRouteCmd.java | 8 +-
.../api/command/user/vpc/CreateVPCCmd.java | 17 +-
.../api/command/user/vpc/DeleteStaticRouteCmd.java | 10 +-
.../api/command/user/vpc/DeleteVPCCmd.java | 10 +-
.../command/user/vpc/ListPrivateGatewaysCmd.java | 6 +-
.../api/command/user/vpc/ListStaticRoutesCmd.java | 6 +-
.../api/command/user/vpc/ListVPCOfferingsCmd.java | 6 +-
.../api/command/user/vpc/ListVPCsCmd.java | 14 +-
.../api/command/user/vpc/RestartVPCCmd.java | 10 +-
.../api/command/user/vpc/UpdateVPCCmd.java | 7 +-
.../api/command/user/vpn/AddVpnUserCmd.java | 7 +-
.../command/user/vpn/CreateRemoteAccessVpnCmd.java | 11 +-
.../command/user/vpn/CreateVpnConnectionCmd.java | 11 +-
.../user/vpn/CreateVpnCustomerGatewayCmd.java | 9 +-
.../api/command/user/vpn/CreateVpnGatewayCmd.java | 9 +-
.../command/user/vpn/DeleteRemoteAccessVpnCmd.java | 8 +-
.../command/user/vpn/DeleteVpnConnectionCmd.java | 10 +-
.../user/vpn/DeleteVpnCustomerGatewayCmd.java | 10 +-
.../api/command/user/vpn/DeleteVpnGatewayCmd.java | 10 +-
.../command/user/vpn/ListRemoteAccessVpnsCmd.java | 8 +-
.../command/user/vpn/ListVpnConnectionsCmd.java | 6 +-
.../user/vpn/ListVpnCustomerGatewaysCmd.java | 4 +-
.../api/command/user/vpn/ListVpnGatewaysCmd.java | 6 +-
.../api/command/user/vpn/ListVpnUsersCmd.java | 4 +-
.../api/command/user/vpn/RemoveVpnUserCmd.java | 7 +-
.../command/user/vpn/ResetVpnConnectionCmd.java | 10 +-
.../user/vpn/UpdateVpnCustomerGatewayCmd.java | 10 +-
.../api/command/user/zone/ListZonesByCmd.java | 6 +-
.../cloudstack/api/response/AccountResponse.java | 2 +-
.../cloudstack/api/response/AlertResponse.java | 7 +-
.../cloudstack/api/response/AsyncJobResponse.java | 1 +
.../api/response/AutoScalePolicyResponse.java | 9 +-
.../api/response/AutoScaleVmGroupResponse.java | 9 +-
.../api/response/AutoScaleVmProfileResponse.java | 3 +-
.../api/response/CapabilitiesResponse.java | 3 +-
.../api/response/CapabilityResponse.java | 3 +-
.../cloudstack/api/response/CapacityResponse.java | 3 +-
.../api/response/CloudIdentifierResponse.java | 3 +-
.../cloudstack/api/response/ClusterResponse.java | 2 +-
.../cloudstack/api/response/ConditionResponse.java | 7 +-
.../api/response/ConfigurationResponse.java | 3 +-
.../cloudstack/api/response/CounterResponse.java | 2 +-
.../api/response/CustomCertificateResponse.java | 3 +-
.../api/response/DiskOfferingResponse.java | 7 +-
.../cloudstack/api/response/DomainResponse.java | 1 +
.../api/response/DomainRouterResponse.java | 8 +-
.../cloudstack/api/response/EventResponse.java | 5 +-
.../cloudstack/api/response/EventTypeResponse.java | 3 +-
.../cloudstack/api/response/ExceptionResponse.java | 3 +-
.../api/response/ExternalFirewallResponse.java | 2 +-
.../api/response/ExternalLoadBalancerResponse.java | 2 +-
.../cloudstack/api/response/ExtractResponse.java | 3 +-
.../cloudstack/api/response/FirewallResponse.java | 3 +-
.../api/response/FirewallRuleResponse.java | 7 +-
.../api/response/GetVMPasswordResponse.java | 3 +-
.../api/response/GuestOSCategoryResponse.java | 7 +-
.../cloudstack/api/response/GuestOSResponse.java | 7 +-
.../cloudstack/api/response/HostResponse.java | 5 +-
.../response/HypervisorCapabilitiesResponse.java | 7 +-
.../api/response/HypervisorResponse.java | 3 +-
.../cloudstack/api/response/IPAddressResponse.java | 7 +-
.../api/response/InstanceGroupResponse.java | 3 +-
.../api/response/IpForwardingRuleResponse.java | 3 +-
.../cloudstack/api/response/IsoVmResponse.java | 3 +-
.../api/response/LBStickinessPolicyResponse.java | 11 +-
.../api/response/LBStickinessResponse.java | 9 +-
.../api/response/LDAPConfigResponse.java | 3 +-
.../api/response/LoadBalancerResponse.java | 3 +-
.../api/response/NetworkACLResponse.java | 3 +-
.../api/response/NetworkDeviceResponse.java | 3 +-
.../api/response/NetworkOfferingResponse.java | 7 +-
.../cloudstack/api/response/NetworkResponse.java | 3 +-
.../cloudstack/api/response/NicResponse.java | 6 +-
.../api/response/PhysicalNetworkResponse.java | 7 +-
.../cloudstack/api/response/PodResponse.java | 2 +-
.../api/response/PrivateGatewayResponse.java | 7 +-
.../api/response/ProjectAccountResponse.java | 7 +-
.../api/response/ProjectInvitationResponse.java | 7 +-
.../cloudstack/api/response/ProjectResponse.java | 7 +-
.../cloudstack/api/response/ProviderResponse.java | 7 +-
.../cloudstack/api/response/RegisterResponse.java | 3 +-
.../api/response/RemoteAccessVpnResponse.java | 7 +-
.../api/response/ResourceCountResponse.java | 3 +-
.../api/response/ResourceLimitResponse.java | 7 +-
.../api/response/ResourceTagResponse.java | 3 +-
.../apache/cloudstack/api/response/S3Response.java | 15 +-
.../api/response/SSHKeyPairResponse.java | 3 +-
.../api/response/SecurityGroupResponse.java | 1 +
.../api/response/SecurityGroupRuleResponse.java | 3 +-
.../api/response/ServiceOfferingResponse.java | 7 +-
.../cloudstack/api/response/ServiceResponse.java | 3 +-
.../response/Site2SiteCustomerGatewayResponse.java | 7 +-
.../response/Site2SiteVpnConnectionResponse.java | 7 +-
.../api/response/Site2SiteVpnGatewayResponse.java | 7 +-
.../api/response/SnapshotPolicyResponse.java | 5 +-
.../cloudstack/api/response/SnapshotResponse.java | 10 +
.../api/response/SnapshotScheduleResponse.java | 3 +-
.../api/response/StaticRouteResponse.java | 7 +-
.../cloudstack/api/response/StatusResponse.java | 3 +-
.../response/StorageNetworkIpRangeResponse.java | 7 +-
.../api/response/StoragePoolResponse.java | 7 +-
.../cloudstack/api/response/SuccessResponse.java | 3 +-
.../cloudstack/api/response/SwiftResponse.java | 3 +-
.../api/response/SystemVmInstanceResponse.java | 3 +-
.../cloudstack/api/response/SystemVmResponse.java | 7 +-
.../api/response/TemplatePermissionsResponse.java | 7 +-
.../cloudstack/api/response/TemplateResponse.java | 7 +-
.../api/response/TrafficMonitorResponse.java | 1 +
.../response/TrafficTypeImplementorResponse.java | 3 +-
.../api/response/TrafficTypeResponse.java | 7 +-
.../cloudstack/api/response/UpgradeVmResponse.java | 3 +-
.../api/response/UsageRecordResponse.java | 2 +-
.../cloudstack/api/response/UsageTypeResponse.java | 1 +
.../cloudstack/api/response/UserResponse.java | 8 +-
.../cloudstack/api/response/UserVmResponse.java | 7 +-
.../response/VirtualRouterProviderResponse.java | 7 +-
.../api/response/VlanIpRangeResponse.java | 7 +-
.../cloudstack/api/response/VolumeResponse.java | 7 +-
.../api/response/VpcOfferingResponse.java | 7 +-
.../cloudstack/api/response/VpcResponse.java | 7 +-
.../cloudstack/api/response/VpnUsersResponse.java | 7 +-
.../cloudstack/api/response/ZoneResponse.java | 1 +
.../network/ExternalNetworkDeviceManager.java | 5 +-
.../org/apache/cloudstack/query/QueryService.java | 6 -
.../api/agent/test/BackupSnapshotCommandTest.java | 34 +-
.../api/agent/test/SnapshotCommandTest.java | 20 +-
.../api/command/test/AddClusterCmdTest.java | 4 +-
.../api/command/test/AddHostCmdTest.java | 8 +-
.../test/AddNetworkServiceProviderCmdTest.java | 2 +-
.../command/test/AddSecondaryStorageCmdTest.java | 6 +-
.../api/command/test/AddSwiftCmdTest.java | 6 +-
.../api/command/test/AddVpnUserCmdTest.java | 2 +-
.../agent/api/test/ResizeVolumeCommandTest.java | 36 +-
awsapi/conf/applicationContext.xml.in | 53 +
awsapi/conf/cloud-bridge.properties | 25 -
awsapi/conf/cloud-bridge.properties.in | 25 +
awsapi/conf/ec2-service.properties | 25 -
awsapi/conf/ec2-service.properties.in | 25 +
awsapi/modules/.gitignore | 54 -
awsapi/pom.xml | 47 +-
.../bridge/auth/ec2/AuthenticationHandler.java | 247 +-
.../bridge/auth/s3/AuthenticationHandler.java | 346 +-
.../bridge/persist/dao/BucketPolicyDaoImpl.java | 60 +-
.../persist/dao/CloudStackAccountDaoImpl.java | 3 +
.../dao/CloudStackConfigurationDaoImpl.java | 59 +-
.../persist/dao/CloudStackSvcOfferingDaoImpl.java | 2 +
.../com/cloud/bridge/persist/dao/MHostDaoImpl.java | 3 +
.../bridge/persist/dao/MHostMountDaoImpl.java | 3 +
.../bridge/persist/dao/MultiPartPartsDaoImpl.java | 3 +
.../persist/dao/MultiPartUploadsDaoImpl.java | 3 +
.../cloud/bridge/persist/dao/MultipartLoadDao.java | 420 +-
.../bridge/persist/dao/MultipartMetaDaoImpl.java | 3 +
.../cloud/bridge/persist/dao/OfferingDaoImpl.java | 2 +
.../com/cloud/bridge/persist/dao/SAclDaoImpl.java | 3 +
.../cloud/bridge/persist/dao/SBucketDaoImpl.java | 3 +
.../com/cloud/bridge/persist/dao/SHostDaoImpl.java | 3 +
.../com/cloud/bridge/persist/dao/SMetaDaoImpl.java | 3 +
.../cloud/bridge/persist/dao/SObjectDaoImpl.java | 90 +-
.../bridge/persist/dao/SObjectItemDaoImpl.java | 3 +
.../bridge/persist/dao/UserCredentialsDaoImpl.java | 2 +
.../com/cloud/bridge/service/EC2MainServlet.java | 132 +-
.../com/cloud/bridge/service/EC2RestServlet.java | 2213 +++++-----
.../com/cloud/bridge/service/S3RestServlet.java | 1253 +++---
.../service/controller/s3/S3BucketAction.java | 2054 ++++----
.../service/controller/s3/S3ObjectAction.java | 2257 +++++-----
.../service/controller/s3/ServiceProvider.java | 588 ++--
.../cloud/bridge/service/core/ec2/EC2Engine.java | 3657 ++++++++-------
.../com/cloud/bridge/service/core/s3/S3Engine.java | 3095 ++++++------
awsapi/web/web.xml | 16 +-
client/WEB-INF/web.xml | 9 +-
client/cloudstack-ui.launch | 32 -
client/pom.xml | 97 +-
client/tomcatconf/applicationContext.xml.in | 170 +
client/tomcatconf/componentContext.xml.in | 269 ++
client/tomcatconf/db.properties.in | 4 +
client/tomcatconf/nonossComponentContext.xml.in | 303 ++
client/vmops.log.2013-01-09.gz | Bin 0 -> 1248433 bytes
client/vmops.log.2013-01-18.gz | Bin 0 -> 4674726 bytes
.../virtualnetwork/VirtualRoutingResource.java | 39 +-
core/src/com/cloud/event/dao/EventDaoImpl.java | 2 +
.../src/com/cloud/event/dao/UsageEventDaoImpl.java | 2 +
.../hyperv/resource/HypervDummyResourceBase.java | 32 +
.../hypervisor/hyperv/resource/HypervResource.java | 30 +
.../network/resource/TrafficSentinelResource.java | 30 +
core/src/com/cloud/storage/JavaStorageLayer.java | 30 +
core/src/com/cloud/storage/SnapshotVO.java | 48 +-
core/src/com/cloud/storage/StoragePoolVO.java | 35 +-
core/src/com/cloud/storage/VolumeVO.java | 15 +
.../resource/CifsSecondaryStorageResource.java | 597 ++--
.../resource/LocalSecondaryStorageResource.java | 91 +-
.../resource/NfsSecondaryStorageResource.java | 833 ++--
.../storage/template/DownloadManagerImpl.java | 242 +-
.../com/cloud/storage/template/IsoProcessor.java | 20 +-
.../com/cloud/storage/template/QCOW2Processor.java | 23 +-
.../cloud/storage/template/RawImageProcessor.java | 20 +-
.../cloud/storage/template/UploadManagerImpl.java | 585 ++--
.../com/cloud/storage/template/VhdProcessor.java | 19 +-
.../com/cloud/storage/template/VmdkProcessor.java | 20 +-
core/src/com/cloud/vm/DomainRouterVO.java | 160 +-
core/src/com/cloud/vm/UserVmVO.java | 4 +-
core/src/com/cloud/vm/VMInstanceVO.java | 400 +-
.../src/com/xensource/xenapi/Marshalling.java | 41 +-
.../src/com/xensource/xenapi/XenAPIObject.java | 41 +-
developer/pom.xml | 493 +--
docs/en-US/LDAPserver-for-user-authentication.xml | 33 +-
docs/en-US/about-clusters.xml | 2 +-
docs/en-US/about-hosts.xml | 32 +-
docs/en-US/about-physical-networks.xml | 38 +-
docs/en-US/about-pods.xml | 41 +-
docs/en-US/about-primary-storage.xml | 2 +-
docs/en-US/about-secondary-storage.xml | 2 +-
docs/en-US/about-virtual-networks.xml | 31 +-
docs/en-US/about-working-with-vms.xml | 54 +-
docs/en-US/about-zones.xml | 37 +-
docs/en-US/accessing-vms.xml | 31 +-
docs/en-US/accounts-users-domains.xml | 31 +-
docs/en-US/accounts.xml | 30 +-
docs/en-US/advanced-zone-guest-ip-addresses.xml | 33 +-
docs/en-US/advanced-zone-network-traffic-types.xml | 35 +-
...dvanced-zone-physical-network-configuration.xml | 16 +-
docs/en-US/advanced-zone-public-ip-addresses.xml | 33 +-
docs/en-US/alerts.xml | 88 +-
docs/en-US/api-calls.xml | 30 +-
docs/en-US/attach-iso-to-vm.xml | 59 +-
docs/en-US/basic-zone-configuration.xml | 37 +-
docs/en-US/basic-zone-guest-ip-addresses.xml | 33 +-
docs/en-US/basic-zone-network-traffic-types.xml | 35 +-
.../basic-zone-physical-network-configuration.xml | 35 +-
docs/en-US/best-practices-for-vms.xml | 60 +-
.../change-network-offering-on-guest-network.xml | 77 +-
docs/en-US/changing-root-password.xml | 37 +-
docs/en-US/changing-secondary-storage-ip.xml | 74 +-
docs/en-US/changing-service-offering-for-vm.xml | 83 +-
docs/en-US/changing-vm-name-os-group.xml | 95 +-
docs/en-US/cloud-infrastructure-concepts.xml | 43 +-
docs/en-US/concepts.xml | 41 +-
docs/en-US/configure-usage-server.xml | 43 +-
docs/en-US/configure-vpn.xml | 87 +-
docs/en-US/console-proxy.xml | 33 +-
docs/en-US/convert-hyperv-vm-to-template.xml | 117 +-
docs/en-US/create-template-from-existing-vm.xml | 87 +-
docs/en-US/create-template-from-snapshot.xml | 31 +-
docs/en-US/create-templates-overview.xml | 52 +-
docs/en-US/create-windows-template.xml | 58 +-
docs/en-US/creating-network-offerings.xml | 122 +-
docs/en-US/creating-new-volumes.xml | 88 +-
docs/en-US/creating-vms.xml | 84 +-
docs/en-US/default-account-resource-limit.xml | 53 +-
docs/en-US/deleting-vms.xml | 66 +-
docs/en-US/deployment-architecture-overview.xml | 63 +-
docs/en-US/detach-move-volumes.xml | 69 +-
docs/en-US/enable-disable-static-nat.xml | 70 +-
docs/en-US/enable-security-groups.xml | 39 +-
docs/en-US/end-user-ui-overview.xml | 37 +-
docs/en-US/event-log-queries.xml | 33 +-
docs/en-US/event-types.xml | 420 +-
docs/en-US/events-log.xml | 43 +-
docs/en-US/events.xml | 30 +-
docs/en-US/feature-overview.xml | 101 +-
docs/en-US/firewall-rules.xml | 91 +-
docs/en-US/guest-traffic.xml | 41 +-
docs/en-US/ha-for-hosts.xml | 35 +-
docs/en-US/host-add.xml | 8 +
docs/en-US/host-allocation.xml | 33 +-
.../hypervisor-support-for-primarystorage.xml | 165 +-
docs/en-US/images/cluster-overview.png | Bin 6973 -> 6080 bytes
docs/en-US/import-ami.xml | 108 +-
docs/en-US/initialize-and-test.xml | 102 +-
docs/en-US/ip-forwarding-firewalling.xml | 34 +-
docs/en-US/isolated-networks.xml | 33 +-
docs/en-US/linux-installation.xml | 82 +-
docs/en-US/load-balancer-rules.xml | 37 +-
docs/en-US/log-in-root-admin.xml | 32 +-
docs/en-US/maintain-hypervisors-on-hosts.xml | 33 +-
docs/en-US/manage-cloud.xml | 36 +-
docs/en-US/manual-live-migration.xml | 81 +-
...grate-vm-rootvolume-volume-new-storage-pool.xml | 54 +-
docs/en-US/minimum-system-requirements.xml | 97 +-
docs/en-US/network-offerings.xml | 31 +-
docs/en-US/network-service-providers.xml | 127 +-
docs/en-US/networking-in-a-pod.xml | 69 +-
docs/en-US/networking-in-a-zone.xml | 56 +-
docs/en-US/networking-overview.xml | 51 +-
docs/en-US/port-forwarding.xml | 80 +-
docs/en-US/primary-storage-add.xml | 60 +-
docs/en-US/primary-storage.xml | 32 +-
docs/en-US/projects.xml | 11 +
docs/en-US/provisioning-steps-overview.xml | 70 +-
docs/en-US/provisioning-steps.xml | 33 +-
docs/en-US/release-ip-address.xml | 64 +-
docs/en-US/removing-vsphere-hosts.xml | 32 +-
...untime-allocation-virtual-network-resources.xml | 37 +-
...cheduled-maintenance-maintenance-mode-hosts.xml | 34 +-
docs/en-US/secondary-storage-vm.xml | 41 +-
docs/en-US/secondary-storage.xml | 32 +-
docs/en-US/security-groups.xml | 35 +-
docs/en-US/set-up-invitations.xml | 53 +-
docs/en-US/set-up-network-for-users.xml | 30 +-
docs/en-US/set-usage-limit.xml | 36 +-
docs/en-US/shared-networks.xml | 38 +-
docs/en-US/site-to-site-vpn.xml | 2 +-
docs/en-US/standard-events.xml | 35 +-
docs/en-US/static-nat.xml | 34 +-
docs/en-US/stop-restart-management-server.xml | 33 +-
docs/en-US/stopping-and-starting-vms.xml | 7 +-
docs/en-US/storage.xml | 42 +-
docs/en-US/sys-reliability-and-ha.xml | 46 +-
docs/en-US/sysprep-for-windows-server-2003R2.xml | 96 +-
docs/en-US/sysprep-windows-server-2008R2.xml | 48 +-
docs/en-US/system-reserved-ip-addresses.xml | 31 +-
docs/en-US/time-zones.xml | 252 +-
docs/en-US/troubleshooting.xml | 42 +-
docs/en-US/tuning.xml | 34 +-
docs/en-US/upload-template.xml | 96 +-
docs/en-US/using-multiple-guest-networks.xml | 39 +-
docs/en-US/vcenter-maintenance-mode.xml | 34 +-
docs/en-US/virtual-router.xml | 35 +-
docs/en-US/vm-lifecycle.xml | 61 +-
docs/en-US/vm-storage-migration.xml | 44 +-
docs/en-US/vpc.xml | 2 +-
docs/en-US/vpn.xml | 62 +-
docs/en-US/windows-installation.xml | 33 +-
docs/en-US/work-with-usage.xml | 52 +-
docs/en-US/working-with-hosts.xml | 58 +-
docs/en-US/working-with-iso.xml | 43 +-
docs/en-US/working-with-snapshots.xml | 37 +-
docs/en-US/working-with-system-vm.xml | 46 +-
docs/en-US/working-with-templates.xml | 38 +-
docs/en-US/working-with-volumes.xml | 31 +-
docs/en-US/xenserver-maintenance-mode.xml | 40 +-
engine/api/pom.xml | 60 +
.../src/org/apache/cloudstack/engine/Rules.java | 85 +
.../engine/cloud/entity/api/BackupEntity.java | 29 +
.../engine/cloud/entity/api/EdgeService.java | 23 +
.../engine/cloud/entity/api/NetworkEntity.java | 39 +
.../engine/cloud/entity/api/NicEntity.java | 29 +
.../engine/cloud/entity/api/SnapshotEntity.java | 49 +
.../engine/cloud/entity/api/TemplateEntity.java | 28 +
.../cloud/entity/api/VirtualMachineEntity.java | 164 +
.../engine/cloud/entity/api/VolumeEntity.java | 84 +
.../datacenter/entity/api/ClusterEntity.java | 40 +
.../entity/api/DataCenterResourceEntity.java | 104 +
.../engine/datacenter/entity/api/HostEntity.java | 61 +
.../datacenter/entity/api/OrganizationScope.java | 23 +
.../engine/datacenter/entity/api/PodEntity.java | 43 +
.../datacenter/entity/api/StorageEntity.java | 24 +
.../engine/datacenter/entity/api/ZoneEntity.java | 43 +
.../engine/entity/api/CloudStackEntity.java | 96 +
.../exception/InsufficientCapacityException.java | 24 +
.../rest/service/api/ClusterRestService.java | 86 +
.../rest/service/api/NetworkRestService.java | 62 +
.../engine/rest/service/api/PodRestService.java | 79 +
.../service/api/VirtualMachineRestService.java | 56 +
.../engine/rest/service/api/VolumeRestService.java | 76 +
.../engine/rest/service/api/ZoneRestService.java | 87 +
.../engine/service/api/DirectoryService.java | 34 +
.../engine/service/api/EntityService.java | 48 +
.../engine/service/api/OperationsServices.java | 57 +
.../engine/service/api/OrchestrationService.java | 114 +
.../engine/service/api/ProvisioningService.java | 72 +
.../subsystem/api/hypervisor/ComputeSubsystem.java | 31 +
.../api/network/NetworkServiceProvider.java | 47 +
.../subsystem/api/network/NetworkSubsystem.java | 35 +
.../engine/subsystem/api/storage/ClusterScope.java | 52 +
.../subsystem/api/storage/CommandResult.java | 52 +
.../subsystem/api/storage/CopyCommandResult.java | 31 +
.../subsystem/api/storage/CreateCmdResult.java | 37 +
.../api/storage/DataMigrationSubSystem.java | 29 +
.../engine/subsystem/api/storage/DataObject.java | 31 +
.../subsystem/api/storage/DataObjectType.java | 25 +
.../engine/subsystem/api/storage/DataStore.java | 25 +
.../subsystem/api/storage/DataStoreDriver.java | 33 +
.../subsystem/api/storage/DataStoreLifeCycle.java | 42 +
.../subsystem/api/storage/DataStoreRole.java | 54 +
.../engine/subsystem/api/storage/EndPoint.java | 28 +
.../engine/subsystem/api/storage/HostScope.java | 37 +
.../api/storage/PrimaryDataStoreInfo.java | 39 +
.../api/storage/PrimaryDataStoreLifeCycle.java | 23 +
.../api/storage/PrimaryDataStoreProvider.java | 16 +
.../engine/subsystem/api/storage/Scope.java | 24 +
.../engine/subsystem/api/storage/ScopeType.java | 27 +
.../subsystem/api/storage/SnapshotProfile.java | 26 +
.../engine/subsystem/api/storage/StorageEvent.java | 25 +
.../subsystem/api/storage/StorageOrchestrator.java | 68 +
.../subsystem/api/storage/StorageSubSystem.java | 29 +
.../subsystem/api/storage/TemplateProfile.java | 287 ++
.../engine/subsystem/api/storage/VolumeInfo.java | 23 +
.../subsystem/api/storage/VolumeProfile.java | 34 +
.../engine/subsystem/api/storage/ZoneScope.java | 40 +
.../subsystem/api/storage/disktype/DiskFormat.java | 38 +
.../subsystem/api/storage/disktype/QCOW2.java | 16 +
.../subsystem/api/storage/disktype/Unknown.java | 16 +
.../engine/subsystem/api/storage/disktype/VHD.java | 16 +
.../subsystem/api/storage/disktype/VMDK.java | 16 +
.../api/storage/disktype/VolumeDiskType.java | 16 +
.../api/storage/disktype/VolumeDiskTypeBase.java | 16 +
.../api/storage/disktype/VolumeDiskTypeHelper.java | 16 +
.../subsystem/api/storage/type/BaseImage.java | 23 +
.../subsystem/api/storage/type/DataDisk.java | 26 +
.../engine/subsystem/api/storage/type/Iso.java | 26 +
.../subsystem/api/storage/type/RootDisk.java | 26 +
.../engine/subsystem/api/storage/type/Unknown.java | 24 +
.../subsystem/api/storage/type/VolumeType.java | 22 +
.../subsystem/api/storage/type/VolumeTypeBase.java | 47 +
.../api/storage/type/VolumeTypeHelper.java | 44 +
engine/components-api/pom.xml | 47 +
.../org/apache/cloudstack/compute/ComputeGuru.java | 34 +
engine/compute/pom.xml | 52 +
.../cloudstack/compute/ComputeOrchestrator.java | 34 +
.../compute/ComputeOrchestratorImpl.java | 42 +
engine/network/pom.xml | 52 +
.../cloudstack/network/NetworkOrchestrator.java | 40 +
engine/orchestration/pom.xml | 88 +
.../engine/cloud/entity/api/VMEntityManager.java | 42 +
.../cloud/entity/api/VMEntityManagerImpl.java | 229 +
.../entity/api/VirtualMachineEntityFactory.java | 40 +
.../cloud/entity/api/VirtualMachineEntityImpl.java | 263 ++
.../engine/cloud/entity/api/db/VMComputeTagVO.java | 67 +
.../engine/cloud/entity/api/db/VMEntityVO.java | 577 +++
.../engine/cloud/entity/api/db/VMNetworkMapVO.java | 71 +
.../cloud/entity/api/db/VMReservationVO.java | 127 +
.../cloud/entity/api/db/VMRootDiskTagVO.java | 67 +
.../cloud/entity/api/db/VolumeReservationVO.java | 100 +
.../cloud/entity/api/db/dao/VMComputeTagDao.java | 31 +
.../entity/api/db/dao/VMComputeTagDaoImpl.java | 89 +
.../cloud/entity/api/db/dao/VMEntityDao.java | 41 +
.../cloud/entity/api/db/dao/VMEntityDaoImpl.java | 169 +
.../cloud/entity/api/db/dao/VMNetworkMapDao.java | 31 +
.../entity/api/db/dao/VMNetworkMapDaoImpl.java | 85 +
.../cloud/entity/api/db/dao/VMReservationDao.java | 34 +
.../entity/api/db/dao/VMReservationDaoImpl.java | 111 +
.../cloud/entity/api/db/dao/VMRootDiskTagDao.java | 31 +
.../entity/api/db/dao/VMRootDiskTagDaoImpl.java | 88 +
.../entity/api/db/dao/VolumeReservationDao.java | 31 +
.../api/db/dao/VolumeReservationDaoImpl.java | 68 +
.../datacenter/entity/api/ClusterEntityImpl.java | 209 +
.../entity/api/DataCenterResourceManager.java | 50 +
.../entity/api/DataCenterResourceManagerImpl.java | 129 +
.../datacenter/entity/api/HostEntityImpl.java | 215 +
.../datacenter/entity/api/PodEntityImpl.java | 211 +
.../datacenter/entity/api/ZoneEntityImpl.java | 201 +
.../datacenter/entity/api/db/ClusterDetailsVO.java | 68 +
.../datacenter/entity/api/db/DcDetailVO.java | 67 +
.../datacenter/entity/api/db/EngineCluster.java | 23 +
.../datacenter/entity/api/db/EngineClusterVO.java | 243 +
.../datacenter/entity/api/db/EngineDataCenter.java | 23 +
.../entity/api/db/EngineDataCenterVO.java | 480 ++
.../datacenter/entity/api/db/EngineHost.java | 24 +
.../datacenter/entity/api/db/EngineHostPodVO.java | 245 +
.../datacenter/entity/api/db/EngineHostVO.java | 778 +++
.../engine/datacenter/entity/api/db/EnginePod.java | 23 +
.../datacenter/entity/api/db/dao/DcDetailsDao.java | 29 +
.../entity/api/db/dao/DcDetailsDaoImpl.java | 94 +
.../entity/api/db/dao/EngineClusterDao.java | 37 +
.../entity/api/db/dao/EngineClusterDaoImpl.java | 288 ++
.../entity/api/db/dao/EngineDataCenterDao.java | 54 +
.../entity/api/db/dao/EngineDataCenterDaoImpl.java | 327 ++
.../entity/api/db/dao/EngineHostDao.java | 85 +
.../entity/api/db/dao/EngineHostDaoImpl.java | 809 ++++
.../entity/api/db/dao/EngineHostPodDao.java | 33 +
.../entity/api/db/dao/EngineHostPodDaoImpl.java | 184 +
.../entity/api/db/dao/HostDetailsDao.java | 32 +
.../entity/api/db/dao/HostDetailsDaoImpl.java | 110 +
.../datacenter/entity/api/db/dao/HostTagsDao.java | 30 +
.../entity/api/db/dao/HostTagsDaoImpl.java | 75 +
.../service/api/ProvisioningServiceImpl.java | 170 +
.../platform/orchestration/CloudOrchestrator.java | 292 ++
.../provisioning/test/ChildTestConfiguration.java | 51 +
.../engine/provisioning/test/ProvisioningTest.java | 137 +
.../test/resource/provisioningContext.xml | 47 +
.../cloudstack/platform/planning/Concierge.java | 36 +
engine/pom.xml | 51 +
engine/schema/pom.xml | 52 +
engine/service/pom.xml | 119 +
engine/service/src/main/webapp/WEB-INF/beans.xml | 71 +
engine/service/src/main/webapp/WEB-INF/log4j.xml | 49 +
engine/service/src/main/webapp/WEB-INF/web.xml | 52 +
engine/service/src/main/webapp/index.jsp | 23 +
engine/storage/backup/pom.xml | 50 +
.../storage/backup/BackupMotionService.java | 23 +
.../cloudstack/storage/backup/BackupService.java | 26 +
engine/storage/image/pom.xml | 50 +
.../storage/image/ImageDataFactoryImpl.java | 57 +
.../storage/image/ImageOrchestrator.java | 29 +
.../cloudstack/storage/image/ImageServiceImpl.java | 165 +
.../storage/image/downloader/ImageDownloader.java | 25 +
.../driver/DefaultImageDataStoreDriverImpl.java | 119 +
.../storage/image/manager/ImageDataManager.java | 30 +
.../image/manager/ImageDataManagerImpl.java | 50 +
.../image/manager/ImageDataStoreManagerImpl.java | 68 +
.../image/store/DefaultImageDataStoreProvider.java | 75 +
.../storage/image/store/HttpDataStoreImpl.java | 144 +
.../storage/image/store/TemplateObject.java | 149 +
.../lifecycle/DefaultImageDataStoreLifeCycle.java | 97 +
.../store/lifecycle/ImageDataStoreLifeCycle.java | 24 +
engine/storage/imagemotion/pom.xml | 62 +
.../image/motion/DefaultImageMotionStrategy.java | 141 +
.../image/motion/ImageMotionServiceImpl.java | 76 +
.../storage/image/motion/ImageMotionStrategy.java | 24 +
engine/storage/integration-test/pom.xml | 124 +
.../apache/cloudstack/storage/test/AllTests.java | 29 +
.../apache/cloudstack/storage/test/AopTest.java | 30 +
.../cloudstack/storage/test/AopTestAdvice.java | 34 +
.../storage/test/ChildTestConfiguration.java | 156 +
.../storage/test/CloudStackTestNGBase.java | 104 +
.../storage/test/DirectAgentManagerSimpleImpl.java | 243 +
.../cloudstack/storage/test/DirectAgentTest.java | 154 +
...ockHostEndpointRpcServerDirectCallResource.java | 70 +
.../test/MockHypervsiorHostEndPointRpcServer.java | 72 +
.../cloudstack/storage/test/MockRpcCallBack.java | 60 +
.../storage/test/StorageFactoryBean.java | 58 +
.../cloudstack/storage/test/StorageTest.java | 36 +
.../cloudstack/storage/test/TestConfiguration.java | 31 +
.../apache/cloudstack/storage/test/TestHttp.java | 90 +
.../org/apache/cloudstack/storage/test/TestNG.java | 35 +
.../apache/cloudstack/storage/test/TestNGAop.java | 53 +
.../cloudstack/storage/test/XenEndpoint.java | 21 +
.../cloudstack/storage/test/volumeServiceTest.java | 470 ++
.../test/resource/storageContext.xml | 82 +
.../integration-test/test/resource/testng.xml | 40 +
engine/storage/pom.xml | 74 +
engine/storage/snapshot/pom.xml | 50 +
.../storage/snapshot/SnapshotDataFactoryImpl.java | 47 +
.../storage/snapshot/SnapshotObject.java | 100 +
.../storage/snapshot/SnapshotServiceImpl.java | 49 +
.../storage/snapshot/db/SnapshotDao2.java | 25 +
.../storage/snapshot/db/SnapshotDao2Impl.java | 28 +
.../cloudstack/storage/snapshot/db/SnapshotVO.java | 296 ++
.../snapshot/strategy/HypervisorBasedSnapshot.java | 44 +
.../snapshot/strategy/StorageBasedSnapshot.java | 42 +
.../org/apache/cloudstack/storage/BaseType.java | 40 +
.../org/apache/cloudstack/storage/EndPoint.java | 16 +
.../cloudstack/storage/HostEndpointRpcServer.java | 29 +
.../cloudstack/storage/HypervisorHostEndPoint.java | 75 +
.../storage/HypervsiorHostEndPointRpcServer.java | 119 +
.../storage/backup/SnapshotOnBackupStoreInfo.java | 24 +
.../storage/backup/datastore/BackupStoreInfo.java | 24 +
.../command/AttachPrimaryDataStoreAnswer.java | 55 +
.../storage/command/AttachPrimaryDataStoreCmd.java | 38 +
.../apache/cloudstack/storage/command/CopyCmd.java | 45 +
.../cloudstack/storage/command/CopyCmdAnswer.java | 33 +
.../CopyTemplateToPrimaryStorageAnswer.java | 16 +
.../storage/command/CreateObjectAnswer.java | 48 +
.../storage/command/CreateObjectCommand.java | 45 +
.../storage/command/CreatePrimaryDataStoreCmd.java | 37 +
.../command/CreateVolumeFromBaseImageCommand.java | 49 +
.../cloudstack/storage/command/DeleteCommand.java | 44 +
.../storage/command/StorageSubSystemCommand.java | 23 +
.../storage/datastore/DataObjectManager.java | 37 +
.../storage/datastore/DataObjectManagerImpl.java | 402 ++
.../cloudstack/storage/datastore/DataStore.java | 16 +
.../storage/datastore/DataStoreManager.java | 29 +
.../storage/datastore/DataStoreManagerImpl.java | 54 +
.../storage/datastore/DataStoreStatus.java | 23 +
.../datastore/ObjectInDataStoreManager.java | 42 +
.../datastore/ObjectInDataStoreManagerImpl.java | 176 +
.../storage/datastore/PrimaryDataStore.java | 65 +
.../datastore/PrimaryDataStoreEntityImpl.java | 250 +
.../datastore/PrimaryDataStoreProviderManager.java | 28 +
.../storage/datastore/TemplateInDataStore.java | 16 +
.../storage/datastore/VolumeDataFactory.java | 26 +
.../storage/datastore/db/DataStoreProviderDao.java | 25 +
.../datastore/db/DataStoreProviderDaoImpl.java | 38 +
.../storage/datastore/db/DataStoreProviderVO.java | 60 +
.../storage/datastore/db/PrimaryDataStoreDao.java | 116 +
.../datastore/db/PrimaryDataStoreDaoImpl.java | 360 ++
.../datastore/db/PrimaryDataStoreDetailVO.java | 79 +
.../datastore/db/PrimaryDataStoreDetailsDao.java | 28 +
.../db/PrimaryDataStoreDetailsDaoImpl.java | 71 +
.../storage/datastore/db/PrimaryDataStoreVO.java | 267 ++
.../datastore/protocol/DataStoreProtocol.java | 32 +
.../datastore/provider/DataStoreProvider.java | 32 +
.../provider/DataStoreProviderManager.java | 30 +
.../provider/DataStoreProviderManagerImpl.java | 100 +
.../datastore/provider/ImageDataStoreProvider.java | 23 +
.../provider/PrimaryDataStoreProvider.java | 21 +
.../storage/db/ObjectInDataStoreDao.java | 25 +
.../storage/db/ObjectInDataStoreDaoImpl.java | 84 +
.../cloudstack/storage/db/ObjectInDataStoreVO.java | 181 +
.../storage/endpoint/DefaultEndPointSelector.java | 200 +
.../storage/endpoint/EndPointSelector.java | 40 +
.../cloudstack/storage/image/ImageDataFactory.java | 25 +
.../storage/image/ImageDataStoreDriver.java | 24 +
.../cloudstack/storage/image/ImageService.java | 28 +
.../storage/image/TemplateEntityImpl.java | 278 ++
.../cloudstack/storage/image/TemplateEvent.java | 26 +
.../cloudstack/storage/image/TemplateInfo.java | 27 +
.../cloudstack/storage/image/TemplateState.java | 27 +
.../storage/image/datastore/ImageDataStore.java | 35 +
.../image/datastore/ImageDataStoreHelper.java | 60 +
.../image/datastore/ImageDataStoreInfo.java | 26 +
.../image/datastore/ImageDataStoreManager.java | 26 +
.../storage/image/db/ImageDaoStoreDaoImpl.java | 38 +
.../cloudstack/storage/image/db/ImageDataDao.java | 85 +
.../storage/image/db/ImageDataDaoImpl.java | 975 ++++
.../storage/image/db/ImageDataStoreDao.java | 25 +
.../image/db/ImageDataStoreProviderDao.java | 25 +
.../image/db/ImageDataStoreProviderDaoImpl.java | 40 +
.../storage/image/db/ImageDataStoreProviderVO.java | 49 +
.../storage/image/db/ImageDataStoreVO.java | 110 +
.../cloudstack/storage/image/db/ImageDataVO.java | 450 ++
.../cloudstack/storage/image/format/BAREMETAL.java | 32 +
.../cloudstack/storage/image/format/ISO.java | 32 +
.../storage/image/format/ImageFormat.java | 23 +
.../storage/image/format/ImageFormatHelper.java | 45 +
.../cloudstack/storage/image/format/OVA.java | 32 +
.../cloudstack/storage/image/format/QCOW2.java | 32 +
.../cloudstack/storage/image/format/Unknown.java | 32 +
.../cloudstack/storage/image/format/VHD.java | 32 +
.../storage/image/motion/ImageMotionService.java | 30 +
.../storage/motion/DataMotionDriver.java | 25 +
.../storage/motion/DataMotionService.java | 28 +
.../storage/motion/DataMotionServiceImpl.java | 61 +
.../storage/motion/DataMotionStrategy.java | 30 +
.../storage/snapshot/SnapshotDataFactory.java | 25 +
.../storage/snapshot/SnapshotEntityImpl.java | 193 +
.../cloudstack/storage/snapshot/SnapshotInfo.java | 26 +
.../storage/snapshot/SnapshotService.java | 26 +
.../storage/snapshot/SnapshotStrategy.java | 23 +
.../cloudstack/storage/to/ImageDataStoreTO.java | 36 +
.../storage/to/ImageOnPrimayDataStoreTO.java | 44 +
.../storage/to/NfsPrimaryDataStoreTO.java | 44 +
.../cloudstack/storage/to/PrimaryDataStoreTO.java | 48 +
.../apache/cloudstack/storage/to/TemplateTO.java | 51 +
.../org/apache/cloudstack/storage/to/VolumeTO.java | 77 +
.../volume/ObjectInDataStoreStateMachine.java | 54 +
.../storage/volume/PrimaryDataStoreDriver.java | 29 +
.../volume/TemplateOnPrimaryDataStoreInfo.java | 32 +
.../cloudstack/storage/volume/VolumeEvent.java | 23 +
.../cloudstack/storage/volume/VolumeService.java | 91 +
.../volume/datastore/PrimaryDataStoreHelper.java | 76 +
.../volume/db/TemplatePrimaryDataStoreDao.java | 29 +
.../volume/db/TemplatePrimaryDataStoreDaoImpl.java | 96 +
.../volume/db/TemplatePrimaryDataStoreVO.java | 253 +
.../cloudstack/storage/volume/db/VolumeDao2.java | 82 +
.../storage/volume/db/VolumeDao2Impl.java | 439 ++
.../cloudstack/storage/volume/db/VolumeVO.java | 416 ++
engine/storage/storage.ucls | 365 ++
engine/storage/volume/pom.xml | 66 +
.../storage/datastore/DefaultPrimaryDataStore.java | 241 +
.../driver/DefaultPrimaryDataStoreDriverImpl.java | 242 +
.../datastore/driver/PrimaryDataStoreDriver.java | 16 +
.../DefaultPrimaryDataStoreLifeCycleImpl.java | 142 +
...DefaultPrimaryDataStoreProviderManagerImpl.java | 69 +
.../storage/datastore/manager/data model.ucls | 75 +
.../DefaultPrimaryDatastoreProviderImpl.java | 71 +
.../provider/PrimaryDataStoreProviderManager.java | 16 +
.../storage/datastore/type/DataStoreType.java | 23 +
.../cloudstack/storage/datastore/type/ISCSI.java | 32 +
.../storage/datastore/type/NetworkFileSystem.java | 32 +
.../storage/datastore/type/SharedMount.java | 30 +
.../storage/volume/TemplateInstallStrategy.java | 28 +
.../volume/TemplateInstallStrategyImpl.java | 294 ++
.../storage/volume/VolumeDataFactoryImpl.java | 54 +
.../storage/volume/VolumeEntityImpl.java | 207 +
.../cloudstack/storage/volume/VolumeManager.java | 45 +
.../storage/volume/VolumeManagerImpl.java | 112 +
.../storage/volume/VolumeMotionService.java | 23 +
.../cloudstack/storage/volume/VolumeObject.java | 148 +
.../storage/volume/VolumeServiceImpl.java | 409 ++
.../storage/volume/test/ConfiguratorTest.java | 94 +
.../cloudstack/storage/volume/test/Server.java | 40 +
.../cloudstack/storage/volume/test/Server1.java | 27 +
.../storage/volume/test/TestConfiguration.java | 41 +
.../storage/volume/test/TestInProcessAsync.java | 40 +
.../storage/volume/test/resource/testContext.xml | 79 +
framework/ipc/pom.xml | 48 +
.../framework/async/AsyncCallFuture.java | 84 +
.../framework/async/AsyncCallbackDispatcher.java | 136 +
.../framework/async/AsyncCallbackDriver.java | 24 +
.../framework/async/AsyncCompletionCallback.java | 23 +
.../cloudstack/framework/async/AsyncRpcConext.java | 30 +
.../async/InplaceAsyncCallbackDriver.java | 28 +
.../apache/cloudstack/framework/async/Void.java | 27 +
.../framework/client/ClientEventBus.java | 31 +
.../client/ClientTransportConnection.java | 81 +
.../framework/client/ClientTransportEndpoint.java | 40 +
.../client/ClientTransportEndpointSite.java | 47 +
.../framework/client/ClientTransportProvider.java | 140 +
.../cloudstack/framework/eventbus/EventBus.java | 32 +
.../framework/eventbus/EventBusBase.java | 308 ++
.../framework/eventbus/EventBusEndpoint.java | 61 +
.../framework/eventbus/EventDispatcher.java | 104 +
.../framework/eventbus/EventHandler.java | 30 +
.../framework/eventbus/PublishScope.java | 24 +
.../cloudstack/framework/eventbus/Subscriber.java | 24 +
.../framework/rpc/RpcCallRequestPdu.java | 68 +
.../framework/rpc/RpcCallResponsePdu.java | 80 +
.../framework/rpc/RpcCallbackDispatcher.java | 74 +
.../framework/rpc/RpcCallbackListener.java | 25 +
.../cloudstack/framework/rpc/RpcClientCall.java | 47 +
.../framework/rpc/RpcClientCallImpl.java | 234 +
.../cloudstack/framework/rpc/RpcException.java | 35 +
.../cloudstack/framework/rpc/RpcIOException.java | 37 +
.../cloudstack/framework/rpc/RpcProvider.java | 46 +
.../cloudstack/framework/rpc/RpcProviderImpl.java | 250 +
.../cloudstack/framework/rpc/RpcServerCall.java | 27 +
.../framework/rpc/RpcServerCallImpl.java | 72 +
.../framework/rpc/RpcServiceDispatcher.java | 118 +
.../framework/rpc/RpcServiceEndpoint.java | 31 +
.../framework/rpc/RpcServiceHandler.java | 30 +
.../framework/rpc/RpcTimeoutException.java | 33 +
.../serializer/JsonMessageSerializer.java | 87 +
.../framework/serializer/MessageSerializer.java | 24 +
.../framework/serializer/OnwireClassRegistry.java | 180 +
.../framework/serializer/OnwireName.java | 31 +
.../framework/server/ServerEventBus.java | 31 +
.../framework/server/ServerTransportProvider.java | 190 +
.../framework/transport/TransportAddress.java | 139 +
.../transport/TransportAddressMapper.java | 23 +
.../transport/TransportAttachRequestPdu.java | 34 +
.../transport/TransportAttachResponsePdu.java | 43 +
.../transport/TransportConnectRequestPdu.java | 46 +
.../transport/TransportConnectResponsePdu.java | 37 +
.../framework/transport/TransportDataPdu.java | 47 +
.../framework/transport/TransportEndpoint.java | 24 +
.../framework/transport/TransportEndpointSite.java | 144 +
.../framework/transport/TransportMultiplexier.java | 24 +
.../framework/transport/TransportPdu.java | 40 +
.../framework/transport/TransportProvider.java | 34 +
.../framework/codestyle/AsyncSampleCallee.java | 40 +
.../AsyncSampleEventDrivenStyleCaller.java | 118 +
.../codestyle/AsyncSampleListenerStyleCaller.java | 38 +
.../codestyle/ClientOnlyEventDrivenStyle.java | 54 +
.../codestyle/ClientOnlyListenerStyle.java | 59 +
.../sampleserver/SampleManagementServer.java | 34 +
.../sampleserver/SampleManagementServerApp.java | 56 +
.../sampleserver/SampleManagerComponent.java | 98 +
.../sampleserver/SampleManagerComponent2.java | 76 +
.../sampleserver/SampleStoragePrepareAnswer.java | 37 +
.../sampleserver/SampleStoragePrepareCommand.java | 47 +
.../resources/SampleManagementServerAppContext.xml | 63 +
framework/ipc/test/resources/log4j-cloud.xml | 94 +
framework/jobs/pom.xml | 29 +
.../org/apache/cloudstack/framework/job/Job.java | 32 +
.../cloudstack/framework/job/JobInterceptor.java | 23 +
framework/pom.xml | 2 +
framework/rest/pom.xml | 73 +
.../jackson/CSJacksonAnnotationIntrospector.java | 60 +
.../ws/jackson/CSJacksonAnnotationModule.java | 47 +
.../framework/ws/jackson/UriSerializer.java | 58 +
.../framework/ws/jackson/UrisSerializer.java | 71 +
.../cloudstack/framework/ws/jackson/Url.java | 53 +
.../ws/jackson/CSJacksonAnnotationTest.java | 118 +
m2-settings.xml | 59 +
parent/pom.xml | 86 +
.../acl/StaticRoleBasedAPIAccessChecker.java | 44 +-
.../api/command/user/discovery/ListApisCmd.java | 13 +-
.../discovery/ApiDiscoveryServiceImpl.java | 57 +-
.../cloudstack/discovery/ApiDiscoveryTest.java | 3 +-
.../command/admin/ratelimit/ResetApiLimitCmd.java | 5 +-
.../api/command/user/ratelimit/GetApiLimitCmd.java | 8 +-
.../ratelimit/ApiRateLimitServiceImpl.java | 9 +-
.../cloudstack/mom/rabbitmq/RabbitMQEventBus.java | 3 +-
.../cloud/api/commands/netapp/AssociateLunCmd.java | 30 +-
.../cloud/api/commands/netapp/CreateLunCmd.java | 23 +-
.../commands/netapp/CreateVolumeOnFilerCmd.java | 49 +-
.../api/commands/netapp/CreateVolumePoolCmd.java | 17 +-
.../api/commands/netapp/DeleteVolumePoolCmd.java | 13 +-
.../cloud/api/commands/netapp/DestroyLunCmd.java | 11 +-
.../commands/netapp/DestroyVolumeOnFilerCmd.java | 23 +-
.../api/commands/netapp/DissociateLunCmd.java | 11 +-
.../com/cloud/api/commands/netapp/ListLunsCmd.java | 11 +-
.../api/commands/netapp/ListVolumePoolsCmd.java | 11 +-
.../api/commands/netapp/ListVolumesOnFilerCmd.java | 13 +-
.../api/commands/netapp/ModifyVolumePoolCmd.java | 10 +-
.../src/com/cloud/netapp/NetappManagerImpl.java | 26 +-
.../src/com/cloud/netapp/dao/LunDaoImpl.java | 2 +
.../src/com/cloud/netapp/dao/PoolDaoImpl.java | 2 +
.../src/com/cloud/netapp/dao/VolumeDaoImpl.java | 2 +
.../manager/allocator/impl/RandomAllocator.java | 83 +-
.../baremetal/database/BaremetalCmdbDaoImpl.java | 3 +
.../baremetal/database/BaremetalDhcpDaoImpl.java | 3 +
.../baremetal/database/BaremetalPxeDaoImpl.java | 3 +
.../baremetal/manager/BareMetalDiscoverer.java | 2 +-
.../com/cloud/baremetal/manager/BareMetalGuru.java | 2 +-
.../manager/BareMetalTemplateAdapter.java | 4 +-
.../baremetal/manager/BaremetalManagerImpl.java | 5 +-
.../networkservice/AddBaremetalDhcpCmd.java | 5 +-
.../networkservice/AddBaremetalPxeCmd.java | 5 +-
.../networkservice/BareMetalPingServiceImpl.java | 4 +-
.../networkservice/BareMetalPxeServiceBase.java | 27 +-
.../networkservice/BareMetalResourceBase.java | 8 +-
.../networkservice/BaremetaNetworkGuru.java | 4 +-
.../networkservice/BaremetalDhcpElement.java | 2 +-
.../networkservice/BaremetalDhcpManagerImpl.java | 9 +-
.../networkservice/BaremetalDhcpResourceBase.java | 3 +-
.../BaremetalKickStartServiceImpl.java | 6 +-
.../networkservice/BaremetalPxeElement.java | 2 +-
.../networkservice/BaremetalPxeManagerImpl.java | 22 +-
.../networkservice/BaremetalPxeResourceBase.java | 3 +-
.../networkservice/BaremetalUserdataElement.java | 2 +-
.../networkservice/ListBaremetalDhcpCmd.java | 5 +-
.../ListBaremetalPxePingServersCmd.java | 5 +-
.../kvm/resource/LibvirtComputingResource.java | 309 +-
.../com/cloud/ovm/hypervisor/OvmDiscoverer.java | 2 +-
.../src/com/cloud/ovm/hypervisor/OvmFencer.java | 14 +-
.../ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java | 2 +-
.../com/cloud/ovm/hypervisor/OvmResourceBase.java | 30 +
.../com/cloud/agent/manager/MockAgentManager.java | 1 -
.../cloud/agent/manager/MockAgentManagerImpl.java | 762 ++--
.../cloud/agent/manager/MockStorageManager.java | 13 +-
.../agent/manager/MockStorageManagerImpl.java | 2307 +++++-----
.../src/com/cloud/agent/manager/MockVmManager.java | 21 +-
.../com/cloud/agent/manager/MockVmManagerImpl.java | 504 ++-
.../com/cloud/agent/manager/SimulatorManager.java | 1 -
.../cloud/agent/manager/SimulatorManagerImpl.java | 163 +-
.../com/cloud/api/commands/ConfigureSimulator.java | 15 +-
.../configuration/SimulatorComponentLibrary.java | 50 +-
.../src/com/cloud/resource/AgentResourceBase.java | 451 +-
.../com/cloud/resource/AgentRoutingResource.java | 4 -
.../com/cloud/resource/AgentStorageResource.java | 1 -
.../com/cloud/resource/SimulatorDiscoverer.java | 381 +-
.../resource/SimulatorSecondaryDiscoverer.java | 143 +-
.../server/ManagementServerSimulatorImpl.java | 6 +-
.../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 +-
.../src/com/cloud/simulator/SimulatorGuru.java | 12 +-
.../src/com/cloud/simulator/dao/MockVMDaoImpl.java | 2 +-
plugins/hypervisors/ucs/pom.xml | 37 +
.../src/com/cloud/ucs/database/UcsBladeDao.java | 7 +
.../com/cloud/ucs/database/UcsBladeDaoImpl.java | 11 +
.../ucs/src/com/cloud/ucs/database/UcsBladeVO.java | 69 +
.../src/com/cloud/ucs/database/UcsManagerDao.java | 16 +
.../com/cloud/ucs/database/UcsManagerDaoImpl.java | 12 +
.../src/com/cloud/ucs/database/UcsManagerVO.java | 78 +
.../com/cloud/ucs/manager/AddUcsManagerCmd.java | 108 +
.../cloud/ucs/manager/AddUcsManagerResponse.java | 53 +
.../ucs/manager/AssociateUcsProfileToBladeCmd.java | 76 +
...sociateUcsProfileToBladesInClusterResponse.java | 6 +
.../com/cloud/ucs/manager/ListUcsManagerCmd.java | 62 +
.../cloud/ucs/manager/ListUcsManagerResponse.java | 42 +
.../com/cloud/ucs/manager/ListUcsProfileCmd.java | 63 +
.../cloud/ucs/manager/ListUcsProfileResponse.java | 20 +
.../src/com/cloud/ucs/manager/StringTemplate.java | 22 +
.../ucs/src/com/cloud/ucs/manager/UcsCommands.java | 83 +
.../src/com/cloud/ucs/manager/UcsHttpClient.java | 33 +
.../ucs/src/com/cloud/ucs/manager/UcsManager.java | 15 +
.../src/com/cloud/ucs/manager/UcsManagerImpl.java | 288 ++
.../src/com/cloud/ucs/structure/ComputeBlade.java | 165 +
.../src/com/cloud/ucs/structure/UcsProfile.java | 37 +
.../cloud/api/commands/DeleteCiscoNexusVSMCmd.java | 7 +-
.../api/commands/DisableCiscoNexusVSMCmd.java | 7 +-
.../cloud/api/commands/EnableCiscoNexusVSMCmd.java | 4 +-
.../cloud/api/commands/ListCiscoNexusVSMsCmd.java | 17 +-
.../vmware/src/com/cloud/ha/VmwareFencer.java | 25 +-
.../src/com/cloud/hypervisor/guru/VMwareGuru.java | 363 +-
.../cloud/hypervisor/vmware/VmwareCleanupMaid.java | 23 +-
.../hypervisor/vmware/VmwareServerDiscoverer.java | 543 ++-
.../hypervisor/vmware/manager/VmwareManager.java | 68 +-
.../vmware/manager/VmwareManagerImpl.java | 328 +-
.../vmware/resource/VmwareContextFactory.java | 8 +-
.../hypervisor/vmware/resource/VmwareResource.java | 935 ++--
.../network/CiscoNexusVSMDeviceManagerImpl.java | 3 +-
.../network/dao/CiscoNexusVSMDeviceDaoImpl.java | 2 +
.../network/element/CiscoNexusVSMElement.java | 51 +-
plugins/hypervisors/xen/pom.xml | 44 +-
.../xen/src/com/cloud/ha/XenServerFencer.java | 5 +-
.../src/com/cloud/hypervisor/XenServerGuru.java | 4 +-
.../xen/discoverer/XcpServerDiscoverer.java | 16 +-
.../xen/resource/CitrixResourceBase.java | 504 ++-
.../hypervisor/xen/resource/XcpOssResource.java | 2 +-
.../xen/resource/XenServerStorageResource.java | 657 +++
.../api/commands/AddBigSwitchVnsDeviceCmd.java | 5 +-
.../api/commands/DeleteBigSwitchVnsDeviceCmd.java | 5 +-
.../api/commands/ListBigSwitchVnsDevicesCmd.java | 5 +-
.../com/cloud/network/dao/BigSwitchVnsDaoImpl.java | 3 +
.../cloud/network/element/BigSwitchVnsElement.java | 6 +-
.../network/guru/BigSwitchVnsGuestNetworkGuru.java | 6 +-
.../network/resource/BigSwitchVnsResource.java | 3 +-
.../cloudstack/network/element/DnsNotifier.java | 25 +-
.../element/ElasticLoadBalancerElement.java | 5 +-
.../network/lb/ElasticLoadBalancerManagerImpl.java | 120 +-
.../cloud/network/lb/dao/ElasticLbVmMapDao.java | 2 +-
.../network/lb/dao/ElasticLbVmMapDaoImpl.java | 29 +-
.../api/commands/AddExternalLoadBalancerCmd.java | 17 +-
.../cloud/api/commands/AddF5LoadBalancerCmd.java | 10 +-
.../api/commands/ConfigureF5LoadBalancerCmd.java | 6 +-
.../commands/DeleteExternalLoadBalancerCmd.java | 16 +-
.../api/commands/DeleteF5LoadBalancerCmd.java | 5 +-
.../api/commands/ListExternalLoadBalancersCmd.java | 4 +-
.../commands/ListF5LoadBalancerNetworksCmd.java | 5 +-
.../cloud/api/commands/ListF5LoadBalancersCmd.java | 6 +-
.../cloud/api/response/F5LoadBalancerResponse.java | 3 +-
.../element/F5ExternalLoadBalancerElement.java | 39 +-
.../F5ExternalLoadBalancerElementService.java | 3 +-
.../cloud/network/resource/F5BigIpResource.java | 30 +
.../cloud/api/commands/AddExternalFirewallCmd.java | 37 +-
.../com/cloud/api/commands/AddSrxFirewallCmd.java | 13 +-
.../api/commands/ConfigureSrxFirewallCmd.java | 9 +-
.../api/commands/DeleteExternalFirewallCmd.java | 21 +-
.../cloud/api/commands/DeleteSrxFirewallCmd.java | 7 +-
.../api/commands/ListExternalFirewallsCmd.java | 5 +-
.../api/commands/ListSrxFirewallNetworksCmd.java | 6 +-
.../cloud/api/commands/ListSrxFirewallsCmd.java | 8 +-
.../cloud/api/response/SrxFirewallResponse.java | 3 +-
.../element/JuniperSRXExternalFirewallElement.java | 42 +-
.../element/JuniperSRXFirewallElementService.java | 3 +-
.../cloud/network/resource/JuniperSrxResource.java | 32 +-
.../network/element/MidokuraMidonetElement.java | 3 +
.../guru/MidokuraMidonetGuestNetworkGuru.java | 2 +
.../api/commands/AddNetscalerLoadBalancerCmd.java | 10 +-
.../ConfigureNetscalerLoadBalancerCmd.java | 6 +-
.../commands/DeleteNetscalerLoadBalancerCmd.java | 5 +-
.../ListNetscalerLoadBalancerNetworksCmd.java | 5 +-
.../commands/ListNetscalerLoadBalancersCmd.java | 7 +-
.../response/NetscalerLoadBalancerResponse.java | 3 +-
.../com/cloud/network/dao/NetScalerPodDaoImpl.java | 3 +
.../cloud/network/element/NetscalerElement.java | 32 +-
.../NetscalerLoadBalancerElementService.java | 2 +-
.../cloud/network/resource/NetscalerResource.java | 30 +
.../cloud/api/commands/AddNiciraNvpDeviceCmd.java | 20 +-
.../api/commands/DeleteNiciraNvpDeviceCmd.java | 5 +-
.../commands/ListNiciraNvpDeviceNetworksCmd.java | 5 +-
.../api/commands/ListNiciraNvpDevicesCmd.java | 7 +-
.../com/cloud/network/dao/NiciraNvpDaoImpl.java | 3 +
.../network/dao/NiciraNvpNicMappingDaoImpl.java | 3 +
.../network/dao/NiciraNvpRouterMappingDaoImpl.java | 3 +
.../cloud/network/element/NiciraNvpElement.java | 1568 +++---
.../network/guru/NiciraNvpGuestNetworkGuru.java | 9 +-
.../cloud/network/resource/NiciraNvpResource.java | 30 +
.../guru/NiciraNvpGuestNetworkGuruTest.java | 4 +-
.../src/com/cloud/network/element/OvsElement.java | 14 +-
.../cloud/network/guru/OvsGuestNetworkGuru.java | 64 +-
.../cloud/network/ovs/OvsTunnelManagerImpl.java | 24 +-
.../network/ovs/dao/OvsTunnelInterfaceDaoImpl.java | 3 +
.../network/ovs/dao/OvsTunnelNetworkDaoImpl.java | 3 +
plugins/parent/pom.xml | 42 +
plugins/pom.xml | 7 +-
.../allocator/RandomStoragePoolAllocator.java | 2 +
plugins/storage/image/s3/pom.xml | 41 +
plugins/storage/volume/solidfire/pom.xml | 56 +
.../driver/SolidfirePrimaryDataStoreDriver.java | 88 +
.../SolidfirePrimaryDataStoreProvider.java | 39 +
.../cloudstack/storage/test/AopTestAdvice.java | 34 +
.../storage/test/ChildTestConfiguration.java | 51 +
.../cloudstack/storage/test/TestConfiguration.java | 37 +
.../apache/cloudstack/storage/test/VolumeTest.java | 151 +
.../solidfire/test/resource/storageContext.xml | 52 +
.../cloud/server/auth/LDAPUserAuthenticator.java | 68 +-
.../cloud/server/auth/MD5UserAuthenticator.java | 9 +-
.../server/auth/PlainTextUserAuthenticator.java | 9 +-
.../server/auth/SHA256SaltedUserAuthenticator.java | 152 +-
pom.xml | 223 +-
scripts/vm/hypervisor/xenserver/mockxcpplugin.py | 66 +
scripts/vm/hypervisor/xenserver/storagePlugin | 71 +
server/pom.xml | 15 +
server/src/com/cloud/acl/DomainChecker.java | 173 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 316 +-
.../src/com/cloud/agent/manager/AgentMonitor.java | 26 +-
.../agent/manager/ClusteredAgentManagerImpl.java | 19 +-
.../manager/allocator/impl/FirstFitAllocator.java | 18 +-
.../allocator/impl/FirstFitRoutingAllocator.java | 1 +
.../allocator/impl/RecreateHostAllocator.java | 4 +-
.../manager/allocator/impl/TestingAllocator.java | 46 +-
.../allocator/impl/UserConcentratedAllocator.java | 14 +-
.../manager/authn/impl/BasicAgentAuthManager.java | 23 +-
server/src/com/cloud/alert/AlertManagerImpl.java | 518 +--
.../src/com/cloud/alert/ClusterAlertAdapter.java | 43 +-
.../com/cloud/alert/ConsoleProxyAlertAdapter.java | 353 +-
.../alert/SecondaryStorageVmAlertAdapter.java | 23 +-
server/src/com/cloud/alert/dao/AlertDaoImpl.java | 3 +
server/src/com/cloud/api/ApiDBUtils.java | 692 ++-
server/src/com/cloud/api/ApiDispatcher.java | 265 +-
server/src/com/cloud/api/ApiResponseHelper.java | 104 +-
server/src/com/cloud/api/ApiServer.java | 153 +-
server/src/com/cloud/api/ApiServlet.java | 56 +-
.../cloud/api/commands/AddTrafficMonitorCmd.java | 133 +-
.../api/commands/DeleteTrafficMonitorCmd.java | 73 +-
.../cloud/api/commands/ListTrafficMonitorsCmd.java | 28 +-
.../src/com/cloud/api/query/QueryManagerImpl.java | 67 +-
.../cloud/api/query/dao/AccountJoinDaoImpl.java | 4 +-
.../cloud/api/query/dao/AsyncJobJoinDaoImpl.java | 4 +-
.../cloud/api/query/dao/DataCenterJoinDaoImpl.java | 3 +-
.../api/query/dao/DiskOfferingJoinDaoImpl.java | 3 +-
.../api/query/dao/DomainRouterJoinDaoImpl.java | 14 +-
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 30 +-
.../api/query/dao/InstanceGroupJoinDaoImpl.java | 2 +
.../api/query/dao/ProjectAccountJoinDaoImpl.java | 2 +
.../query/dao/ProjectInvitationJoinDaoImpl.java | 2 +
.../cloud/api/query/dao/ProjectJoinDaoImpl.java | 11 +-
.../api/query/dao/ResourceTagJoinDaoImpl.java | 12 +-
.../api/query/dao/SecurityGroupJoinDaoImpl.java | 13 +-
.../api/query/dao/ServiceOfferingJoinDaoImpl.java | 3 +-
.../api/query/dao/StoragePoolJoinDaoImpl.java | 12 +-
.../api/query/dao/UserAccountJoinDaoImpl.java | 2 +
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 20 +-
.../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 24 +-
.../cloud/async/AsyncJobExecutorContextImpl.java | 289 +-
.../src/com/cloud/async/AsyncJobManagerImpl.java | 740 ++--
.../src/com/cloud/async/SyncQueueManagerImpl.java | 425 +-
.../src/com/cloud/async/dao/AsyncJobDaoImpl.java | 2 +
.../src/com/cloud/async/dao/SyncQueueDaoImpl.java | 40 +-
.../com/cloud/async/dao/SyncQueueItemDaoImpl.java | 109 +-
.../com/cloud/baremetal/BareMetalDiscoverer.java | 2 +-
server/src/com/cloud/baremetal/BareMetalGuru.java | 3 +-
.../cloud/baremetal/BareMetalPingServiceImpl.java | 4 +-
.../cloud/baremetal/BareMetalPxeServiceBase.java | 28 +-
.../com/cloud/baremetal/BareMetalResourceBase.java | 30 +
.../cloud/baremetal/BareMetalTemplateAdapter.java | 26 +-
.../cloud/baremetal/BareMetalVmManagerImpl.java | 73 +-
.../cloud/baremetal/ExternalDhcpManagerImpl.java | 57 +-
.../cloud/baremetal/ExternalDhcpResourceBase.java | 30 +
.../com/cloud/baremetal/PxeServerManagerImpl.java | 34 +-
.../com/cloud/baremetal/PxeServerResourceBase.java | 30 +
.../com/cloud/capacity/CapacityManagerImpl.java | 14 +-
.../cloud/capacity/ComputeCapacityListener.java | 1 -
.../com/cloud/capacity/dao/CapacityDaoImpl.java | 530 ++--
.../cloud/certificate/dao/CertificateDaoImpl.java | 2 +
.../src/com/cloud/cluster/CheckPointManager.java | 52 -
.../com/cloud/cluster/CheckPointManagerImpl.java | 246 -
server/src/com/cloud/cluster/CleanupMaid.java | 41 -
.../com/cloud/cluster/ClusterFenceManagerImpl.java | 26 +-
.../src/com/cloud/cluster/ClusterManagerImpl.java | 82 +-
.../cluster/ClusterServiceServletAdapter.java | 38 +-
.../com/cloud/cluster/DummyClusterManagerImpl.java | 11 +-
.../com/cloud/cluster/ManagementServerNode.java | 27 +-
server/src/com/cloud/cluster/StackMaid.java | 153 -
.../ClusterBasedAgentLoadBalancerPlanner.java | 30 +-
.../agentlb/dao/HostTransferMapDaoImpl.java | 2 +
.../cluster/dao/ManagementServerHostDaoImpl.java | 2 +
.../dao/ManagementServerHostPeerDaoImpl.java | 2 +
.../com/cloud/cluster/dao/StackMaidDaoImpl.java | 2 +
.../configuration/CloudZonesComponentLibrary.java | 37 -
.../configuration/ConfigurationManagerImpl.java | 48 +-
.../configuration/DefaultComponentLibrary.java | 518 --
.../configuration/PremiumComponentLibrary.java | 72 -
.../cloud/configuration/dao/ConfigurationDao.java | 2 +
.../configuration/dao/ConfigurationDaoImpl.java | 19 +
.../configuration/dao/ResourceCountDaoImpl.java | 260 +-
.../configuration/dao/ResourceLimitDaoImpl.java | 3 +
.../AgentBasedConsoleProxyManager.java | 59 +-
.../AgentBasedStandaloneConsoleProxyManager.java | 1 +
.../consoleproxy/ConsoleProxyBalanceAllocator.java | 91 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 177 +-
.../consoleproxy/StaticConsoleProxyManager.java | 29 +-
server/src/com/cloud/dao/EntityManagerImpl.java | 6 +-
server/src/com/cloud/dc/ClusterDetailsDaoImpl.java | 3 +
.../com/cloud/dc/dao/AccountVlanMapDaoImpl.java | 3 +
server/src/com/cloud/dc/dao/ClusterDaoImpl.java | 127 +-
.../src/com/cloud/dc/dao/ClusterVSMMapDaoImpl.java | 3 +
server/src/com/cloud/dc/dao/DataCenterDaoImpl.java | 169 +-
.../cloud/dc/dao/DataCenterIpAddressDaoImpl.java | 4 +-
.../dao/DataCenterLinkLocalIpAddressDaoImpl.java | 4 +-
.../com/cloud/dc/dao/DataCenterVnetDaoImpl.java | 5 +-
server/src/com/cloud/dc/dao/DcDetailsDaoImpl.java | 5 +-
server/src/com/cloud/dc/dao/HostPodDao.java | 2 -
server/src/com/cloud/dc/dao/HostPodDaoImpl.java | 130 +-
server/src/com/cloud/dc/dao/PodVlanDaoImpl.java | 5 +-
server/src/com/cloud/dc/dao/PodVlanMapDaoImpl.java | 3 +
.../dc/dao/StorageNetworkIpAddressDaoImpl.java | 3 +
.../cloud/dc/dao/StorageNetworkIpRangeDaoImpl.java | 3 +
server/src/com/cloud/dc/dao/VlanDaoImpl.java | 404 +-
server/src/com/cloud/deploy/BareMetalPlanner.java | 14 +-
server/src/com/cloud/deploy/FirstFitPlanner.java | 215 +-
server/src/com/cloud/domain/dao/DomainDaoImpl.java | 2 +
.../com/cloud/event/ActionEventInterceptor.java | 128 +
server/src/com/cloud/event/ActionEventUtils.java | 42 +-
server/src/com/cloud/event/AlertGenerator.java | 32 +-
server/src/com/cloud/event/EventUtils.java | 118 +
server/src/com/cloud/event/UsageEventUtils.java | 39 +-
.../src/com/cloud/event/dao/EventJoinDaoImpl.java | 4 +-
.../src/com/cloud/ha/AbstractInvestigatorImpl.java | 12 +-
.../src/com/cloud/ha/CheckOnAgentInvestigator.java | 2 +-
.../cloud/ha/HighAvailabilityManagerExtImpl.java | 20 +-
.../com/cloud/ha/HighAvailabilityManagerImpl.java | 141 +-
server/src/com/cloud/ha/KVMFencer.java | 12 +-
.../cloud/ha/ManagementIPSystemVMInvestigator.java | 2 +-
server/src/com/cloud/ha/RecreatableFencer.java | 4 +-
.../src/com/cloud/ha/UserVmDomRInvestigator.java | 2 +-
server/src/com/cloud/ha/XenServerInvestigator.java | 2 +-
.../com/cloud/ha/dao/HighAvailabilityDaoImpl.java | 77 +-
server/src/com/cloud/host/dao/HostDao.java | 1 +
server/src/com/cloud/host/dao/HostDaoImpl.java | 131 +-
.../src/com/cloud/host/dao/HostDetailsDaoImpl.java | 5 +-
server/src/com/cloud/host/dao/HostTagsDaoImpl.java | 6 +-
.../hypervisor/CloudZonesStartupProcessor.java | 25 +-
.../com/cloud/hypervisor/HypervisorGuruBase.java | 3 +-
.../hypervisor/HypervisorGuruManagerImpl.java | 70 +-
server/src/com/cloud/hypervisor/KVMGuru.java | 2 +-
.../dao/HypervisorCapabilitiesDaoImpl.java | 2 +
.../src/com/cloud/hypervisor/guru/HypervGuru.java | 3 +-
.../hypervisor/hyperv/HypervServerDiscoverer.java | 2 +-
.../kvm/discoverer/KvmDummyResourceBase.java | 30 +
.../kvm/discoverer/KvmServerDiscoverer.java | 571 ++--
server/src/com/cloud/keystore/KeystoreDaoImpl.java | 3 +
.../com/cloud/keystore/KeystoreManagerImpl.java | 30 +-
server/src/com/cloud/maint/UpgradeManagerImpl.java | 68 +-
.../com/cloud/maint/dao/AgentUpgradeDaoImpl.java | 3 +
.../com/cloud/migration/Db21to22MigrationUtil.java | 173 +-
.../com/cloud/migration/DiskOffering20DaoImpl.java | 2 +
.../com/cloud/migration/DiskOffering21DaoImpl.java | 2 +
.../cloud/migration/ServiceOffering20DaoImpl.java | 2 +
.../cloud/migration/ServiceOffering21DaoImpl.java | 2 +
.../cloud/network/ExteralIpAddressAllocator.java | 251 +-
.../network/ExternalFirewallDeviceManager.java | 1 +
.../network/ExternalFirewallDeviceManagerImpl.java | 88 +-
.../cloud/network/ExternalFirewallDeviceVO.java | 161 -
.../network/ExternalLoadBalancerDeviceManager.java | 1 +
.../ExternalLoadBalancerDeviceManagerImpl.java | 65 +-
.../network/ExternalLoadBalancerDeviceVO.java | 200 -
.../ExternalLoadBalancerUsageManagerImpl.java | 18 +-
.../network/ExternalNetworkDeviceManagerImpl.java | 59 +-
.../com/cloud/network/FirewallRulesCidrsVO.java | 65 -
server/src/com/cloud/network/IPAddressVO.java | 292 --
.../cloud/network/InlineLoadBalancerNicMapVO.java | 60 -
.../com/cloud/network/Ipv6AddressManagerImpl.java | 29 +-
.../com/cloud/network/LBStickinessPolicyVO.java | 145 -
.../src/com/cloud/network/LoadBalancerVMMapVO.java | 77 -
server/src/com/cloud/network/LoadBalancerVO.java | 98 -
.../com/cloud/network/NetworkAccountDaoImpl.java | 26 -
server/src/com/cloud/network/NetworkAccountVO.java | 72 -
server/src/com/cloud/network/NetworkDomainVO.java | 71 -
.../cloud/network/NetworkExternalFirewallVO.java | 88 -
.../network/NetworkExternalLoadBalancerVO.java | 89 -
server/src/com/cloud/network/NetworkManager.java | 2 +
.../src/com/cloud/network/NetworkManagerImpl.java | 118 +-
server/src/com/cloud/network/NetworkModelImpl.java | 38 +-
.../src/com/cloud/network/NetworkRuleConfigVO.java | 93 -
.../src/com/cloud/network/NetworkServiceImpl.java | 77 +-
.../src/com/cloud/network/NetworkServiceMapVO.java | 91 -
.../com/cloud/network/NetworkStateListener.java | 19 +-
.../src/com/cloud/network/NetworkUsageManager.java | 2 +
.../com/cloud/network/NetworkUsageManagerImpl.java | 37 +-
server/src/com/cloud/network/NetworkVO.java | 519 --
.../src/com/cloud/network/PhysicalNetworkVO.java | 231 -
.../com/cloud/network/PortProfileManagerImpl.java | 5 +-
server/src/com/cloud/network/PortProfileVO.java | 204 -
.../src/com/cloud/network/RemoteAccessVpnVO.java | 116 -
server/src/com/cloud/network/RouterNetworkVO.java | 74 -
.../cloud/network/Site2SiteCustomerGatewayVO.java | 205 -
.../cloud/network/Site2SiteVpnConnectionVO.java | 141 -
.../com/cloud/network/Site2SiteVpnGatewayVO.java | 113 -
.../cloud/network/StorageNetworkManagerImpl.java | 582 ++--
server/src/com/cloud/network/addr/PublicIp.java | 2 +-
.../com/cloud/network/as/AutoScaleManagerImpl.java | 49 +-
.../as/dao/AutoScalePolicyConditionMapDaoImpl.java | 5 +-
.../network/as/dao/AutoScalePolicyDaoImpl.java | 5 +-
.../network/as/dao/AutoScaleVmGroupDaoImpl.java | 5 +-
.../as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java | 5 +-
.../network/as/dao/AutoScaleVmProfileDaoImpl.java | 5 +-
.../com/cloud/network/as/dao/ConditionDaoImpl.java | 3 +
.../com/cloud/network/as/dao/CounterDaoImpl.java | 3 +
.../network/dao/ExternalFirewallDeviceDao.java | 5 +-
.../network/dao/ExternalFirewallDeviceDaoImpl.java | 9 +-
.../network/dao/ExternalFirewallDeviceVO.java | 161 +
.../network/dao/ExternalLoadBalancerDeviceDao.java | 6 +-
.../dao/ExternalLoadBalancerDeviceDaoImpl.java | 9 +-
.../network/dao/ExternalLoadBalancerDeviceVO.java | 200 +
.../cloud/network/dao/FirewallRulesCidrsDao.java | 1 -
.../network/dao/FirewallRulesCidrsDaoImpl.java | 4 +-
.../cloud/network/dao/FirewallRulesCidrsVO.java | 65 +
.../com/cloud/network/dao/FirewallRulesDao.java | 5 +-
.../cloud/network/dao/FirewallRulesDaoImpl.java | 24 +-
server/src/com/cloud/network/dao/IPAddressDao.java | 1 -
.../com/cloud/network/dao/IPAddressDaoImpl.java | 82 +-
server/src/com/cloud/network/dao/IPAddressVO.java | 295 ++
.../network/dao/InlineLoadBalancerNicMapDao.java | 1 -
.../dao/InlineLoadBalancerNicMapDaoImpl.java | 4 +-
.../network/dao/InlineLoadBalancerNicMapVO.java | 60 +
.../cloud/network/dao/LBStickinessPolicyDao.java | 1 -
.../network/dao/LBStickinessPolicyDaoImpl.java | 6 +-
.../cloud/network/dao/LBStickinessPolicyVO.java | 145 +
.../src/com/cloud/network/dao/LoadBalancerDao.java | 1 -
.../com/cloud/network/dao/LoadBalancerDaoImpl.java | 9 +-
.../cloud/network/dao/LoadBalancerVMMapDao.java | 1 -
.../network/dao/LoadBalancerVMMapDaoImpl.java | 6 +-
.../com/cloud/network/dao/LoadBalancerVMMapVO.java | 77 +
.../src/com/cloud/network/dao/LoadBalancerVO.java | 98 +
.../cloud/network/dao/NetworkAccountDaoImpl.java | 29 +
.../com/cloud/network/dao/NetworkAccountVO.java | 72 +
server/src/com/cloud/network/dao/NetworkDao.java | 2 -
.../src/com/cloud/network/dao/NetworkDaoImpl.java | 85 +-
.../com/cloud/network/dao/NetworkDomainDao.java | 1 -
.../cloud/network/dao/NetworkDomainDaoImpl.java | 4 +-
.../src/com/cloud/network/dao/NetworkDomainVO.java | 72 +
.../network/dao/NetworkExternalFirewallDao.java | 1 -
.../dao/NetworkExternalFirewallDaoImpl.java | 4 +-
.../network/dao/NetworkExternalFirewallVO.java | 88 +
.../dao/NetworkExternalLoadBalancerDao.java | 1 -
.../dao/NetworkExternalLoadBalancerDaoImpl.java | 4 +-
.../network/dao/NetworkExternalLoadBalancerVO.java | 89 +
.../com/cloud/network/dao/NetworkOpDaoImpl.java | 6 +-
.../cloud/network/dao/NetworkRuleConfigDao.java | 1 -
.../network/dao/NetworkRuleConfigDaoImpl.java | 4 +-
.../com/cloud/network/dao/NetworkRuleConfigVO.java | 93 +
.../cloud/network/dao/NetworkServiceMapDao.java | 1 -
.../network/dao/NetworkServiceMapDaoImpl.java | 4 +-
.../com/cloud/network/dao/NetworkServiceMapVO.java | 92 +
server/src/com/cloud/network/dao/NetworkVO.java | 524 +++
.../com/cloud/network/dao/PhysicalNetworkDao.java | 1 -
.../cloud/network/dao/PhysicalNetworkDaoImpl.java | 16 +-
.../dao/PhysicalNetworkIsolationMethodDaoImpl.java | 4 +-
.../dao/PhysicalNetworkServiceProviderDaoImpl.java | 3 +
.../network/dao/PhysicalNetworkTagDaoImpl.java | 4 +-
.../dao/PhysicalNetworkTrafficTypeDaoImpl.java | 3 +
.../com/cloud/network/dao/PhysicalNetworkVO.java | 234 +
.../src/com/cloud/network/dao/PortProfileDao.java | 1 -
.../com/cloud/network/dao/PortProfileDaoImpl.java | 3 +-
.../src/com/cloud/network/dao/PortProfileVO.java | 204 +
.../com/cloud/network/dao/RemoteAccessVpnDao.java | 1 -
.../cloud/network/dao/RemoteAccessVpnDaoImpl.java | 3 +-
.../com/cloud/network/dao/RemoteAccessVpnVO.java | 119 +
.../cloud/network/dao/RouterNetworkDaoImpl.java | 5 +-
.../src/com/cloud/network/dao/RouterNetworkVO.java | 75 +
.../network/dao/Site2SiteCustomerGatewayDao.java | 1 -
.../dao/Site2SiteCustomerGatewayDaoImpl.java | 3 +-
.../network/dao/Site2SiteCustomerGatewayVO.java | 206 +
.../network/dao/Site2SiteVpnConnectionDao.java | 1 -
.../network/dao/Site2SiteVpnConnectionDaoImpl.java | 32 +-
.../network/dao/Site2SiteVpnConnectionVO.java | 143 +
.../cloud/network/dao/Site2SiteVpnGatewayDao.java | 1 -
.../network/dao/Site2SiteVpnGatewayDaoImpl.java | 13 +-
.../cloud/network/dao/Site2SiteVpnGatewayVO.java | 114 +
.../cloud/network/dao/UserIpv6AddressDaoImpl.java | 2 +
.../network/dao/VirtualRouterProviderDaoImpl.java | 3 +
.../src/com/cloud/network/dao/VpnUserDaoImpl.java | 3 +
.../cloud/network/element/BareMetalElement.java | 3 +-
.../network/element/CloudZonesNetworkElement.java | 3 +-
.../cloud/network/element/ExternalDhcpElement.java | 3 +-
.../network/element/SecurityGroupElement.java | 1 -
.../network/element/VirtualRouterElement.java | 4 +-
.../network/element/VpcVirtualRouterElement.java | 166 +-
.../network/firewall/FirewallManagerImpl.java | 209 +-
.../com/cloud/network/guru/ControlNetworkGuru.java | 145 +-
.../com/cloud/network/guru/DirectNetworkGuru.java | 22 +-
.../network/guru/DirectPodBasedNetworkGuru.java | 4 +-
.../network/guru/ExternalGuestNetworkGuru.java | 4 +-
.../com/cloud/network/guru/GuestNetworkGuru.java | 12 +-
server/src/com/cloud/network/guru/GuruUtils.java | 22 -
.../cloud/network/guru/PodBasedNetworkGuru.java | 4 +-
.../com/cloud/network/guru/PrivateNetworkGuru.java | 4 +-
.../com/cloud/network/guru/PublicNetworkGuru.java | 6 +-
.../com/cloud/network/guru/StorageNetworkGuru.java | 7 +-
.../network/lb/LoadBalancingRulesManagerImpl.java | 118 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 292 +-
.../VpcVirtualNetworkApplianceManagerImpl.java | 55 +-
.../com/cloud/network/rules/FirewallManager.java | 2 +-
.../com/cloud/network/rules/FirewallRuleVO.java | 36 +-
.../com/cloud/network/rules/RulesManagerImpl.java | 128 +-
.../rules/dao/PortForwardingRulesDaoImpl.java | 8 +-
.../network/security/SecurityGroupManagerImpl.java | 72 +-
.../security/SecurityGroupManagerImpl2.java | 3 +
.../network/security/SecurityManagerMBeanImpl.java | 2 +-
.../network/security/dao/SecurityGroupDaoImpl.java | 10 +-
.../security/dao/SecurityGroupRuleDaoImpl.java | 5 +-
.../security/dao/SecurityGroupRulesDaoImpl.java | 3 +
.../security/dao/SecurityGroupVMMapDaoImpl.java | 5 +-
.../security/dao/SecurityGroupWorkDaoImpl.java | 2 +
.../network/security/dao/VmRulesetLogDaoImpl.java | 2 +
.../cloud/network/vpc/NetworkACLManagerImpl.java | 35 +-
.../src/com/cloud/network/vpc/VpcManagerImpl.java | 39 +-
.../cloud/network/vpc/dao/PrivateIpDaoImpl.java | 3 +-
.../cloud/network/vpc/dao/StaticRouteDaoImpl.java | 9 +-
.../src/com/cloud/network/vpc/dao/VpcDaoImpl.java | 9 +-
.../cloud/network/vpc/dao/VpcGatewayDaoImpl.java | 4 +-
.../cloud/network/vpc/dao/VpcOfferingDaoImpl.java | 4 +-
.../vpc/dao/VpcOfferingServiceMapDaoImpl.java | 4 +-
.../network/vpn/RemoteAccessVpnManagerImpl.java | 172 +-
.../com/cloud/network/vpn/Site2SiteVpnManager.java | 2 +-
.../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 98 +-
.../offerings/dao/NetworkOfferingDaoImpl.java | 3 +
.../dao/NetworkOfferingServiceMapDaoImpl.java | 3 +
.../src/com/cloud/projects/ProjectManagerImpl.java | 215 +-
.../cloud/projects/dao/ProjectAccountDaoImpl.java | 2 +
.../src/com/cloud/projects/dao/ProjectDaoImpl.java | 8 +-
.../projects/dao/ProjectInvitationDaoImpl.java | 2 +
server/src/com/cloud/resource/DiscovererBase.java | 54 +-
.../com/cloud/resource/DummyHostDiscoverer.java | 27 +-
.../cloud/resource/DummyHostServerResource.java | 30 +
.../com/cloud/resource/ResourceManagerImpl.java | 1197 ++++--
.../resourcelimit/ResourceLimitManagerImpl.java | 14 +-
.../cloud/secstorage/CommandExecLogDaoImpl.java | 3 +
.../PremiumSecondaryStorageManagerImpl.java | 4 +-
.../com/cloud/server/ConfigurationServerImpl.java | 119 +-
server/src/com/cloud/server/ManagementServer.java | 2 +-
.../com/cloud/server/ManagementServerExtImpl.java | 34 +-
.../src/com/cloud/server/ManagementServerImpl.java | 379 +-
server/src/com/cloud/server/StatsCollector.java | 48 +-
.../server/auth/DefaultUserAuthenticator.java | 7 +-
.../cloud/service/dao/ServiceOfferingDaoImpl.java | 4 +-
.../src/com/cloud/servlet/CloudStartupServlet.java | 58 +-
.../src/com/cloud/servlet/ConsoleProxyServlet.java | 30 +-
.../com/cloud/servlet/RegisterCompleteServlet.java | 183 +-
.../cloud/storage/LocalStoragePoolListener.java | 4 +-
server/src/com/cloud/storage/OCFS2ManagerImpl.java | 14 +-
.../src/com/cloud/storage/StorageManagerImpl.java | 381 +-
.../cloud/storage/StorageMigrationCleanupMaid.java | 121 -
server/src/com/cloud/storage/TemplateProfile.java | 255 +
.../allocator/AbstractStoragePoolAllocator.java | 2 +-
.../allocator/FirstFitStoragePoolAllocator.java | 2 +-
.../GarbageCollectingStoragePoolAllocator.java | 87 +-
.../allocator/LocalStoragePoolAllocator.java | 2 +-
.../allocator/UseLocalForRootAllocator.java | 7 +-
.../com/cloud/storage/dao/DiskOfferingDaoImpl.java | 2 +
.../cloud/storage/dao/GuestOSCategoryDaoImpl.java | 3 +
.../src/com/cloud/storage/dao/GuestOSDaoImpl.java | 3 +
.../cloud/storage/dao/LaunchPermissionDaoImpl.java | 2 +
server/src/com/cloud/storage/dao/S3DaoImpl.java | 3 +
.../src/com/cloud/storage/dao/SnapshotDaoImpl.java | 56 +-
.../cloud/storage/dao/SnapshotPolicyDaoImpl.java | 19 +-
.../cloud/storage/dao/SnapshotScheduleDaoImpl.java | 4 +-
.../com/cloud/storage/dao/StoragePoolDaoImpl.java | 9 +-
.../storage/dao/StoragePoolDetailsDaoImpl.java | 3 +
.../cloud/storage/dao/StoragePoolHostDaoImpl.java | 2 +
.../cloud/storage/dao/StoragePoolWorkDaoImpl.java | 3 +
server/src/com/cloud/storage/dao/SwiftDaoImpl.java | 3 +-
.../src/com/cloud/storage/dao/UploadDaoImpl.java | 2 +
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 28 +-
.../storage/dao/VMTemplateDetailsDaoImpl.java | 5 +-
.../cloud/storage/dao/VMTemplateHostDaoImpl.java | 4 +-
.../cloud/storage/dao/VMTemplatePoolDaoImpl.java | 2 +
.../com/cloud/storage/dao/VMTemplateS3DaoImpl.java | 4 +
.../cloud/storage/dao/VMTemplateSwiftDaoImpl.java | 2 +
.../cloud/storage/dao/VMTemplateZoneDaoImpl.java | 2 +
.../src/com/cloud/storage/dao/VolumeDaoImpl.java | 8 +-
.../com/cloud/storage/dao/VolumeHostDaoImpl.java | 157 +-
.../storage/download/DownloadMonitorImpl.java | 42 +-
.../storage/listener/SnapshotStateListener.java | 16 +-
.../cloud/storage/listener/StoragePoolMonitor.java | 106 +-
.../storage/listener/VolumeStateListener.java | 16 +-
.../resource/DummySecondaryStorageResource.java | 157 +-
server/src/com/cloud/storage/s3/S3ManagerImpl.java | 189 +-
.../secondary/SecondaryStorageDiscoverer.java | 6 +-
.../secondary/SecondaryStorageManagerImpl.java | 64 +-
.../SecondaryStorageVmDefaultAllocator.java | 34 +-
.../storage/snapshot/SnapshotManagerImpl.java | 165 +-
.../storage/snapshot/SnapshotSchedulerImpl.java | 44 +-
.../com/cloud/storage/swift/SwiftManagerImpl.java | 21 +-
.../cloud/storage/upload/UploadMonitorImpl.java | 13 +-
.../com/cloud/tags/TaggedResourceManagerImpl.java | 97 +-
.../com/cloud/tags/dao/ResourceTagsDaoImpl.java | 7 +-
.../cloud/template/HyervisorTemplateAdapter.java | 22 +-
server/src/com/cloud/template/TemplateAdapter.java | 1 +
.../com/cloud/template/TemplateAdapterBase.java | 23 +-
.../com/cloud/template/TemplateManagerImpl.java | 79 +-
server/src/com/cloud/template/TemplateProfile.java | 255 -
server/src/com/cloud/test/DatabaseConfig.java | 1016 ++--
server/src/com/cloud/test/IPRangeConfig.java | 898 ++--
server/src/com/cloud/test/PodZoneConfig.java | 696 ++--
server/src/com/cloud/upgrade/DatabaseCreator.java | 211 +
.../cloud/upgrade/DatabaseIntegrityChecker.java | 25 +-
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 12 +-
.../upgrade/PremiumDatabaseUpgradeChecker.java | 6 +-
.../src/com/cloud/upgrade/dao/VersionDaoImpl.java | 2 +
.../dao/ExternalPublicIpStatisticsDaoImpl.java | 3 +
server/src/com/cloud/usage/dao/UsageDaoImpl.java | 2 +
.../com/cloud/usage/dao/UsageIPAddressDaoImpl.java | 2 +
.../src/com/cloud/usage/dao/UsageJobDaoImpl.java | 2 +
.../usage/dao/UsageLoadBalancerPolicyDaoImpl.java | 2 +
.../com/cloud/usage/dao/UsageNetworkDaoImpl.java | 2 +
.../usage/dao/UsageNetworkOfferingDaoImpl.java | 2 +
.../usage/dao/UsagePortForwardingRuleDaoImpl.java | 2 +
.../cloud/usage/dao/UsageSecurityGroupDaoImpl.java | 2 +
.../com/cloud/usage/dao/UsageStorageDaoImpl.java | 2 +
.../cloud/usage/dao/UsageVMInstanceDaoImpl.java | 2 +
.../com/cloud/usage/dao/UsageVPNUserDaoImpl.java | 2 +
.../com/cloud/usage/dao/UsageVolumeDaoImpl.java | 2 +
.../src/com/cloud/user/AccountDetailsDaoImpl.java | 3 +
server/src/com/cloud/user/AccountManagerImpl.java | 67 +-
server/src/com/cloud/user/DomainManagerImpl.java | 44 +-
server/src/com/cloud/user/dao/AccountDaoImpl.java | 4 +-
.../src/com/cloud/user/dao/SSHKeyPairDaoImpl.java | 3 +
.../src/com/cloud/user/dao/UserAccountDaoImpl.java | 5 +-
server/src/com/cloud/user/dao/UserDaoImpl.java | 5 +
.../com/cloud/user/dao/UserStatisticsDaoImpl.java | 2 +
.../com/cloud/user/dao/UserStatsLogDaoImpl.java | 3 +
.../cloud/uuididentity/IdentityServiceImpl.java | 47 +-
.../cloud/uuididentity/dao/IdentityDaoImpl.java | 2 +
.../vm/ClusteredVirtualMachineManagerImpl.java | 3 +
server/src/com/cloud/vm/ItWorkDaoImpl.java | 3 +
server/src/com/cloud/vm/SystemVmLoadScanner.java | 100 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 2125 ++++++---
server/src/com/cloud/vm/UserVmStateListener.java | 44 +-
server/src/com/cloud/vm/VirtualMachineManager.java | 2 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 224 +-
.../src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java | 4 +-
.../src/com/cloud/vm/dao/DomainRouterDaoImpl.java | 41 +-
.../src/com/cloud/vm/dao/InstanceGroupDaoImpl.java | 3 +
.../cloud/vm/dao/InstanceGroupVMMapDaoImpl.java | 3 +
server/src/com/cloud/vm/dao/NicDaoImpl.java | 5 +-
.../dao/RandomlyIncreasingVMInstanceDaoImpl.java | 2 +
.../cloud/vm/dao/SecondaryStorageVmDaoImpl.java | 6 +-
server/src/com/cloud/vm/dao/UserVmDaoImpl.java | 196 +-
server/src/com/cloud/vm/dao/UserVmDetailsDao.java | 3 +
.../src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java | 5 +-
server/src/com/cloud/vm/dao/VMInstanceDao.java | 6 +-
server/src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 61 +-
.../cloudstack/region/RegionManagerImpl.java | 5 +-
.../cloudstack/region/RegionServiceImpl.java | 5 +-
.../cloudstack/region/dao/RegionDaoImpl.java | 2 +
.../cloudstack/region/dao/RegionSyncDaoImpl.java | 2 +
.../test/com/cloud/agent/MockAgentManagerImpl.java | 6 +-
.../test/com/cloud/alert/MockAlertManagerImpl.java | 4 +-
server/test/com/cloud/async/TestAsync.java | 224 +-
.../test/com/cloud/async/TestAsyncJobManager.java | 304 +-
.../test/com/cloud/async/TestSyncQueueManager.java | 341 +-
.../com/cloud/cluster/CheckPointManagerTest.java | 390 --
.../com/cloud/network/MockFirewallManagerImpl.java | 6 +-
.../com/cloud/network/MockNetworkManagerImpl.java | 69 +-
.../com/cloud/network/MockNetworkModelImpl.java | 5 +-
.../com/cloud/network/MockRulesManagerImpl.java | 3 +-
.../test/com/cloud/network/NetworkManagerTest.java | 51 +-
.../NetworkManagerTestComponentLibrary.java | 101 +-
.../test/com/cloud/network/NetworkModelTest.java | 21 +-
.../network/firewall/FirewallManagerTest.java | 149 +-
.../security/SecurityGroupManagerImpl2Test.java | 93 +-
.../SecurityGroupManagerTestConfiguration.java | 158 +
.../vpn/MockRemoteAccessVPNServiceProvider.java | 3 +-
.../com/cloud/network/vpn/RemoteAccessVpnTest.java | 128 +-
.../com/cloud/projects/MockProjectManagerImpl.java | 3 +-
.../cloud/resource/MockResourceManagerImpl.java | 3 +-
.../test/com/cloud/snapshot/SnapshotDaoTest.java | 28 +-
.../snapshot/SnapshotDaoTestConfiguration.java | 72 +
.../com/cloud/storage/dao/StoragePoolDaoTest.java | 15 +-
.../dao/StoragePoolDaoTestConfiguration.java | 52 +
.../upgrade/AdvanceZone217To224UpgradeTest.java | 11 +-
.../upgrade/AdvanceZone223To224UpgradeTest.java | 8 +-
.../upgrade/BasicZone218To224UpgradeTest.java | 10 +-
.../com/cloud/upgrade/HostCapacity218to22Test.java | 10 +-
.../upgrade/InstanceGroup218To224UpgradeTest.java | 10 +-
.../upgrade/PortForwarding218To224UpgradeTest.java | 10 +-
.../cloud/upgrade/Sanity220To224UpgradeTest.java | 10 +-
.../cloud/upgrade/Sanity222To224UpgradeTest.java | 9 +-
.../cloud/upgrade/Sanity223To225UpgradeTest.java | 10 +-
.../cloud/upgrade/Sanity224To225UpgradeTest.java | 10 +-
.../cloud/upgrade/Template2214To30UpgradeTest.java | 7 +-
.../com/cloud/upgrade/Test2214To30DBUpgrade.java | 10 +-
.../cloud/upgrade/Usage217To224UpgradeTest.java | 9 +-
.../upgrade/UsageEvents218To224UpgradeTest.java | 10 +-
.../com/cloud/user/MockAccountManagerImpl.java | 22 +-
.../test/com/cloud/user/MockDomainManagerImpl.java | 7 +-
server/test/com/cloud/utils/db/GlobalLockTest.java | 75 -
.../test/com/cloud/vm/MockUserVmManagerImpl.java | 79 +-
.../cloud/vm/MockVirtualMachineManagerImpl.java | 32 +-
.../test/com/cloud/vm/dao/UserVmDaoImplTest.java | 11 +-
.../cloud/vpc/MockConfigurationManagerImpl.java | 29 +-
.../test/com/cloud/vpc/MockNetworkManagerImpl.java | 17 +-
.../test/com/cloud/vpc/MockNetworkModelImpl.java | 832 ++++
.../cloud/vpc/MockResourceLimitManagerImpl.java | 6 +-
.../com/cloud/vpc/MockSite2SiteVpnManagerImpl.java | 15 +-
.../cloud/vpc/MockSite2SiteVpnServiceProvider.java | 6 +-
server/test/com/cloud/vpc/MockVpcManagerImpl.java | 18 +-
.../vpc/MockVpcVirtualNetworkApplianceManager.java | 17 +-
server/test/com/cloud/vpc/Site2SiteVpnTest.java | 113 +-
server/test/com/cloud/vpc/VpcApiUnitTest.java | 52 +-
.../test/com/cloud/vpc/VpcTestConfiguration.java | 231 +
.../cloud/vpc/dao/MockConfigurationDaoImpl.java | 4 +
.../test/com/cloud/vpc/dao/MockNetworkDaoImpl.java | 4 +-
.../cloud/vpc/dao/MockNetworkOfferingDaoImpl.java | 3 +-
.../dao/MockNetworkOfferingServiceMapDaoImpl.java | 5 +
.../vpc/dao/MockNetworkServiceMapDaoImpl.java | 2 +-
.../resources/SecurityGroupManagerTestContext.xml | 42 +
server/test/resources/SnapshotDaoTestContext.xml | 42 +
.../test/resources/StoragePoolDaoTestContext.xml | 42 +
server/test/resources/VpcApiUnitTestContext.xml | 42 +
server/test/resources/VpcTestContext.xml | 76 +
server/test/resources/db.properties | 70 +
server/test/resources/testContext.xml | 94 +
setup/db/4.1-new-db-schema.sql | 140 +
setup/db/create-index-fk.sql | 97 -
setup/db/create-schema.sql | 39 +
setup/db/templates.kvm.sql | 71 -
setup/db/templates.vmware.sql | 100 -
setup/db/templates.xenserver.sql | 106 -
test/integration/smoke/test_vm_life_cycle.py | 21 +-
tools/cli/cloudmonkey/cloudmonkey.py | 10 +-
tools/devcloud/pom.xml | 2 +-
usage/conf/usageApplicationContext.xml.in | 53 +
.../src/com/cloud/usage/UsageAlertManagerImpl.java | 47 +-
usage/src/com/cloud/usage/UsageManagerImpl.java | 59 +-
usage/src/com/cloud/usage/UsageServer.java | 45 +-
.../cloud/usage/UsageServerComponentConfig.java | 180 +
.../cloud/usage/parser/IPAddressUsageParser.java | 20 +-
.../usage/parser/LoadBalancerUsageParser.java | 20 +-
.../usage/parser/NetworkOfferingUsageParser.java | 19 +-
.../com/cloud/usage/parser/NetworkUsageParser.java | 21 +-
.../usage/parser/PortForwardingUsageParser.java | 19 +-
.../usage/parser/SecurityGroupUsageParser.java | 19 +-
.../com/cloud/usage/parser/StorageUsageParser.java | 19 +-
.../cloud/usage/parser/VMInstanceUsageParser.java | 19 +-
.../com/cloud/usage/parser/VPNUserUsageParser.java | 19 +-
.../com/cloud/usage/parser/VolumeUsageParser.java | 19 +-
utils/conf/db.properties | 4 +
utils/pom.xml | 9 +-
utils/src/com/cloud/utils/LogUtils.java | 43 +
utils/src/com/cloud/utils/StringUtils.java | 157 +-
utils/src/com/cloud/utils/UriUtils.java | 52 +-
.../utils/backoff/impl/ConstantTimeBackoff.java | 10 +-
utils/src/com/cloud/utils/component/Adapter.java | 40 +-
.../src/com/cloud/utils/component/AdapterBase.java | 38 +-
utils/src/com/cloud/utils/component/Adapters.java | 85 -
.../cloud/utils/component/ComponentContext.java | 222 +
.../cloud/utils/component/ComponentLibrary.java | 56 -
.../utils/component/ComponentLibraryBase.java | 99 -
.../cloud/utils/component/ComponentLifecycle.java | 58 +
.../utils/component/ComponentLifecycleBase.java | 80 +
.../cloud/utils/component/ComponentLocator.java | 1296 -----
.../utils/component/ComponentLocatorMBean.java | 43 -
utils/src/com/cloud/utils/component/Inject.java | 29 -
utils/src/com/cloud/utils/component/Manager.java | 38 +-
.../src/com/cloud/utils/component/ManagerBase.java | 24 +
.../utils/component/MatchAnyMethodPointcut.java | 27 +
utils/src/com/cloud/utils/component/Plugin.java | 64 -
.../utils/component/SpringComponentScanUtils.java | 42 +
.../utils/crypt/EncryptionSecretKeyChecker.java | 179 +-
.../utils/crypt/EncryptionSecretKeySender.java | 68 +-
utils/src/com/cloud/utils/db/GenericDaoBase.java | 26 +-
utils/src/com/cloud/utils/db/Merovingian.java | 351 --
utils/src/com/cloud/utils/db/ParentWhere.java | 21 -
utils/src/com/cloud/utils/db/ScriptRunner.java | 19 +-
utils/src/com/cloud/utils/db/SearchCriteria.java | 147 +-
utils/src/com/cloud/utils/db/Transaction.java | 132 +-
.../cloud/utils/db/TransactionContextBuilder.java | 80 +
utils/src/com/cloud/utils/events/EventsTest.java | 66 -
.../utils/exception/CloudRuntimeException.java | 4 +
utils/src/com/cloud/utils/fsm/ChangeEvent.java | 23 +
utils/src/com/cloud/utils/fsm/FiniteState.java | 7 +-
utils/src/com/cloud/utils/fsm/FiniteState2.java | 33 +
utils/src/com/cloud/utils/fsm/State.java | 26 +
.../cloud/utils/log/CglibThrowableRenderer.java | 38 +-
utils/src/com/cloud/utils/net/MacAddress.java | 27 +-
utils/src/com/cloud/utils/net/NetUtils.java | 42 +-
utils/src/com/cloud/utils/net/NfsUtils.java | 19 +-
utils/src/com/cloud/utils/nio/HandlerFactory.java | 1 -
utils/src/com/cloud/utils/nio/Link.java | 161 +-
.../cloud/utils/security/CertificateHelper.java | 129 +-
.../utils/storage/encoding/DecodedDataObject.java | 58 +
.../utils/storage/encoding/DecodedDataStore.java | 73 +
.../com/cloud/utils/storage/encoding/Decoder.java | 68 +
.../cloud/utils/storage/encoding/EncodingType.java | 31 +
utils/src/com/cloud/utils/xmlobject/XmlObject.java | 177 +
.../com/cloud/utils/xmlobject/XmlObjectParser.java | 107 +
utils/test/com/cloud/utils/DummyImpl.java | 28 +
utils/test/com/cloud/utils/DummyInterface.java | 21 +
utils/test/com/cloud/utils/DummyPremiumImpl.java | 25 +
utils/test/com/cloud/utils/TestProfiler.java | 39 +-
.../utils/component/MockComponentLocator.java | 121 -
utils/test/com/cloud/utils/db/DbAnnotatedBase.java | 44 +
.../com/cloud/utils/db/DbAnnotatedBaseDerived.java | 27 +
utils/test/com/cloud/utils/db/DummyComponent.java | 27 +
utils/test/com/cloud/utils/db/GlobalLockTest.java | 83 +
.../test/com/cloud/utils/db/QueryBuilderTest.java | 142 -
.../utils/db/TransactionContextBuilderTest.java | 63 +
utils/test/com/cloud/utils/db/TransactionTest.java | 16 +-
.../utils/log/CglibThrowableRendererTest.java | 16 +-
utils/test/com/cloud/utils/net/NetUtilsTest.java | 3 +-
.../com/cloud/utils/testcase/ComponentSetup.java | 28 -
.../cloud/utils/testcase/ComponentTestCase.java | 44 -
.../com/cloud/utils/xmlobject/TestXmlObject.java | 33 +
.../com/cloud/utils/xmlobject/TestXmlObject2.java | 37 +
.../com/cloud/utils/QualifierTestContext.xml | 37 +
.../utils/db/transactionContextBuilderTest.xml | 47 +
utils/test/resources/testContext.xml | 54 +
1928 files changed, 81824 insertions(+), 41973 deletions(-)
----------------------------------------------------------------------