cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tall...@apache.org
Subject [60/60] [abbrv] git commit: updated refs/heads/marvin to 0e223d6
Date Tue, 08 Apr 2014 12:26:15 GMT
Merge branch 'master' into marvin

Conflicts:
	test/integration/component/test_base_image_updation.py
	test/integration/component/test_cpu_domain_limits.py
	test/integration/component/test_cpu_limits.py
	test/integration/component/test_cpu_project_limits.py
	test/integration/component/test_ip_reservation.py
	test/integration/component/test_memory_limits.py
	test/integration/component/test_mm_domain_limits.py
	test/integration/component/test_mm_project_limits.py
	test/integration/component/test_persistent_networks.py
	test/integration/component/test_portable_ip.py
	test/integration/component/test_routers.py
	test/integration/smoke/test_deploy_vm.py
	test/integration/smoke/test_deploy_vm_with_userdata.py
	test/integration/smoke/test_internal_lb.py
	test/integration/smoke/test_vm_life_cycle.py
	test/integration/smoke/test_volumes.py
	tools/marvin/marvin/codes.py
	tools/marvin/marvin/configGenerator.py
	tools/marvin/marvin/lib/base.py
	tools/marvin/marvin/lib/common.py
	tools/marvin/marvin/lib/utils.py


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0e223d67
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0e223d67
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0e223d67

Branch: refs/heads/marvin
Commit: 0e223d6787ac7207357b9173d825c4a447c16e40
Parents: 818d4a6 1dfe4c1
Author: SrikanteswaraRao Talluri <talluri@apache.org>
Authored: Tue Apr 8 17:53:37 2014 +0530
Committer: SrikanteswaraRao Talluri <talluri@apache.org>
Committed: Tue Apr 8 17:53:37 2014 +0530

----------------------------------------------------------------------
 .gitignore                                      |     1 +
 LICENSE                                         |    34 +-
 NOTICE                                          |     3 +-
 agent/conf/agent.properties                     |    11 +
 .../SYSCONFDIR/rc.d/init.d/cloud-agent.in       |     8 +-
 .../SYSCONFDIR/rc.d/init.d/cloud-agent.in       |     8 +-
 .../sles/SYSCONFDIR/init.d/cloud-agent.in       |     8 +-
 .../rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in  |     8 +-
 .../sles/SYSCONFDIR/init.d/cloud-agent.in       |     8 +-
 agent/findbugsExcludeFilter.xml                 |    25 +
 agent/pom.xml                                   |     2 +-
 api/findbugsExcludeFilter.xml                   |    25 +
 api/pom.xml                                     |     2 +-
 .../cloud/agent/api/HostVmStateReportEntry.java |    10 +-
 api/src/com/cloud/agent/api/to/GPUDeviceTO.java |    56 +
 api/src/com/cloud/agent/api/to/NicTO.java       |     8 +
 .../cloud/agent/api/to/VirtualMachineTO.java    |     9 +
 api/src/com/cloud/domain/Domain.java            |     3 -
 api/src/com/cloud/event/EventTypes.java         |    43 +
 api/src/com/cloud/gpu/GPU.java                  |    49 +
 api/src/com/cloud/network/IpAddress.java        |     2 +
 .../com/cloud/network/MonitoringService.java    |     2 +-
 api/src/com/cloud/network/Network.java          |     8 +-
 api/src/com/cloud/network/NetworkModel.java     |     8 +-
 api/src/com/cloud/network/NetworkProfile.java   |    13 +
 api/src/com/cloud/network/NetworkService.java   |     6 +-
 api/src/com/cloud/network/RemoteAccessVpn.java  |     2 +
 .../cloud/network/Site2SiteVpnConnection.java   |     2 +
 .../com/cloud/network/Site2SiteVpnGateway.java  |     5 +-
 .../VpcVirtualNetworkApplianceService.java      |     8 +-
 .../com/cloud/network/as/AutoScaleVmGroup.java  |     2 +
 .../cloud/network/as/AutoScaleVmProfile.java    |     2 +
 .../element/AggregatedCommandExecutor.java      |    28 +
 .../cloud/network/firewall/FirewallService.java |     2 +
 .../network/lb/LoadBalancingRulesService.java   |    15 +-
 .../com/cloud/network/rules/FirewallRule.java   |     2 +
 .../com/cloud/network/rules/RulesService.java   |     5 +-
 api/src/com/cloud/network/vpc/NetworkACL.java   |     2 +
 .../com/cloud/network/vpc/NetworkACLItem.java   |     2 +
 .../cloud/network/vpc/NetworkACLService.java    |     9 +-
 .../cloud/network/vpc/StaticRouteProfile.java   |    29 +-
 api/src/com/cloud/network/vpc/Vpc.java          |    13 +
 api/src/com/cloud/network/vpc/VpcOffering.java  |     9 +
 .../network/vpc/VpcProvisioningService.java     |     7 +-
 api/src/com/cloud/network/vpc/VpcService.java   |    10 +-
 .../network/vpn/RemoteAccessVpnService.java     |     7 +-
 .../cloud/network/vpn/Site2SiteVpnService.java  |     4 +
 .../com/cloud/offering/DiskOfferingInfo.java    |    65 +
 api/src/com/cloud/offering/NetworkOffering.java |     2 +
 api/src/com/cloud/serializer/Param.java         |     4 +
 api/src/com/cloud/server/ManagementService.java |    77 +-
 .../cloud/server/ResourceMetaDataService.java   |     3 +-
 api/src/com/cloud/server/ResourceTag.java       |     4 +-
 api/src/com/cloud/storage/GuestOS.java          |     6 +
 .../com/cloud/storage/GuestOSHypervisor.java    |    10 +
 api/src/com/cloud/storage/Storage.java          |     6 +-
 api/src/com/cloud/storage/StoragePool.java      |     6 +-
 api/src/com/cloud/storage/Volume.java           |     4 +-
 api/src/com/cloud/storage/VolumeApiService.java |    10 +-
 .../cloud/template/VirtualMachineTemplate.java  |     2 +-
 api/src/com/cloud/user/Account.java             |     4 +-
 api/src/com/cloud/user/AccountService.java      |    19 +-
 .../com/cloud/user/ResourceLimitService.java    |     2 +-
 api/src/com/cloud/uservm/UserVm.java            |     1 +
 api/src/com/cloud/vm/UserVmService.java         |     6 +
 api/src/com/cloud/vm/VirtualMachine.java        |    10 +-
 .../apache/cloudstack/acl/ControlledEntity.java |     1 +
 .../apache/cloudstack/acl/PermissionScope.java  |    41 +
 .../apache/cloudstack/acl/QuerySelector.java    |    72 +
 api/src/org/apache/cloudstack/acl/Role.java     |    34 -
 api/src/org/apache/cloudstack/acl/RoleType.java |     2 +-
 .../apache/cloudstack/acl/SecurityChecker.java  |    54 +-
 api/src/org/apache/cloudstack/api/ACL.java      |     4 +-
 .../org/apache/cloudstack/api/APICommand.java   |     9 +
 .../cloudstack/api/ApiCommandJobType.java       |     8 +-
 .../org/apache/cloudstack/api/ApiConstants.java |    52 +-
 .../org/apache/cloudstack/api/BaseAsyncCmd.java |    34 -
 .../cloudstack/api/BaseAsyncCustomIdCmd.java    |     7 +-
 .../apache/cloudstack/api/BaseAsyncVMCmd.java   |    30 +
 .../cloudstack/api/BaseAsyncVolumeCmd.java      |    30 +
 api/src/org/apache/cloudstack/api/BaseCmd.java  |   254 +-
 .../apache/cloudstack/api/BaseCustomIdCmd.java  |     7 +-
 .../api/BaseListAccountResourcesCmd.java        |    12 +
 .../org/apache/cloudstack/api/BaseListCmd.java  |    32 +-
 .../BaseListTemplateOrIsoPermissionsCmd.java    |    18 +-
 .../org/apache/cloudstack/api/Parameter.java    |     2 -
 .../cloudstack/api/ResponseGenerator.java       |    48 +-
 .../apache/cloudstack/api/ResponseObject.java   |     5 +
 .../command/admin/account/CreateAccountCmd.java |     9 +-
 .../command/admin/account/DeleteAccountCmd.java |     9 +-
 .../admin/account/DisableAccountCmd.java        |    15 +-
 .../command/admin/account/EnableAccountCmd.java |    13 +-
 .../admin/account/ListAccountsCmdByAdmin.java   |    26 +
 .../command/admin/account/LockAccountCmd.java   |     3 +-
 .../command/admin/account/UpdateAccountCmd.java |    14 +-
 .../address/AssociateIPAddrCmdByAdmin.java      |    68 +
 .../ListPublicIpAddressesCmdByAdmin.java        |    53 +
 .../UpdateVMAffinityGroupCmdByAdmin.java        |    63 +
 .../command/admin/alert/GenerateAlertCmd.java   |     5 +-
 .../admin/autoscale/CreateCounterCmd.java       |     3 +-
 .../admin/autoscale/DeleteCounterCmd.java       |     3 +-
 .../command/admin/cluster/AddClusterCmd.java    |     3 +-
 .../command/admin/cluster/DeleteClusterCmd.java |     3 +-
 .../command/admin/cluster/ListClustersCmd.java  |     3 +-
 .../command/admin/cluster/UpdateClusterCmd.java |     3 +-
 .../api/command/admin/config/ListCfgsByCmd.java |     3 +-
 .../admin/config/ListDeploymentPlannersCmd.java |     3 +-
 .../config/ListHypervisorCapabilitiesCmd.java   |     4 +-
 .../api/command/admin/config/UpdateCfgCmd.java  |     3 +-
 .../config/UpdateHypervisorCapabilitiesCmd.java |     4 +-
 .../command/admin/domain/CreateDomainCmd.java   |     3 +-
 .../command/admin/domain/DeleteDomainCmd.java   |     3 +-
 .../admin/domain/ListDomainChildrenCmd.java     |     3 +-
 .../command/admin/domain/ListDomainsCmd.java    |     3 +-
 .../command/admin/domain/UpdateDomainCmd.java   |     3 +-
 .../api/command/admin/guest/AddGuestOsCmd.java  |   136 +
 .../admin/guest/AddGuestOsMappingCmd.java       |   146 +
 .../admin/guest/ListGuestOsMappingCmd.java      |   101 +
 .../command/admin/guest/RemoveGuestOsCmd.java   |    98 +
 .../admin/guest/RemoveGuestOsMappingCmd.java    |    98 +
 .../command/admin/guest/UpdateGuestOsCmd.java   |   104 +
 .../admin/guest/UpdateGuestOsMappingCmd.java    |   102 +
 .../api/command/admin/host/AddHostCmd.java      |     3 +-
 .../admin/host/AddSecondaryStorageCmd.java      |     3 +-
 .../admin/host/CancelMaintenanceCmd.java        |     3 +-
 .../api/command/admin/host/DeleteHostCmd.java   |     3 +-
 .../admin/host/FindHostsForMigrationCmd.java    |     3 +-
 .../api/command/admin/host/ListHostsCmd.java    |     3 +-
 .../admin/host/PrepareForMaintenanceCmd.java    |     3 +-
 .../command/admin/host/ReconnectHostCmd.java    |     3 +-
 .../admin/host/ReleaseHostReservationCmd.java   |     3 +-
 .../api/command/admin/host/UpdateHostCmd.java   |     3 +-
 .../admin/host/UpdateHostPasswordCmd.java       |     3 +-
 ...ConfigureInternalLoadBalancerElementCmd.java |     4 +-
 .../CreateInternalLoadBalancerElementCmd.java   |     4 +-
 .../admin/internallb/ListInternalLBVMsCmd.java  |     6 +-
 .../ListInternalLoadBalancerElementsCmd.java    |     8 +-
 .../admin/internallb/StartInternalLBVMCmd.java  |    10 +-
 .../admin/internallb/StopInternalLBVMCmd.java   |    10 +-
 .../command/admin/iso/AttachIsoCmdByAdmin.java  |    53 +
 .../command/admin/iso/CopyIsoCmdByAdmin.java    |    28 +
 .../command/admin/iso/DetachIsoCmdByAdmin.java  |    47 +
 .../admin/iso/ListIsoPermissionsCmdByAdmin.java |    31 +
 .../command/admin/iso/ListIsosCmdByAdmin.java   |    26 +
 .../admin/iso/RegisterIsoCmdByAdmin.java        |    53 +
 .../command/admin/iso/UpdateIsoCmdByAdmin.java  |    45 +
 ...ListLoadBalancerRuleInstancesCmdByAdmin.java |    92 +
 .../admin/network/AddNetworkDeviceCmd.java      |     3 +-
 .../network/AddNetworkServiceProviderCmd.java   |     4 +-
 .../admin/network/CreateNetworkCmdByAdmin.java  |    66 +
 .../admin/network/CreateNetworkOfferingCmd.java |    11 +-
 .../admin/network/CreatePhysicalNetworkCmd.java |     3 +-
 .../network/CreateStorageNetworkIpRangeCmd.java |     4 +-
 .../network/DedicateGuestVlanRangeCmd.java      |     3 +-
 .../admin/network/DeleteNetworkDeviceCmd.java   |     3 +-
 .../admin/network/DeleteNetworkOfferingCmd.java |     3 +-
 .../DeleteNetworkServiceProviderCmd.java        |     3 +-
 .../admin/network/DeletePhysicalNetworkCmd.java |     3 +-
 .../network/DeleteStorageNetworkIpRangeCmd.java |     3 +-
 .../ListDedicatedGuestVlanRangesCmd.java        |     3 +-
 .../admin/network/ListNetworkDeviceCmd.java     |     3 +-
 .../network/ListNetworkIsolationMethodsCmd.java |     4 +-
 .../network/ListNetworkServiceProvidersCmd.java |     4 +-
 .../admin/network/ListNetworksCmdByAdmin.java   |    50 +
 .../admin/network/ListPhysicalNetworksCmd.java  |     3 +-
 .../network/ListStorageNetworkIpRangeCmd.java   |     3 +-
 .../ListSupportedNetworkServicesCmd.java        |     8 +-
 .../ReleaseDedicatedGuestVlanRangeCmd.java      |     3 +-
 .../admin/network/UpdateNetworkCmdByAdmin.java  |    63 +
 .../admin/network/UpdateNetworkOfferingCmd.java |     7 +-
 .../UpdateNetworkServiceProviderCmd.java        |     4 +-
 .../admin/network/UpdatePhysicalNetworkCmd.java |     3 +-
 .../network/UpdateStorageNetworkIpRangeCmd.java |     4 +-
 .../admin/offering/CreateDiskOfferingCmd.java   |     9 +-
 .../offering/CreateServiceOfferingCmd.java      |    62 +-
 .../admin/offering/DeleteDiskOfferingCmd.java   |     3 +-
 .../offering/DeleteServiceOfferingCmd.java      |     3 +-
 .../admin/offering/UpdateDiskOfferingCmd.java   |     3 +-
 .../offering/UpdateServiceOfferingCmd.java      |     3 +-
 .../api/command/admin/pod/CreatePodCmd.java     |     3 +-
 .../api/command/admin/pod/DeletePodCmd.java     |     3 +-
 .../api/command/admin/pod/ListPodsByCmd.java    |     3 +-
 .../api/command/admin/pod/UpdatePodCmd.java     |     3 +-
 .../api/command/admin/region/AddRegionCmd.java  |     3 +-
 .../admin/region/CreatePortableIpRangeCmd.java  |     4 +-
 .../admin/region/DeletePortableIpRangeCmd.java  |     3 +-
 .../admin/region/ListPortableIpRangesCmd.java   |     3 +-
 .../command/admin/region/RemoveRegionCmd.java   |     3 +-
 .../command/admin/region/UpdateRegionCmd.java   |     3 +-
 .../admin/resource/ArchiveAlertsCmd.java        |     3 +-
 .../admin/resource/CleanVMReservationsCmd.java  |     3 +-
 .../command/admin/resource/DeleteAlertsCmd.java |     3 +-
 .../command/admin/resource/ListAlertsCmd.java   |     3 +-
 .../command/admin/resource/ListCapacityCmd.java |     3 +-
 .../resource/UploadCustomCertificateCmd.java    |     3 +-
 .../admin/router/ConfigureOvsElementCmd.java    |     3 +-
 .../ConfigureVirtualRouterElementCmd.java       |     3 +-
 .../router/CreateVirtualRouterElementCmd.java   |     3 +-
 .../command/admin/router/DestroyRouterCmd.java  |     6 +-
 .../admin/router/ListOvsElementsCmd.java        |     3 +-
 .../command/admin/router/ListRoutersCmd.java    |     6 +-
 .../router/ListVirtualRouterElementsCmd.java    |     7 +-
 .../command/admin/router/RebootRouterCmd.java   |     8 +-
 .../command/admin/router/StartRouterCmd.java    |     6 +-
 .../api/command/admin/router/StopRouterCmd.java |     6 +-
 .../command/admin/router/UpgradeRouterCmd.java  |     6 +-
 .../admin/router/UpgradeRouterTemplateCmd.java  |     3 +-
 .../command/admin/storage/AddImageStoreCmd.java |     3 +-
 .../api/command/admin/storage/AddS3Cmd.java     |     7 +-
 .../CancelPrimaryStorageMaintenanceCmd.java     |     3 +-
 .../storage/CreateSecondaryStagingStoreCmd.java |     3 +-
 .../admin/storage/CreateStoragePoolCmd.java     |     3 +-
 .../admin/storage/DeleteImageStoreCmd.java      |     3 +-
 .../command/admin/storage/DeletePoolCmd.java    |     3 +-
 .../storage/DeleteSecondaryStagingStoreCmd.java |     3 +-
 .../FindStoragePoolsForMigrationCmd.java        |     3 +-
 .../admin/storage/ListImageStoresCmd.java       |     3 +-
 .../api/command/admin/storage/ListS3sCmd.java   |     3 +-
 .../storage/ListSecondaryStagingStoresCmd.java  |     3 +-
 .../admin/storage/ListStoragePoolsCmd.java      |     3 +-
 .../admin/storage/ListStorageProvidersCmd.java  |     3 +-
 .../PreparePrimaryStorageForMaintenanceCmd.java |     3 +-
 .../storage/UpdateCloudToUseObjectStoreCmd.java |     3 +-
 .../admin/storage/UpdateStoragePoolCmd.java     |     3 +-
 .../api/command/admin/swift/AddSwiftCmd.java    |     3 +-
 .../api/command/admin/swift/ListSwiftsCmd.java  |     3 +-
 .../admin/systemvm/DestroySystemVmCmd.java      |     8 +-
 .../admin/systemvm/ListSystemVMsCmd.java        |     5 +-
 .../admin/systemvm/MigrateSystemVMCmd.java      |     8 +-
 .../admin/systemvm/RebootSystemVmCmd.java       |     9 +-
 .../admin/systemvm/ScaleSystemVMCmd.java        |     9 +-
 .../admin/systemvm/StartSystemVMCmd.java        |     9 +-
 .../command/admin/systemvm/StopSystemVmCmd.java |     8 +-
 .../admin/systemvm/UpgradeSystemVMCmd.java      |     9 +-
 .../admin/template/CopyTemplateCmdByAdmin.java  |    63 +
 .../template/CreateTemplateCmdByAdmin.java      |    62 +
 .../ListTemplatePermissionsCmdByAdmin.java      |    32 +
 .../admin/template/ListTemplatesCmdByAdmin.java |    29 +
 .../admin/template/PrepareTemplateCmd.java      |    11 +-
 .../template/RegisterTemplateCmdByAdmin.java    |    57 +
 .../template/UpdateTemplateCmdByAdmin.java      |    47 +
 .../admin/usage/AddTrafficMonitorCmd.java       |     3 +-
 .../command/admin/usage/AddTrafficTypeCmd.java  |     3 +-
 .../admin/usage/DeleteTrafficMonitorCmd.java    |     3 +-
 .../admin/usage/DeleteTrafficTypeCmd.java       |     3 +-
 .../admin/usage/GenerateUsageRecordsCmd.java    |     4 +-
 .../command/admin/usage/GetUsageRecordsCmd.java |     3 +-
 .../admin/usage/ListTrafficMonitorsCmd.java     |     3 +-
 .../usage/ListTrafficTypeImplementorsCmd.java   |     8 +-
 .../admin/usage/ListTrafficTypesCmd.java        |     7 +-
 .../command/admin/usage/ListUsageTypesCmd.java  |     3 +-
 .../admin/usage/UpdateTrafficTypeCmd.java       |     3 +-
 .../api/command/admin/user/CreateUserCmd.java   |     8 +-
 .../api/command/admin/user/DeleteUserCmd.java   |     3 +-
 .../api/command/admin/user/DisableUserCmd.java  |     3 +-
 .../api/command/admin/user/EnableUserCmd.java   |     3 +-
 .../api/command/admin/user/GetUserCmd.java      |     3 +-
 .../api/command/admin/user/ListUsersCmd.java    |     3 +-
 .../api/command/admin/user/LockUserCmd.java     |     3 +-
 .../api/command/admin/user/RegisterCmd.java     |     3 +-
 .../api/command/admin/user/UpdateUserCmd.java   |     3 +-
 .../admin/vlan/CreateVlanIpRangeCmd.java        |     3 +-
 .../admin/vlan/DedicatePublicIpRangeCmd.java    |     3 +-
 .../admin/vlan/DeleteVlanIpRangeCmd.java        |     3 +-
 .../command/admin/vlan/ListVlanIpRangesCmd.java |     3 +-
 .../admin/vlan/ReleasePublicIpRangeCmd.java     |     3 +-
 .../command/admin/vm/AddNicToVMCmdByAdmin.java  |    55 +
 .../api/command/admin/vm/AssignVMCmd.java       |    10 +-
 .../command/admin/vm/DeployVMCmdByAdmin.java    |    79 +
 .../command/admin/vm/DestroyVMCmdByAdmin.java   |    57 +
 .../api/command/admin/vm/ExpungeVMCmd.java      |     9 +-
 .../api/command/admin/vm/GetVMUserDataCmd.java  |     3 +-
 .../api/command/admin/vm/ListVMsCmdByAdmin.java |    69 +
 .../api/command/admin/vm/MigrateVMCmd.java      |     9 +-
 .../vm/MigrateVirtualMachineWithVolumeCmd.java  |    11 +-
 .../command/admin/vm/RebootVMCmdByAdmin.java    |    51 +
 .../api/command/admin/vm/RecoverVMCmd.java      |    11 +-
 .../admin/vm/RemoveNicFromVMCmdByAdmin.java     |    55 +
 .../admin/vm/ResetVMPasswordCmdByAdmin.java     |    54 +
 .../admin/vm/ResetVMSSHKeyCmdByAdmin.java       |    57 +
 .../command/admin/vm/RestoreVMCmdByAdmin.java   |    54 +
 .../api/command/admin/vm/ScaleVMCmdByAdmin.java |    69 +
 .../api/command/admin/vm/StartVMCmdByAdmin.java |    80 +
 .../api/command/admin/vm/StopVMCmdByAdmin.java  |    53 +
 .../vm/UpdateDefaultNicForVMCmdByAdmin.java     |    56 +
 .../command/admin/vm/UpdateVMCmdByAdmin.java    |    53 +
 .../command/admin/vm/UpgradeVMCmdByAdmin.java   |    59 +
 .../RevertToVMSnapshotCmdByAdmin.java           |    57 +
 .../admin/volume/AttachVolumeCmdByAdmin.java    |    47 +
 .../admin/volume/CreateVolumeCmdByAdmin.java    |    61 +
 .../admin/volume/DetachVolumeCmdByAdmin.java    |    48 +
 .../admin/volume/ListVolumesCmdByAdmin.java     |    63 +
 .../admin/volume/MigrateVolumeCmdByAdmin.java   |    47 +
 .../admin/volume/ResizeVolumeCmdByAdmin.java    |    47 +
 .../admin/volume/UpdateVolumeCmdByAdmin.java    |    45 +
 .../admin/volume/UploadVolumeCmdByAdmin.java    |    57 +
 .../admin/vpc/CreatePrivateGatewayCmd.java      |     4 +-
 .../command/admin/vpc/CreateVPCCmdByAdmin.java  |    64 +
 .../command/admin/vpc/CreateVPCOfferingCmd.java |    17 +-
 .../admin/vpc/DeletePrivateGatewayCmd.java      |     5 +-
 .../command/admin/vpc/DeleteVPCOfferingCmd.java |     3 +-
 .../command/admin/vpc/ListVPCsCmdByAdmin.java   |    55 +
 .../command/admin/vpc/UpdateVPCCmdByAdmin.java  |    47 +
 .../command/admin/vpc/UpdateVPCOfferingCmd.java |     7 +-
 .../api/command/admin/zone/CreateZoneCmd.java   |    10 +-
 .../api/command/admin/zone/DeleteZoneCmd.java   |     3 +-
 .../command/admin/zone/ListZonesCmdByAdmin.java |    26 +
 .../zone/MarkDefaultZoneForAccountCmd.java      |    13 +-
 .../api/command/admin/zone/UpdateZoneCmd.java   |     8 +-
 .../user/account/AddAccountToProjectCmd.java    |     3 +-
 .../account/DeleteAccountFromProjectCmd.java    |     3 +-
 .../command/user/account/ListAccountsCmd.java   |     8 +-
 .../user/account/ListProjectAccountsCmd.java    |     3 +-
 .../user/address/AssociateIPAddrCmd.java        |    19 +-
 .../user/address/DisassociateIPAddrCmd.java     |     3 +-
 .../user/address/ListPublicIpAddressesCmd.java  |    20 +-
 .../command/user/address/UpdateIPAddrCmd.java   |   134 +
 .../affinitygroup/CreateAffinityGroupCmd.java   |     7 +-
 .../affinitygroup/DeleteAffinityGroupCmd.java   |    12 +-
 .../ListAffinityGroupTypesCmd.java              |     3 +-
 .../affinitygroup/ListAffinityGroupsCmd.java    |    11 +-
 .../affinitygroup/UpdateVMAffinityGroupCmd.java |    17 +-
 .../autoscale/CreateAutoScalePolicyCmd.java     |    10 +-
 .../autoscale/CreateAutoScaleVmGroupCmd.java    |    16 +-
 .../autoscale/CreateAutoScaleVmProfileCmd.java  |    18 +-
 .../user/autoscale/CreateConditionCmd.java      |    11 +-
 .../autoscale/DeleteAutoScalePolicyCmd.java     |     8 +-
 .../autoscale/DeleteAutoScaleVmGroupCmd.java    |     8 +-
 .../autoscale/DeleteAutoScaleVmProfileCmd.java  |     8 +-
 .../user/autoscale/DeleteConditionCmd.java      |     8 +-
 .../autoscale/DisableAutoScaleVmGroupCmd.java   |     8 +-
 .../autoscale/EnableAutoScaleVmGroupCmd.java    |     8 +-
 .../autoscale/ListAutoScalePoliciesCmd.java     |     5 +-
 .../autoscale/ListAutoScaleVmGroupsCmd.java     |    17 +-
 .../autoscale/ListAutoScaleVmProfilesCmd.java   |    34 +-
 .../user/autoscale/ListConditionsCmd.java       |     3 +-
 .../command/user/autoscale/ListCountersCmd.java |     3 +-
 .../autoscale/UpdateAutoScalePolicyCmd.java     |     8 +-
 .../autoscale/UpdateAutoScaleVmGroupCmd.java    |    27 +-
 .../autoscale/UpdateAutoScaleVmProfileCmd.java  |    27 +-
 .../user/config/ListCapabilitiesCmd.java        |     4 +-
 .../command/user/event/ArchiveEventsCmd.java    |     6 +-
 .../api/command/user/event/DeleteEventsCmd.java |     6 +-
 .../command/user/event/ListEventTypesCmd.java   |     3 +-
 .../api/command/user/event/ListEventsCmd.java   |     7 +-
 .../firewall/CreateEgressFirewallRuleCmd.java   |    39 +-
 .../user/firewall/CreateFirewallRuleCmd.java    |    28 +-
 .../firewall/CreatePortForwardingRuleCmd.java   |    47 +-
 .../firewall/DeleteEgressFirewallRuleCmd.java   |     8 +-
 .../user/firewall/DeleteFirewallRuleCmd.java    |     9 +-
 .../firewall/DeletePortForwardingRuleCmd.java   |     6 +-
 .../firewall/ListEgressFirewallRulesCmd.java    |     5 +-
 .../user/firewall/ListFirewallRulesCmd.java     |    17 +-
 .../firewall/ListPortForwardingRulesCmd.java    |    17 +-
 .../firewall/UpdateEgressFirewallRuleCmd.java   |   122 +
 .../user/firewall/UpdateFirewallRuleCmd.java    |   123 +
 .../firewall/UpdatePortForwardingRuleCmd.java   |    38 +-
 .../user/guest/ListGuestOsCategoriesCmd.java    |     3 +-
 .../api/command/user/guest/ListGuestOsCmd.java  |     3 +-
 .../api/command/user/iso/AttachIsoCmd.java      |    24 +-
 .../api/command/user/iso/CopyIsoCmd.java        |     4 +-
 .../api/command/user/iso/DeleteIsoCmd.java      |     3 +-
 .../api/command/user/iso/DetachIsoCmd.java      |    19 +-
 .../api/command/user/iso/ExtractIsoCmd.java     |     3 +-
 .../command/user/iso/ListIsoPermissionsCmd.java |    12 +-
 .../api/command/user/iso/ListIsosCmd.java       |     8 +-
 .../api/command/user/iso/RegisterIsoCmd.java    |    26 +-
 .../api/command/user/iso/UpdateIsoCmd.java      |     8 +-
 .../user/iso/UpdateIsoPermissionsCmd.java       |     3 +-
 .../api/command/user/job/ListAsyncJobsCmd.java  |     3 +-
 .../user/job/QueryAsyncJobResultCmd.java        |     3 +-
 .../AssignCertToLoadBalancerCmd.java            |     6 +-
 .../AssignToLoadBalancerRuleCmd.java            |    66 +-
 .../CreateApplicationLoadBalancerCmd.java       |    15 +-
 .../CreateLBHealthCheckPolicyCmd.java           |     4 +-
 .../CreateLBStickinessPolicyCmd.java            |     3 +-
 .../loadbalancer/CreateLoadBalancerRuleCmd.java |    16 +-
 .../DeleteApplicationLoadBalancerCmd.java       |     3 +-
 .../DeleteLBHealthCheckPolicyCmd.java           |     3 +-
 .../DeleteLBStickinessPolicyCmd.java            |     3 +-
 .../loadbalancer/DeleteLoadBalancerRuleCmd.java |     3 +-
 .../user/loadbalancer/DeleteSslCertCmd.java     |     3 +-
 .../ListApplicationLoadBalancersCmd.java        |    18 +-
 .../ListLBHealthCheckPoliciesCmd.java           |     3 +-
 .../ListLBStickinessPoliciesCmd.java            |     7 +-
 .../ListLoadBalancerRuleInstancesCmd.java       |    75 +-
 .../loadbalancer/ListLoadBalancerRulesCmd.java  |     3 +-
 .../user/loadbalancer/ListSslCertsCmd.java      |     3 +-
 .../RemoveCertFromLoadBalancerCmd.java          |     5 +-
 .../RemoveFromLoadBalancerRuleCmd.java          |    73 +-
 .../UpdateApplicationLoadBalancerCmd.java       |   105 +
 .../loadbalancer/UpdateLoadBalancerRuleCmd.java |    25 +-
 .../user/loadbalancer/UploadSslCertCmd.java     |     3 +-
 .../user/nat/CreateIpForwardingRuleCmd.java     |    21 +-
 .../user/nat/DeleteIpForwardingRuleCmd.java     |     3 +-
 .../command/user/nat/DisableStaticNatCmd.java   |     3 +-
 .../command/user/nat/EnableStaticNatCmd.java    |    11 +-
 .../user/nat/ListIpForwardingRulesCmd.java      |     3 +-
 .../user/network/CreateNetworkACLCmd.java       |    16 +-
 .../user/network/CreateNetworkACLListCmd.java   |    16 +-
 .../command/user/network/CreateNetworkCmd.java  |    15 +-
 .../user/network/DeleteNetworkACLCmd.java       |     3 +-
 .../user/network/DeleteNetworkACLListCmd.java   |     3 +-
 .../command/user/network/DeleteNetworkCmd.java  |     9 +-
 .../user/network/ListNetworkACLListsCmd.java    |    17 +-
 .../user/network/ListNetworkACLsCmd.java        |    18 +-
 .../user/network/ListNetworkOfferingsCmd.java   |     7 +-
 .../command/user/network/ListNetworksCmd.java   |    26 +-
 .../user/network/ReplaceNetworkACLListCmd.java  |     3 +-
 .../command/user/network/RestartNetworkCmd.java |    10 +-
 .../user/network/UpdateNetworkACLItemCmd.java   |    26 +-
 .../user/network/UpdateNetworkACLListCmd.java   |   100 +
 .../command/user/network/UpdateNetworkCmd.java  |    37 +-
 .../user/offering/ListDiskOfferingsCmd.java     |     3 +-
 .../user/offering/ListServiceOfferingsCmd.java  |     3 +-
 .../user/project/ActivateProjectCmd.java        |     3 +-
 .../command/user/project/CreateProjectCmd.java  |     3 +-
 .../command/user/project/DeleteProjectCmd.java  |     3 +-
 .../project/DeleteProjectInvitationCmd.java     |     3 +-
 .../user/project/ListProjectInvitationsCmd.java |     4 +-
 .../command/user/project/ListProjectsCmd.java   |     4 +-
 .../command/user/project/SuspendProjectCmd.java |     3 +-
 .../command/user/project/UpdateProjectCmd.java  |     3 +-
 .../project/UpdateProjectInvitationCmd.java     |     3 +-
 .../api/command/user/region/ListRegionsCmd.java |     3 +-
 .../gslb/AssignToGlobalLoadBalancerRuleCmd.java |     4 +-
 .../gslb/CreateGlobalLoadBalancerRuleCmd.java   |     8 +-
 .../gslb/DeleteGlobalLoadBalancerRuleCmd.java   |     3 +-
 .../ha/gslb/ListGlobalLoadBalancerRuleCmd.java  |     3 +-
 .../RemoveFromGlobalLoadBalancerRuleCmd.java    |     4 +-
 .../gslb/UpdateGlobalLoadBalancerRuleCmd.java   |     3 +-
 .../user/resource/GetCloudIdentifierCmd.java    |     3 +-
 .../user/resource/ListHypervisorsCmd.java       |     3 +-
 .../user/resource/ListResourceLimitsCmd.java    |     8 +-
 .../user/resource/UpdateResourceCountCmd.java   |    10 +-
 .../user/resource/UpdateResourceLimitCmd.java   |    10 +-
 .../AuthorizeSecurityGroupEgressCmd.java        |    25 +-
 .../AuthorizeSecurityGroupIngressCmd.java       |    24 +-
 .../securitygroup/CreateSecurityGroupCmd.java   |     7 +-
 .../securitygroup/DeleteSecurityGroupCmd.java   |    16 +-
 .../securitygroup/ListSecurityGroupsCmd.java    |     7 +-
 .../RevokeSecurityGroupEgressCmd.java           |    12 +-
 .../RevokeSecurityGroupIngressCmd.java          |    10 +-
 .../user/snapshot/CreateSnapshotCmd.java        |    19 +-
 .../user/snapshot/CreateSnapshotPolicyCmd.java  |     3 +-
 .../user/snapshot/DeleteSnapshotCmd.java        |    13 +-
 .../snapshot/DeleteSnapshotPoliciesCmd.java     |     3 +-
 .../user/snapshot/ListSnapshotPoliciesCmd.java  |     3 +-
 .../command/user/snapshot/ListSnapshotsCmd.java |     5 +-
 .../user/snapshot/RevertSnapshotCmd.java        |    14 +-
 .../command/user/ssh/CreateSSHKeyPairCmd.java   |     7 +-
 .../command/user/ssh/DeleteSSHKeyPairCmd.java   |     9 +-
 .../command/user/ssh/ListSSHKeyPairsCmd.java    |     5 +-
 .../command/user/ssh/RegisterSSHKeyPairCmd.java |     7 +-
 .../api/command/user/tag/CreateTagsCmd.java     |     5 +-
 .../api/command/user/tag/DeleteTagsCmd.java     |     6 +-
 .../api/command/user/tag/ListTagsCmd.java       |     7 +-
 .../command/user/template/CopyTemplateCmd.java  |    10 +-
 .../user/template/CreateTemplateCmd.java        |    41 +-
 .../user/template/DeleteTemplateCmd.java        |     3 +-
 .../user/template/ExtractTemplateCmd.java       |     3 +-
 .../template/ListTemplatePermissionsCmd.java    |    13 +-
 .../command/user/template/ListTemplatesCmd.java |     9 +-
 .../user/template/RegisterTemplateCmd.java      |    22 +-
 .../user/template/UpdateTemplateCmd.java        |    10 +-
 .../template/UpdateTemplatePermissionsCmd.java  |     3 +-
 .../api/command/user/vm/AddIpToVmNicCmd.java    |    11 +-
 .../api/command/user/vm/AddNicToVMCmd.java      |    23 +-
 .../api/command/user/vm/DeployVMCmd.java        |   128 +-
 .../api/command/user/vm/DestroyVMCmd.java       |    25 +-
 .../api/command/user/vm/GetVMPasswordCmd.java   |    12 +-
 .../api/command/user/vm/ListNicsCmd.java        |    16 +-
 .../api/command/user/vm/ListVMsCmd.java         |    52 +-
 .../api/command/user/vm/RebootVMCmd.java        |    26 +-
 .../command/user/vm/RemoveIpFromVmNicCmd.java   |    26 +-
 .../api/command/user/vm/RemoveNicFromVMCmd.java |    22 +-
 .../api/command/user/vm/ResetVMPasswordCmd.java |    33 +-
 .../api/command/user/vm/ResetVMSSHKeyCmd.java   |    20 +-
 .../api/command/user/vm/RestoreVMCmd.java       |    33 +-
 .../api/command/user/vm/ScaleVMCmd.java         |    33 +-
 .../api/command/user/vm/StartVMCmd.java         |    29 +-
 .../api/command/user/vm/StopVMCmd.java          |    20 +-
 .../user/vm/UpdateDefaultNicForVMCmd.java       |    21 +-
 .../api/command/user/vm/UpdateVMCmd.java        |    47 +-
 .../api/command/user/vm/UpgradeVMCmd.java       |    32 +-
 .../command/user/vmgroup/CreateVMGroupCmd.java  |     7 +-
 .../command/user/vmgroup/DeleteVMGroupCmd.java  |     8 +-
 .../command/user/vmgroup/ListVMGroupsCmd.java   |     7 +-
 .../command/user/vmgroup/UpdateVMGroupCmd.java  |     9 +-
 .../user/vmsnapshot/CreateVMSnapshotCmd.java    |     9 +-
 .../user/vmsnapshot/DeleteVMSnapshotCmd.java    |     8 +-
 .../user/vmsnapshot/ListVMSnapshotCmd.java      |     5 +-
 .../user/vmsnapshot/RevertToVMSnapshotCmd.java  |    14 +-
 .../user/volume/AddResourceDetailCmd.java       |    16 +-
 .../command/user/volume/AttachVolumeCmd.java    |    28 +-
 .../command/user/volume/CreateVolumeCmd.java    |    40 +-
 .../command/user/volume/DeleteVolumeCmd.java    |    19 +-
 .../command/user/volume/DetachVolumeCmd.java    |    24 +-
 .../command/user/volume/ExtractVolumeCmd.java   |    18 +-
 .../user/volume/ListResourceDetailsCmd.java     |     5 +-
 .../api/command/user/volume/ListVolumesCmd.java |    30 +-
 .../command/user/volume/MigrateVolumeCmd.java   |    30 +-
 .../user/volume/RemoveResourceDetailCmd.java    |     3 +-
 .../command/user/volume/ResizeVolumeCmd.java    |    31 +-
 .../command/user/volume/UpdateVolumeCmd.java    |    41 +-
 .../command/user/volume/UploadVolumeCmd.java    |    28 +-
 .../command/user/vpc/CreateStaticRouteCmd.java  |     3 +-
 .../api/command/user/vpc/CreateVPCCmd.java      |    37 +-
 .../command/user/vpc/DeleteStaticRouteCmd.java  |     9 +-
 .../api/command/user/vpc/DeleteVPCCmd.java      |     9 +-
 .../user/vpc/ListPrivateGatewaysCmd.java        |     6 +-
 .../command/user/vpc/ListStaticRoutesCmd.java   |     5 +-
 .../command/user/vpc/ListVPCOfferingsCmd.java   |     7 +-
 .../api/command/user/vpc/ListVPCsCmd.java       |    25 +-
 .../api/command/user/vpc/RestartVPCCmd.java     |    13 +-
 .../api/command/user/vpc/UpdateVPCCmd.java      |    38 +-
 .../api/command/user/vpn/AddVpnUserCmd.java     |     7 +-
 .../user/vpn/CreateRemoteAccessVpnCmd.java      |    20 +-
 .../user/vpn/CreateVpnConnectionCmd.java        |    12 +-
 .../user/vpn/CreateVpnCustomerGatewayCmd.java   |     7 +-
 .../command/user/vpn/CreateVpnGatewayCmd.java   |    11 +-
 .../user/vpn/DeleteRemoteAccessVpnCmd.java      |     4 +-
 .../user/vpn/DeleteVpnConnectionCmd.java        |     5 +-
 .../user/vpn/DeleteVpnCustomerGatewayCmd.java   |     8 +-
 .../command/user/vpn/DeleteVpnGatewayCmd.java   |     5 +-
 .../user/vpn/ListRemoteAccessVpnsCmd.java       |    17 +-
 .../command/user/vpn/ListVpnConnectionsCmd.java |    17 +-
 .../user/vpn/ListVpnCustomerGatewaysCmd.java    |     5 +-
 .../command/user/vpn/ListVpnGatewaysCmd.java    |    17 +-
 .../api/command/user/vpn/ListVpnUsersCmd.java   |     5 +-
 .../api/command/user/vpn/RemoveVpnUserCmd.java  |     6 +-
 .../command/user/vpn/ResetVpnConnectionCmd.java |     7 +-
 .../user/vpn/UpdateRemoteAccessVpnCmd.java      |   111 +
 .../user/vpn/UpdateVpnConnectionCmd.java        |    99 +
 .../user/vpn/UpdateVpnCustomerGatewayCmd.java   |     7 +-
 .../command/user/vpn/UpdateVpnGatewayCmd.java   |    98 +
 .../api/command/user/zone/ListZonesByCmd.java   |   132 -
 .../api/command/user/zone/ListZonesCmd.java     |   134 +
 .../api/response/AccountResponse.java           |     9 +
 ...ApplicationLoadBalancerInstanceResponse.java |     3 +-
 .../ApplicationLoadBalancerResponse.java        |    12 +-
 .../api/response/AutoScaleVmGroupResponse.java  |    12 +-
 .../response/AutoScaleVmProfileResponse.java    |    13 +-
 .../api/response/CapabilitiesResponse.java      |     8 +
 .../api/response/DiskOfferingResponse.java      |    14 +-
 .../api/response/FirewallResponse.java          |    12 +-
 .../api/response/FirewallRuleResponse.java      |    12 +-
 .../api/response/GetVMPasswordResponse.java     |     2 +-
 .../cloudstack/api/response/GpuResponse.java    |    46 +
 .../api/response/GuestOsMappingResponse.java    |   102 +
 .../cloudstack/api/response/HostResponse.java   |     8 +
 .../api/response/IPAddressResponse.java         |    12 +-
 .../api/response/LoadBalancerResponse.java      |    12 +-
 .../response/LoadBalancerRuleVmMapResponse.java |    54 +
 .../api/response/NetworkACLItemResponse.java    |    12 +-
 .../api/response/NetworkACLResponse.java        |    12 +-
 .../api/response/NetworkOfferingResponse.java   |     9 +-
 .../api/response/NetworkResponse.java           |    23 +-
 .../api/response/RemoteAccessVpnResponse.java   |    11 +-
 .../api/response/ResourceTagResponse.java       |    31 +
 .../api/response/ServiceOfferingResponse.java   |    48 +
 .../Site2SiteVpnConnectionResponse.java         |    14 +-
 .../response/Site2SiteVpnGatewayResponse.java   |    11 +-
 .../api/response/StoragePoolResponse.java       |     8 +
 .../cloudstack/api/response/UserVmResponse.java |    17 +-
 .../cloudstack/api/response/VgpuResponse.java   |    52 +
 .../cloudstack/api/response/VolumeResponse.java |    49 +-
 .../api/response/VpcOfferingResponse.java       |    16 +
 .../cloudstack/api/response/VpcResponse.java    |    28 +-
 .../config/ApiServiceConfiguration.java         |     2 +-
 .../apache/cloudstack/context/CallContext.java  |    28 +-
 .../cloudstack/context/CallContextListener.java |     3 +-
 .../lb/ApplicationLoadBalancerService.java      |     4 +-
 .../apache/cloudstack/query/QueryService.java   |    18 +-
 .../org/apache/cloudstack/api/BaseCmdTest.java  |    69 +
 .../api/command/test/ScaleVMCmdTest.java        |     4 +-
 awsapi/findbugsExcludeFilter.xml                |    25 +
 awsapi/pom.xml                                  |    95 +-
 .../bridge/io/DimeDelimitedInputStream.java     |    12 +-
 .../com/cloud/bridge/model/SObjectItemVO.java   |     2 +-
 .../bridge/service/EC2SoapServiceImpl.java      |    25 +-
 .../bridge/service/core/ec2/EC2Engine.java      |     6 +-
 .../src/com/cloud/bridge/util/EC2RestAuth.java  |     2 +-
 build/simulator.properties                      |    28 -
 .../classes/resources/messages.properties       |   303 +-
 .../classes/resources/messages_es.properties    |     3 -
 .../classes/resources/messages_ja_JP.properties |   336 +-
 .../classes/resources/messages_nl_NL.properties |    50 +-
 .../classes/resources/messages_pl.properties    |    12 +-
 .../classes/resources/messages_pt_BR.properties |    11 +-
 .../classes/resources/messages_zh_CN.properties |   616 +-
 client/pom.xml                                  |    83 +-
 client/tomcatconf/applicationContext.xml.in     |   951 ++
 client/tomcatconf/catalina.properties.in        |     2 +-
 client/tomcatconf/commands.properties.in        |    39 +
 client/tomcatconf/componentContext.xml.in       |   317 +
 client/tomcatconf/nonossComponentContext.xml.in |   422 +
 .../tomcatconf/simulatorComponentContext.xml.in |   286 +
 core/findbugsExcludeFilter.xml                  |    25 +
 core/pom.xml                                    |     2 +-
 ...g-core-lifecycle-api-context-inheritable.xml |     5 +
 .../core/spring-core-registry-core-context.xml  |     9 +-
 .../com/cloud/agent/api/CheckRouterCommand.java |     5 +
 .../api/CheckS2SVpnConnectionsCommand.java      |     9 +-
 .../com/cloud/agent/api/ClusterSyncAnswer.java  |    10 +-
 .../agent/api/ClusterVMMetaDataSyncAnswer.java  |    52 +
 .../agent/api/ClusterVMMetaDataSyncCommand.java |    47 +
 .../com/cloud/agent/api/GetDomRVersionCmd.java  |     5 +
 .../com/cloud/agent/api/GetGPUStatsAnswer.java  |    36 +
 .../com/cloud/agent/api/GetGPUStatsCommand.java |    47 +
 .../cloud/agent/api/GetRouterAlertsAnswer.java  |    62 +
 .../agent/api/MigrateWithStorageCommand.java    |    16 +
 .../agent/api/ModifyVmNicConfigCommand.java     |     7 +
 .../com/cloud/agent/api/PoolEjectCommand.java   |    44 -
 .../agent/api/SetupGuestNetworkAnswer.java      |    26 -
 .../cloud/agent/api/StartupRoutingCommand.java  |    17 +-
 core/src/com/cloud/agent/api/StopCommand.java   |     9 +
 .../api/routing/AggregationControlCommand.java  |    44 +
 .../api/routing/GetRouterAlertsCommand.java     |    46 +
 .../cloud/agent/api/routing/GroupAnswer.java    |    40 +
 .../cloud/agent/api/routing/IpAssocCommand.java |     4 +
 .../agent/api/routing/IpAssocVpcCommand.java    |     6 +
 .../api/routing/NetworkElementCommand.java      |     9 +
 .../api/routing/SetFirewallRulesCommand.java    |     9 +-
 .../agent/api/routing/SetNetworkACLCommand.java |    11 +-
 .../routing/SetPortForwardingRulesCommand.java  |    10 +-
 .../SetPortForwardingRulesVpcCommand.java       |     4 +-
 .../api/routing/SetStaticNatRulesCommand.java   |     9 +-
 .../agent/api/routing/SetStaticRouteAnswer.java |    13 +-
 .../api/routing/SetStaticRouteCommand.java      |    13 +-
 .../virtualnetwork/VirtualRouterDeployer.java   |     2 +
 .../virtualnetwork/VirtualRoutingResource.java  |  1013 +-
 core/src/com/cloud/info/ConsoleProxyInfo.java   |    19 +-
 .../storage/command/AttachCommand.java          |     6 +
 .../command/AttachPrimaryDataStoreCmd.java      |     5 +
 .../cloudstack/storage/command/CopyCommand.java |     4 +
 .../storage/command/CreateObjectCommand.java    |     4 +
 .../command/CreatePrimaryDataStoreCmd.java      |     4 +
 .../storage/command/DeleteCommand.java          |     4 +
 .../storage/command/DettachCommand.java         |     5 +
 .../storage/command/ForgetObjectCmd.java        |     5 +
 .../storage/command/IntroduceObjectCmd.java     |     5 +
 .../command/StorageSubSystemCommand.java        |     2 +-
 .../storage/to/PrimaryDataStoreTO.java          |    19 +
 .../VirtualRoutingResourceTest.java             |  1095 ++
 .../agent/test/BackupSnapshotCommandTest.java   |    10 +-
 .../api/agent/test/CheckNetworkAnswerTest.java  |    10 +-
 .../api/agent/test/SnapshotCommandTest.java     |    10 +-
 debian/changelog                                |     6 +
 debian/cloudstack-agent.postinst                |     1 -
 debian/control                                  |     2 +-
 debian/rules                                    |     2 +-
 deps/XenServerJava/Makefile                     |    44 -
 deps/XenServerJava/findbugsExcludeFilter.xml    |    25 +
 deps/XenServerJava/pom.xml                      |    60 -
 .../src/com/xensource/xenapi/APIVersion.java    |   118 -
 .../src/com/xensource/xenapi/Auth.java          |   112 -
 .../src/com/xensource/xenapi/Blob.java          |   445 -
 .../src/com/xensource/xenapi/Bond.java          |   565 -
 .../src/com/xensource/xenapi/Connection.java    |   379 -
 .../src/com/xensource/xenapi/Console.java       |   418 -
 .../src/com/xensource/xenapi/Crashdump.java     |   357 -
 .../src/com/xensource/xenapi/DRTask.java        |   302 -
 .../src/com/xensource/xenapi/DataSource.java    |   163 -
 .../src/com/xensource/xenapi/Event.java         |   318 -
 .../src/com/xensource/xenapi/GPUGroup.java      |   444 -
 .../src/com/xensource/xenapi/Host.java          |  2926 ----
 .../src/com/xensource/xenapi/HostCpu.java       |   538 -
 .../src/com/xensource/xenapi/HostCrashdump.java |   416 -
 .../src/com/xensource/xenapi/HostMetrics.java   |   373 -
 .../src/com/xensource/xenapi/HostPatch.java     |   555 -
 .../src/com/xensource/xenapi/Marshalling.java   |    59 -
 .../src/com/xensource/xenapi/Message.java       |   320 -
 .../src/com/xensource/xenapi/Network.java       |   792 -
 .../src/com/xensource/xenapi/PBD.java           |   541 -
 .../src/com/xensource/xenapi/PCI.java           |   417 -
 .../src/com/xensource/xenapi/PGPU.java          |   348 -
 .../src/com/xensource/xenapi/PIF.java           |  1397 --
 .../src/com/xensource/xenapi/PIFMetrics.java    |   532 -
 .../src/com/xensource/xenapi/Pool.java          |  2332 ---
 .../src/com/xensource/xenapi/PoolPatch.java     |   692 -
 .../src/com/xensource/xenapi/Role.java          |   363 -
 .../src/com/xensource/xenapi/SM.java            |   527 -
 .../src/com/xensource/xenapi/SR.java            |  1670 --
 .../src/com/xensource/xenapi/Secret.java        |   388 -
 .../src/com/xensource/xenapi/Session.java       |   674 -
 .../src/com/xensource/xenapi/Subject.java       |   395 -
 .../src/com/xensource/xenapi/Task.java          |   687 -
 .../src/com/xensource/xenapi/Tunnel.java        |   473 -
 .../src/com/xensource/xenapi/Types.java         | 13442 -----------------
 .../src/com/xensource/xenapi/User.java          |   389 -
 .../src/com/xensource/xenapi/VBD.java           |  1160 --
 .../src/com/xensource/xenapi/VBDMetrics.java    |   348 -
 .../src/com/xensource/xenapi/VDI.java           |  2138 ---
 .../src/com/xensource/xenapi/VGPU.java          |   447 -
 .../src/com/xensource/xenapi/VIF.java           |  1185 --
 .../src/com/xensource/xenapi/VIFMetrics.java    |   348 -
 .../src/com/xensource/xenapi/VLAN.java          |   420 -
 .../src/com/xensource/xenapi/VM.java            |  4916 ------
 .../src/com/xensource/xenapi/VMAppliance.java   |   654 -
 .../com/xensource/xenapi/VMGuestMetrics.java    |   486 -
 .../src/com/xensource/xenapi/VMMetrics.java     |   509 -
 .../src/com/xensource/xenapi/VMPP.java          |  1157 --
 .../src/com/xensource/xenapi/VTPM.java          |   289 -
 .../src/com/xensource/xenapi/XenAPIObject.java  |    18 -
 developer/pom.xml                               |    25 +-
 engine/api/findbugsExcludeFilter.xml            |    25 +
 engine/api/pom.xml                              |     2 +-
 .../src/com/cloud/vm/VirtualMachineManager.java |    14 +-
 .../cloud/entity/api/VirtualMachineEntity.java  |     3 +-
 .../service/NetworkOrchestrationService.java    |     2 +-
 .../service/VolumeOrchestrationService.java     |    10 +-
 .../api/storage/DataMotionService.java          |     2 +
 .../api/storage/DataMotionStrategy.java         |     2 +
 .../api/storage/PrimaryDataStoreInfo.java       |    19 +
 .../subsystem/api/storage/StorageAction.java    |     3 +-
 .../api/storage/StorageCacheManager.java        |     2 +
 .../api/storage/TemplateDataFactory.java        |     2 +
 .../subsystem/api/storage/VolumeService.java    |     6 +-
 .../api/storage/type/VolumeTypeBase.java        |    39 +-
 .../api/storage/type/VolumeTypeHelper.java      |    25 +-
 .../api/storage/type/VolumeTypeHelperTest.java  |   101 +
 engine/components-api/findbugsExcludeFilter.xml |    25 +
 engine/components-api/pom.xml                   |     2 +-
 .../src/com/cloud/capacity/CapacityManager.java |     2 +-
 .../cloud/deploy/DeploymentPlanningManager.java |     4 +-
 .../src/com/cloud/event/UsageEventUtils.java    |    30 +-
 .../com/cloud/ha/HighAvailabilityManager.java   |     5 +
 .../src/com/cloud/network/IpAddressManager.java |     2 +-
 .../src/com/cloud/network/addr/PublicIp.java    |    14 +-
 .../network/lb/LoadBalancingRulesManager.java   |     2 +-
 .../cloud/network/rules/StaticNatRuleImpl.java  |    35 +-
 .../cloud/network/vpc/NetworkACLManager.java    |    10 +-
 .../src/com/cloud/resource/ResourceManager.java |    48 +
 .../src/com/cloud/template/TemplateManager.java |    12 +
 engine/network/findbugsExcludeFilter.xml        |    25 +
 engine/network/pom.xml                          |     2 +-
 engine/orchestration/findbugsExcludeFilter.xml  |    25 +
 engine/orchestration/pom.xml                    |     2 +-
 .../com/cloud/agent/manager/AgentAttache.java   |    42 +-
 .../cloud/agent/manager/AgentManagerImpl.java   |   101 +-
 .../agent/manager/ClusteredAgentAttache.java    |    18 +-
 .../agent/manager/ConnectedAgentAttache.java    |    33 +-
 .../cloud/agent/manager/DirectAgentAttache.java |     4 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java |  1425 +-
 .../vm/VirtualMachinePowerStateSyncImpl.java    |    63 +
 .../src/com/cloud/vm/VmWorkJobDispatcher.java   |    12 +-
 .../src/com/cloud/vm/VmWorkMigrateAway.java     |    36 +
 .../src/com/cloud/vm/VmWorkStart.java           |    12 +-
 .../com/cloud/vm/VmWorkStorageMigration.java    |    12 +-
 .../cloud/entity/api/VMEntityManager.java       |     3 +-
 .../cloud/entity/api/VMEntityManagerImpl.java   |    19 +-
 .../entity/api/VirtualMachineEntityImpl.java    |     4 +-
 .../engine/orchestration/CloudOrchestrator.java |    96 +-
 .../orchestration/NetworkOrchestrator.java      |   127 +-
 .../orchestration/VolumeOrchestrator.java       |   146 +-
 .../service/api/ProvisioningServiceImpl.java    |    34 +-
 .../manager/ConnectedAgentAttacheTest.java      |    82 +
 .../cloud/vm/VirtualMachineManagerImplTest.java |    71 +-
 .../orchestration/NetworkOrchestratorTest.java  |   164 +
 engine/pom.xml                                  |    15 +-
 engine/schema/findbugsExcludeFilter.xml         |    25 +
 engine/schema/pom.xml                           |     2 +-
 .../spring-engine-schema-core-daos-context.xml  |    33 +-
 .../src/com/cloud/dc/DataCenterDetailVO.java    |     5 +-
 .../src/com/cloud/dc/dao/DataCenterDaoImpl.java |     2 +-
 .../cloud/dc/dao/DataCenterDetailsDaoImpl.java  |     4 +-
 engine/schema/src/com/cloud/event/EventVO.java  |    20 +-
 .../src/com/cloud/gpu/HostGpuGroupsVO.java      |    70 +
 .../schema/src/com/cloud/gpu/VGPUTypesVO.java   |    82 +
 .../src/com/cloud/gpu/dao/HostGpuGroupsDao.java |    60 +
 .../com/cloud/gpu/dao/HostGpuGroupsDaoImpl.java |    94 +
 .../src/com/cloud/gpu/dao/VGPUTypesDao.java     |    48 +
 .../src/com/cloud/gpu/dao/VGPUTypesDaoImpl.java |    95 +
 engine/schema/src/com/cloud/host/HostVO.java    |    13 +
 .../src/com/cloud/host/dao/HostDaoImpl.java     |    98 +-
 .../com/cloud/network/UserIpv6AddressVO.java    |    15 +-
 .../schema/src/com/cloud/network/VpnUserVO.java |    17 +-
 .../com/cloud/network/as/AutoScalePolicyVO.java |     8 +-
 .../cloud/network/as/AutoScaleVmGroupVO.java    |    25 +-
 .../cloud/network/as/AutoScaleVmProfileVO.java  |    26 +-
 .../src/com/cloud/network/as/ConditionVO.java   |    10 +-
 .../network/dao/FirewallRulesCidrsDaoImpl.java  |     1 -
 .../com/cloud/network/dao/IPAddressDaoImpl.java |     1 +
 .../src/com/cloud/network/dao/IPAddressVO.java  |    55 +-
 .../cloud/network/dao/LoadBalancerVMMapDao.java |     8 +
 .../network/dao/LoadBalancerVMMapDaoImpl.java   |    43 +
 .../cloud/network/dao/LoadBalancerVMMapVO.java  |    19 +
 .../network/dao/MonitoringServiceDaoImpl.java   |     4 +-
 .../cloud/network/dao/MonitoringServiceVO.java  |    33 +-
 .../com/cloud/network/dao/NetworkDetailVO.java  |     5 +-
 .../network/dao/NetworkDetailsDaoImpl.java      |     4 +-
 .../src/com/cloud/network/dao/NetworkVO.java    |    57 +-
 .../network/dao/OpRouterMonitorServiceDao.java  |    25 +
 .../dao/OpRouterMonitorServiceDaoImpl.java      |    28 +
 .../network/dao/OpRouterMonitorServiceVO.java   |    69 +
 .../cloud/network/dao/RemoteAccessVpnVO.java    |    33 +-
 .../network/dao/Site2SiteCustomerGatewayVO.java |     8 +-
 .../network/dao/Site2SiteVpnConnectionVO.java   |    30 +-
 .../network/dao/Site2SiteVpnGatewayVO.java      |    28 +-
 .../src/com/cloud/network/dao/SslCertVO.java    |    12 +-
 .../com/cloud/network/rules/FirewallRuleVO.java |    34 +-
 .../cloud/network/security/SecurityGroupVO.java |    11 +-
 .../security/dao/VmRulesetLogDaoImpl.java       |     2 +-
 .../com/cloud/network/vpc/NetworkACLItemVO.java |    30 +-
 .../src/com/cloud/network/vpc/NetworkACLVO.java |    15 +
 .../com/cloud/network/vpc/StaticRouteVO.java    |    13 +-
 .../src/com/cloud/network/vpc/VpcGatewayVO.java |    15 +-
 .../com/cloud/network/vpc/VpcOfferingVO.java    |    21 +-
 .../schema/src/com/cloud/network/vpc/VpcVO.java |    52 +-
 .../com/cloud/offerings/NetworkOfferingVO.java  |    11 +-
 .../com/cloud/projects/ProjectInvitationVO.java |    15 +-
 .../src/com/cloud/projects/ProjectVO.java       |     5 +
 .../cloud/service/ServiceOfferingDetailsVO.java |     9 +-
 .../com/cloud/service/ServiceOfferingVO.java    |     1 +
 .../service/dao/ServiceOfferingDaoImpl.java     |     2 +-
 .../dao/ServiceOfferingDetailsDaoImpl.java      |     4 +-
 .../src/com/cloud/storage/DiskOfferingVO.java   |     3 +-
 .../com/cloud/storage/GuestOSHypervisorVO.java  |    62 +-
 .../schema/src/com/cloud/storage/GuestOSVO.java |    25 +-
 .../src/com/cloud/storage/SnapshotVO.java       |    17 +-
 .../com/cloud/storage/VMTemplateDetailVO.java   |     5 +-
 .../src/com/cloud/storage/VMTemplateVO.java     |     6 +-
 .../src/com/cloud/storage/VolumeDetailVO.java   |     5 +-
 .../schema/src/com/cloud/storage/VolumeVO.java  |   101 +-
 .../cloud/storage/dao/GuestOSHypervisorDao.java |     3 +
 .../storage/dao/GuestOSHypervisorDaoImpl.java   |    27 +
 .../storage/dao/SnapshotDetailsDaoImpl.java     |     4 +-
 .../cloud/storage/dao/SnapshotDetailsVO.java    |     9 +-
 .../storage/dao/StoragePoolDetailsDaoImpl.java  |     4 +-
 .../cloud/storage/dao/VMTemplateDaoImpl.java    |    40 +-
 .../storage/dao/VMTemplateDetailsDaoImpl.java   |     4 +-
 .../src/com/cloud/storage/dao/VolumeDao.java    |     8 +
 .../com/cloud/storage/dao/VolumeDaoImpl.java    |    26 +
 .../cloud/storage/dao/VolumeDetailsDaoImpl.java |     4 +-
 .../src/com/cloud/tags/ResourceTagVO.java       |    10 +-
 .../cloud/upgrade/DatabaseUpgradeChecker.java   |   187 +-
 .../cloud/upgrade/dao/DatabaseAccessObject.java |    99 +
 .../com/cloud/upgrade/dao/DbUpgradeUtils.java   |    76 +-
 .../com/cloud/upgrade/dao/Upgrade430to440.java  |    56 +-
 .../com/cloud/upgrade/dao/Upgrade440to450.java  |    70 +
 engine/schema/src/com/cloud/user/AccountVO.java |    13 +-
 .../schema/src/com/cloud/user/SSHKeyPairVO.java |     4 +
 .../src/com/cloud/vm/InstanceGroupVO.java       |     9 +-
 engine/schema/src/com/cloud/vm/NicDetailVO.java |     5 +-
 .../schema/src/com/cloud/vm/UserVmDetailVO.java |     5 +-
 .../schema/src/com/cloud/vm/VMInstanceVO.java   |    48 +-
 .../schema/src/com/cloud/vm/dao/NicDaoImpl.java |     1 -
 .../src/com/cloud/vm/dao/NicDetailsDaoImpl.java |     4 +-
 .../src/com/cloud/vm/dao/NicIpAliasVO.java      |    22 +-
 .../src/com/cloud/vm/dao/NicSecondaryIpVO.java  |     7 +-
 .../schema/src/com/cloud/vm/dao/UserVmDao.java  |     3 +-
 .../src/com/cloud/vm/dao/UserVmDaoImpl.java     |     7 +-
 .../com/cloud/vm/dao/UserVmDetailsDaoImpl.java  |     4 +-
 .../src/com/cloud/vm/dao/VMInstanceDaoImpl.java |    57 +-
 .../cloud/vm/snapshot/VMSnapshotDetailsVO.java  |     9 +-
 .../src/com/cloud/vm/snapshot/VMSnapshotVO.java |    13 +-
 .../snapshot/dao/VMSnapshotDetailsDaoImpl.java  |     4 +-
 .../cloudstack/affinity/AffinityGroupVO.java    |    11 +-
 .../engine/cloud/entity/api/db/VMEntityVO.java  |    38 +-
 .../cloud/entity/api/db/VMReservationVO.java    |    11 +
 .../region/gslb/GlobalLoadBalancerRuleVO.java   |    13 +-
 .../AutoScaleVmGroupDetailVO.java               |    82 +
 .../AutoScaleVmProfileDetailVO.java             |    82 +
 .../resourcedetail/DiskOfferingDetailVO.java    |     3 +-
 .../resourcedetail/FirewallRuleDetailVO.java    |     5 +-
 .../resourcedetail/NetworkACLItemDetailVO.java  |     5 +-
 .../resourcedetail/NetworkACLListDetailVO.java  |     5 +-
 .../resourcedetail/RemoteAccessVpnDetailVO.java |     5 +-
 .../resourcedetail/ResourceDetailsDao.java      |     2 +-
 .../resourcedetail/ResourceDetailsDaoBase.java  |     5 +-
 .../Site2SiteCustomerGatewayDetailVO.java       |     5 +-
 .../Site2SiteVpnConnectionDetailVO.java         |     5 +-
 .../Site2SiteVpnGatewayDetailVO.java            |     5 +-
 .../cloudstack/resourcedetail/UserDetailVO.java |     2 +-
 .../resourcedetail/UserIpAddressDetailVO.java   |     5 +-
 .../cloudstack/resourcedetail/VpcDetailVO.java  |     5 +-
 .../resourcedetail/VpcGatewayDetailVO.java      |     5 +-
 .../dao/AutoScaleVmGroupDetailsDao.java         |    26 +
 .../dao/AutoScaleVmGroupDetailsDaoImpl.java     |    33 +
 .../dao/AutoScaleVmProfileDetailsDao.java       |    26 +
 .../dao/AutoScaleVmProfileDetailsDaoImpl.java   |    33 +
 .../dao/DiskOfferingDetailsDaoImpl.java         |     4 +-
 .../dao/FirewallRuleDetailsDaoImpl.java         |     4 +-
 .../dao/NetworkACLItemDetailsDaoImpl.java       |     4 +-
 .../dao/NetworkACLListDetailsDaoImpl.java       |     4 +-
 .../dao/RemoteAccessVpnDetailsDaoImpl.java      |     4 +-
 .../Site2SiteCustomerGatewayDetailsDaoImpl.java |     4 +-
 .../Site2SiteVpnConnectionDetailsDaoImpl.java   |     4 +-
 .../dao/Site2SiteVpnGatewayDetailsDaoImpl.java  |     4 +-
 .../resourcedetail/dao/UserDetailsDaoImpl.java  |     2 +-
 .../dao/UserIpAddressDetailsDaoImpl.java        |     4 +-
 .../resourcedetail/dao/VpcDetailsDaoImpl.java   |     4 +-
 .../dao/VpcGatewayDetailsDaoImpl.java           |     4 +-
 .../storage/datastore/db/ImageStoreVO.java      |     7 +-
 .../datastore/db/PrimaryDataStoreDaoImpl.java   |     4 +-
 .../datastore/db/PrimaryDataStoreDetailVO.java  |     5 +-
 .../datastore/db/SnapshotDataStoreVO.java       |    11 +-
 .../datastore/db/StoragePoolDetailVO.java       |     5 +-
 .../storage/datastore/db/StoragePoolVO.java     |    12 +-
 .../datastore/db/TemplateDataStoreDao.java      |     2 +
 .../datastore/db/TemplateDataStoreVO.java       |    11 +-
 .../storage/datastore/db/VolumeDataStoreVO.java |    11 +-
 .../upgrade/dao/DatabaseAccessObjectTest.java   |   463 +
 .../cloud/upgrade/dao/DbUpgradeUtilsTest.java   |   162 +
 engine/service/findbugsExcludeFilter.xml        |    25 +
 engine/service/pom.xml                          |     2 +-
 engine/storage/cache/findbugsExcludeFilter.xml  |    25 +
 engine/storage/cache/pom.xml                    |     2 +-
 .../cache/allocator/StorageCacheAllocator.java  |     3 +
 .../allocator/StorageCacheRandomAllocator.java  |    38 +
 .../cache/manager/StorageCacheManagerImpl.java  |    13 +
 .../datamotion/findbugsExcludeFilter.xml        |    25 +
 engine/storage/datamotion/pom.xml               |     2 +-
 ...ngine-storage-datamotion-storage-context.xml |     3 +-
 .../motion/AncientDataMotionStrategy.java       |    31 +-
 .../storage/motion/DataMotionServiceImpl.java   |     9 +-
 engine/storage/findbugsExcludeFilter.xml        |    25 +
 engine/storage/image/findbugsExcludeFilter.xml  |    25 +
 engine/storage/image/pom.xml                    |     2 +-
 .../storage/image/TemplateDataFactoryImpl.java  |    16 +-
 .../storage/image/TemplateServiceImpl.java      |    13 +-
 .../storage/image/store/TemplateObject.java     |    24 +-
 engine/storage/integration-test/pom.xml         |     7 +-
 .../vm/snapshot/dao/VmSnapshotDaoTest.java      |     2 +-
 .../storage/allocator/StorageAllocatorTest.java |     4 +-
 .../storage/test/ChildTestConfiguration.java    |     6 -
 .../storage/test/MockStorageMotionStrategy.java |     5 +
 engine/storage/pom.xml                          |     2 +-
 .../storage/snapshot/findbugsExcludeFilter.xml  |    25 +
 engine/storage/snapshot/pom.xml                 |     2 +-
 .../storage/snapshot/SnapshotObject.java        |     8 +
 .../storage/snapshot/SnapshotServiceImpl.java   |    12 +-
 .../snapshot/XenserverSnapshotStrategy.java     |     5 +
 .../allocator/AbstractStoragePoolAllocator.java |     3 +-
 .../ClusterScopeStoragePoolAllocator.java       |     5 +-
 .../endpoint/DefaultEndPointSelector.java       |    12 +-
 .../storage/image/TemplateEntityImpl.java       |     9 +-
 .../image/datastore/ImageStoreHelper.java       |    26 +
 .../image/db/TemplateDataStoreDaoImpl.java      |    16 +
 .../storage/image/format/ImageFormatHelper.java |     2 +-
 .../storage/snapshot/SnapshotEntityImpl.java    |     5 +
 .../datastore/PrimaryDataStoreHelper.java       |    30 +-
 .../db/PrimaryDataStoreDetailsDaoImpl.java      |     4 +-
 engine/storage/volume/findbugsExcludeFilter.xml |    25 +
 engine/storage/volume/pom.xml                   |     2 +-
 .../storage/datastore/PrimaryDataStoreImpl.java |    33 +-
 .../datastore/provider/DefaultHostListener.java |     2 +-
 .../cloudstack/storage/volume/VolumeObject.java |   168 +-
 .../storage/volume/VolumeServiceImpl.java       |   233 +-
 framework/cluster/findbugsExcludeFilter.xml     |    23 +
 framework/cluster/pom.xml                       |     2 +-
 framework/config/findbugsExcludeFilter.xml      |    23 +
 framework/config/pom.xml                        |     2 +-
 framework/db/findbugsExcludeFilter.xml          |    23 +
 framework/db/pom.xml                            |     7 +-
 .../db/src/com/cloud/dao/EntityManagerImpl.java |     1 +
 framework/db/src/com/cloud/utils/db/Filter.java |     2 +-
 .../src/com/cloud/utils/db/GenericDaoBase.java  |    63 +-
 .../db/src/com/cloud/utils/db/GroupBy.java      |    31 +-
 .../db/src/com/cloud/utils/db/SearchBase.java   |    99 +-
 .../src/com/cloud/utils/db/StaticStrategy.java  |   131 -
 .../com/cloud/utils/db/GenericDaoBaseTest.java  |    29 +-
 .../db/test/com/cloud/utils/db/GroupByTest.java |    81 +
 framework/events/findbugsExcludeFilter.xml      |    23 +
 framework/events/pom.xml                        |     2 +-
 framework/ipc/findbugsExcludeFilter.xml         |    23 +
 framework/ipc/pom.xml                           |     2 +-
 .../framework/messagebus/MessageBusBase.java    |    65 +-
 .../framework/messagebus/MessageDetector.java   |     4 +-
 framework/jobs/findbugsExcludeFilter.xml        |    23 +
 framework/jobs/pom.xml                          |     2 +-
 .../jobs/AsyncJobExecutionContext.java          |    21 +-
 .../framework/jobs/AsyncJobManager.java         |     3 +-
 .../framework/jobs/dao/SyncQueueItemDao.java    |     1 +
 .../jobs/dao/SyncQueueItemDaoImpl.java          |    35 +-
 .../framework/jobs/dao/VmWorkJobDaoImpl.java    |    54 +-
 .../jobs/impl/AsyncJobManagerImpl.java          |   143 +-
 .../framework/jobs/impl/AsyncJobMonitor.java    |    32 +-
 .../framework/jobs/impl/AsyncJobVO.java         |     2 +-
 .../jobs/impl/JobSerializerHelper.java          |     5 +-
 .../jobs/impl/SyncQueueManagerImpl.java         |    43 +-
 .../managed-context/findbugsExcludeFilter.xml   |    25 +
 framework/managed-context/pom.xml               |     2 +-
 .../managed/context/ManagedContextRunnable.java |     2 +-
 framework/pom.xml                               |    15 +-
 framework/rest/findbugsExcludeFilter.xml        |    23 +
 framework/rest/pom.xml                          |     2 +-
 framework/security/findbugsExcludeFilter.xml    |    23 +
 framework/security/pom.xml                      |     2 +-
 .../spring/lifecycle/findbugsExcludeFilter.xml  |    23 +
 framework/spring/lifecycle/pom.xml              |     2 +-
 .../spring/module/findbugsExcludeFilter.xml     |    23 +
 framework/spring/module/pom.xml                 |     2 +-
 maven-standard/pom.xml                          |     2 +-
 packaging/centos63/cloud-agent.rc               |     8 +-
 packaging/centos63/cloud-ipallocator.rc         |     8 +-
 packaging/centos63/package.sh                   |   170 +-
 packaging/debian/init/cloud-agent               |     2 +-
 .../static-role-based/findbugsExcludeFilter.xml |    25 +
 plugins/acl/static-role-based/pom.xml           |     2 +-
 .../findbugsExcludeFilter.xml                   |    25 +
 .../explicit-dedication/pom.xml                 |     2 +-
 .../affinity/ExplicitDedicationProcessor.java   |    11 +-
 .../findbugsExcludeFilter.xml                   |    25 +
 .../host-anti-affinity/pom.xml                  |     2 +-
 .../snmp-alerts/findbugsExcludeFilter.xml       |    25 +
 plugins/alert-handlers/snmp-alerts/pom.xml      |     2 +-
 .../syslog-alerts/findbugsExcludeFilter.xml     |    25 +
 plugins/alert-handlers/syslog-alerts/pom.xml    |     2 +-
 plugins/api/discovery/findbugsExcludeFilter.xml |    25 +
 plugins/api/discovery/pom.xml                   |     2 +-
 .../api/command/user/discovery/ListApisCmd.java |     4 +-
 .../api/rate-limit/findbugsExcludeFilter.xml    |    25 +
 plugins/api/rate-limit/pom.xml                  |     2 +-
 .../admin/ratelimit/ResetApiLimitCmd.java       |     3 +-
 .../command/user/ratelimit/GetApiLimitCmd.java  |     3 +-
 .../ratelimit/ApiRateLimitServiceImpl.java      |     4 +-
 .../cloudstack/ratelimit/ApiRateLimitTest.java  |    10 +-
 plugins/database/mysql-ha/pom.xml               |    28 +
 .../src/com/cloud/utils/db/StaticStrategy.java  |   131 +
 .../findbugsExcludeFilter.xml                   |    25 +
 plugins/dedicated-resources/pom.xml             |     2 +-
 .../api/commands/DedicateClusterCmd.java        |     3 +-
 .../api/commands/DedicateHostCmd.java           |     3 +-
 .../cloudstack/api/commands/DedicatePodCmd.java |     3 +-
 .../api/commands/DedicateZoneCmd.java           |     3 +-
 .../api/commands/ListDedicatedClustersCmd.java  |     3 +-
 .../api/commands/ListDedicatedHostsCmd.java     |     3 +-
 .../api/commands/ListDedicatedPodsCmd.java      |     3 +-
 .../api/commands/ListDedicatedZonesCmd.java     |     3 +-
 .../commands/ReleaseDedicatedClusterCmd.java    |     3 +-
 .../api/commands/ReleaseDedicatedHostCmd.java   |     3 +-
 .../api/commands/ReleaseDedicatedPodCmd.java    |     3 +-
 .../api/commands/ReleaseDedicatedZoneCmd.java   |     3 +-
 .../dedicated/DedicatedResourceManagerImpl.java |    38 +-
 .../findbugsExcludeFilter.xml                   |    25 +
 .../implicit-dedication/pom.xml                 |     2 +-
 .../findbugsExcludeFilter.xml                   |    25 +
 .../user-concentrated-pod/pom.xml               |     2 +-
 .../user-dispersing/findbugsExcludeFilter.xml   |    25 +
 .../deployment-planners/user-dispersing/pom.xml |     2 +-
 .../inmemory/findbugsExcludeFilter.xml          |    25 +
 plugins/event-bus/inmemory/pom.xml              |     2 +-
 .../mom/inmemory/InMemoryEventBus.java          |    53 +-
 .../mom/inmemory/InMemoryEventBusTest.java      |   162 +
 .../rabbitmq/findbugsExcludeFilter.xml          |    25 +
 plugins/event-bus/rabbitmq/pom.xml              |     2 +-
 .../mom/rabbitmq/RabbitMQEventBus.java          |    18 +-
 .../netapp/findbugsExcludeFilter.xml            |    25 +
 plugins/file-systems/netapp/pom.xml             |     2 +-
 .../api/commands/netapp/AssociateLunCmd.java    |     3 +-
 .../cloud/api/commands/netapp/CreateLunCmd.java |     3 +-
 .../commands/netapp/CreateVolumeOnFilerCmd.java |     3 +-
 .../commands/netapp/CreateVolumePoolCmd.java    |     3 +-
 .../commands/netapp/DeleteVolumePoolCmd.java    |     3 +-
 .../api/commands/netapp/DestroyLunCmd.java      |     3 +-
 .../netapp/DestroyVolumeOnFilerCmd.java         |     3 +-
 .../api/commands/netapp/DissociateLunCmd.java   |     3 +-
 .../cloud/api/commands/netapp/ListLunsCmd.java  |     3 +-
 .../api/commands/netapp/ListVolumePoolsCmd.java |     3 +-
 .../commands/netapp/ListVolumesOnFilerCmd.java  |     3 +-
 .../commands/netapp/ModifyVolumePoolCmd.java    |     3 +-
 .../skip-heurestics/findbugsExcludeFilter.xml   |    25 +
 plugins/ha-planners/skip-heurestics/pom.xml     |     2 +-
 .../random/findbugsExcludeFilter.xml            |    25 +
 plugins/host-allocators/random/pom.xml          |     2 +-
 .../baremetal/findbugsExcludeFilter.xml         |    25 +
 plugins/hypervisors/baremetal/pom.xml           |     2 +-
 .../baremetal/manager/BareMetalDiscoverer.java  |    18 +-
 .../networkservice/BareMetalResourceBase.java   |     3 +-
 .../cloudstack/api/AddBaremetalDhcpCmd.java     |     3 +-
 .../cloudstack/api/AddBaremetalHostCmd.java     |     3 +-
 .../api/AddBaremetalKickStartPxeCmd.java        |     3 +-
 .../api/AddBaremetalPxePingServerCmd.java       |     3 +-
 .../cloudstack/api/ListBaremetalDhcpCmd.java    |     3 +-
 .../api/ListBaremetalPxeServersCmd.java         |     3 +-
 .../ServerResource/AgentShell/AgentShell.csproj |     4 +
 .../HypervResource/CloudStackTypes.cs           |    68 +-
 .../HypervResource/HypervResource.csproj        |     4 +
 .../HypervResource/HypervResourceController.cs  |   295 +-
 .../HypervResource/IWmiCallsV2.cs               |     4 +
 .../ServerResource/HypervResource/Utils.cs      |     4 +-
 .../ServerResource/HypervResource/WmiCallsV2.cs |   199 +-
 .../ServerResource.Tests.csproj                 |     4 +
 ...tion.v2.Msvm_StorageAllocationSettingData.cs |     2 +-
 .../WmiWrappers/WmiWrappers.csproj              |     4 +
 .../hyperv/findbugsExcludeFilter.xml            |    25 +
 plugins/hypervisors/hyperv/pom.xml              |     2 +-
 .../src/com/cloud/ha/HypervInvestigator.java    |     4 +-
 .../discoverer/HypervServerDiscoverer.java      |    25 +-
 .../hypervisor/hyperv/guru/HypervGuru.java      |    54 +-
 .../resource/HypervDirectConnectResource.java   |   382 +-
 .../motion/HypervStorageMotionStrategy.java     |   179 +
 .../hypervisors/kvm/findbugsExcludeFilter.xml   |    25 +
 plugins/hypervisors/kvm/pom.xml                 |     2 +-
 .../kvm/resource/KVMGuestOsMapper.java          |     2 +
 .../hypervisor/kvm/resource/KVMHABase.java      |    13 +-
 .../kvm/resource/LibvirtComputingResource.java  |   450 +-
 .../kvm/resource/LibvirtDomainXMLParser.java    |    16 +-
 .../kvm/resource/LibvirtStoragePoolDef.java     |    29 +-
 .../resource/LibvirtStoragePoolXMLParser.java   |    20 +-
 .../hypervisor/kvm/resource/LibvirtVMDef.java   |    34 +-
 .../kvm/resource/LibvirtXMLParser.java          |     3 +-
 .../hypervisor/kvm/storage/KVMPhysicalDisk.java |     4 +
 .../kvm/storage/KVMStoragePoolManager.java      |    12 +-
 .../kvm/storage/KVMStorageProcessor.java        |    93 +-
 .../kvm/storage/LibvirtStorageAdaptor.java      |   164 +-
 .../kvm/storage/LibvirtStoragePool.java         |    14 +-
 .../apache/cloudstack/utils/qemu/QemuImg.java   |    16 +-
 .../cloudstack/utils/qemu/QemuImgFile.java      |     1 -
 .../resource/LibvirtComputingResourceTest.java  |     7 +
 .../resource/LibvirtDomainXMLParserTest.java    |   194 +
 .../hypervisors/ovm/findbugsExcludeFilter.xml   |    25 +
 plugins/hypervisors/ovm/pom.xml                 |     6 +-
 .../cloud/ovm/hypervisor/OvmResourceBase.java   |     2 +-
 .../simulator/findbugsExcludeFilter.xml         |    25 +
 plugins/hypervisors/simulator/pom.xml           |     2 +-
 .../cloud/agent/manager/MockNetworkManager.java |     3 +-
 .../agent/manager/MockNetworkManagerImpl.java   |     9 +-
 .../cloud/agent/manager/MockVmManagerImpl.java  |     4 +-
 .../agent/manager/SimulatorManagerImpl.java     |     8 +-
 .../api/commands/ConfigureSimulatorCmd.java     |     3 +-
 .../cloud/resource/AgentRoutingResource.java    |     2 +-
 .../resource/SimulatorSecondaryDiscoverer.java  |     5 +-
 .../driver/SimulatorImageStoreDriverImpl.java   |     6 +
 .../motion/SimulatorDataMotionStrategy.java     |     5 +
 .../hypervisors/ucs/findbugsExcludeFilter.xml   |    25 +
 plugins/hypervisors/ucs/pom.xml                 |     2 +-
 .../apache/cloudstack/api/AddUcsManagerCmd.java |     3 +-
 .../api/AssociateUcsProfileToBladeCmd.java      |     3 +-
 .../cloudstack/api/DeleteUcsManagerCmd.java     |     3 +-
 .../apache/cloudstack/api/ListUcsBladeCmd.java  |     3 +-
 .../cloudstack/api/ListUcsManagerCmd.java       |     3 +-
 .../cloudstack/api/ListUcsProfileCmd.java       |     3 +-
 .../vmware/findbugsExcludeFilter.xml            |    25 +
 plugins/hypervisors/vmware/pom.xml              |     2 +-
 .../api/commands/DeleteCiscoNexusVSMCmd.java    |     3 +-
 .../api/commands/DisableCiscoNexusVSMCmd.java   |     3 +-
 .../api/commands/EnableCiscoNexusVSMCmd.java    |     3 +-
 .../api/commands/ListCiscoNexusVSMsCmd.java     |     3 +-
 .../com/cloud/hypervisor/guru/VMwareGuru.java   |   112 +-
 .../vmware/VmwareServerDiscoverer.java          |    24 +-
 .../vmware/manager/VmwareHostService.java       |     7 +-
 .../vmware/manager/VmwareManagerImpl.java       |   100 +-
 .../vmware/resource/VmwareResource.java         |   316 +-
 .../network/element/CiscoNexusVSMElement.java   |     5 +-
 .../VmwareSecondaryStorageResourceHandler.java  |     9 +-
 .../resource/VmwareStorageProcessor.java        |   214 +-
 .../VmwareStorageSubsystemCommandHandler.java   |    51 +-
 .../api/command/admin/zone/AddVmwareDcCmd.java  |     3 +-
 .../command/admin/zone/ListVmwareDcsCmd.java    |     3 +-
 .../command/admin/zone/RemoveVmwareDcCmd.java   |     3 +-
 .../motion/VmwareStorageMotionStrategy.java     |    41 +-
 .../vmware/VmwareDatacenterApiUnitTest.java     |     6 -
 .../hypervisors/xen/findbugsExcludeFilter.xml   |    31 +
 plugins/hypervisors/xen/pom.xml                 |     6 +-
 .../xen/src/com/cloud/ha/XenServerFencer.java   |     1 -
 .../src/com/cloud/hypervisor/XenServerGuru.java |    39 +-
 .../xen/discoverer/XcpServerDiscoverer.java     |   191 +-
 .../hypervisor/xen/resource/CitrixHelper.java   |   369 +
 .../xen/resource/CitrixResourceBase.java        |   781 +-
 .../hypervisor/xen/resource/XcpOssResource.java |    86 +-
 .../xen/resource/XenServer56FP1Resource.java    |     9 +-
 .../xen/resource/XenServer56Resource.java       |    67 +-
 .../xen/resource/XenServer600Resource.java      |     2 +-
 .../xen/resource/XenServer602Resource.java      |    24 +-
 .../xen/resource/XenServer610Resource.java      |    25 +-
 .../xen/resource/XenServer620Resource.java      |    60 +-
 .../xen/resource/XenServer620SP1Resource.java   |   185 +
 .../xen/resource/XenServerConnectionPool.java   |   214 +-
 .../xen/resource/XenServerPoolVms.java          |    41 +-
 .../xen/resource/XenServerStorageProcessor.java |   315 +-
 .../xen/resource/Xenserver625Resource.java      |    80 +-
 .../resource/Xenserver625StorageProcessor.java  |    16 +-
 .../xenserver/XenServerResourceNewBase.java     |    73 +-
 .../hypervisor/xenserver/XenserverConfigs.java  |    25 +
 .../motion/XenServerStorageMotionStrategy.java  |     5 +
 .../test/com/cloud/ha/XenServerFencerTest.java  |    39 +
 .../xen/resource/CitrixResourceBaseTest.java    |    16 +
 .../bigswitch-vns/findbugsExcludeFilter.xml     |    25 +
 plugins/network-elements/bigswitch-vns/pom.xml  |     2 +-
 .../api/commands/AddBigSwitchVnsDeviceCmd.java  |     3 +-
 .../commands/DeleteBigSwitchVnsDeviceCmd.java   |     3 +-
 .../commands/ListBigSwitchVnsDevicesCmd.java    |     3 +-
 .../cisco-vnmc/findbugsExcludeFilter.xml        |    25 +
 plugins/network-elements/cisco-vnmc/pom.xml     |     2 +-
 .../commands/AddCiscoAsa1000vResourceCmd.java   |     3 +-
 .../api/commands/AddCiscoVnmcResourceCmd.java   |     3 +-
 .../DeleteCiscoAsa1000vResourceCmd.java         |     3 +-
 .../commands/DeleteCiscoVnmcResourceCmd.java    |     3 +-
 .../commands/ListCiscoAsa1000vResourcesCmd.java |     3 +-
 .../api/commands/ListCiscoVnmcResourcesCmd.java |     3 +-
 .../cloud/network/element/CiscoVnmcElement.java |     5 +-
 .../network/cisco/CiscoVnmcConnectionTest.java  |   209 +-
 .../dns-notifier/findbugsExcludeFilter.xml      |    25 +
 plugins/network-elements/dns-notifier/pom.xml   |     2 +-
 .../findbugsExcludeFilter.xml                   |    25 +
 .../elastic-loadbalancer/pom.xml                |     2 +-
 .../lb/ElasticLoadBalancerManagerImpl.java      |   486 +-
 .../network/lb/LoadBalanceRuleHandler.java      |   467 +
 .../lb/ElasticLoadBalancerManagerImplTest.java  |   101 +
 .../network/lb/LoadBalanceRuleHandlerTest.java  |   215 +
 .../f5/findbugsExcludeFilter.xml                |    25 +
 plugins/network-elements/f5/pom.xml             |     2 +-
 .../commands/AddExternalLoadBalancerCmd.java    |     3 +-
 .../api/commands/AddF5LoadBalancerCmd.java      |     3 +-
 .../commands/ConfigureF5LoadBalancerCmd.java    |     3 +-
 .../commands/DeleteExternalLoadBalancerCmd.java |     3 +-
 .../api/commands/DeleteF5LoadBalancerCmd.java   |     3 +-
 .../commands/ListExternalLoadBalancersCmd.java  |     3 +-
 .../commands/ListF5LoadBalancerNetworksCmd.java |    12 +-
 .../api/commands/ListF5LoadBalancersCmd.java    |     3 +-
 .../findbugsExcludeFilter.xml                   |    25 +
 .../internal-loadbalancer/pom.xml               |     2 +-
 .../lb/InternalLoadBalancerVMManagerImpl.java   |    23 +-
 .../juniper-contrail/findbugsExcludeFilter.xml  |    25 +
 .../network-elements/juniper-contrail/pom.xml   |     3 +-
 .../contrail/spring-contrail-context.xml        |     4 +
 ...ring-contrail-system-context-inheritable.xml |    41 +
 .../api/command/CreateServiceInstanceCmd.java   |     6 +-
 .../contrail/management/ContrailGuru.java       |    62 +-
 .../contrail/management/ContrailManager.java    |    11 +
 .../management/ContrailManagerImpl.java         |   205 +-
 .../management/ContrailVpcElementImpl.java      |   199 +
 .../network/contrail/management/EventUtils.java |    56 +-
 .../contrail/management/ServerDBSyncImpl.java   |    18 +-
 .../contrail/management/ServiceManagerImpl.java |    16 +-
 .../network/contrail/model/ModelObject.java     |    10 +-
 .../contrail/model/NetworkPolicyModel.java      |     6 +-
 .../contrail/model/ServiceInstanceModel.java    |    21 +-
 .../contrail/model/VirtualMachineModel.java     |    78 +-
 .../contrail/model/VirtualNetworkModel.java     |   171 +-
 .../IntegrationTestConfiguration.java           |     6 -
 .../contrail/management/MockAccountManager.java |    78 +-
 .../contrail/model/VirtualMachineModelTest.java |     9 +-
 .../contrail/model/VirtualNetworkModelTest.java |   143 +-
 .../test/resources/log4j.properties             |     2 +-
 .../juniper-srx/findbugsExcludeFilter.xml       |    25 +
 plugins/network-elements/juniper-srx/pom.xml    |     2 +-
 .../api/commands/AddExternalFirewallCmd.java    |     3 +-
 .../cloud/api/commands/AddSrxFirewallCmd.java   |     3 +-
 .../api/commands/ConfigureSrxFirewallCmd.java   |     3 +-
 .../api/commands/DeleteExternalFirewallCmd.java |     3 +-
 .../api/commands/DeleteSrxFirewallCmd.java      |     3 +-
 .../api/commands/ListExternalFirewallsCmd.java  |     3 +-
 .../commands/ListSrxFirewallNetworksCmd.java    |    12 +-
 .../cloud/api/commands/ListSrxFirewallsCmd.java |     3 +-
 .../midonet/findbugsExcludeFilter.xml           |    25 +
 plugins/network-elements/midonet/pom.xml        |     2 +-
 .../network/guru/MidoNetPublicNetworkGuru.java  |    29 +-
 .../netscaler/findbugsExcludeFilter.xml         |    25 +
 plugins/network-elements/netscaler/pom.xml      |    10 +-
 .../commands/AddNetscalerLoadBalancerCmd.java   |     3 +-
 .../ConfigureNetscalerLoadBalancerCmd.java      |     3 +-
 .../DeleteNetscalerLoadBalancerCmd.java         |     3 +-
 .../ListNetscalerLoadBalancerNetworksCmd.java   |    12 +-
 .../commands/ListNetscalerLoadBalancersCmd.java |     3 +-
 .../network/resource/NetscalerResource.java     |   151 +-
 .../nicira-nvp/findbugsExcludeFilter.xml        |    25 +
 plugins/network-elements/nicira-nvp/pom.xml     |     2 +-
 .../api/commands/AddNiciraNvpDeviceCmd.java     |     3 +-
 .../api/commands/DeleteNiciraNvpDeviceCmd.java  |     3 +-
 .../ListNiciraNvpDeviceNetworksCmd.java         |     8 +-
 .../api/commands/ListNiciraNvpDevicesCmd.java   |     3 +-
 .../network/nicira/AccessConfiguration.java     |    90 +-
 .../src/com/cloud/network/nicira/Acl.java       |     1 -
 .../cloud/network/nicira/BaseNiciraEntity.java  |    85 +
 .../network/nicira/BaseNiciraNamedEntity.java   |    44 +
 .../com/cloud/network/nicira/LogicalRouter.java |    71 +
 .../network/nicira/LogicalRouterConfig.java     |    65 -
 .../cloud/network/nicira/LogicalRouterPort.java |    41 +-
 .../com/cloud/network/nicira/LogicalSwitch.java |    68 +-
 .../cloud/network/nicira/LogicalSwitchPort.java |    50 +-
 .../com/cloud/network/nicira/NiciraNvpApi.java  |   750 +-
 .../nicira/RoutingTableRoutingConfig.java       |    30 +
 ...SingleDefaultRouteImplicitRoutingConfig.java |    40 +
 .../SingleDefaultRouteImplictRoutingConfig.java |    40 -
 .../com/cloud/network/nicira/VifAttachment.java |    35 +-
 .../network/resource/NiciraNvpResource.java     |    20 +-
 .../network/element/NiciraNvpElementTest.java   |    42 +-
 .../guru/NiciraNvpGuestNetworkGuruTest.java     |   154 +-
 .../com/cloud/network/nicira/NatRuleTest.java   |    12 +-
 .../cloud/network/nicira/NiciraNvpApiIT.java    |   200 +-
 .../cloud/network/nicira/NiciraNvpApiTest.java  |   367 +-
 .../com/cloud/network/nicira/NiciraTagTest.java |     8 +-
 .../network/resource/NiciraNvpResourceTest.java |   258 +-
 .../opendaylight/findbugsExcludeFilter.xml      |    25 +
 plugins/network-elements/opendaylight/pom.xml   |     2 +-
 .../commands/AddOpenDaylightControllerCmd.java  |     3 +-
 .../DeleteOpenDaylightControllerCmd.java        |     3 +-
 .../ListOpenDaylightControllersCmd.java         |     3 +-
 .../ovs/findbugsExcludeFilter.xml               |    25 +
 plugins/network-elements/ovs/pom.xml            |     2 +-
 .../cloudstack/ovs/spring-ovs-context.xml       |     2 +-
 .../cloud/agent/api/OvsCreateTunnelCommand.java |    19 +-
 .../agent/api/OvsDestroyBridgeCommand.java      |    10 +-
 .../agent/api/OvsDestroyTunnelCommand.java      |    10 +-
 .../cloud/agent/api/OvsSetupBridgeCommand.java  |    10 +-
 .../OvsVpcPhysicalTopologyConfigCommand.java    |   130 +
 .../api/OvsVpcRoutingPolicyConfigCommand.java   |   123 +
 .../com/cloud/network/element/OvsElement.java   |   303 +-
 .../cloud/network/guru/OvsGuestNetworkGuru.java |    22 +-
 .../network/ovs/OvsNetworkTopologyGuru.java     |    64 +
 .../network/ovs/OvsNetworkTopologyGuruImpl.java |   240 +
 .../com/cloud/network/ovs/OvsTunnelManager.java |    16 +-
 .../cloud/network/ovs/OvsTunnelManagerImpl.java |   717 +-
 .../com/cloud/network/ovs/dao/OvsTunnel.java    |    24 +
 .../network/ovs/dao/OvsTunnelNetworkVO.java     |     2 +-
 .../palo-alto/findbugsExcludeFilter.xml         |    25 +
 plugins/network-elements/palo-alto/pom.xml      |     2 +-
 .../api/commands/AddPaloAltoFirewallCmd.java    |     3 +-
 .../commands/ConfigurePaloAltoFirewallCmd.java  |     3 +-
 .../api/commands/DeletePaloAltoFirewallCmd.java |     3 +-
 .../ListPaloAltoFirewallNetworksCmd.java        |     8 +-
 .../api/commands/ListPaloAltoFirewallsCmd.java  |     3 +-
 .../stratosphere-ssp/findbugsExcludeFilter.xml  |    25 +
 .../network-elements/stratosphere-ssp/pom.xml   |     2 +-
 .../cloudstack/api/commands/AddSspCmd.java      |     3 +-
 .../cloudstack/api/commands/DeleteSspCmd.java   |     3 +-
 .../cloudstack/network/element/SspClient.java   |   244 +-
 .../cloudstack/network/element/SspElement.java  |    21 +-
 .../stratosphere-ssp/sspmock/sspmock.py         |    58 +-
 .../network/element/SspClientTest.java          |    55 +-
 .../vxlan/findbugsExcludeFilter.xml             |    25 +
 plugins/network-elements/vxlan/pom.xml          |     2 +-
 plugins/pom.xml                                 |    31 +-
 .../random/findbugsExcludeFilter.xml            |    25 +
 plugins/storage-allocators/random/pom.xml       |     2 +-
 .../image/default/findbugsExcludeFilter.xml     |    25 +
 plugins/storage/image/default/pom.xml           |     2 +-
 .../driver/CloudStackImageStoreDriverImpl.java  |    12 +-
 .../storage/image/s3/findbugsExcludeFilter.xml  |    25 +
 plugins/storage/image/s3/pom.xml                |     2 +-
 .../image/sample/findbugsExcludeFilter.xml      |    25 +
 plugins/storage/image/sample/pom.xml            |     2 +-
 .../image/swift/findbugsExcludeFilter.xml       |    25 +
 plugins/storage/image/swift/pom.xml             |     2 +-
 .../volume/cloudbyte/findbugsExcludeFilter.xml  |    25 +
 plugins/storage/volume/cloudbyte/pom.xml        |    71 +
 .../storage-volume-cloudbyte/module.properties  |    18 +
 .../spring-storage-volume-cloudbyte-context.xml |    40 +
 .../ElastistorPrimaryDataStoreDriver.java       |    97 +
 .../ElastistorPrimaryDataStoreLifeCycle.java    |   497 +
 .../provider/ElastistorHostListener.java        |    87 +
 .../ElastistorPrimaryDataStoreProvider.java     |   175 +
 .../storage/datastore/util/ElastistorUtil.java  |  1156 ++
 .../volume/default/findbugsExcludeFilter.xml    |    25 +
 plugins/storage/volume/default/pom.xml          |     2 +-
 .../CloudStackPrimaryDataStoreDriverImpl.java   |    32 +-
 ...CloudStackPrimaryDataStoreLifeCycleImpl.java |    36 +-
 .../CloudStackPrimaryDataStoreProviderImpl.java |     9 +-
 .../volume/nexenta/findbugsExcludeFilter.xml    |    25 +
 plugins/storage/volume/nexenta/pom.xml          |     4 +-
 .../volume/sample/findbugsExcludeFilter.xml     |    25 +
 plugins/storage/volume/sample/pom.xml           |     2 +-
 .../volume/solidfire/findbugsExcludeFilter.xml  |    25 +
 plugins/storage/volume/solidfire/pom.xml        |     2 +-
 .../ldap/findbugsExcludeFilter.xml              |    25 +
 plugins/user-authenticators/ldap/pom.xml        |     2 +-
 .../cloudstack/api/command/LDAPConfigCmd.java   |     4 +-
 .../cloudstack/api/command/LDAPRemoveCmd.java   |     3 +-
 .../api/command/LdapAddConfigurationCmd.java    |     3 +-
 .../api/command/LdapCreateAccountCmd.java       |    23 +-
 .../api/command/LdapDeleteConfigurationCmd.java |     3 +-
 .../api/command/LdapImportUsersCmd.java         |     3 +-
 .../api/command/LdapListConfigurationCmd.java   |     3 +-
 .../api/command/LdapListUsersCmd.java           |     3 +-
 .../api/command/LdapUserSearchCmd.java          |     3 +-
 .../apache/cloudstack/ldap/LdapUserManager.java |     8 +-
 .../cloudstack/ldap/LdapUserManagerSpec.groovy  |   263 +-
 .../md5/findbugsExcludeFilter.xml               |    25 +
 plugins/user-authenticators/md5/pom.xml         |     2 +-
 .../plain-text/findbugsExcludeFilter.xml        |    25 +
 plugins/user-authenticators/plain-text/pom.xml  |     2 +-
 .../sha256salted/findbugsExcludeFilter.xml      |    25 +
 .../user-authenticators/sha256salted/pom.xml    |     2 +-
 pom.xml                                         |    66 +-
 .../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in |     8 +-
 .../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in |     8 +-
 .../SYSCONFDIR/init.d/cloud-ipallocator.in      |     8 +-
 .../SYSCONFDIR/rc.d/init.d/cloud-ipallocator.in |     8 +-
 .../sles/SYSCONFDIR/init.d/cloud-ipallocator.in |     8 +-
 .../SYSCONFDIR/init.d/cloud-ipallocator.in      |     8 +-
 quickcloud/findbugsExcludeFilter.xml            |    25 +
 quickcloud/pom.xml                              |     2 +-
 scripts/common/keys/ssl-keys.py                 |    47 +
 scripts/installer/windows/acs.wxs               |   256 +
 scripts/installer/windows/client.wxs            |  2414 +++
 scripts/installer/windows/start.bat             |    12 +
 .../vm/hypervisor/xenserver/check_heartbeat.sh  |     1 +
 .../xenserver/cloudstack_pluginlib.py           |   294 +-
 .../vm/hypervisor/xenserver/createipAlias.sh    |    25 -
 .../vm/hypervisor/xenserver/deleteipAlias.sh    |    24 -
 scripts/vm/hypervisor/xenserver/hostvmstats.py  |    61 -
 .../vm/hypervisor/xenserver/ovs-vif-flows.py    |   143 +-
 scripts/vm/hypervisor/xenserver/ovstunnel       |   132 +-
 scripts/vm/hypervisor/xenserver/vmops           |    43 +-
 scripts/vm/hypervisor/xenserver/vmopspremium    |    16 +-
 scripts/vm/hypervisor/xenserver/xcposs/patch    |    13 -
 scripts/vm/hypervisor/xenserver/xcposs/vmops    |  1493 ++
 scripts/vm/hypervisor/xenserver/xcpserver/patch |    10 -
 .../vm/hypervisor/xenserver/xenserver56/patch   |     8 -
 .../hypervisor/xenserver/xenserver56fp1/patch   |     8 -
 .../vm/hypervisor/xenserver/xenserver60/patch   |     8 -
 .../vm/hypervisor/xenserver/xenserver62/patch   |     9 -
 scripts/vm/network/security_group.py            |     2 +-
 scripts/vm/network/vnet/cloudstack_pluginlib.py |   226 +
 scripts/vm/network/vnet/ovstunnel.py            |    86 +-
 scripts/vm/systemvm/injectkeys.py               |   142 +
 scripts/vm/systemvm/injectkeys.sh               |     2 +-
 server/findbugsExcludeFilter.xml                |    25 +
 server/pom.xml                                  |     2 +-
 .../spring-server-core-managers-context.xml     |     9 +-
 .../core/spring-server-core-misc-context.xml    |    14 +
 .../cloud/acl/AffinityGroupAccessChecker.java   |     6 +-
 server/src/com/cloud/acl/DomainChecker.java     |    69 +-
 .../allocator/impl/FirstFitAllocator.java       |    66 +-
 .../com/cloud/api/ApiAsyncJobDispatcher.java    |    14 +-
 server/src/com/cloud/api/ApiDBUtils.java        |    89 +-
 server/src/com/cloud/api/ApiDispatcher.java     |   496 +-
 server/src/com/cloud/api/ApiGsonHelper.java     |     4 +-
 .../com/cloud/api/ApiResponseGsonHelper.java    |    39 +-
 server/src/com/cloud/api/ApiResponseHelper.java |   471 +-
 server/src/com/cloud/api/ApiServer.java         |   470 +-
 server/src/com/cloud/api/ApiServerService.java  |     4 +-
 server/src/com/cloud/api/ApiServlet.java        |   204 +-
 .../cloud/api/ResponseObjectTypeAdapter.java    |     7 +-
 .../api/dispatch/CommandCreationWorker.java     |    56 +
 .../com/cloud/api/dispatch/DispatchChain.java   |    40 +
 .../api/dispatch/DispatchChainFactory.java      |    72 +
 .../com/cloud/api/dispatch/DispatchTask.java    |    58 +
 .../com/cloud/api/dispatch/DispatchWorker.java  |    30 +
 .../dispatch/ParamGenericValidationWorker.java  |   106 +
 .../cloud/api/dispatch/ParamProcessWorker.java  |   513 +
 .../cloud/api/dispatch/ParamUnpackWorker.java   |   114 +
 .../dispatch/SpecificCmdValidationWorker.java   |    34 +
 .../com/cloud/api/query/QueryManagerImpl.java   |   721 +-
 .../com/cloud/api/query/ViewResponseHelper.java |    53 +-
 .../com/cloud/api/query/dao/AccountJoinDao.java |     3 +-
 .../cloud/api/query/dao/AccountJoinDaoImpl.java |   100 +-
 .../cloud/api/query/dao/DataCenterJoinDao.java  |     3 +-
 .../api/query/dao/DataCenterJoinDaoImpl.java    |    11 +-
 .../api/query/dao/DiskOfferingJoinDaoImpl.java  |     1 +
 .../api/query/dao/DomainRouterJoinDaoImpl.java  |    10 +-
 .../cloud/api/query/dao/HostJoinDaoImpl.java    |    25 +
 .../api/query/dao/ImageStoreJoinDaoImpl.java    |     4 +-
 .../query/dao/ServiceOfferingJoinDaoImpl.java   |     4 +
 .../api/query/dao/StoragePoolJoinDaoImpl.java   |     4 +-
 .../cloud/api/query/dao/TemplateJoinDao.java    |    11 +-
 .../api/query/dao/TemplateJoinDaoImpl.java      |    53 +-
 .../com/cloud/api/query/dao/UserVmJoinDao.java  |     5 +-
 .../cloud/api/query/dao/UserVmJoinDaoImpl.java  |    27 +-
 .../com/cloud/api/query/dao/VolumeJoinDao.java  |     5 +-
 .../cloud/api/query/dao/VolumeJoinDaoImpl.java  |    21 +-
 .../cloud/api/query/vo/AffinityGroupJoinVO.java |     6 +
 .../com/cloud/api/query/vo/AsyncJobJoinVO.java  |    34 +-
 .../cloud/api/query/vo/DiskOfferingJoinVO.java  |     7 +-
 .../cloud/api/query/vo/DomainRouterJoinVO.java  |     6 +
 .../src/com/cloud/api/query/vo/EventJoinVO.java |    13 +
 .../cloud/api/query/vo/InstanceGroupJoinVO.java |     6 +
 .../api/query/vo/ProjectInvitationJoinVO.java   |     6 +
 .../cloud/api/query/vo/ResourceTagJoinVO.java   |     6 +
 .../cloud/api/query/vo/SecurityGroupJoinVO.java |     6 +
 .../api/query/vo/ServiceOfferingJoinVO.java     |    28 +
 .../com/cloud/api/query/vo/TemplateJoinVO.java  |    12 +-
 .../com/cloud/api/query/vo/UserVmJoinVO.java    |    28 +-
 .../com/cloud/api/query/vo/VolumeJoinVO.java    |    12 +
 .../api/response/ApiResponseSerializer.java     |    34 +-
 .../api/response/SecurityGroupResultObject.java |     7 +-
 .../com/cloud/capacity/CapacityManagerImpl.java |     9 +
 .../cloud/capacity/StorageCapacityListener.java |     2 +-
 server/src/com/cloud/configuration/Config.java  |    13 +-
 .../configuration/ConfigurationManagerImpl.java |   724 +-
 .../com/cloud/consoleproxy/AgentHookBase.java   |     5 +-
 .../ConsoleProxyBalanceAllocator.java           |     3 -
 .../consoleproxy/ConsoleProxyManagerImpl.java   |    18 +-
 .../consoleproxy/StaticConsoleProxyManager.java |    18 -
 .../src/com/cloud/dc/DedicatedResourceVO.java   |    17 +-
 .../deploy/DeploymentPlanningManagerImpl.java   |  2315 +--
 .../src/com/cloud/deploy/FirstFitPlanner.java   |    13 +-
 .../com/cloud/event/ActionEventInterceptor.java |    19 +-
 .../src/com/cloud/event/ActionEventUtils.java   |    59 +-
 .../cloud/ha/HighAvailabilityManagerImpl.java   |    73 +-
 .../com/cloud/ha/dao/HighAvailabilityDao.java   |     2 +
 .../cloud/ha/dao/HighAvailabilityDaoImpl.java   |    17 +
 .../cloud/hypervisor/HypervisorGuruBase.java    |    22 +
 server/src/com/cloud/hypervisor/KVMGuru.java    |    13 +
 .../kvm/discoverer/LibvirtServerDiscoverer.java |     3 -
 .../metadata/ResourceMetaDataManagerImpl.java   |    16 +-
 .../com/cloud/network/IpAddressManagerImpl.java |   756 +-
 .../src/com/cloud/network/NetworkModelImpl.java |    48 +-
 .../com/cloud/network/NetworkServiceImpl.java   |   878 +-
 .../cloud/network/NetworkUsageManagerImpl.java  |     4 +
 .../cloud/network/as/AutoScaleManagerImpl.java  |   130 +-
 .../network/element/VirtualRouterElement.java   |    71 +-
 .../element/VpcVirtualRouterElement.java        |    14 +-
 .../network/firewall/FirewallManagerImpl.java   |   238 +-
 .../network/guru/ExternalGuestNetworkGuru.java  |     8 +
 .../cloud/network/guru/GuestNetworkGuru.java    |     4 +-
 .../lb/LoadBalancingRulesManagerImpl.java       |   319 +-
 .../router/VirtualNetworkApplianceManager.java  |    20 +-
 .../VirtualNetworkApplianceManagerImpl.java     |  1818 ++-
 .../VpcVirtualNetworkApplianceManagerImpl.java  |   111 +-
 .../cloud/network/rules/RulesManagerImpl.java   |   107 +-
 .../security/SecurityGroupManagerImpl.java      |    53 +-
 .../security/SecurityGroupWorkTracker.java      |     6 +-
 .../network/vpc/NetworkACLManagerImpl.java      |    39 +-
 .../network/vpc/NetworkACLServiceImpl.java      |    98 +-
 .../network/vpc/PrivateGatewayProfile.java      |     5 +
 .../com/cloud/network/vpc/VpcManagerImpl.java   |   574 +-
 .../network/vpn/RemoteAccessVpnManagerImpl.java |    86 +-
 .../network/vpn/Site2SiteVpnManagerImpl.java    |   135 +-
 .../com/cloud/projects/ProjectManagerImpl.java  |   246 +-
 .../src/com/cloud/resource/DiscovererBase.java  |     8 +-
 .../com/cloud/resource/ResourceManagerImpl.java |   423 +-
 .../resourcelimit/ResourceLimitManagerImpl.java |   251 +-
 .../PremiumSecondaryStorageManagerImpl.java     |   185 -
 .../cloud/server/ConfigurationServerImpl.java   |   442 +-
 server/src/com/cloud/server/Criteria.java       |     2 +
 .../src/com/cloud/server/ManagementServer.java  |     3 +
 .../com/cloud/server/ManagementServerImpl.java  |   752 +-
 server/src/com/cloud/server/StatsCollector.java |    25 +-
 .../com/cloud/servlet/ConsoleProxyServlet.java  |    57 +-
 .../com/cloud/storage/StorageManagerImpl.java   |    74 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java |   798 +-
 .../storage/download/DownloadMonitorImpl.java   |    29 +-
 .../secondary/SecondaryStorageListener.java     |     5 +-
 .../secondary/SecondaryStorageManagerImpl.java  |  1389 --
 .../storage/snapshot/SnapshotManagerImpl.java   |   125 +-
 .../storage/snapshot/SnapshotSchedulerImpl.java |   115 +-
 .../cloud/storage/upload/UploadMonitorImpl.java |    33 +-
 .../cloud/tags/TaggedResourceManagerImpl.java   |    22 +-
 .../template/HypervisorTemplateAdapter.java     |    53 +-
 .../com/cloud/template/TemplateAdapterBase.java |    19 +-
 .../com/cloud/template/TemplateManagerImpl.java |   301 +-
 .../src/com/cloud/usage/UsageServiceImpl.java   |     9 +-
 server/src/com/cloud/user/AccountManager.java   |    57 +-
 .../src/com/cloud/user/AccountManagerImpl.java  |   592 +-
 server/src/com/cloud/user/DomainManager.java    |     3 +
 .../src/com/cloud/user/DomainManagerImpl.java   |    52 +-
 .../src/com/cloud/uuididentity/UUIDManager.java |    37 -
 .../com/cloud/uuididentity/UUIDManagerImpl.java |     3 +-
 server/src/com/cloud/vm/UserVmManager.java      |    29 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java  |   960 +-
 .../src/com/cloud/vm/UserVmStateListener.java   |    33 +-
 .../vm/snapshot/VMSnapshotManagerImpl.java      |    74 +-
 .../affinity/AffinityGroupServiceImpl.java      |   992 +-
 .../lb/ApplicationLoadBalancerManagerImpl.java  |    58 +-
 .../cloudstack/network/lb/CertServiceImpl.java  |    13 +-
 .../GlobalLoadBalancingRulesServiceImpl.java    |    16 +-
 .../test/com/cloud/api/ApiDispatcherTest.java   |   106 -
 .../com/cloud/api/ApiResponseHelperTest.java    |    68 +
 server/test/com/cloud/api/ApiServletTest.java   |   265 +
 .../api/dispatch/CommandCreationWorkerTest.java |    48 +
 .../api/dispatch/DispatchChainFactoryTest.java  |    55 +
 .../ParamGenericValidationWorkerTest.java       |   219 +
 .../api/dispatch/ParamProcessWorkerTest.java    |   107 +
 .../SpecificCmdValidationWorkerTest.java        |    48 +
 .../com/cloud/event/EventControlsUnitTest.java  |     2 +-
 .../metadata/ResourceMetaDataManagerTest.java   |     2 +-
 .../cloud/network/CreatePrivateNetworkTest.java |     2 +-
 .../cloud/network/MockFirewallManagerImpl.java  |     6 +
 .../com/cloud/network/MockNetworkModelImpl.java |    11 +-
 .../network/lb/AssignLoadBalancerTest.java      |   271 +
 .../cloud/network/vpc/VpcManagerImplTest.java   |    66 +
 .../cloud/resource/MockResourceManagerImpl.java |    37 +
 .../server/ConfigurationServerImplTest.java     |    26 +
 .../cloud/storage/VolumeApiServiceImplTest.java |   332 +
 .../cloud/template/TemplateManagerImplTest.java |    37 +
 .../com/cloud/user/MockAccountManagerImpl.java  |   100 +-
 .../vm/DeploymentPlanningManagerImplTest.java   |    12 +
 server/test/com/cloud/vm/UserVmManagerTest.java |    72 +-
 .../vm/snapshot/VMSnapshotManagerTest.java      |     2 +-
 .../com/cloud/vpc/MockNetworkManagerImpl.java   |    22 +-
 .../com/cloud/vpc/MockNetworkModelImpl.java     |    11 +-
 .../cloud/vpc/MockResourceLimitManagerImpl.java |     2 +-
 .../cloud/vpc/MockSite2SiteVpnManagerImpl.java  |    15 +-
 .../MockVpcVirtualNetworkApplianceManager.java  |    39 +-
 .../com/cloud/vpc/NetworkACLManagerTest.java    |    17 +-
 .../com/cloud/vpc/NetworkACLServiceTest.java    |    16 +-
 server/test/com/cloud/vpc/VpcApiUnitTest.java   |     2 +-
 .../test/com/cloud/vpc/dao/MockVpcDaoImpl.java  |     4 +-
 .../affinity/AffinityApiUnitTest.java           |    15 +
 .../network/lb/ApplicationLoadBalancerTest.java |    14 +-
 .../networkoffering/ChildTestConfiguration.java |     6 -
 server/test/resources/createNetworkOffering.xml |     4 +-
 .../rdpconsole/findbugsExcludeFilter.xml        |    25 +
 services/console-proxy-rdp/rdpconsole/pom.xml   |     4 +-
 .../rdpconsole/src/main/java/common/Client.java |    92 +-
 .../src/main/java/streamer/ByteBuffer.java      |   122 +-
 .../src/test/java/common/ClientTest.java        |    43 +
 .../src/test/java/rdpclient/MockServerTest.java |     9 +-
 .../src/test/java/streamer/ByteBufferTest.java  |   152 +
 services/console-proxy/plugin/pom.xml           |     2 +-
 services/console-proxy/pom.xml                  |     2 +-
 .../server/findbugsExcludeFilter.xml            |    25 +
 services/console-proxy/server/pom.xml           |     2 +-
 .../consoleproxy/ConsoleProxyRdpClient.java     |   159 +-
 .../ConsoleProxyThumbnailHandler.java           |     1 +
 .../consoleproxy/ConsoleProxyVncClient.java     |    89 +-
 .../consoleproxy/ConsoleProxyRdpClientTest.java |    62 +
 services/iam/plugin/findbugsExcludeFilter.xml   |    25 +
 services/iam/plugin/pom.xml                     |    58 +
 .../iam-access-checkers/module.properties       |    18 +
 .../spring-iam-access-checkers-context.xml      |    35 +
 .../command/iam/AddAccountToIAMGroupCmd.java    |   127 +
 .../iam/AddIAMPermissionToIAMPolicyCmd.java     |   159 +
 .../iam/AttachIAMPolicyToAccountCmd.java        |   122 +
 .../iam/AttachIAMPolicyToIAMGroupCmd.java       |   127 +
 .../api/command/iam/CreateIAMGroupCmd.java      |   168 +
 .../api/command/iam/CreateIAMPolicyCmd.java     |   175 +
 .../api/command/iam/DeleteIAMGroupCmd.java      |   102 +
 .../api/command/iam/DeleteIAMPolicyCmd.java     |   102 +
 .../api/command/iam/ListIAMGroupsCmd.java       |    88 +
 .../api/command/iam/ListIAMPoliciesCmd.java     |    88 +
 .../iam/RemoveAccountFromIAMGroupCmd.java       |   127 +
 .../RemoveIAMPermissionFromIAMPolicyCmd.java    |   148 +
 .../iam/RemoveIAMPolicyFromAccountCmd.java      |   122 +
 .../iam/RemoveIAMPolicyFromIAMGroupCmd.java     |   127 +
 .../api/response/iam/IAMGroupResponse.java      |   193 +
 .../api/response/iam/IAMPermissionResponse.java |   124 +
 .../api/response/iam/IAMPolicyResponse.java     |   177 +
 .../apache/cloudstack/iam/IAMApiService.java    |    87 +
 .../cloudstack/iam/IAMApiServiceImpl.java       |   825 +
 .../iam/RoleBasedAPIAccessChecker.java          |   288 +
 .../iam/RoleBasedEntityAccessChecker.java       |   248 +
 .../iam/RoleBasedEntityQuerySelector.java       |   147 +
 .../cloudstack/iam/test/IAMApiServiceTest.java  |   385 +
 .../iam/plugin/test/resources/db.properties     |    75 +
 services/iam/pom.xml                            |    59 +
 services/iam/server/findbugsExcludeFilter.xml   |    25 +
 services/iam/server/pom.xml                     |    52 +
 .../core/spring-iam-server-context.xml          |    40 +
 .../org/apache/cloudstack/iam/api/IAMGroup.java |    37 +
 .../apache/cloudstack/iam/api/IAMPolicy.java    |    41 +
 .../cloudstack/iam/api/IAMPolicyPermission.java |    53 +
 .../apache/cloudstack/iam/api/IAMService.java   |    92 +
 .../iam/server/IAMAccountPolicyMapVO.java       |    77 +
 .../iam/server/IAMGroupAccountMapVO.java        |    78 +
 .../iam/server/IAMGroupPolicyMapVO.java         |    79 +
 .../cloudstack/iam/server/IAMGroupVO.java       |   122 +
 .../iam/server/IAMPolicyPermissionVO.java       |   181 +
 .../cloudstack/iam/server/IAMPolicyVO.java      |   138 +
 .../cloudstack/iam/server/IAMServiceImpl.java   |   818 +
 .../iam/server/dao/IAMAccountPolicyMapDao.java  |    33 +
 .../server/dao/IAMAccountPolicyMapDaoImpl.java  |    77 +
 .../iam/server/dao/IAMGroupAccountMapDao.java   |    40 +
 .../server/dao/IAMGroupAccountMapDaoImpl.java   |   119 +
 .../cloudstack/iam/server/dao/IAMGroupDao.java  |    28 +
 .../iam/server/dao/IAMGroupDaoImpl.java         |    59 +
 .../iam/server/dao/IAMGroupPolicyMapDao.java    |    33 +
 .../server/dao/IAMGroupPolicyMapDaoImpl.java    |    77 +
 .../cloudstack/iam/server/dao/IAMPolicyDao.java |    28 +
 .../iam/server/dao/IAMPolicyDaoImpl.java        |    57 +
 .../iam/server/dao/IAMPolicyPermissionDao.java  |    39 +
 .../server/dao/IAMPolicyPermissionDaoImpl.java  |   129 +
 .../cloudstack/iam/IAMServiceUnitTest.java      |   211 +
 .../iam/server/test/resources/db.properties     |    75 +
 services/pom.xml                                |    16 +-
 .../controller/findbugsExcludeFilter.xml        |    25 +
 services/secondary-storage/controller/pom.xml   |    50 +
 ...econdary-storage-controller-core-context.xml |    33 +
 .../PremiumSecondaryStorageManagerImpl.java     |   186 +
 .../SecondaryStorageManagerImpl.java            |  1393 ++
 services/secondary-storage/pom.xml              |    87 +-
 .../module.properties                           |    18 -
 ...ing-secondary-storage-discoverer-context.xml |    36 -
 .../server/findbugsExcludeFilter.xml            |    25 +
 services/secondary-storage/server/pom.xml       |   105 +
 .../module.properties                           |    18 +
 ...ing-secondary-storage-discoverer-context.xml |    36 +
 .../LocalNfsSecondaryStorageResource.java       |    95 +
 .../resource/LocalSecondaryStorageResource.java |   240 +
 .../resource/NfsSecondaryStorageResource.java   |  2430 +++
 .../resource/SecondaryStorageDiscoverer.java    |   312 +
 .../resource/SecondaryStorageResource.java      |    29 +
 .../SecondaryStorageResourceHandler.java        |    24 +
 .../storage/template/DownloadManager.java       |   108 +
 .../storage/template/DownloadManagerImpl.java   |  1080 ++
 .../storage/template/UploadManager.java         |    82 +
 .../storage/template/UploadManagerImpl.java     |   550 +
 .../LocalNfsSecondaryStorageResourceTest.java   |   143 +
 .../NfsSecondaryStorageResourceTest.java        |   110 +
 .../LocalNfsSecondaryStorageResource.java       |    95 -
 .../resource/LocalSecondaryStorageResource.java |   240 -
 .../resource/NfsSecondaryStorageResource.java   |  2553 ----
 .../resource/SecondaryStorageDiscoverer.java    |   319 -
 .../resource/SecondaryStorageResource.java      |    29 -
 .../SecondaryStorageResourceHandler.java        |    24 -
 .../storage/template/DownloadManager.java       |   108 -
 .../storage/template/DownloadManagerImpl.java   |  1149 --
 .../storage/template/UploadManager.java         |    82 -
 .../storage/template/UploadManagerImpl.java     |   646 -
 .../LocalNfsSecondaryStorageResourceTest.java   |   143 -
 .../NfsSecondaryStorageResourceTest.java        |   110 -
 setup/db/create-schema.sql                      |     2 +-
 setup/db/db/schema-421to430.sql                 |    11 +-
 setup/db/db/schema-430to440.sql                 |   319 +-
 setup/db/db/schema-440to450-cleanup.sql         |    22 +
 setup/db/db/schema-440to450.sql                 |    24 +
 setup/db/templates.sql                          |    11 +-
 systemvm/conf/consoleproxy.properties           |     2 +-
 .../rc.d/init.d/cloud-console-proxy.in          |     8 +-
 .../rc.d/init.d/cloud-console-proxy.in          |     8 +-
 .../rc.d/init.d/cloud-console-proxy.in          |     8 +-
 .../SYSCONFDIR/init.d/cloud-console-proxy.in    |     8 +-
 .../patches/debian/config/etc/dnsmasq.conf.tmpl |     6 +-
 .../debian/config/etc/init.d/cloud-early-config |    28 +-
 .../debian/config/etc/logrotate.d/conntrackd    |    13 +
 .../patches/debian/config/etc/vpcdnsmasq.conf   |     2 +-
 .../debian/config/opt/cloud/bin/edithosts.sh    |    55 +-
 .../config/opt/cloud/bin/getRouterAlerts.sh     |    70 +
 .../patches/debian/config/opt/cloud/bin/ilb.sh  |    12 +-
 .../debian/config/opt/cloud/bin/loadbalancer.sh |     7 +-
 .../config/opt/cloud/bin/monitor_service.sh     |    27 +-
 .../debian/config/opt/cloud/bin/savepassword.sh |     2 +-
 .../debian/config/opt/cloud/bin/vpc_acl.sh      |    19 +-
 .../debian/config/opt/cloud/bin/vpc_guestnw.sh  |    44 +-
 .../config/opt/cloud/bin/vpc_loadbalancer.sh    |    13 +-
 .../debian/config/opt/cloud/bin/vr_cfg.sh       |    96 +
 .../debian/config/root/monitorServices.py       |     3 +
 .../patches/debian/config/root/reconfigLB.sh    |     7 +-
 systemvm/pom.xml                                |     2 +-
 systemvm/scripts/_run.sh                        |     7 +
 test/findbugsExcludeFilter.xml                  |    25 +
 test/integration/component/test_accounts.py     |    16 +-
 .../component/test_affinity_groups.py           |    82 +-
 .../component/test_allocation_states.py         |    12 +-
 .../component/test_base_image_updation.py       |     8 +-
 test/integration/component/test_blocker_bugs.py |    14 +-
 .../component/test_cpu_domain_limits.py         |    21 +-
 test/integration/component/test_cpu_limits.py   |    29 +-
 .../component/test_cpu_max_limits.py            |     8 +-
 .../component/test_cpu_project_limits.py        |    13 +-
 .../component/test_custom_hostname.py           |    12 +-
 .../component/test_deploy_vm_userdata_reg.py    |     2 +-
 .../component/test_dynamic_compute_offering.py  |   409 +
 .../component/test_egress_fw_rules.py           |    60 +-
 .../component/test_explicit_dedication.py       |     2 +-
 test/integration/component/test_haproxy.py      |    10 +-
 .../component/test_implicit_planner.py          |     2 +-
 .../component/test_ip_reservation.py            |  1102 +-
 test/integration/component/test_ldap.py         |     2 +-
 .../integration/component/test_memory_limits.py |    29 +-
 .../component/test_mm_domain_limits.py          |    17 +-
 .../integration/component/test_mm_max_limits.py |     8 +-
 .../component/test_mm_project_limits.py         |    13 +-
 .../component/test_multiple_ips_per_nic.py      |  1291 ++
 .../component/test_netscaler_configs.py         |     8 +-
 .../component/test_netscaler_nw_off.py          |     4 +-
 .../component/test_network_offering.py          |    10 +-
 .../component/test_persistent_networks.py       |  2010 ++-
 test/integration/component/test_portable_ip.py  |   145 +-
 .../component/test_project_configs.py           |     6 +-
 .../component/test_project_limits.py            |    14 +-
 .../component/test_project_resources.py         |    14 +-
 .../integration/component/test_project_usage.py |    18 +-
 test/integration/component/test_projects.py     |    20 +-
 .../component/test_recurring_snapshots.py       |     4 +-
 .../component/test_redundant_router_cleanups.py |     6 +-
 .../component/test_redundant_router_services.py |     2 +-
 .../component/test_redundant_router_upgrades.py |     4 +-
 test/integration/component/test_region_vpc.py   |   517 +
 test/integration/component/test_regions.py      |     6 +-
 .../component/test_regions_accounts.py          |     6 +-
 .../component/test_resource_limits.py           |    20 +-
 test/integration/component/test_routers.py      |    40 +-
 .../component/test_shared_networks.py           |    26 +-
 test/integration/component/test_snapshot_gc.py  |     2 +-
 .../component/test_snapshot_limits.py           |     2 +-
 test/integration/component/test_snapshots.py    |    14 +-
 .../component/test_snapshots_improvement.py     |     2 +-
 test/integration/component/test_stopped_vm.py   |    32 +-
 .../component/test_storage_motion.py            |     4 +-
 test/integration/component/test_tags.py         |    40 +-
 test/integration/component/test_templates.py    |     8 +-
 test/integration/component/test_update_vm.py    |     2 +-
 test/integration/component/test_usage.py        |    18 +-
 test/integration/component/test_vmware_drs.py   |     6 +-
 test/integration/component/test_volumes.py      |     8 +-
 test/integration/component/test_vpc.py          |    40 +-
 .../test_vpc_distributed_routing_offering.py    |   512 +
 test/integration/component/test_vpc_network.py  |    18 +-
 .../component/test_vpc_network_lbrules.py       |    30 +-
 .../component/test_vpc_network_pfrules.py       |    20 +-
 .../component/test_vpc_network_staticnatrule.py |    12 +-
 .../integration/component/test_vpc_offerings.py |    16 +-
 test/integration/component/test_vpc_routers.py  |    20 +-
 .../component/test_vpc_vm_life_cycle.py         |   108 +-
 .../component/test_vpc_vms_deployment.py        |    14 +-
 test/integration/component/test_vpn_users.py    |    12 +-
 .../smoke/test_VirtualRouter_alerts.py          |   244 +
 test/integration/smoke/test_affinity_groups.py  |     2 +-
 .../smoke/test_deploy_vgpu_enabled_vm.py        |   227 +
 test/integration/smoke/test_deploy_vm.py        |    52 +-
 .../smoke/test_deploy_vm_root_resize.py         |   263 +
 .../smoke/test_deploy_vm_with_userdata.py       |     6 +-
 ...deploy_vms_with_varied_deploymentplanners.py |     6 +-
 test/integration/smoke/test_disk_offerings.py   |    17 +-
 test/integration/smoke/test_global_settings.py  |     2 +-
 test/integration/smoke/test_guest_vlan_range.py |     5 +-
 test/integration/smoke/test_hosts.py            |    11 +-
 test/integration/smoke/test_internal_lb.py      |     8 +-
 test/integration/smoke/test_iso.py              |    15 +-
 test/integration/smoke/test_loadbalance.py      |     6 +-
 .../smoke/test_multipleips_per_nic.py           |     3 +-
 test/integration/smoke/test_network.py          |    14 +-
 test/integration/smoke/test_network_acl.py      |     3 +-
 test/integration/smoke/test_nic.py              |     3 +-
 .../smoke/test_non_contigiousvlan.py            |     2 +-
 .../integration/smoke/test_over_provisioning.py |   107 +
 .../integration/smoke/test_portable_publicip.py |     4 +-
 test/integration/smoke/test_primary_storage.py  |     4 +-
 test/integration/smoke/test_privategw_acl.py    |     3 +-
 test/integration/smoke/test_public_ip_range.py  |     2 +-
 test/integration/smoke/test_pvlan.py            |     2 +-
 test/integration/smoke/test_regions.py          |     2 +-
 .../smoke/test_reset_vm_on_reboot.py            |     3 +-
 test/integration/smoke/test_resource_detail.py  |     2 +-
 test/integration/smoke/test_routers.py          |    18 +-
 test/integration/smoke/test_scale_vm.py         |     2 +-
 .../integration/smoke/test_secondary_storage.py |     4 +-
 .../integration/smoke/test_service_offerings.py |     8 +-
 test/integration/smoke/test_snapshots.py        |     2 +-
 test/integration/smoke/test_ssvm.py             |    20 +-
 test/integration/smoke/test_templates.py        |    16 +-
 test/integration/smoke/test_vm_iam.py           |   717 +
 test/integration/smoke/test_vm_life_cycle.py    |    68 +-
 test/integration/smoke/test_vm_snapshots.py     |     6 +-
 test/integration/smoke/test_volumes.py          |    87 +-
 test/integration/smoke/test_vpc_vpn.py          |     4 +-
 test/pom.xml                                    |     2 +-
 test/selenium/browser/__init__.py               |    16 +
 test/selenium/browser/firefox.py                |    56 +
 test/selenium/common/Global_Locators.py         |   230 +
 test/selenium/common/__init__.py                |    18 +
 test/selenium/common/shared.py                  |   149 +
 test/selenium/cspages/__init__.py               |    18 +
 test/selenium/cspages/accounts/accountspage.py  |   175 +
 test/selenium/cspages/accounts/userspage.py     |   146 +
 test/selenium/cspages/cspage.py                 |    21 +
 test/selenium/cspages/dashboard/__init__.py     |    18 +
 .../selenium/cspages/dashboard/dashboardpage.py |    74 +
 test/selenium/cspages/login/__init__.py         |    18 +
 test/selenium/cspages/login/loginpage.py        |   103 +
 test/selenium/cstests/__init__.py               |    17 +
 .../cstests/regressiontests/__init__.py         |    17 +
 test/selenium/cstests/smoketests/__init__.py    |    17 +
 .../selenium/cstests/smoketests/adduser_test.py |   103 +
 .../cstests/smoketests/adduseraccount_test.py   |    96 +
 .../cstests/smoketests/deleteuser_test.py       |   100 +
 .../smoketests/deleteuseraccount_test.py        |    91 +
 .../cstests/smoketests/global_settings_test.py  |    69 +
 .../smoketests/login_logout_as_JohnD_test.py    |    61 +
 .../cstests/smoketests/login_logout_test.py     |   190 +
 .../cstests/smoketests/navigation_test.py       |    79 +
 test/selenium/cstests/smoketests/smokecfg.py    |    63 +
 tools/apidoc/gen_toc.py                         |     4 +-
 tools/apidoc/pom.xml                            |     4 +-
 tools/appliance/build.sh                        |    52 +-
 .../definitions/systemvm64template/base.sh      |     6 +-
 .../systemvm64template/definition.rb            |     6 +-
 .../systemvm64template/postinstall.sh           |    17 +-
 .../definitions/systemvmtemplate/base.sh        |     4 +-
 .../definitions/systemvmtemplate/definition.rb  |     6 +-
 .../definitions/systemvmtemplate/postinstall.sh |    13 +-
 tools/checkstyle/pom.xml                        |     2 +-
 .../devcloud-kvm-advanced-fusion.cfg            |   133 +
 tools/devcloud-kvm/devcloud-kvm-advanced.cfg    |     7 +-
 tools/devcloud-kvm/devcloud-kvm.cfg             |     3 +-
 tools/devcloud-kvm/pom.xml                      |     4 +-
 tools/devcloud/pom.xml                          |     4 +-
 tools/marvin/marvin/codes.py                    |    10 +
 tools/marvin/marvin/config/config.cfg           |   274 +-
 tools/marvin/marvin/lib/base.py                 |   227 +-
 tools/marvin/marvin/lib/common.py               |   168 +-
 tools/marvin/marvin/lib/utils.py                |    31 +-
 tools/marvin/pom.xml                            |     2 +-
 tools/ngui/static/js/app/accounts/accounts.js   |    16 +-
 tools/ngui/static/js/app/storage/storage.js     |     2 +-
 tools/pom.xml                                   |     2 +-
 tools/transifex/.tx/config                      |    39 +-
 ui/css/cloudstack3.css                          |   483 +-
 ui/css/cloudstack3.ja.css                       |    66 -
 ui/css/cloudstack3.ja_JP.css                    |    76 +
 ui/dictionary.jsp                               |   297 +-
 ui/images/icons.png                             |   Bin 50052 -> 61164 bytes
 ui/images/infrastructure-icons.png              |   Bin 62059 -> 66823 bytes
 ui/images/sprites.png                           |   Bin 207810 -> 194105 bytes
 ui/index.jsp                                    |    49 +-
 ui/lib/jquery.validate.js                       |    34 +-
 .../vnmcNetworkProvider/vnmcNetworkProvider.js  |    50 +-
 ui/scripts/accounts.js                          |    16 +-
 ui/scripts/autoscaler.js                        |    26 +-
 ui/scripts/cloudStack.js                        |     8 +-
 ui/scripts/configuration.js                     |   372 +-
 ui/scripts/docs.js                              |     4 +-
 ui/scripts/domains.js                           |     2 +-
 ui/scripts/installWizard.js                     |    10 +-
 ui/scripts/instanceWizard.js                    |   122 +-
 ui/scripts/instances.js                         |   108 +-
 ui/scripts/network.js                           |   305 +-
 ui/scripts/regions.js                           |    78 +-
 ui/scripts/sharedFunctions.js                   |    57 +-
 ui/scripts/storage.js                           |     6 +-
 ui/scripts/system.js                            |  1038 +-
 ui/scripts/templates.js                         |   101 +-
 ui/scripts/ui-custom/accountsWizard.js          |    33 +-
 ui/scripts/ui-custom/instanceWizard.js          |   223 +-
 ui/scripts/ui-custom/zoneChart.js               |    20 +-
 ui/scripts/ui/core.js                           |     2 +-
 ui/scripts/ui/dialog.js                         |    14 +
 ui/scripts/ui/widgets/detailView.js             |    40 +-
 ui/scripts/ui/widgets/listView.js               |    31 +-
 ui/scripts/ui/widgets/multiEdit.js              |     2 +-
 ui/scripts/ui/widgets/tagger.js                 |     4 +-
 ui/scripts/vpc.js                               |    16 +-
 ui/scripts/zoneWizard.js                        |    84 +-
 usage/findbugsExcludeFilter.xml                 |    25 +
 usage/pom.xml                                   |     7 +-
 utils/conf/db.properties                        |     6 +-
 utils/conf/log4j-vmops.xml                      |    34 +-
 utils/findbugsExcludeFilter.xml                 |    31 +
 utils/pom.xml                                   |    72 +-
 utils/src/com/cloud/maint/Version.java          |     3 +
 utils/src/com/cloud/utils/ActionDelegate.java   |     7 +-
 .../com/cloud/utils/CloudResourceBundle.java    |     7 +-
 utils/src/com/cloud/utils/DateUtil.java         |     7 +-
 utils/src/com/cloud/utils/EnumUtils.java        |     7 +-
 utils/src/com/cloud/utils/ExecutionResult.java  |     2 +
 utils/src/com/cloud/utils/FileUtil.java         |     7 +-
 utils/src/com/cloud/utils/IteratorUtil.java     |     7 +-
 utils/src/com/cloud/utils/Journal.java          |     7 +-
 utils/src/com/cloud/utils/LogUtils.java         |     7 +-
 utils/src/com/cloud/utils/MethodCapturer.java   |     7 +-
 utils/src/com/cloud/utils/NumbersUtil.java      |     7 +-
 utils/src/com/cloud/utils/Pair.java             |     7 +-
 .../src/com/cloud/utils/PasswordGenerator.java  |     7 +-
 utils/src/com/cloud/utils/Predicate.java        |     7 +-
 utils/src/com/cloud/utils/ProcessUtil.java      |     7 +-
 utils/src/com/cloud/utils/Profiler.java         |     7 +-
 utils/src/com/cloud/utils/PropertiesUtil.java   |     7 +-
 utils/src/com/cloud/utils/ReflectUtil.java      |    20 +-
 utils/src/com/cloud/utils/S3Utils.java          |    37 +-
 utils/src/com/cloud/utils/SerialVersionUID.java |     7 +-
 utils/src/com/cloud/utils/StringUtils.java      |    15 +-
 utils/src/com/cloud/utils/SwiftUtil.java        |    44 +-
 utils/src/com/cloud/utils/Ternary.java          |     7 +-
 utils/src/com/cloud/utils/UriUtils.java         |    92 +-
 .../cloud/utils/UsernamePasswordValidator.java  |     7 +-
 utils/src/com/cloud/utils/UuidUtils.java        |    13 +-
 .../cloud/utils/backoff/BackoffAlgorithm.java   |     7 +-
 .../utils/backoff/impl/ConstantTimeBackoff.java |     7 +-
 .../backoff/impl/ConstantTimeBackoffMBean.java  |     7 +-
 .../utils/cisco/n1kv/vsm/NetconfHelper.java     |     7 +-
 .../cloud/utils/cisco/n1kv/vsm/PolicyMap.java   |     7 +-
 .../cloud/utils/cisco/n1kv/vsm/PortProfile.java |     7 +-
 .../cloud/utils/cisco/n1kv/vsm/VsmCommand.java  |     7 +-
 .../utils/cisco/n1kv/vsm/VsmOkResponse.java     |     7 +-
 .../cisco/n1kv/vsm/VsmPolicyMapResponse.java    |     7 +-
 .../cisco/n1kv/vsm/VsmPortProfileResponse.java  |     7 +-
 .../cloud/utils/cisco/n1kv/vsm/VsmResponse.java |     7 +-
 .../src/com/cloud/utils/component/Adapter.java  |     7 +-
 .../com/cloud/utils/component/AdapterBase.java  |     7 +-
 .../com/cloud/utils/component/AdapterList.java  |     7 +-
 .../cloud/utils/component/ComponentContext.java |     6 +-
 .../ComponentInstantiationPostProcessor.java    |     7 +-
 .../utils/component/ComponentLifecycle.java     |     7 +-
 .../utils/component/ComponentLifecycleBase.java |     7 +-
 .../component/ComponentMethodInterceptable.java |     7 +-
 .../component/ComponentMethodInterceptor.java   |     7 +-
 .../utils/component/ComponentNamingPolicy.java  |     7 +-
 .../src/com/cloud/utils/component/Manager.java  |     7 +-
 .../com/cloud/utils/component/ManagerBase.java  |     7 +-
 utils/src/com/cloud/utils/component/Named.java  |    37 +-
 .../cloud/utils/component/PluggableService.java |     7 +-
 .../src/com/cloud/utils/component/Registry.java |    37 +-
 .../utils/component/SystemIntegrityChecker.java |     7 +-
 .../utils/concurrency/NamedThreadFactory.java   |     7 +-
 .../com/cloud/utils/concurrency/Scheduler.java  |     7 +-
 .../utils/concurrency/SynchronizationEvent.java |     7 +-
 .../com/cloud/utils/concurrency/TestClock.java  |     7 +-
 .../com/cloud/utils/crypt/DBEncryptionUtil.java |     9 +-
 .../utils/crypt/EncryptionSecretKeyChecker.java |     7 +-
 .../utils/crypt/EncryptionSecretKeySender.java  |     7 +-
 utils/src/com/cloud/utils/crypt/RSAHelper.java  |     7 +-
 utils/src/com/cloud/utils/db/DbProperties.java  |    37 +-
 utils/src/com/cloud/utils/db/EntityManager.java |    11 +
 utils/src/com/cloud/utils/db/UUIDManager.java   |    40 +
 .../com/cloud/utils/encoding/URLEncoder.java    |    33 +-
 utils/src/com/cloud/utils/events/EventArgs.java |     7 +-
 .../com/cloud/utils/events/SubscriptionMgr.java |     7 +-
 .../utils/exception/CSExceptionErrorCode.java   |     6 +-
 .../utils/exception/CloudRuntimeException.java  |     7 +-
 .../com/cloud/utils/exception/ErrorContext.java |     3 +
 .../utils/exception/ExceptionProxyObject.java   |     7 +-
 .../cloud/utils/exception/ExceptionUtil.java    |     7 +-
 .../utils/exception/ExecutionException.java     |     7 +-
 .../HypervisorVersionChangedException.java      |     7 +-
 utils/src/com/cloud/utils/fsm/ChangeEvent.java  |    37 +-
 utils/src/com/cloud/utils/fsm/FiniteState.java  |     7 +-
 utils/src/com/cloud/utils/fsm/FiniteState2.java |    37 +-
 .../com/cloud/utils/fsm/FiniteStateObject.java  |     7 +-
 .../cloud/utils/fsm/NoTransitionException.java  |     7 +-
 utils/src/com/cloud/utils/fsm/State.java        |    37 +-
 utils/src/com/cloud/utils/fsm/StateDao.java     |     7 +-
 .../src/com/cloud/utils/fsm/StateListener.java  |     7 +-
 utils/src/com/cloud/utils/fsm/StateMachine.java |     7 +-
 .../src/com/cloud/utils/fsm/StateMachine2.java  |     7 +-
 utils/src/com/cloud/utils/fsm/StateObject.java  |     7 +-
 .../cloud/utils/log/CglibThrowableRenderer.java |     7 +-
 utils/src/com/cloud/utils/mgmt/JmxUtil.java     |     7 +-
 .../com/cloud/utils/mgmt/ManagementBean.java    |     7 +-
 .../utils/mgmt/PropertyMapDynamicBean.java      |     7 +-
 utils/src/com/cloud/utils/net/Ip.java           |     9 +-
 utils/src/com/cloud/utils/net/Ip4Address.java   |     7 +-
 utils/src/com/cloud/utils/net/MacAddress.java   |     7 +-
 utils/src/com/cloud/utils/net/NetUtils.java     |    22 +-
 utils/src/com/cloud/utils/net/NfsUtils.java     |     7 +-
 utils/src/com/cloud/utils/net/UrlUtil.java      |     7 +-
 .../src/com/cloud/utils/nio/HandlerFactory.java |     7 +-
 utils/src/com/cloud/utils/nio/Link.java         |     7 +-
 utils/src/com/cloud/utils/nio/NioClient.java    |     7 +-
 .../src/com/cloud/utils/nio/NioConnection.java  |     7 +-
 utils/src/com/cloud/utils/nio/NioServer.java    |     7 +-
 utils/src/com/cloud/utils/nio/Task.java         |     7 +-
 .../com/cloud/utils/nio/TrustAllManager.java    |     7 +-
 .../BasicEncodedRESTValidationStrategy.java     |    66 +
 .../utils/rest/CloudstackRESTException.java     |    39 +
 .../cloud/utils/rest/RESTServiceConnector.java  |   377 +
 .../utils/rest/RESTValidationStrategy.java      |   165 +
 .../cloud/utils/script/OutputInterpreter.java   |     7 +-
 utils/src/com/cloud/utils/script/Script.java    |    66 +-
 utils/src/com/cloud/utils/script/Script2.java   |     7 +-
 .../cloud/utils/security/CertificateHelper.java |     7 +-
 utils/src/com/cloud/utils/ssh/SSHCmdHelper.java |    40 +-
 .../src/com/cloud/utils/ssh/SSHKeysHelper.java  |     7 +-
 utils/src/com/cloud/utils/ssh/SshException.java |     7 +-
 utils/src/com/cloud/utils/ssh/SshHelper.java    |     2 +
 .../storage/encoding/DecodedDataObject.java     |    47 +-
 .../storage/encoding/DecodedDataStore.java      |    51 +-
 .../cloud/utils/storage/encoding/Decoder.java   |    37 +-
 .../utils/storage/encoding/EncodingType.java    |    37 +-
 .../com/cloud/utils/time/InaccurateClock.java   |     7 +-
 .../cloud/utils/time/InaccurateClockMBean.java  |     7 +-
 .../com/cloud/utils/xmlobject/XmlObject.java    |     3 +
 .../cloud/utils/xmlobject/XmlObjectParser.java  |     3 +
 .../utils/identity/ManagementServerNode.java    |     3 +
 .../ssl/EasySSLProtocolSocketFactory.java       |    53 +-
 .../contrib/ssl/EasyX509TrustManager.java       |    43 +-
 utils/test/com/cloud/utils/DummyImpl.java       |     7 +-
 utils/test/com/cloud/utils/DummyInterface.java  |     7 +-
 .../test/com/cloud/utils/DummyPremiumImpl.java  |     7 +-
 utils/test/com/cloud/utils/NumbersUtilTest.java |    10 +-
 .../com/cloud/utils/PasswordGeneratorTest.java  |     7 +-
 utils/test/com/cloud/utils/ProcessUtilTest.java |    33 +-
 .../com/cloud/utils/PropertiesUtilsTest.java    |     3 +
 utils/test/com/cloud/utils/ReflectUtilTest.java |     9 +-
 utils/test/com/cloud/utils/ScriptTest.java      |    44 +-
 utils/test/com/cloud/utils/StringUtilsTest.java |    18 +-
 utils/test/com/cloud/utils/TernaryTest.java     |     6 +-
 utils/test/com/cloud/utils/TestProfiler.java    |     7 +-
 utils/test/com/cloud/utils/UriUtilsTest.java    |    60 +
 utils/test/com/cloud/utils/UuidUtilsTest.java   |    42 +
 .../backoff/impl/ConstantTimeBackoffTest.java   |     7 +-
 .../com/cloud/utils/crypto/RSAHelperTest.java   |     3 +
 .../cloud/utils/encoding/UrlEncoderTest.java    |    37 +-
 .../utils/exception/ExceptionUtilTest.java      |    37 +-
 utils/test/com/cloud/utils/net/IpTest.java      |    46 +
 .../test/com/cloud/utils/net/NetUtilsTest.java  |   234 +-
 .../utils/rest/RESTServiceConnectorTest.java    |   395 +
 .../com/cloud/utils/ssh/SSHKeysHelperTest.java  |     3 +
 .../utils/testcase/Log4jEnabledTestCase.java    |     7 +-
 .../test/com/cloud/utils/testcase/NioTest.java  |     7 +-
 .../cloud/utils/xmlobject/TestXmlObject.java    |     3 +
 .../cloud/utils/xmlobject/TestXmlObject2.java   |     3 +
 .../com/cloud/utils/QualifierTestContext.xml    |    30 +-
 .../utils/db/transactionContextBuilderTest.xml  |    30 +-
 utils/test/resources/log4j.xml                  |    30 +-
 utils/test/resources/testContext.xml            |    34 +-
 vmware-base/findbugsExcludeFilter.xml           |    25 +
 vmware-base/pom.xml                             |     2 +-
 .../com/cloud/hypervisor/vmware/mo/BaseMO.java  |     4 +
 .../cloud/hypervisor/vmware/mo/ClusterMO.java   |    12 +-
 .../cloud/hypervisor/vmware/mo/DatastoreMO.java |    17 +
 .../com/cloud/hypervisor/vmware/mo/HostMO.java  |    16 +
 .../hypervisor/vmware/mo/VirtualMachineMO.java  |    88 +-
 .../vmware/util/VmwareGuestOsMapper.java        |    11 +
 2089 files changed, 85663 insertions(+), 78067 deletions(-)
----------------------------------------------------------------------



Mime
View raw message