You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sh...@apache.org on 2024/03/15 09:53:23 UTC
(cloudstack) branch dummy updated (ef006fde977 -> 43d14023551)
This is an automated email from the ASF dual-hosted git repository.
shwstppr pushed a change to branch dummy
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
omit ef006fde977 Merge branch 'main' into dummy
omit 13844c475b5 do not merge
add 3550f6a959a tools,changelog: fix nextversion (#8606)
add e33f98f52c4 Merge remote-tracking branch 'apache/4.19'
add d5d8b6d086a tools,changelog: fix nextversion 4.20.0.0-SNAPSHOT (#8607)
add d353fcc599d engine-schema: upgrade path 4.19.0.0 to 4.20.0.0 (#8608)
add 8ea9fc911d1 StoragePoolType as class (#8544)
add f702f7f57c6 Remove sensitive params (VmPassword, etc) from VMWork log (#8553)
add 2df68021761 Allocate new ROOT volume (on restore virtual machine operation) only when resource count increment succeeds (#8555)
add 9f1b34aeb22 Fix libvirt domain event listener by properly processing events (#8437)
add 5361b415e6a Image Store: View Access status of the image store and view events (#8467)
add 2f299492f65 Fix API `moveUser` parameters descriptions (#8499)
add 0ba26912df3 Fix typo in alert name (#8579)
add 94c8b1da5ce Option to create StorPool primary storage with a valid URL (#8356)
add 25009bfb764 Merge remote-tracking branch 'origin/4.19'
add d8b4be6cef6 @alexandremattiioli is committer now (#8525)
add 48410d0d67e Bump `actions/setup-python` to `v5` (#8419)
add c0643a8f6e4 Update server.properties.in (#8509)
add 4d370a3772d Merge remote-tracking branch 'origin/4.19'
add 33bb92acce2 Veeam: Support Veeam 11 and 12 (#8241)
add b34f0931373 veeam: fix some issues with restoring volume from backup and attaching it to VM (#8570)
add 1c98b5a4e56 Change Cryptsetup validation (#8482)
add 3f33592b676 systemvm: vncport evaluation (#8369)
add 1d5230b5168 server: use ed25519 instead of rsa when generate public/private keys (#8549)
add ca55fc08e9f Added missing metrics English locale strings (#8560)
add b2e29931e89 UI: fix icmp code/type of ACL rule are not display if the value is 0 (#8589)
add b8904f75ddf Merge remote-tracking branch 'apache/4.18' into 4.19
add 54225ecd150 Veeam: fix incompatible types: String cannot be converted to Date
add c7955471528 server: fix build error with BackupManagerTest.tryRestoreVMTestRestoreSucceeded
add 37bb24f29e0 Merge branch '4.19'
add 399bd0a067d Upgrade to mockito 4 and handle Mockito deprecations (#8427)
add b0ac78705d4 Add IOPS to disk offerings details (#8447)
add df412a99d2f test: Add e2e tests for listing resources (#8410)
add 376243975ba README: silently revert to the original project logo
add affead11607 Merge remote-tracking branch 'origin/4.19'
add 69e8ebc03fc CKS: retry if unable to drain node or unable to upgrade k8s node (#8402)
add 0d36098c768 Merge remote-tracking branch 'origin/4.18' into 4.19
add 2bfa9de2825 Merge remote-tracking branch 'origin/4.19'
add 49cecaed067 Normalize loggers and upgrade log4j 1.2 to log4j 2.19 (#7131)
add e53d3274fa3 Fix cloudstack-ui package: bad directory permissions and missing WEB-INF (#8568)
add 3fa052c1f57 Fix cloudstack-ui package: bad directory permissions and missing WEB-INF (#8568)
add 7394af30718 Merge remote-tracking branch 'origin/4.18' into 4.19
add 0447040c08b Merge remote-tracking branch 'origin/4.19'
add bb70da0fed9 add compute offering details in UI (#8563)
add 4de2f38cd13 Adding vmId as part of error response when vm create fails. (#8484)
add 1d1b3321416 remove StorPool tags from detached volumes (#8377)
add 56f0448f0d4 Linstor fix migration while node offline (#8610)
add a1f547a0110 Merge remote-tracking branch 'origin/4.18' into 4.19
add cfb4d4378f2 Merge remote-tracking branch 'origin/4.19'
add 9b18243b876 Fix merge forward bug (#8636)
add 3291a62fc12 Allow locking and unlocking users via UI (#8337)
add 27520f83fec packaging: bundle cmk in cloudstack-management package (#8574)
add 2729ee110eb Enable over provisioning for SharedMountPoint primary storages (#8481)
add 393f3d7727a linstor: use relative hostname path (#8633)
add af2e277999a Merge remote-tracking branch 'apache/4.18' into 4.19
add a924a110e18 Veeam: revert unnecessary state change if restore backup and attach to another VM (#8614)
add d7362dd332f Migrating volumes filter (#8631)
add 70b634fff21 Linstor: add HA support and small cleanups (#8407)
add 1955d8f3db0 Add advance settings to fine tune DRS imbalance calculation (#8521)
add d8cd1228496 zone wizard: allow only one untagged physical network with guest traffic type (#8625)
add 672206c3124 kvm: ITCO watchdog added (#8282)
add e47a910019d VR: fix issue between VPC VMs and other Public IPs in the same subnet as additional Public IPs (#8599)
add a8028eecbdb Merge remote-tracking branch 'origin/4.18' into 4.19
add bda49ab08ff Merge remote-tracking branch 'shapeblue/merged-4-18' into 4.19
add 93406f5582b Merge remote-tracking branch 'apache/4.19'
add 90526419a3d fix build error after merge-forward
add 187f17c216d fix build errors with DRS plugins after merge-forward
add 4a0ca2071d3 An ICMP ACL rule should not be able to have code and type null (#8464)
add a31449b1049 Allow altering only either CPU or memory during VM live scale (#8234)
add 17516fd9890 test: skip check for volume stats history on xenserver (#8661)
add f86c62e49a5 UI: load domain lists only if listDomains API is available (#8660)
add 6f3e4e63022 fix_filter_and_pagination (#8306)
add a0e592e945e prevent nic removal on out of bounds router stop (#8371)
add 6af1c25f520 Merge remote-tracking branch 'apache/4.19'
add 592038a3042 api,server,ui: granular resource limit management (#8362)
add 8f6721ed4c4 Improve some UserVmManagerImpl's methods name and docs (#8673)
add e9416c4987e Move views into separate files for easier modification (#8647)
add e74a72b4ef8 test: fix test_guest_os.py failure on xcpng82 (#8659)
add 275abaff6bc Refactor updateDiskOffering API (#8446)
add 1a1131154ef Fixup vm powerstate update (#8545)
add ed579bfeca5 UI: remove duplicated section for backup (#8678)
add 3aafb286b9d Fixed deleteVlanIpRange API description (#8700)
add 8d4b4dcec42 CKS: add kube config path in extra control nodes (#8658)
add af942e2260f vpc: optimize createMonitorServiceCommand() execution (#8385)
add e09fd2e26b9 Fixup: Optimize getRouterHealthChecksConfig method (#8677)
add 2a56c61adea Merge remote-tracking branch 'apache/4.18' into 4.19
add 0926e5c15a9 Merge remote-tracking branch 'apache/4.19'
add 87284f03f08 Upgrade to JRE17 and Upgrade System VMs/VRs to Python3 and Debian 12 (#8497)
add 7342fbd8e1a docs: fix spelling in code comments (#8690)
add e545259bd36 Added JS Script to pick Favicon, Title from config file (#7418)
add 08dc1bbcd4b UI: cleanup arrangement of instance schedule modal dialog (#8620)
add b4404fbcc7e db: fix wrong cloud.domain_view (#8705)
add 18c3d470c6c CKS: fix /opt/bin/deploy-cloudstack-secret in CKS control nodes (#8697)
add f731fe882c5 Storage plugin support to check if volume on datastore requires access for migration (#8655)
add f4987bf8ee6 Merge release branch 4.18 to 4.19
add 3baa45bc2a8 forward Merge branch '4.19' into main
add d1715821634 Fix false positives in Usage sanity checks of templates and network offerings (#8136)
add c8a4575bcd0 Fix `deleteUser` API to prevent deletion of the caller (#8691)
add 6f27b1f459f Improve logs when adding components to avoid set (#7214)
add 68a3e9e8398 engine-schema,test: fix domain searchbuilder, test check (#8725)
add 45d267ccbf2 UI: fix permission of VNF appliances (#8668)
add c462be1412d New API "checkVolume" to check and repair any leaks or issues reported by qemu-img check (#8577)
add 813d53d031a Sync the pool stats in DB with the actual stats from stats collector (#8686)
add bbe56ae2838 Update actions/setup-java from v3 to v4 (#8709)
add 4e34e6b3348 console proxy client sleep more generic (#8694)
add 56e04505266 Logging improvements on migration in the VmwareResource (#8300)
add 52d5b271617 UI: Add button to show public IPs associated with vlanid (#8717)
add 9bd359a039a UI: Fix error message in zone wizard (#8721)
add 9fd410be36d Merge remote-tracking branch 'apache/4.18' into 4.19
add b29ec2bf12a Merge remote-tracking branch 'apache/4.19'
add f36273888be build: fix logger post forward-merge
add 10f72a17f6e server: use ecdsa instead of ed25519 when generate public/private keys (#8719)
add e86363be8e7 Merge remote-tracking branch 'apache/4.18' into 4.19
add 240db195674 Merge remote-tracking branch 'apache/4.19'
add 9a73a2f9e14 Display dates in Quota and Usage messages according to the timezone configurations (#8230)
add 6dc3d06037c NSX integration (#7919)
add e87c6cfcb1d Fix resource count discrepancies (#8302)
add a7ec8738a27 kvm: fix NPE while import KVM VMs from other hosts (#8720)
add b82ea3de2d2 Update pre-populated quota tariffs' unit types (#8591)
add 0b080cfd820 [UI] Allow detach ISO from instance toolbar when ISO is attached (#8716)
add 986d754768d SG: fix SQL exception when add security group rule with allowed account/group (#8616)
add 223a9b8031c Quota tariff events (#8030)
add d99b1b9c2d0 Merge branch '4.18' into 4.19
add 001c769054b Linstor 4.19 fix selecting non enabled hosts (#8653)
add 0208e094ce6 build: fix failure after latest forward-merge
add f25d35c5d6b VM Import: Use datastore name when datastore path is not set to search for pools on DB (#8759)
add db564b12b69 Merge branch '4.19'
add 92bfb4dcaac Support KVM storage implementations controlling logical/physical block io size (#8724)
add d487a1c3417 Fix disk offering override in VM deployment wizard (#8070)
add f8fd22c2d62 Usage: Fixup entity exists exception (#8726)
add 0780f0e5c61 Merge remote-tracking branch 'apache/4.18' into 4.19
add bb244842fa1 Merge remote-tracking branch 'apache/4.19'
add 43d14023551 do not merge
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ef006fde977)
\
N -- N -- N refs/heads/dummy (43d14023551)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 1 -
.github/workflows/build.yml | 4 +-
.github/workflows/ci.yml | 22 +-
.github/workflows/codecov.yml | 2 +-
.github/workflows/main-sonar-check.yml | 2 +-
.github/workflows/rat.yml | 2 +-
.github/workflows/sonar-check.yml | 2 +-
INSTALL.md | 2 +-
README.md | 4 +-
agent/conf/log4j-cloud.xml.in | 145 +--
agent/src/main/java/com/cloud/agent/Agent.java | 191 ++--
.../src/main/java/com/cloud/agent/AgentShell.java | 49 +-
.../cloud/agent/dao/impl/PropertiesStorage.java | 21 +-
.../cloud/agent/dhcp/DhcpProtocolParserServer.java | 7 +-
.../java/com/cloud/agent/mockvm/MockVmMgr.java | 25 +-
.../properties/AgentPropertiesFileHandler.java | 13 +-
.../consoleproxy/ConsoleProxyResource.java | 90 +-
.../org.mockito.plugins.MockMaker | 1 -
api/src/main/java/com/cloud/agent/api/Command.java | 4 +
.../main/java/com/cloud/agent/api/LogLevel.java | 6 +-
.../com/cloud/agent/api/storage/OVFHelper.java | 59 +-
.../com/cloud/agent/api/storage/OVFParser.java | 9 +-
.../main/java/com/cloud/agent/api/to/NicTO.java | 19 +
.../com/cloud/agent/api/to/VirtualMachineTO.java | 9 +
api/src/main/java/com/cloud/capacity/Capacity.java | 9 +
.../java/com/cloud/configuration/Resource.java | 1 +
.../java/com/cloud/deploy/DeploymentPlanner.java | 24 +-
api/src/main/java/com/cloud/event/EventTypes.java | 14 +
.../cluster/KubernetesClusterHelper.java | 1 +
api/src/main/java/com/cloud/network/IpAddress.java | 2 +
api/src/main/java/com/cloud/network/Network.java | 4 +
.../java/com/cloud/network/NetworkProfile.java | 2 -
.../java/com/cloud/network/NetworkService.java | 9 +
api/src/main/java/com/cloud/network/Networks.java | 3 +-
.../com/cloud/network/VirtualRouterProvider.java | 2 +-
.../network/element/NetworkACLServiceProvider.java | 3 +
.../java/com/cloud/network/guru/NetworkGuru.java | 16 +-
.../java/com/cloud/network/nsx/NsxProvider.java | 34 +
.../java/com/cloud/network/nsx/NsxService.java | 26 +
.../java/com/cloud/network/vpc/VpcOffering.java | 6 +
.../cloud/network/vpc/VpcProvisioningService.java | 3 +-
.../java/com/cloud/offering/NetworkOffering.java | 14 +
.../java/com/cloud/server/ManagementService.java | 3 +-
.../main/java/com/cloud/storage/DataStoreRole.java | 1 +
api/src/main/java/com/cloud/storage/Storage.java | 145 ++-
api/src/main/java/com/cloud/storage/Volume.java | 2 +
.../java/com/cloud/storage/VolumeApiService.java | 4 +
.../java/com/cloud/user/ResourceLimitService.java | 76 +-
api/src/main/java/com/cloud/vm/NicProfile.java | 2 +-
.../java/org/apache/cloudstack/acl/RoleType.java | 9 +-
.../org/apache/cloudstack/alert/AlertService.java | 2 +-
.../cloudstack/api/AbstractGetUploadParamsCmd.java | 2 -
.../cloudstack/api/ApiCommandResourceType.java | 3 +-
.../org/apache/cloudstack/api/ApiConstants.java | 31 +-
.../org/apache/cloudstack/api/BaseAsyncCmd.java | 2 -
.../java/org/apache/cloudstack/api/BaseCmd.java | 12 +-
.../api/BaseListTemplateOrIsoPermissionsCmd.java | 5 -
.../cloudstack/api/BaseUpdateTemplateOrIsoCmd.java | 2 -
.../api/BaseUpdateTemplateOrIsoPermissionsCmd.java | 5 -
.../command/admin/account/CreateAccountCmd.java | 2 -
.../command/admin/account/DeleteAccountCmd.java | 2 -
.../command/admin/account/DisableAccountCmd.java | 2 -
.../command/admin/account/EnableAccountCmd.java | 2 -
.../api/command/admin/account/LockAccountCmd.java | 2 -
.../command/admin/account/UpdateAccountCmd.java | 2 -
.../admin/address/AcquirePodIpCmdByAdmin.java | 2 -
.../admin/address/AssociateIPAddrCmdByAdmin.java | 2 -
.../admin/address/ReleasePodIpCmdByAdmin.java | 2 -
.../UpdateVMAffinityGroupCmdByAdmin.java | 2 -
.../api/command/admin/alert/GenerateAlertCmd.java | 2 -
.../command/admin/autoscale/CreateCounterCmd.java | 2 -
.../command/admin/autoscale/DeleteCounterCmd.java | 6 +-
.../admin/backup/UpdateBackupOfferingCmd.java | 4 +-
.../api/command/admin/ca/IssueCertificateCmd.java | 4 +-
.../api/command/admin/cluster/AddClusterCmd.java | 6 +-
.../command/admin/cluster/DeleteClusterCmd.java | 2 -
.../api/command/admin/cluster/ListClustersCmd.java | 2 -
.../command/admin/cluster/UpdateClusterCmd.java | 2 -
.../command/admin/config/ListCfgGroupsByCmd.java | 2 -
.../api/command/admin/config/ListCfgsByCmd.java | 2 -
.../admin/config/ListDeploymentPlannersCmd.java | 2 -
.../config/ListHypervisorCapabilitiesCmd.java | 2 -
.../api/command/admin/config/ResetCfgCmd.java | 2 -
.../api/command/admin/config/UpdateCfgCmd.java | 2 -
.../config/UpdateHypervisorCapabilitiesCmd.java | 2 -
.../admin/diagnostics/RunDiagnosticsCmd.java | 2 -
.../ListTemplateDirectDownloadCertificatesCmd.java | 2 -
...RevokeTemplateDirectDownloadCertificateCmd.java | 2 -
...UploadTemplateDirectDownloadCertificateCmd.java | 4 +-
.../api/command/admin/domain/CreateDomainCmd.java | 2 -
.../api/command/admin/domain/DeleteDomainCmd.java | 2 -
.../admin/domain/ListDomainChildrenCmd.java | 2 -
.../api/command/admin/domain/ListDomainsCmd.java | 32 +-
.../api/command/admin/domain/UpdateDomainCmd.java | 2 -
.../api/command/admin/guest/AddGuestOsCmd.java | 2 -
.../command/admin/guest/AddGuestOsMappingCmd.java | 2 -
.../admin/guest/GetHypervisorGuestOsNamesCmd.java | 3 -
.../command/admin/guest/ListGuestOsMappingCmd.java | 2 -
.../api/command/admin/guest/RemoveGuestOsCmd.java | 2 -
.../admin/guest/RemoveGuestOsMappingCmd.java | 2 -
.../api/command/admin/guest/UpdateGuestOsCmd.java | 2 -
.../admin/guest/UpdateGuestOsMappingCmd.java | 2 -
.../api/command/admin/host/AddHostCmd.java | 4 +-
.../command/admin/host/AddSecondaryStorageCmd.java | 4 +-
.../command/admin/host/CancelMaintenanceCmd.java | 2 -
.../api/command/admin/host/DeleteHostCmd.java | 2 -
.../admin/host/FindHostsForMigrationCmd.java | 2 -
.../api/command/admin/host/ListHostTagsCmd.java | 2 -
.../api/command/admin/host/ListHostsCmd.java | 2 -
.../admin/host/PrepareForMaintenanceCmd.java | 2 -
.../api/command/admin/host/ReconnectHostCmd.java | 2 -
.../admin/host/ReleaseHostReservationCmd.java | 2 -
.../api/command/admin/host/UpdateHostCmd.java | 4 +-
.../command/admin/host/UpdateHostPasswordCmd.java | 2 -
.../ConfigureInternalLoadBalancerElementCmd.java | 13 +-
.../CreateInternalLoadBalancerElementCmd.java | 16 +-
.../admin/internallb/ListInternalLBVMsCmd.java | 2 -
.../ListInternalLoadBalancerElementsCmd.java | 26 +-
.../admin/internallb/StartInternalLBVMCmd.java | 2 -
.../admin/internallb/StopInternalLBVMCmd.java | 2 -
.../api/command/admin/management/ListMgmtsCmd.java | 2 -
.../command/admin/network/AddNetworkDeviceCmd.java | 2 -
.../network/AddNetworkServiceProviderCmd.java | 2 -
.../network/CreateGuestNetworkIpv6PrefixCmd.java | 2 -
.../network/CreateManagementNetworkIpRangeCmd.java | 2 -
.../admin/network/CreateNetworkCmdByAdmin.java | 2 -
.../admin/network/CreateNetworkOfferingCmd.java | 111 +-
.../admin/network/CreatePhysicalNetworkCmd.java | 2 -
.../network/CreateStorageNetworkIpRangeCmd.java | 4 +-
.../admin/network/DedicateGuestVlanRangeCmd.java | 2 -
.../network/DeleteGuestNetworkIpv6PrefixCmd.java | 2 -
.../network/DeleteManagementNetworkIpRangeCmd.java | 8 +-
.../admin/network/DeleteNetworkDeviceCmd.java | 2 -
.../admin/network/DeleteNetworkOfferingCmd.java | 2 -
.../network/DeleteNetworkServiceProviderCmd.java | 6 +-
.../admin/network/DeletePhysicalNetworkCmd.java | 2 -
.../network/DeleteStorageNetworkIpRangeCmd.java | 4 +-
.../network/ListDedicatedGuestVlanRangesCmd.java | 2 -
.../command/admin/network/ListGuestVlansCmd.java | 2 -
.../admin/network/ListNetworkDeviceCmd.java | 2 -
.../network/ListNetworkServiceProvidersCmd.java | 2 -
.../admin/network/ListPhysicalNetworksCmd.java | 2 -
.../network/ListStorageNetworkIpRangeCmd.java | 4 +-
.../network/ListSupportedNetworkServicesCmd.java | 2 -
.../command/admin/network/MigrateNetworkCmd.java | 2 -
.../api/command/admin/network/MigrateVPCCmd.java | 2 -
.../network/ReleaseDedicatedGuestVlanRangeCmd.java | 2 -
.../admin/network/UpdateNetworkOfferingCmd.java | 2 -
.../network/UpdateNetworkServiceProviderCmd.java | 2 -
.../admin/network/UpdatePhysicalNetworkCmd.java | 2 -
.../UpdatePodManagementNetworkIpRangeCmd.java | 6 +-
.../network/UpdateStorageNetworkIpRangeCmd.java | 4 +-
.../admin/offering/CreateDiskOfferingCmd.java | 2 -
.../admin/offering/CreateServiceOfferingCmd.java | 2 -
.../admin/offering/DeleteDiskOfferingCmd.java | 2 -
.../admin/offering/DeleteServiceOfferingCmd.java | 2 -
.../admin/offering/UpdateDiskOfferingCmd.java | 2 -
.../admin/offering/UpdateServiceOfferingCmd.java | 2 -
.../api/command/admin/pod/CreatePodCmd.java | 2 -
.../api/command/admin/pod/DeletePodCmd.java | 2 -
.../api/command/admin/pod/ListPodsByCmd.java | 2 -
.../api/command/admin/pod/UpdatePodCmd.java | 2 -
.../api/command/admin/region/AddRegionCmd.java | 2 -
.../admin/region/CreatePortableIpRangeCmd.java | 4 +-
.../admin/region/DeletePortableIpRangeCmd.java | 2 -
.../admin/region/ListPortableIpRangesCmd.java | 2 -
.../api/command/admin/region/RemoveRegionCmd.java | 2 -
.../api/command/admin/region/UpdateRegionCmd.java | 2 -
.../command/admin/resource/ArchiveAlertsCmd.java | 2 -
.../admin/resource/CleanVMReservationsCmd.java | 2 -
.../command/admin/resource/DeleteAlertsCmd.java | 2 -
.../api/command/admin/resource/ListAlertsCmd.java | 2 -
.../command/admin/resource/ListCapacityCmd.java | 9 +-
.../admin/resource/StartRollingMaintenanceCmd.java | 2 -
.../admin/resource/UploadCustomCertificateCmd.java | 2 -
.../admin/resource/icon/DeleteResourceIconCmd.java | 2 -
.../admin/resource/icon/ListResourceIconCmd.java | 2 -
.../admin/resource/icon/UploadResourceIconCmd.java | 4 +-
.../admin/router/ConfigureOvsElementCmd.java | 3 -
.../router/ConfigureVirtualRouterElementCmd.java | 2 -
.../router/CreateVirtualRouterElementCmd.java | 2 -
.../api/command/admin/router/DestroyRouterCmd.java | 2 -
.../router/GetRouterHealthCheckResultsCmd.java | 2 -
.../command/admin/router/ListOvsElementsCmd.java | 5 +-
.../api/command/admin/router/ListRoutersCmd.java | 2 -
.../admin/router/ListVirtualRouterElementsCmd.java | 2 -
.../api/command/admin/router/RebootRouterCmd.java | 2 -
.../api/command/admin/router/StartRouterCmd.java | 2 -
.../api/command/admin/router/StopRouterCmd.java | 2 -
.../api/command/admin/router/UpgradeRouterCmd.java | 2 -
.../admin/router/UpgradeRouterTemplateCmd.java | 2 -
.../command/admin/storage/AddImageStoreCmd.java | 4 +-
.../command/admin/storage/AddImageStoreS3CMD.java | 4 +-
.../admin/storage/AddObjectStoragePoolCmd.java | 4 +-
.../CancelPrimaryStorageMaintenanceCmd.java | 2 -
.../storage/CreateSecondaryStagingStoreCmd.java | 4 +-
.../admin/storage/CreateStoragePoolCmd.java | 8 +-
.../command/admin/storage/DeleteImageStoreCmd.java | 2 -
.../admin/storage/DeleteObjectStoragePoolCmd.java | 2 -
.../api/command/admin/storage/DeletePoolCmd.java | 2 -
.../storage/DeleteSecondaryStagingStoreCmd.java | 2 -
.../storage/FindStoragePoolsForMigrationCmd.java | 7 +-
.../command/admin/storage/ListImageStoresCmd.java | 2 -
.../admin/storage/ListObjectStoragePoolsCmd.java | 2 -
.../storage/ListSecondaryStagingStoresCmd.java | 2 -
.../command/admin/storage/ListStoragePoolsCmd.java | 2 -
.../admin/storage/ListStorageProvidersCmd.java | 2 -
.../command/admin/storage/ListStorageTagsCmd.java | 2 -
.../storage/MigrateSecondaryStorageDataCmd.java | 2 -
.../PreparePrimaryStorageForMaintenanceCmd.java | 2 -
.../command/admin/storage/SyncStoragePoolCmd.java | 2 -
.../storage/UpdateCloudToUseObjectStoreCmd.java | 4 +-
.../command/admin/storage/UpdateImageStoreCmd.java | 2 -
.../storage/UpdateStorageCapabilitiesCmd.java | 2 -
.../admin/storage/UpdateStoragePoolCmd.java | 2 -
.../api/command/admin/swift/AddSwiftCmd.java | 4 +-
.../api/command/admin/swift/ListSwiftsCmd.java | 2 -
.../command/admin/systemvm/DestroySystemVmCmd.java | 2 -
.../command/admin/systemvm/ListSystemVMsCmd.java | 2 -
.../command/admin/systemvm/MigrateSystemVMCmd.java | 10 +-
.../command/admin/systemvm/PatchSystemVMCmd.java | 2 -
.../command/admin/systemvm/RebootSystemVmCmd.java | 2 -
.../command/admin/systemvm/ScaleSystemVMCmd.java | 10 +-
.../command/admin/systemvm/StartSystemVMCmd.java | 2 -
.../command/admin/systemvm/StopSystemVmCmd.java | 2 -
.../command/admin/systemvm/UpgradeSystemVMCmd.java | 2 -
.../command/admin/template/PrepareTemplateCmd.java | 2 -
.../command/admin/usage/AddTrafficMonitorCmd.java | 2 -
.../api/command/admin/usage/AddTrafficTypeCmd.java | 2 -
.../admin/usage/DeleteTrafficMonitorCmd.java | 2 -
.../command/admin/usage/DeleteTrafficTypeCmd.java | 2 -
.../admin/usage/GenerateUsageRecordsCmd.java | 2 -
.../admin/usage/ListTrafficMonitorsCmd.java | 2 -
.../usage/ListTrafficTypeImplementorsCmd.java | 2 -
.../command/admin/usage/ListTrafficTypesCmd.java | 2 -
.../api/command/admin/usage/ListUsageTypesCmd.java | 2 -
.../admin/usage/RemoveRawUsageRecordsCmd.java | 2 -
.../command/admin/usage/UpdateTrafficTypeCmd.java | 2 -
.../api/command/admin/user/CreateUserCmd.java | 2 -
.../api/command/admin/user/DeleteUserCmd.java | 9 +-
.../api/command/admin/user/DisableUserCmd.java | 2 -
.../api/command/admin/user/EnableUserCmd.java | 2 -
.../api/command/admin/user/GetUserCmd.java | 2 -
.../api/command/admin/user/GetUserKeysCmd.java | 2 -
.../api/command/admin/user/ListUsersCmd.java | 2 -
.../api/command/admin/user/LockUserCmd.java | 2 -
.../api/command/admin/user/MoveUserCmd.java | 10 +-
.../api/command/admin/user/RegisterCmd.java | 2 -
.../api/command/admin/user/UpdateUserCmd.java | 2 -
.../command/admin/vlan/CreateVlanIpRangeCmd.java | 17 +-
.../admin/vlan/DedicatePublicIpRangeCmd.java | 2 -
.../command/admin/vlan/DeleteVlanIpRangeCmd.java | 4 +-
.../command/admin/vlan/ListVlanIpRangesCmd.java | 2 -
.../admin/vlan/ReleasePublicIpRangeCmd.java | 2 -
.../command/admin/vlan/UpdateVlanIpRangeCmd.java | 4 +-
.../api/command/admin/vm/AssignVMCmd.java | 4 +-
.../api/command/admin/vm/DeployVMCmdByAdmin.java | 2 -
.../api/command/admin/vm/ExpungeVMCmd.java | 2 -
.../api/command/admin/vm/GetVMUserDataCmd.java | 2 -
.../admin/vm/ImportUnmanagedInstanceCmd.java | 14 +-
.../api/command/admin/vm/ImportVmCmd.java | 2 -
.../admin/vm/ListUnmanagedInstancesCmd.java | 2 -
.../api/command/admin/vm/ListVMsCmdByAdmin.java | 2 -
.../api/command/admin/vm/ListVmsForImportCmd.java | 2 -
.../api/command/admin/vm/MigrateVMCmd.java | 6 +-
.../vm/MigrateVirtualMachineWithVolumeCmd.java | 8 +-
.../api/command/admin/vm/RecoverVMCmd.java | 2 -
.../command/admin/vm/UnmanageVMInstanceCmd.java | 2 -
.../admin/volume/DestroyVolumeCmdByAdmin.java | 2 -
.../admin/volume/RecoverVolumeCmdByAdmin.java | 2 -
.../admin/vpc/CreatePrivateGatewayByAdminCmd.java | 2 -
.../command/admin/vpc/CreateVPCOfferingCmd.java | 95 +-
.../command/admin/vpc/DeletePrivateGatewayCmd.java | 2 -
.../command/admin/vpc/DeleteVPCOfferingCmd.java | 2 -
.../vpc/ListPrivateGatewaysCmdByAdminCmd.java | 2 -
.../command/admin/vpc/UpdateVPCOfferingCmd.java | 2 -
.../api/command/admin/zone/CreateZoneCmd.java | 2 -
.../api/command/admin/zone/DeleteZoneCmd.java | 2 -
.../admin/zone/MarkDefaultZoneForAccountCmd.java | 2 -
.../api/command/admin/zone/UpdateZoneCmd.java | 2 -
.../user/account/AddAccountToProjectCmd.java | 2 -
.../user/account/DeleteAccountFromProjectCmd.java | 2 -
.../user/account/DeleteUserFromProjectCmd.java | 2 -
.../api/command/user/account/ListAccountsCmd.java | 25 +-
.../user/account/ListProjectAccountsCmd.java | 2 -
.../command/user/address/AssociateIPAddrCmd.java | 8 +-
.../user/address/DisassociateIPAddrCmd.java | 2 -
.../user/address/ListPublicIpAddressesCmd.java | 10 +-
.../api/command/user/address/ReleaseIPAddrCmd.java | 2 -
.../api/command/user/address/ReserveIPAddrCmd.java | 2 -
.../api/command/user/address/UpdateIPAddrCmd.java | 2 -
.../user/affinitygroup/CreateAffinityGroupCmd.java | 2 -
.../user/affinitygroup/DeleteAffinityGroupCmd.java | 2 -
.../affinitygroup/ListAffinityGroupTypesCmd.java | 2 -
.../user/affinitygroup/ListAffinityGroupsCmd.java | 2 -
.../affinitygroup/UpdateVMAffinityGroupCmd.java | 2 -
.../user/autoscale/CreateAutoScalePolicyCmd.java | 2 -
.../user/autoscale/CreateAutoScaleVmGroupCmd.java | 4 +-
.../autoscale/CreateAutoScaleVmProfileCmd.java | 2 -
.../command/user/autoscale/CreateConditionCmd.java | 2 -
.../user/autoscale/DeleteAutoScalePolicyCmd.java | 4 +-
.../user/autoscale/DeleteAutoScaleVmGroupCmd.java | 4 +-
.../autoscale/DeleteAutoScaleVmProfileCmd.java | 4 +-
.../command/user/autoscale/DeleteConditionCmd.java | 6 +-
.../user/autoscale/DisableAutoScaleVmGroupCmd.java | 2 -
.../user/autoscale/EnableAutoScaleVmGroupCmd.java | 2 -
.../user/autoscale/ListAutoScalePoliciesCmd.java | 2 -
.../user/autoscale/ListAutoScaleVmGroupsCmd.java | 2 -
.../user/autoscale/ListAutoScaleVmProfilesCmd.java | 2 -
.../command/user/autoscale/ListConditionsCmd.java | 2 -
.../command/user/autoscale/ListCountersCmd.java | 2 -
.../user/autoscale/UpdateAutoScalePolicyCmd.java | 2 -
.../user/autoscale/UpdateAutoScaleVmGroupCmd.java | 2 -
.../autoscale/UpdateAutoScaleVmProfileCmd.java | 2 -
.../command/user/autoscale/UpdateConditionCmd.java | 4 +-
.../api/command/user/bucket/CreateBucketCmd.java | 2 -
.../api/command/user/bucket/DeleteBucketCmd.java | 2 -
.../api/command/user/bucket/ListBucketsCmd.java | 2 -
.../api/command/user/bucket/UpdateBucketCmd.java | 2 -
.../command/user/config/ListCapabilitiesCmd.java | 2 -
.../consoleproxy/CreateConsoleEndpointCmd.java | 2 -
.../api/command/user/event/ArchiveEventsCmd.java | 2 -
.../api/command/user/event/DeleteEventsCmd.java | 2 -
.../api/command/user/event/ListEventTypesCmd.java | 2 -
.../api/command/user/event/ListEventsCmd.java | 2 -
.../user/firewall/CreateEgressFirewallRuleCmd.java | 8 +-
.../user/firewall/CreateFirewallRuleCmd.java | 4 +-
.../user/firewall/CreatePortForwardingRuleCmd.java | 4 +-
.../user/firewall/DeleteEgressFirewallRuleCmd.java | 2 -
.../user/firewall/DeleteFirewallRuleCmd.java | 2 -
.../user/firewall/DeletePortForwardingRuleCmd.java | 2 -
.../user/firewall/ListEgressFirewallRulesCmd.java | 2 -
.../user/firewall/ListFirewallRulesCmd.java | 2 -
.../user/firewall/ListPortForwardingRulesCmd.java | 2 -
.../user/firewall/UpdateEgressFirewallRuleCmd.java | 2 -
.../user/firewall/UpdateFirewallRuleCmd.java | 2 -
.../user/firewall/UpdatePortForwardingRuleCmd.java | 2 -
.../user/guest/ListGuestOsCategoriesCmd.java | 2 -
.../api/command/user/guest/ListGuestOsCmd.java | 2 -
.../user/ipv6/CreateIpv6FirewallRuleCmd.java | 4 +-
.../user/ipv6/DeleteIpv6FirewallRuleCmd.java | 2 -
.../user/ipv6/ListIpv6FirewallRulesCmd.java | 2 -
.../user/ipv6/UpdateIpv6FirewallRuleCmd.java | 2 -
.../api/command/user/iso/AttachIsoCmd.java | 2 -
.../api/command/user/iso/CopyIsoCmd.java | 2 -
.../api/command/user/iso/DeleteIsoCmd.java | 2 -
.../api/command/user/iso/DetachIsoCmd.java | 2 -
.../api/command/user/iso/ExtractIsoCmd.java | 4 +-
.../command/user/iso/GetUploadParamsForIsoCmd.java | 2 +-
.../command/user/iso/ListIsoPermissionsCmd.java | 5 -
.../api/command/user/iso/ListIsosCmd.java | 2 -
.../api/command/user/iso/RegisterIsoCmd.java | 2 -
.../api/command/user/iso/UpdateIsoCmd.java | 2 -
.../command/user/iso/UpdateIsoPermissionsCmd.java | 5 -
.../command/user/job/QueryAsyncJobResultCmd.java | 2 -
.../loadbalancer/AssignCertToLoadBalancerCmd.java | 2 -
.../loadbalancer/AssignToLoadBalancerRuleCmd.java | 2 -
.../CreateApplicationLoadBalancerCmd.java | 10 +-
.../loadbalancer/CreateLBHealthCheckPolicyCmd.java | 4 +-
.../loadbalancer/CreateLBStickinessPolicyCmd.java | 4 +-
.../loadbalancer/CreateLoadBalancerRuleCmd.java | 8 +-
.../DeleteApplicationLoadBalancerCmd.java | 2 -
.../loadbalancer/DeleteLBHealthCheckPolicyCmd.java | 2 -
.../loadbalancer/DeleteLBStickinessPolicyCmd.java | 2 -
.../loadbalancer/DeleteLoadBalancerRuleCmd.java | 2 -
.../user/loadbalancer/DeleteSslCertCmd.java | 2 -
.../ListApplicationLoadBalancersCmd.java | 2 -
.../loadbalancer/ListLBHealthCheckPoliciesCmd.java | 2 -
.../loadbalancer/ListLBStickinessPoliciesCmd.java | 2 -
.../ListLoadBalancerRuleInstancesCmd.java | 6 +-
.../loadbalancer/ListLoadBalancerRulesCmd.java | 2 -
.../command/user/loadbalancer/ListSslCertsCmd.java | 2 -
.../RemoveCertFromLoadBalancerCmd.java | 2 -
.../RemoveFromLoadBalancerRuleCmd.java | 2 -
.../UpdateApplicationLoadBalancerCmd.java | 2 -
.../loadbalancer/UpdateLBHealthCheckPolicyCmd.java | 2 -
.../loadbalancer/UpdateLBStickinessPolicyCmd.java | 2 -
.../loadbalancer/UpdateLoadBalancerRuleCmd.java | 2 -
.../user/loadbalancer/UploadSslCertCmd.java | 2 -
.../user/nat/CreateIpForwardingRuleCmd.java | 4 +-
.../user/nat/DeleteIpForwardingRuleCmd.java | 2 -
.../api/command/user/nat/DisableStaticNatCmd.java | 2 -
.../api/command/user/nat/EnableStaticNatCmd.java | 6 +-
.../command/user/nat/ListIpForwardingRulesCmd.java | 2 -
.../command/user/network/CreateNetworkACLCmd.java | 2 -
.../user/network/CreateNetworkACLListCmd.java | 4 +-
.../api/command/user/network/CreateNetworkCmd.java | 2 -
.../user/network/CreateNetworkPermissionsCmd.java | 2 -
.../command/user/network/DeleteNetworkACLCmd.java | 2 -
.../user/network/DeleteNetworkACLListCmd.java | 2 -
.../api/command/user/network/DeleteNetworkCmd.java | 2 -
.../user/network/ListNetworkACLListsCmd.java | 2 -
.../command/user/network/ListNetworkACLsCmd.java | 2 -
.../user/network/ListNetworkOfferingsCmd.java | 2 -
.../user/network/ListNetworkPermissionsCmd.java | 2 -
.../user/network/ListNetworkProtocolsCmd.java | 2 -
.../api/command/user/network/ListNetworksCmd.java | 2 -
.../user/network/MoveNetworkAclItemCmd.java | 2 -
.../user/network/RemoveNetworkPermissionsCmd.java | 2 -
.../user/network/ReplaceNetworkACLListCmd.java | 2 -
.../user/network/ResetNetworkPermissionsCmd.java | 2 -
.../command/user/network/RestartNetworkCmd.java | 2 -
.../user/network/UpdateNetworkACLItemCmd.java | 2 -
.../user/network/UpdateNetworkACLListCmd.java | 2 -
.../api/command/user/network/UpdateNetworkCmd.java | 2 -
.../user/offering/ListDiskOfferingsCmd.java | 25 +-
.../user/offering/ListServiceOfferingsCmd.java | 21 +-
.../command/user/project/ActivateProjectCmd.java | 2 -
.../api/command/user/project/CreateProjectCmd.java | 2 -
.../api/command/user/project/DeleteProjectCmd.java | 2 -
.../user/project/DeleteProjectInvitationCmd.java | 2 -
.../user/project/ListProjectInvitationsCmd.java | 2 -
.../api/command/user/project/ListProjectsCmd.java | 2 -
.../command/user/project/SuspendProjectCmd.java | 2 -
.../api/command/user/project/UpdateProjectCmd.java | 2 -
.../user/project/UpdateProjectInvitationCmd.java | 2 -
.../api/command/user/region/ListRegionsCmd.java | 2 -
.../ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java | 2 -
.../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java | 4 +-
.../ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java | 2 -
.../ha/gslb/ListGlobalLoadBalancerRuleCmd.java | 2 -
.../gslb/RemoveFromGlobalLoadBalancerRuleCmd.java | 2 -
.../ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java | 2 -
.../user/resource/GetCloudIdentifierCmd.java | 2 -
.../command/user/resource/ListHypervisorsCmd.java | 2 -
.../user/resource/ListResourceLimitsCmd.java | 16 +-
.../user/resource/UpdateResourceCountCmd.java | 12 +-
.../user/resource/UpdateResourceLimitCmd.java | 11 +-
.../AuthorizeSecurityGroupEgressCmd.java | 2 -
.../AuthorizeSecurityGroupIngressCmd.java | 2 -
.../user/securitygroup/CreateSecurityGroupCmd.java | 2 -
.../user/securitygroup/DeleteSecurityGroupCmd.java | 4 +-
.../user/securitygroup/ListSecurityGroupsCmd.java | 2 -
.../RevokeSecurityGroupEgressCmd.java | 2 -
.../RevokeSecurityGroupIngressCmd.java | 2 -
.../user/securitygroup/UpdateSecurityGroupCmd.java | 2 -
.../command/user/snapshot/ArchiveSnapshotCmd.java | 2 -
.../api/command/user/snapshot/CopySnapshotCmd.java | 9 +-
.../command/user/snapshot/CreateSnapshotCmd.java | 6 +-
.../snapshot/CreateSnapshotFromVMSnapshotCmd.java | 8 +-
.../user/snapshot/CreateSnapshotPolicyCmd.java | 2 -
.../command/user/snapshot/DeleteSnapshotCmd.java | 2 -
.../user/snapshot/DeleteSnapshotPoliciesCmd.java | 2 -
.../user/snapshot/ListSnapshotPoliciesCmd.java | 2 -
.../command/user/snapshot/ListSnapshotsCmd.java | 2 -
.../command/user/snapshot/RevertSnapshotCmd.java | 2 -
.../user/snapshot/UpdateSnapshotPolicyCmd.java | 2 -
.../api/command/user/ssh/CreateSSHKeyPairCmd.java | 2 -
.../api/command/user/ssh/DeleteSSHKeyPairCmd.java | 2 -
.../api/command/user/ssh/ListSSHKeyPairsCmd.java | 2 -
.../command/user/ssh/RegisterSSHKeyPairCmd.java | 2 -
.../api/command/user/tag/CreateTagsCmd.java | 2 -
.../api/command/user/tag/DeleteTagsCmd.java | 2 -
.../api/command/user/template/CopyTemplateCmd.java | 4 +-
.../command/user/template/CreateTemplateCmd.java | 8 +-
.../command/user/template/DeleteTemplateCmd.java | 2 -
.../command/user/template/ExtractTemplateCmd.java | 4 +-
.../template/GetUploadParamsForTemplateCmd.java | 4 +-
.../user/template/ListTemplatePermissionsCmd.java | 6 -
.../command/user/template/ListTemplatesCmd.java | 2 -
.../command/user/template/RegisterTemplateCmd.java | 4 +-
.../command/user/template/UpdateTemplateCmd.java | 10 +-
.../template/UpdateTemplatePermissionsCmd.java | 5 -
.../command/user/userdata/DeleteUserDataCmd.java | 2 -
.../user/userdata/LinkUserDataToTemplateCmd.java | 2 -
.../api/command/user/userdata/ListUserDataCmd.java | 2 -
.../command/user/userdata/RegisterUserDataCmd.java | 2 -
.../api/command/user/vm/AddIpToVmNicCmd.java | 2 -
.../api/command/user/vm/AddNicToVMCmd.java | 2 -
.../api/command/user/vm/DeployVMCmd.java | 36 +-
.../api/command/user/vm/DestroyVMCmd.java | 2 -
.../api/command/user/vm/GetVMPasswordCmd.java | 2 -
.../api/command/user/vm/ListNicsCmd.java | 4 +-
.../cloudstack/api/command/user/vm/ListVMsCmd.java | 6 +-
.../api/command/user/vm/RebootVMCmd.java | 2 -
.../api/command/user/vm/RemoveIpFromVmNicCmd.java | 2 -
.../api/command/user/vm/RemoveNicFromVMCmd.java | 2 -
.../api/command/user/vm/ResetVMPasswordCmd.java | 6 +-
.../api/command/user/vm/ResetVMSSHKeyCmd.java | 2 -
.../api/command/user/vm/ResetVMUserDataCmd.java | 2 -
.../api/command/user/vm/RestoreVMCmd.java | 2 -
.../cloudstack/api/command/user/vm/ScaleVMCmd.java | 10 +-
.../cloudstack/api/command/user/vm/StartVMCmd.java | 16 +-
.../cloudstack/api/command/user/vm/StopVMCmd.java | 2 -
.../command/user/vm/UpdateDefaultNicForVMCmd.java | 2 -
.../api/command/user/vm/UpdateVMCmd.java | 2 -
.../api/command/user/vm/UpdateVmNicIpCmd.java | 2 -
.../api/command/user/vm/UpgradeVMCmd.java | 2 -
.../api/command/user/vmgroup/CreateVMGroupCmd.java | 2 -
.../api/command/user/vmgroup/DeleteVMGroupCmd.java | 2 -
.../api/command/user/vmgroup/ListVMGroupsCmd.java | 2 -
.../api/command/user/vmgroup/UpdateVMGroupCmd.java | 2 -
.../user/vmsnapshot/CreateVMSnapshotCmd.java | 2 -
.../user/vmsnapshot/DeleteVMSnapshotCmd.java | 2 -
.../user/vmsnapshot/RevertToVMSnapshotCmd.java | 2 -
.../command/user/volume/AddResourceDetailCmd.java | 2 -
.../api/command/user/volume/AssignVolumeCmd.java | 4 +-
.../api/command/user/volume/AttachVolumeCmd.java | 2 -
.../user/volume/CheckAndRepairVolumeCmd.java | 137 +++
.../api/command/user/volume/CreateVolumeCmd.java | 2 -
.../api/command/user/volume/DeleteVolumeCmd.java | 2 -
.../api/command/user/volume/DestroyVolumeCmd.java | 2 -
.../api/command/user/volume/DetachVolumeCmd.java | 2 -
.../api/command/user/volume/ExtractVolumeCmd.java | 2 -
.../user/volume/GetUploadParamsForVolumeCmd.java | 4 +-
.../api/command/user/volume/ListVolumesCmd.java | 2 -
.../api/command/user/volume/RecoverVolumeCmd.java | 2 -
.../user/volume/RemoveResourceDetailCmd.java | 2 -
.../api/command/user/volume/ResizeVolumeCmd.java | 6 +-
.../api/command/user/volume/UpdateVolumeCmd.java | 2 -
.../api/command/user/volume/UploadVolumeCmd.java | 2 -
.../command/user/vpc/CreatePrivateGatewayCmd.java | 8 +-
.../api/command/user/vpc/CreateStaticRouteCmd.java | 6 +-
.../api/command/user/vpc/CreateVPCCmd.java | 12 +-
.../api/command/user/vpc/DeleteStaticRouteCmd.java | 2 -
.../api/command/user/vpc/DeleteVPCCmd.java | 6 +-
.../command/user/vpc/ListPrivateGatewaysCmd.java | 2 -
.../api/command/user/vpc/ListVPCOfferingsCmd.java | 2 -
.../api/command/user/vpc/ListVPCsCmd.java | 2 -
.../api/command/user/vpc/RestartVPCCmd.java | 10 +-
.../api/command/user/vpc/UpdateVPCCmd.java | 8 +-
.../api/command/user/vpn/AddVpnUserCmd.java | 2 -
.../command/user/vpn/CreateRemoteAccessVpnCmd.java | 8 +-
.../command/user/vpn/CreateVpnConnectionCmd.java | 8 +-
.../user/vpn/CreateVpnCustomerGatewayCmd.java | 2 -
.../api/command/user/vpn/CreateVpnGatewayCmd.java | 2 -
.../command/user/vpn/DeleteRemoteAccessVpnCmd.java | 2 -
.../command/user/vpn/DeleteVpnConnectionCmd.java | 4 +-
.../user/vpn/DeleteVpnCustomerGatewayCmd.java | 2 -
.../api/command/user/vpn/DeleteVpnGatewayCmd.java | 2 -
.../command/user/vpn/ListRemoteAccessVpnsCmd.java | 2 -
.../command/user/vpn/ListVpnConnectionsCmd.java | 2 -
.../user/vpn/ListVpnCustomerGatewaysCmd.java | 2 -
.../api/command/user/vpn/ListVpnGatewaysCmd.java | 2 -
.../api/command/user/vpn/ListVpnUsersCmd.java | 2 -
.../api/command/user/vpn/RemoveVpnUserCmd.java | 8 +-
.../command/user/vpn/ResetVpnConnectionCmd.java | 4 +-
.../command/user/vpn/UpdateRemoteAccessVpnCmd.java | 2 -
.../command/user/vpn/UpdateVpnConnectionCmd.java | 2 -
.../user/vpn/UpdateVpnCustomerGatewayCmd.java | 2 -
.../api/command/user/vpn/UpdateVpnGatewayCmd.java | 2 -
.../api/command/user/zone/ListZonesCmd.java | 2 -
.../cloudstack/api/response/AccountResponse.java | 9 +
.../cloudstack/api/response/CapacityResponse.java | 11 +-
.../api/response/DiskOfferingResponse.java | 8 +
.../cloudstack/api/response/DomainResponse.java | 10 +
.../cloudstack/api/response/IPAddressResponse.java | 8 +
.../api/response/NetworkOfferingResponse.java | 24 +
.../cloudstack/api/response/ProjectResponse.java | 9 +
.../api/response/ResourceCountResponse.java | 16 +-
.../response/ResourceLimitAndCountResponse.java | 4 +
.../api/response/ResourceLimitResponse.java | 13 +-
.../TaggedResourceLimitAndCountResponse.java | 86 ++
.../api/response/VlanIpRangeResponse.java | 8 +
.../cloudstack/api/response/VolumeResponse.java | 25 +
.../api/response/VpcOfferingResponse.java | 18 +-
.../cloudstack/api/response/ZoneResponse.java | 8 +
.../cloudstack/cluster/ClusterDrsAlgorithm.java | 192 +++-
.../cloudstack/cluster/ClusterDrsService.java | 23 +
.../consoleproxy/ConsoleAccessManager.java | 4 +
.../org/apache/cloudstack/context/CallContext.java | 25 +-
.../org/apache/cloudstack/context/LogContext.java | 21 +-
.../InternalLoadBalancerElementService.java | 2 +
.../org/apache/cloudstack/quota/QuotaTariff.java | 25 +
.../cloudstack/user/ResourceReservation.java | 7 +-
.../test/java/com/cloud/storage/StorageTest.java | 13 +-
.../admin/account/CreateAccountCmdTest.java | 5 +-
.../command/admin/domain/ListDomainsCmdTest.java | 77 ++
.../offering/CreateNetworkOfferingCmdTest.java | 4 +-
.../offering/CreateServiceOfferingCmdTest.java | 2 +-
.../admin/resource/ListCapacityCmdTest.java | 34 +
.../admin/storage/AddObjectStoragePoolCmdTest.java | 13 +-
.../storage/DeleteObjectStoragePoolCmdTest.java | 7 +-
.../FindStoragePoolsForMigrationCmdTest.java | 2 +-
.../storage/UpdateObjectStoragePoolCmdTest.java | 11 +-
.../api/command/admin/user/CreateUserCmdTest.java | 5 +-
.../admin/vpc/CreateVPCOfferingCmdTest.java | 6 +-
.../api/command/test/ActivateProjectCmdTest.java | 8 +-
.../command/test/AddAccountToProjectCmdTest.java | 6 +-
.../api/command/test/AddIpToVmNicTest.java | 10 +-
.../test/AddNetworkServiceProviderCmdTest.java | 6 +-
.../command/test/AddSecondaryStorageCmdTest.java | 4 +-
.../api/command/test/CreateSnapshotCmdTest.java | 10 +-
.../command/user/account/ListAccountsCmdTest.java | 76 ++
.../api/command/user/iso/RegisterIsoCmdTest.java | 2 +-
.../user/offering/ListDiskOfferingsCmdTest.java | 37 +
.../user/offering/ListServiceOfferingsCmdTest.java | 38 +
.../command/user/project/CreateProjectCmdTest.java | 2 +-
.../user/resource/ListResourceLimitsCmdTest.java | 37 +
.../user/resource/UpdateResourceCountCmdTest.java | 37 +
.../user/resource/UpdateResourceLimitCmdTest.java | 37 +
.../user/template/CopyTemplateCmdByAdminTest.java | 2 +-
.../command/user/template/CopyTemplateCmdTest.java | 2 +-
.../template/RegisterTemplateCmdByAdminTest.java | 2 +-
.../user/template/RegisterTemplateCmdTest.java | 2 +-
.../user/template/UpdateTemplateCmdTest.java | 49 +
.../command/user/vm/CreateVMScheduleCmdTest.java | 10 +-
.../command/user/vm/DeleteVMScheduleCmdTest.java | 10 +-
.../api/command/user/vm/ListVMScheduleCmdTest.java | 9 +-
.../command/user/vm/UpdateVMScheduleCmdTest.java | 10 +-
.../cluster/ClusterDrsAlgorithmTest.java | 97 ++
.../apache/cloudstack/context/CallContextTest.java | 2 +-
.../org.mockito.plugins.MockMaker | 1 -
client/conf/log4j-cloud.xml.in | 295 ++----
client/conf/server.properties.in | 14 +-
client/pom.xml | 7 +-
.../java/org/apache/cloudstack/ServerDaemon.java | 17 +-
client/src/main/webapp/WEB-INF/web.xml | 2 +-
.../com/cloud/agent/api/SecurityGroupRulesCmd.java | 4 +-
.../cloud/agent/api/SetupGuestNetworkCommand.java | 9 +
.../api/storage/CheckAndRepairVolumeAnswer.java | 57 +
.../api/storage/CheckAndRepairVolumeCommand.java | 77 ++
.../virtualnetwork/VirtualRoutingResource.java | 73 +-
.../facade/AbstractConfigItemFacade.java | 9 +-
.../facade/SetGuestNetworkConfigItem.java | 1 +
.../facade/SetMonitorServiceConfigItem.java | 6 +-
.../facade/SetNetworkAclConfigItem.java | 4 +-
.../virtualnetwork/model/GuestNetwork.java | 9 +
.../agent/transport/LoggingExclusionStrategy.java | 17 +-
.../java/com/cloud/agent/transport/Request.java | 31 +-
.../agent/transport/StoragePoolTypeAdaptor.java | 53 +
.../com/cloud/network/HAProxyConfigurator.java | 23 +-
.../network/resource/TrafficSentinelResource.java | 11 +-
.../java/com/cloud/resource/CommandWrapper.java | 5 +-
.../java/com/cloud/resource/RequestWrapper.java | 9 +-
.../com/cloud/resource/ServerResourceBase.java | 39 +-
.../main/java/com/cloud/serializer/GsonHelper.java | 22 +-
.../java/com/cloud/storage/JavaStorageLayer.java | 9 +-
.../StorageSubsystemCommandHandlerBase.java | 11 +-
.../storage/template/FtpTemplateUploader.java | 15 +-
.../storage/template/HttpTemplateDownloader.java | 26 +-
.../com/cloud/storage/template/IsoProcessor.java | 6 +-
.../storage/template/LocalTemplateDownloader.java | 18 +-
.../template/MetalinkTemplateDownloader.java | 14 +-
.../com/cloud/storage/template/OVAProcessor.java | 64 +-
.../com/cloud/storage/template/QCOW2Processor.java | 10 +-
.../cloud/storage/template/RawImageProcessor.java | 8 +-
.../storage/template/S3TemplateDownloader.java | 26 +-
.../storage/template/ScpTemplateDownloader.java | 8 +-
.../template/SimpleHttpMultiFileDownloader.java | 20 +-
.../com/cloud/storage/template/TARProcessor.java | 6 +-
.../storage/template/TemplateDownloaderBase.java | 4 +-
.../cloud/storage/template/TemplateLocation.java | 41 +-
.../com/cloud/storage/template/VhdProcessor.java | 18 +-
.../com/cloud/storage/template/VmdkProcessor.java | 20 +-
.../backup/PrepareForBackupRestorationCommand.java | 43 +
.../cloudstack/diagnostics/DiagnosticsAnswer.java | 2 -
.../direct/download/DirectDownloadHelper.java | 5 +-
.../download/DirectTemplateDownloaderImpl.java | 17 +-
.../download/HttpDirectTemplateDownloader.java | 18 +-
.../download/HttpsDirectTemplateDownloader.java | 18 +-
.../download/MetalinkDirectTemplateDownloader.java | 19 +-
.../download/NfsDirectTemplateDownloader.java | 2 +-
.../core/spring-core-registry-core-context.xml | 8 +
...-core-lifecycle-network-context-inheritable.xml | 5 +
.../cloud/agent/api/SecurityGroupRulesCmdTest.java | 2 +-
.../transport/LoggingExclusionStrategyTest.java | 83 ++
.../com/cloud/agent/transport/RequestTest.java | 95 +-
.../download/BaseDirectTemplateDownloaderTest.java | 10 +-
.../org.mockito.plugins.MockMaker | 1 -
debian/changelog | 14 +-
debian/cloudstack-management.install | 1 +
debian/cloudstack-management.postinst | 2 +-
debian/control | 6 +-
debian/rules | 4 +
engine/api/pom.xml | 2 +-
.../java/com/cloud/vm/VirtualMachineManager.java | 2 +
.../service/NetworkOrchestrationService.java | 3 +
.../api/storage/PrimaryDataStoreDriver.java | 4 +
.../api/storage/StoragePoolAllocator.java | 3 +
.../subsystem/api/storage/VolumeService.java | 6 +
.../cloud/configuration/ConfigurationManager.java | 33 +-
.../main/java/com/cloud/event/UsageEventUtils.java | 7 +-
.../com/cloud/network/NetworkStateListener.java | 7 +-
.../main/java/com/cloud/network/addr/PublicIp.java | 7 +
.../com/cloud/network/vpc/NetworkACLManager.java | 3 +
.../java/com/cloud/storage/StorageManager.java | 7 +
.../main/java/com/cloud/storage/StorageUtil.java | 2 +-
.../src/main/java/com/cloud/vm/VmWork.java | 43 +
.../com/cloud/vm/VmWorkCheckAndRepairVolume.java | 42 +
.../java/com/cloud/vm/VmWorkJobHandlerProxy.java | 23 +-
.../java/com/cloud/agent/manager/AgentAttache.java | 75 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 288 +++--
.../cloud/agent/manager/ClusteredAgentAttache.java | 42 +-
.../agent/manager/ClusteredAgentManagerImpl.java | 332 +++---
.../cloud/agent/manager/ConnectedAgentAttache.java | 6 +-
.../cloud/agent/manager/DirectAgentAttache.java | 78 +-
.../cloud/agent/manager/SynchronousListener.java | 13 +-
.../ClusterBasedAgentLoadBalancerPlanner.java | 16 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 893 +++++++++-------
.../cloud/vm/VirtualMachinePowerStateSyncImpl.java | 63 +-
.../java/com/cloud/vm/VmWorkJobDispatcher.java | 22 +-
.../com/cloud/vm/VmWorkJobWakeupDispatcher.java | 14 +-
.../src/main/java/com/cloud/vm/VmWorkReboot.java | 9 +
.../src/main/java/com/cloud/vm/VmWorkStart.java | 13 +-
.../cloud/entity/api/VMEntityManagerImpl.java | 9 +-
.../datacenter/entity/api/db/EngineHostVO.java | 3 +
.../entity/api/db/dao/EngineClusterDaoImpl.java | 6 +-
.../entity/api/db/dao/EngineDataCenterDaoImpl.java | 8 +-
.../entity/api/db/dao/EngineHostDaoImpl.java | 6 +-
.../entity/api/db/dao/EngineHostPodDaoImpl.java | 8 +-
.../engine/orchestration/DataMigrationUtility.java | 11 +-
.../engine/orchestration/NetworkOrchestrator.java | 582 +++++-----
.../engine/orchestration/StorageOrchestrator.java | 22 +-
.../engine/orchestration/VolumeOrchestrator.java | 245 +++--
.../agent/manager/DirectAgentAttacheTest.java | 2 +-
.../cloud/vm/VirtualMachineManagerImplTest.java | 161 ++-
.../test/java/com/cloud/vm/VmWorkRebootTest.java | 42 +
.../test/java/com/cloud/vm/VmWorkStartTest.java | 57 +
.../orchestration/NetworkOrchestratorTest.java | 6 +-
.../engine/provisioning/test/ProvisioningTest.java | 5 +-
.../org.mockito.plugins.MockMaker | 1 -
engine/schema/pom.xml | 6 +-
.../main/java/com/cloud/capacity/CapacityVO.java | 12 +
.../java/com/cloud/capacity/dao/CapacityDao.java | 5 +-
.../com/cloud/capacity/dao/CapacityDaoImpl.java | 76 +-
.../cloud/certificate/dao/CertificateDaoImpl.java | 4 +-
.../agentlb/dao/HostTransferMapDaoImpl.java | 2 -
.../com/cloud/configuration/ResourceCountVO.java | 23 +-
.../com/cloud/configuration/ResourceLimitVO.java | 18 +-
.../cloud/configuration/dao/ResourceCountDao.java | 20 +-
.../configuration/dao/ResourceCountDaoImpl.java | 103 +-
.../cloud/configuration/dao/ResourceLimitDao.java | 4 +-
.../configuration/dao/ResourceLimitDaoImpl.java | 61 +-
.../java/com/cloud/dc/dao/DataCenterDaoImpl.java | 4 +-
.../cloud/dc/dao/DataCenterIpAddressDaoImpl.java | 18 +-
.../dao/DataCenterLinkLocalIpAddressDaoImpl.java | 6 +-
.../main/java/com/cloud/dc/dao/HostPodDaoImpl.java | 4 +-
.../cloud/dc/dao/VsphereStoragePolicyDaoImpl.java | 2 -
.../src/main/java/com/cloud/domain/DomainVO.java | 5 +-
.../java/com/cloud/domain/dao/DomainDaoImpl.java | 22 +-
.../java/com/cloud/event/dao/EventDaoImpl.java | 2 -
.../com/cloud/event/dao/UsageEventDaoImpl.java | 20 +-
.../cloud/event/dao/UsageEventDetailsDaoImpl.java | 2 -
.../com/cloud/gpu/dao/HostGpuGroupsDaoImpl.java | 2 -
.../java/com/cloud/gpu/dao/VGPUTypesDaoImpl.java | 2 -
.../src/main/java/com/cloud/host/HostVO.java | 42 +-
.../src/main/java/com/cloud/host/dao/HostDao.java | 2 +-
.../main/java/com/cloud/host/dao/HostDaoImpl.java | 73 +-
.../dao/HypervisorCapabilitiesDaoImpl.java | 6 +-
.../vmware/dao/VmwareDatacenterDaoImpl.java | 3 +-
.../network/dao/FirewallRulesCidrsDaoImpl.java | 2 -
.../com/cloud/network/dao/IPAddressDaoImpl.java | 4 +-
.../cloud/network/dao/NetworkDomainDaoImpl.java | 2 -
.../main/java/com/cloud/network/dao/NetworkVO.java | 6 +-
.../java/com/cloud/network/dao/NsxProviderDao.java | 30 +
.../com/cloud/network/dao/NsxProviderDaoImpl.java | 65 ++
.../com/cloud/network/dao/PortProfileDaoImpl.java | 2 -
.../cloud/network/dao/RemoteAccessVpnDaoImpl.java | 2 -
.../dao/RouterHealthCheckResultDaoImpl.java | 4 +-
.../network/dao/Site2SiteVpnConnectionDaoImpl.java | 2 -
.../network/dao/Site2SiteVpnGatewayDaoImpl.java | 2 -
.../cloud/network/dao/UserIpv6AddressDaoImpl.java | 2 -
.../com/cloud/network/element/NsxProviderVO.java | 285 +++++
.../security/dao/SecurityGroupVMMapDaoImpl.java | 2 +-
.../security/dao/SecurityGroupWorkDaoImpl.java | 10 +-
.../network/security/dao/VmRulesetLogDaoImpl.java | 26 +-
.../java/com/cloud/network/vpc/VpcOfferingVO.java | 22 +
.../vpc/dao/NetworkACLItemCidrsDaoImpl.java | 2 -
.../cloud/network/vpc/dao/PrivateIpDaoImpl.java | 6 +-
.../com/cloud/offerings/NetworkOfferingVO.java | 24 +
.../cloud/projects/dao/ProjectAccountDaoImpl.java | 4 +-
.../com/cloud/projects/dao/ProjectDaoImpl.java | 2 -
.../projects/dao/ProjectInvitationDaoImpl.java | 8 +-
.../resource/icon/dao/ResourceIconDaoImpl.java | 2 -
.../com/cloud/service/dao/ServiceOfferingDao.java | 2 +
.../cloud/service/dao/ServiceOfferingDaoImpl.java | 22 +-
.../src/main/java/com/cloud/storage/VolumeVO.java | 9 +-
.../java/com/cloud/storage/dao/BucketDaoImpl.java | 2 -
.../com/cloud/storage/dao/DiskOfferingDao.java | 1 +
.../com/cloud/storage/dao/DiskOfferingDaoImpl.java | 18 +
.../storage/dao/GuestOSHypervisorDaoImpl.java | 10 +-
.../cloud/storage/dao/LaunchPermissionDaoImpl.java | 6 +-
.../com/cloud/storage/dao/SnapshotDaoImpl.java | 4 +-
.../com/cloud/storage/dao/SnapshotZoneDaoImpl.java | 2 -
.../cloud/storage/dao/StoragePoolHostDaoImpl.java | 12 +-
.../com/cloud/storage/dao/StoragePoolTagsDao.java | 1 +
.../cloud/storage/dao/StoragePoolTagsDaoImpl.java | 18 +-
.../java/com/cloud/storage/dao/UploadDaoImpl.java | 2 -
.../java/com/cloud/storage/dao/VMTemplateDao.java | 3 +
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 22 +-
.../cloud/storage/dao/VMTemplatePoolDaoImpl.java | 16 +-
.../cloud/storage/dao/VMTemplateZoneDaoImpl.java | 2 -
.../main/java/com/cloud/storage/dao/VolumeDao.java | 3 +
.../java/com/cloud/storage/dao/VolumeDaoImpl.java | 75 +-
.../upgrade/ConfigurationGroupsAggregator.java | 5 +-
.../cloud/upgrade/DatabaseIntegrityChecker.java | 42 +-
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 55 +-
.../main/java/com/cloud/upgrade/GuestOsMapper.java | 49 +-
.../com/cloud/upgrade/RolePermissionChecker.java | 9 +-
.../upgrade/SystemVmTemplateRegistration.java | 5 +-
.../cloud/upgrade/dao/DatabaseAccessObject.java | 35 +-
.../cloud/upgrade/dao/DbUpgradeAbstractImpl.java | 24 +
.../com/cloud/upgrade/dao/LegacyDbUpgrade.java | 6 +-
.../com/cloud/upgrade/dao/Upgrade217to218.java | 2 +-
.../java/com/cloud/upgrade/dao/Upgrade218to22.java | 132 ++-
.../upgrade/dao/Upgrade218to224DomainVlans.java | 12 +-
.../cloud/upgrade/dao/Upgrade218to22Premium.java | 6 +-
.../com/cloud/upgrade/dao/Upgrade2210to2211.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade2211to2212.java | 10 +-
.../upgrade/dao/Upgrade2211to2212Premium.java | 2 -
.../com/cloud/upgrade/dao/Upgrade2212to2213.java | 8 +-
.../com/cloud/upgrade/dao/Upgrade2213to2214.java | 4 +-
.../com/cloud/upgrade/dao/Upgrade2214to30.java | 96 +-
.../com/cloud/upgrade/dao/Upgrade221to222.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade222to224.java | 46 +-
.../cloud/upgrade/dao/Upgrade222to224Premium.java | 6 +-
.../com/cloud/upgrade/dao/Upgrade224to225.java | 24 +-
.../com/cloud/upgrade/dao/Upgrade225to226.java | 8 +-
.../com/cloud/upgrade/dao/Upgrade227to228.java | 20 +-
.../cloud/upgrade/dao/Upgrade227to228Premium.java | 16 +-
.../com/cloud/upgrade/dao/Upgrade228to229.java | 6 +-
.../com/cloud/upgrade/dao/Upgrade229to2210.java | 12 +-
.../com/cloud/upgrade/dao/Upgrade301to302.java | 14 +-
.../com/cloud/upgrade/dao/Upgrade302to303.java | 14 +-
.../java/com/cloud/upgrade/dao/Upgrade302to40.java | 64 +-
.../com/cloud/upgrade/dao/Upgrade303to304.java | 22 +-
.../com/cloud/upgrade/dao/Upgrade304to305.java | 42 +-
.../com/cloud/upgrade/dao/Upgrade305to306.java | 26 +-
.../com/cloud/upgrade/dao/Upgrade306to307.java | 4 +-
.../com/cloud/upgrade/dao/Upgrade307to410.java | 6 +-
.../java/com/cloud/upgrade/dao/Upgrade30to301.java | 4 +-
.../java/com/cloud/upgrade/dao/Upgrade30xBase.java | 14 +-
.../java/com/cloud/upgrade/dao/Upgrade40to41.java | 16 +-
.../com/cloud/upgrade/dao/Upgrade41000to41100.java | 24 +-
.../com/cloud/upgrade/dao/Upgrade410to420.java | 252 +++--
.../com/cloud/upgrade/dao/Upgrade41100to41110.java | 16 +-
.../com/cloud/upgrade/dao/Upgrade41110to41120.java | 4 +-
.../com/cloud/upgrade/dao/Upgrade41120to41130.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade41120to41200.java | 6 +-
.../com/cloud/upgrade/dao/Upgrade41200to41300.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade41300to41310.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade41310to41400.java | 4 +-
.../com/cloud/upgrade/dao/Upgrade41400to41500.java | 29 +-
.../com/cloud/upgrade/dao/Upgrade41500to41510.java | 29 +-
.../com/cloud/upgrade/dao/Upgrade41510to41520.java | 5 +-
.../com/cloud/upgrade/dao/Upgrade41520to41600.java | 20 +-
.../com/cloud/upgrade/dao/Upgrade41600to41610.java | 6 +-
.../com/cloud/upgrade/dao/Upgrade41610to41700.java | 10 +-
.../com/cloud/upgrade/dao/Upgrade41700to41710.java | 6 +-
.../com/cloud/upgrade/dao/Upgrade41710to41720.java | 6 +-
.../com/cloud/upgrade/dao/Upgrade41720to41800.java | 34 +-
.../com/cloud/upgrade/dao/Upgrade41800to41810.java | 20 +-
.../com/cloud/upgrade/dao/Upgrade41810to41900.java | 34 +-
.../com/cloud/upgrade/dao/Upgrade41900to41910.java | 66 ++
.../com/cloud/upgrade/dao/Upgrade41900to42000.java | 83 ++
.../com/cloud/upgrade/dao/Upgrade420to421.java | 12 +-
.../com/cloud/upgrade/dao/Upgrade421to430.java | 10 +-
.../com/cloud/upgrade/dao/Upgrade430to440.java | 16 +-
.../com/cloud/upgrade/dao/Upgrade431to440.java | 4 +-
.../com/cloud/upgrade/dao/Upgrade432to440.java | 4 +-
.../com/cloud/upgrade/dao/Upgrade440to441.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade441to442.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade442to450.java | 14 +-
.../com/cloud/upgrade/dao/Upgrade443to444.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade443to450.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade444to450.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade450to451.java | 16 +-
.../com/cloud/upgrade/dao/Upgrade451to452.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade452to453.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade452to460.java | 12 +-
.../com/cloud/upgrade/dao/Upgrade453to460.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade460to461.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade461to470.java | 8 +-
.../com/cloud/upgrade/dao/Upgrade470to471.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade471to480.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade480to481.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade481to490.java | 20 +-
.../com/cloud/upgrade/dao/Upgrade490to4910.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade4910to4920.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade4920to4930.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade4930to41000.java | 4 +-
.../cloud/upgrade/dao/UpgradeSnapshot217to224.java | 2 +-
.../cloud/upgrade/dao/UpgradeSnapshot223to224.java | 2 +-
.../java/com/cloud/upgrade/dao/VersionDaoImpl.java | 14 +-
.../src/main/java/com/cloud/usage/UsageVO.java | 11 +-
.../cloud/usage/dao/BucketStatisticsDaoImpl.java | 2 -
.../com/cloud/usage/dao/UsageBackupDaoImpl.java | 10 +-
.../java/com/cloud/usage/dao/UsageDaoImpl.java | 40 +-
.../com/cloud/usage/dao/UsageIPAddressDaoImpl.java | 6 +-
.../java/com/cloud/usage/dao/UsageJobDaoImpl.java | 6 +-
.../usage/dao/UsageLoadBalancerPolicyDaoImpl.java | 8 +-
.../com/cloud/usage/dao/UsageNetworkDaoImpl.java | 8 +-
.../usage/dao/UsageNetworkOfferingDaoImpl.java | 6 +-
.../usage/dao/UsagePortForwardingRuleDaoImpl.java | 8 +-
.../cloud/usage/dao/UsageSecurityGroupDaoImpl.java | 6 +-
.../com/cloud/usage/dao/UsageStorageDaoImpl.java | 8 +-
.../cloud/usage/dao/UsageVMInstanceDaoImpl.java | 8 +-
.../cloud/usage/dao/UsageVMSnapshotDaoImpl.java | 8 +-
.../usage/dao/UsageVMSnapshotOnPrimaryDaoImpl.java | 8 +-
.../com/cloud/usage/dao/UsageVPNUserDaoImpl.java | 6 +-
.../com/cloud/usage/dao/UsageVmDiskDaoImpl.java | 8 +-
.../com/cloud/usage/dao/UsageVolumeDaoImpl.java | 8 +-
.../java/com/cloud/user/dao/AccountDaoImpl.java | 8 +-
.../com/cloud/user/dao/UserStatisticsDaoImpl.java | 6 +-
.../cloud/user/dao/VmDiskStatisticsDaoImpl.java | 6 +-
.../com/cloud/util/StoragePoolTypeConverter.java | 40 +
.../schema/src/main/java/com/cloud/vm/NicVO.java | 13 +-
.../src/main/java/com/cloud/vm/VMInstanceVO.java | 7 +-
.../java/com/cloud/vm/dao/ConsoleProxyDaoImpl.java | 14 +-
.../src/main/java/com/cloud/vm/dao/NicDao.java | 2 +
.../src/main/java/com/cloud/vm/dao/NicDaoImpl.java | 15 +-
.../cloud/vm/dao/SecondaryStorageVmDaoImpl.java | 6 +-
.../cloud/vm/dao/UserVmCloneSettingDaoImpl.java | 2 -
.../main/java/com/cloud/vm/dao/UserVmDaoImpl.java | 52 +-
.../java/com/cloud/vm/dao/VMInstanceDaoImpl.java | 39 +-
.../cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java | 6 +-
.../acl/dao/ProjectRolePermissionsDaoImpl.java | 2 -
.../cloudstack/acl/dao/RolePermissionsDaoImpl.java | 4 +-
.../dao/AffinityGroupDomainMapDaoImpl.java | 3 -
.../org/apache/cloudstack/backup/BackupVO.java | 13 +
.../cloud/entity/api/db/dao/VMEntityDaoImpl.java | 2 -
.../apache/cloudstack/ha/dao/HAConfigDaoImpl.java | 12 +-
.../network/dao/NetworkPermissionDaoImpl.java | 2 -
.../dao/OutOfBandManagementDaoImpl.java | 16 +-
.../cloudstack/region/dao/RegionDaoImpl.java | 2 -
.../cloudstack/reservation/ReservationVO.java | 45 +-
.../cloudstack/reservation/dao/ReservationDao.java | 12 +-
.../reservation/dao/ReservationDaoImpl.java | 103 +-
.../storage/datastore/db/PrimaryDataStoreDao.java | 11 +-
.../datastore/db/PrimaryDataStoreDaoImpl.java | 31 +-
.../datastore/db/SnapshotDataStoreDaoImpl.java | 20 +-
.../storage/datastore/db/SnapshotDataStoreVO.java | 7 +-
.../storage/datastore/db/StoragePoolVO.java | 10 +-
.../storage/datastore/db/TemplateDataStoreVO.java | 7 +-
.../storage/datastore/db/VolumeDataStoreVO.java | 7 +-
.../spring-engine-schema-core-daos-context.xml | 1 +
.../META-INF/db/schema-41900to41910-cleanup.sql | 20 +
.../resources/META-INF/db/schema-41900to41910.sql | 32 +
.../META-INF/db/schema-41900to42000-cleanup.sql | 20 +
.../resources/META-INF/db/schema-41900to42000.sql | 71 ++
.../db/views/cloud.account_netstats_view.sql | 31 +
.../META-INF/db/views/cloud.account_view.sql | 164 +++
.../db/views/cloud.account_vmstats_view.sql | 35 +
.../db/views/cloud.affinity_group_view.sql | 60 ++
.../META-INF/db/views/cloud.domain_view.sql | 135 +++
.../META-INF/db/views/cloud.event_view.sql | 63 ++
.../META-INF/db/views/cloud.free_ip_view.sql | 32 +
.../META-INF/db/views/cloud.image_store_view.sql | 45 +
.../db/views/cloud.instance_group_view.sql | 48 +
.../db/views/cloud.last_annotation_view.sql | 43 +
.../META-INF/db/views/cloud.mshost_view.sql | 46 +
.../db/views/cloud.network_offering_view.sql | 2 +
.../db/views/cloud.project_account_view.sql | 54 +
.../db/views/cloud.project_invitation_view.sql | 52 +
.../META-INF/db/views/cloud.project_view.sql | 50 +
.../META-INF/db/views/cloud.resource_tag_view.sql | 51 +
.../db/views/cloud.security_group_view.sql | 79 ++
.../META-INF/db/views/cloud.volume_view.sql | 156 +++
.../META-INF/db/views/cloud.vpc_offering_view.sql | 64 ++
.../src/test/java/com/cloud/host/HostVOTest.java | 210 ++--
.../offerings/dao/NetworkOfferingDaoImplTest.java | 10 +-
.../storage/dao/StoragePoolTagsDaoImplTest.java | 20 +-
.../upgrade/dao/DatabaseAccessObjectTest.java | 7 +-
.../cloud/usage/dao/UsageStorageDaoImplTest.java | 2 +-
.../com/cloud/vm/dao/VMInstanceDaoImplTest.java | 162 ++-
.../org.mockito.plugins.MockMaker | 1 -
engine/service/src/main/webapp/WEB-INF/log4j.xml | 59 +-
.../allocator/StorageCacheRandomAllocator.java | 15 +-
.../cache/manager/StorageCacheManagerImpl.java | 27 +-
.../storage/configdrive/ConfigDriveBuilder.java | 21 +-
.../configdrive/ConfigDriveBuilderTest.java | 8 +-
.../org.mockito.plugins.MockMaker | 1 -
.../storage/motion/AncientDataMotionStrategy.java | 73 +-
.../storage/motion/DataMotionServiceImpl.java | 5 +-
.../KvmNonManagedStorageDataMotionStrategy.java | 10 +-
.../motion/StorageSystemDataMotionStrategy.java | 103 +-
.../KvmNonManagedStorageSystemDataMotionTest.java | 2 +-
.../StorageSystemDataMotionStrategyTest.java | 2 +-
.../storage/image/SecondaryStorageServiceImpl.java | 23 +-
.../storage/image/TemplateDataFactoryImpl.java | 13 +-
.../storage/image/TemplateServiceImpl.java | 111 +-
.../manager/ImageStoreProviderManagerImpl.java | 11 +-
.../storage/image/store/ImageStoreImpl.java | 9 +-
.../storage/image/store/TemplateObject.java | 11 +-
.../storage/test/DirectAgentManagerSimpleImpl.java | 2 -
.../cloudstack/storage/test/MockRpcCallBack.java | 7 +-
.../storage/object/ObjectStorageServiceImpl.java | 3 -
.../manager/ObjectStoreProviderManagerImpl.java | 2 -
.../storage/object/store/ObjectStoreImpl.java | 2 -
.../org.mockito.plugins.MockMaker | 1 -
.../storage/snapshot/CephSnapshotStrategy.java | 4 +-
.../storage/snapshot/DefaultSnapshotStrategy.java | 40 +-
.../storage/snapshot/ScaleIOSnapshotStrategy.java | 4 +-
.../storage/snapshot/SnapshotObject.java | 13 +-
.../storage/snapshot/SnapshotServiceImpl.java | 91 +-
.../storage/snapshot/SnapshotStrategyBase.java | 3 +
.../snapshot/StorageSystemSnapshotStrategy.java | 38 +-
.../vmsnapshot/DefaultVMSnapshotStrategy.java | 30 +-
.../vmsnapshot/ScaleIOVMSnapshotStrategy.java | 28 +-
.../vmsnapshot/StorageVMSnapshotStrategy.java | 34 +-
.../storage/snapshot/CephSnapshotStrategyTest.java | 2 +-
.../vmsnapshot/VMSnapshotStrategyKVMTest.java | 38 +-
.../storage/vmsnapshot/VMSnapshotStrategyTest.java | 66 +-
.../org.mockito.plugins.MockMaker | 1 -
.../cloudstack/storage/RemoteHostEndPoint.java | 13 +-
.../allocator/AbstractStoragePoolAllocator.java | 106 +-
.../ClusterScopeStoragePoolAllocator.java | 22 +-
.../GarbageCollectingStoragePoolAllocator.java | 6 +-
.../allocator/LocalStoragePoolAllocator.java | 20 +-
.../allocator/ZoneWideStoragePoolAllocator.java | 20 +-
.../storage/datastore/DataObjectManagerImpl.java | 55 +-
.../datastore/ObjectInDataStoreManagerImpl.java | 27 +-
.../provider/DataStoreProviderManagerImpl.java | 10 +-
.../storage/db/ObjectInDataStoreDaoImpl.java | 6 +-
.../storage/endpoint/DefaultEndPointSelector.java | 15 +-
.../storage/helper/HypervisorHelperImpl.java | 11 +-
.../storage/image/BaseImageStoreDriverImpl.java | 69 +-
.../storage/image/db/TemplateDataStoreDaoImpl.java | 18 +-
.../storage/image/db/VolumeDataStoreDaoImpl.java | 14 +-
.../image/deployasis/DeployAsIsHelperImpl.java | 45 +-
.../storage/object/BaseObjectStoreDriverImpl.java | 5 +-
.../volume/datastore/PrimaryDataStoreHelper.java | 9 +-
.../api/storage/StrategyPriorityTest.java | 2 +-
.../AbstractStoragePoolAllocatorTest.java | 2 +-
.../storage/datastore/PrimaryDataStoreImpl.java | 23 +-
.../datastore/provider/DefaultHostListener.java | 23 +-
.../cloudstack/storage/volume/VolumeObject.java | 21 +-
.../storage/volume/VolumeServiceImpl.java | 327 +++---
.../storage/volume/VolumeServiceTest.java | 109 +-
.../userdata/CloudInitUserDataProvider.java | 9 +-
.../com/cloud/cluster/ClusterFenceManagerImpl.java | 4 +-
.../java/com/cloud/cluster/ClusterManagerImpl.java | 210 ++--
.../cluster/ClusterServiceServletAdapter.java | 10 +-
.../cluster/ClusterServiceServletContainer.java | 38 +-
.../cluster/ClusterServiceServletHttpHandler.java | 41 +-
.../cloud/cluster/ClusterServiceServletImpl.java | 23 +-
.../cluster/dao/ManagementServerHostDaoImpl.java | 14 +-
.../dao/ManagementServerHostPeerDaoImpl.java | 4 +-
.../cluster/ClusterServiceServletAdapterTest.java | 2 +-
.../framework/config/dao/ConfigurationDaoImpl.java | 8 +-
.../framework/config/impl/ConfigDepotImpl.java | 7 +-
.../config/impl/ConfigDepotAdminTest.java | 13 +-
.../com/cloud/utils/db/ConnectionConcierge.java | 31 +-
.../src/main/java/com/cloud/utils/db/DbUtil.java | 5 +-
.../main/java/com/cloud/utils/db/DriverLoader.java | 5 +-
.../java/com/cloud/utils/db/GenericDaoBase.java | 107 +-
.../main/java/com/cloud/utils/db/GlobalLock.java | 37 +-
.../main/java/com/cloud/utils/db/Merovingian2.java | 77 +-
.../main/java/com/cloud/utils/db/ScriptRunner.java | 11 +-
.../java/com/cloud/utils/db/SequenceFetcher.java | 13 +-
.../main/java/com/cloud/utils/db/Transaction.java | 2 -
.../java/com/cloud/utils/db/TransactionLegacy.java | 183 ++--
.../src/test/java/com/cloud/utils/DbUtilTest.java | 14 +-
.../java/com/cloud/utils/db/DbAnnotatedBase.java | 7 +-
.../com/cloud/utils/db/ElementCollectionTest.java | 2 -
.../java/com/cloud/utils/db/GlobalLockTest.java | 9 +-
.../java/com/cloud/utils/db/Merovingian2Test.java | 15 +-
.../framework/async/AsyncCallbackDispatcher.java | 7 +-
.../framework/client/ClientTransportProvider.java | 7 +-
.../framework/messagebus/MessageBusBase.java | 33 +-
.../framework/messagebus/MessageDetector.java | 9 +-
.../framework/messagebus/MessageDispatcher.java | 33 +-
.../framework/serializer/OnwireClassRegistry.java | 23 +-
.../framework/server/ServerTransportProvider.java | 7 +-
.../sampleserver/SampleManagementServer.java | 7 +-
.../sampleserver/SampleManagementServerApp.java | 4 +-
.../sampleserver/SampleManagerComponent.java | 9 +-
.../sampleserver/SampleManagerComponent2.java | 9 +-
.../cloudstack/messagebus/TestMessageBus.java | 4 -
framework/ipc/src/test/resources/log4j-cloud.xml | 129 +--
.../framework/jobs/AsyncJobExecutionContext.java | 17 +-
.../framework/jobs/dao/AsyncJobDaoImpl.java | 8 +-
.../framework/jobs/dao/AsyncJobJoinMapDaoImpl.java | 4 +-
.../framework/jobs/dao/SyncQueueDaoImpl.java | 6 +-
.../framework/jobs/dao/SyncQueueItemDaoImpl.java | 6 +-
.../framework/jobs/dao/VmWorkJobDaoImpl.java | 14 +-
.../framework/jobs/impl/AsyncJobManagerImpl.java | 186 ++--
.../framework/jobs/impl/AsyncJobMonitor.java | 10 +-
.../framework/jobs/impl/JobSerializerHelper.java | 7 +-
.../framework/jobs/impl/SyncQueueManagerImpl.java | 32 +-
.../framework/jobs/AsyncJobTestDispatcher.java | 7 +-
framework/managed-context/pom.xml | 9 +-
.../managed/context/ManagedContextRunnable.java | 7 +-
.../context/impl/DefaultManagedContext.java | 9 +-
.../managed/threadlocal/ManagedThreadLocal.java | 7 +-
.../cloudstack/quota/QuotaAlertManagerImpl.java | 53 +-
.../apache/cloudstack/quota/QuotaManagerImpl.java | 111 +-
.../cloudstack/quota/QuotaStatementImpl.java | 22 +-
.../presetvariables/PresetVariableHelper.java | 5 +-
.../cloudstack/quota/dao/QuotaAccountDaoImpl.java | 4 +-
.../cloudstack/quota/dao/QuotaBalanceDaoImpl.java | 12 +-
.../quota/dao/QuotaEmailTemplatesDaoImpl.java | 2 -
.../cloudstack/quota/dao/QuotaTariffDaoImpl.java | 24 +-
.../cloudstack/quota/dao/QuotaUsageDaoImpl.java | 2 -
.../apache/cloudstack/quota/vo/QuotaTariffVO.java | 18 +-
.../quota/QuotaAlertManagerImplTest.java | 4 +-
.../cloudstack/quota/QuotaStatementTest.java | 2 +-
.../cloudstack/quota/constant/QuotaTypesTest.java | 2 +-
framework/rest/pom.xml | 2 +-
.../framework/security/keys/KeysManagerImpl.java | 9 +-
.../security/keystore/KeystoreManagerImpl.java | 14 +-
.../spring/lifecycle/AbstractSmartLifeCycle.java | 3 +
.../lifecycle/CloudStackExtendedLifeCycle.java | 26 +-
.../spring/lifecycle/registry/DumpRegistry.java | 4 +-
.../lifecycle/registry/ExtensionRegistry.java | 7 +-
.../lifecycle/registry/RegistryLifecycle.java | 9 +-
.../module/factory/CloudStackSpringContext.java | 9 +-
.../model/impl/DefaultModuleDefinitionSet.java | 51 +-
.../web/CloudStackContextLoaderListener.java | 11 +-
packaging/centos7/cloud.spec | 11 +-
packaging/centos8/cloud.spec | 21 +-
packaging/systemd/cloudstack-management.default | 4 +-
packaging/systemd/cloudstack-usage.default | 2 +-
.../acl/DynamicRoleBasedAPIAccessChecker.java | 10 +-
.../acl/ProjectRoleBasedApiAccessChecker.java | 22 +-
.../org.mockito.plugins.MockMaker | 1 -
.../acl/StaticRoleBasedAPIAccessChecker.java | 6 +-
.../affinity/ExplicitDedicationProcessor.java | 30 +-
.../cloudstack/affinity/HostAffinityProcessor.java | 4 +-
.../affinity/HostAffinityProcessorTest.java | 14 +-
.../affinity/HostAntiAffinityProcessor.java | 18 +-
.../affinity/NonStrictHostAffinityProcessor.java | 2 -
plugins/alert-handlers/snmp-alerts/pom.xml | 8 +-
.../alert/snmp/SnmpEnhancedPatternLayout.java | 37 +-
.../cloudstack/alert/snmp/SnmpTrapAppender.java | 138 ++-
.../alert/snmp/SnmpEnhancedPatternLayoutTest.java | 54 +-
.../alert/snmp/SnmpTrapAppenderTest.java | 11 +-
plugins/alert-handlers/syslog-alerts/pom.xml | 8 +-
.../cloudstack/syslog/AlertsSyslogAppender.java | 168 ++-
.../syslog/AlertsSyslogAppenderTest.java | 21 +-
.../api/command/user/discovery/ListApisCmd.java | 2 -
.../discovery/ApiDiscoveryServiceImpl.java | 14 +-
.../command/admin/ratelimit/ResetApiLimitCmd.java | 2 -
.../api/command/user/ratelimit/GetApiLimitCmd.java | 2 -
.../ratelimit/ApiRateLimitServiceImpl.java | 12 +-
.../admin/solidfire/GetPathForVolumeCmd.java | 4 +-
.../admin/solidfire/GetSolidFireAccountIdCmd.java | 4 +-
.../GetSolidFireVolumeAccessGroupIdsCmd.java | 4 +-
.../admin/solidfire/GetSolidFireVolumeSizeCmd.java | 4 +-
.../solidfire/GetVolumeSnapshotDetailsCmd.java | 4 +-
.../admin/solidfire/GetVolumeiScsiNameCmd.java | 4 +-
.../ApiSolidFireIntegrationTestServiceImpl.java | 1 -
.../api/command/admin/sioc/UpdateSiocInfoCmd.java | 4 +-
.../apache/cloudstack/sioc/SiocManagerImpl.java | 11 +-
.../apache/cloudstack/util/vmware/VMwareUtil.java | 7 +-
.../cloudstack/backup/DummyBackupProvider.java | 16 +-
.../cloudstack/backup/NetworkerBackupProvider.java | 5 +-
.../backup/networker/NetworkerClient.java | 5 +-
plugins/backup/veeam/pom.xml | 15 +
.../cloudstack/backup/VeeamBackupProvider.java | 100 +-
.../cloudstack/backup/veeam/VeeamClient.java | 389 +++++--
.../cloudstack/backup/veeam/api/BackupFile.java | 160 +++
.../cloudstack/backup/veeam/api/BackupFiles.java | 39 +
.../backup/veeam/api/VmRestorePoint.java | 149 +++
.../backup/veeam/api/VmRestorePoints.java | 39 +
.../cloudstack/backup/veeam/VeeamClientTest.java | 333 +++++-
.../ca/provider/RootCACustomTrustManager.java | 23 +-
.../cloudstack/ca/provider/RootCAProvider.java | 44 +-
.../ca/provider/RootCACustomTrustManagerTest.java | 2 +-
.../java/com/cloud/utils/db/StaticStrategy.java | 7 +-
.../cloudstack/api/command/QuotaBalanceCmd.java | 2 -
.../cloudstack/api/command/QuotaCreditsCmd.java | 2 -
.../api/command/QuotaEmailTemplateListCmd.java | 2 -
.../api/command/QuotaEmailTemplateUpdateCmd.java | 2 -
.../cloudstack/api/command/QuotaEnabledCmd.java | 2 -
.../cloudstack/api/command/QuotaStatementCmd.java | 2 -
.../cloudstack/api/command/QuotaSummaryCmd.java | 2 -
.../api/command/QuotaTariffCreateCmd.java | 9 +-
.../api/command/QuotaTariffDeleteCmd.java | 9 +-
.../cloudstack/api/command/QuotaTariffListCmd.java | 4 +-
.../api/command/QuotaTariffUpdateCmd.java | 9 +-
.../cloudstack/api/command/QuotaUpdateCmd.java | 2 -
.../api/response/QuotaResponseBuilderImpl.java | 81 +-
.../apache/cloudstack/quota/QuotaServiceImpl.java | 52 +-
.../api/command/QuotaBalanceCmdTest.java | 2 +-
.../api/command/QuotaEmailTemplateListCmdTest.java | 2 +-
.../command/QuotaEmailTemplateUpdateCmdTest.java | 2 +-
.../api/command/QuotaStatementCmdTest.java | 2 +-
.../api/command/QuotaTariffListCmdTest.java | 2 +-
.../api/command/QuotaTariffUpdateCmdTest.java | 2 +-
.../cloudstack/quota/QuotaServiceImplTest.java | 3 +-
.../org.mockito.plugins.MockMaker | 1 -
.../api/commands/DedicateClusterCmd.java | 2 -
.../cloudstack/api/commands/DedicateHostCmd.java | 2 -
.../cloudstack/api/commands/DedicatePodCmd.java | 2 -
.../cloudstack/api/commands/DedicateZoneCmd.java | 2 -
.../api/commands/ListDedicatedClustersCmd.java | 2 -
.../api/commands/ListDedicatedHostsCmd.java | 2 -
.../api/commands/ListDedicatedPodsCmd.java | 2 -
.../api/commands/ListDedicatedZonesCmd.java | 2 -
.../api/commands/ReleaseDedicatedClusterCmd.java | 2 -
.../api/commands/ReleaseDedicatedHostCmd.java | 2 -
.../api/commands/ReleaseDedicatedPodCmd.java | 2 -
.../api/commands/ReleaseDedicatedZoneCmd.java | 2 -
.../dedicated/DedicatedResourceManagerImpl.java | 57 +-
.../dedicated/manager/DedicatedApiUnitTest.java | 12 +-
.../cloud/deploy/ImplicitDedicationPlanner.java | 12 +-
.../implicitplanner/ImplicitPlannerTest.java | 2 +-
.../cloud/deploy/UserConcentratedPodPlanner.java | 22 +-
.../com/cloud/deploy/UserDispersingPlanner.java | 38 +-
.../org/apache/cloudstack/cluster/Balanced.java | 77 +-
.../apache/cloudstack/cluster/BalancedTest.java | 53 +-
.../org/apache/cloudstack/cluster/Condensed.java | 80 +-
.../apache/cloudstack/cluster/CondensedTest.java | 46 +-
.../cloudstack/mom/inmemory/InMemoryEventBus.java | 2 -
.../apache/cloudstack/mom/kafka/KafkaEventBus.java | 2 -
.../cloudstack/mom/rabbitmq/RabbitMQEventBus.java | 28 +-
.../com/cloud/deploy/SkipHeuresticsPlanner.java | 6 +-
.../manager/allocator/impl/RandomAllocator.java | 76 +-
.../allocator/impl/RandomAllocatorTest.java | 80 ++
plugins/hypervisors/baremetal/pom.xml | 2 +-
.../baremetal/manager/BareMetalDiscoverer.java | 20 +-
.../com/cloud/baremetal/manager/BareMetalGuru.java | 2 -
.../cloud/baremetal/manager/BareMetalPlanner.java | 12 +-
.../manager/BareMetalTemplateAdapter.java | 12 +-
.../baremetal/manager/BaremetalManagerImpl.java | 10 +-
.../networkservice/BareMetalPingServiceImpl.java | 14 +-
.../networkservice/BareMetalResourceBase.java | 52 +-
.../networkservice/BaremetaNetworkGuru.java | 6 +-
.../networkservice/BaremetalDhcpElement.java | 4 +-
.../networkservice/BaremetalDhcpManagerImpl.java | 12 +-
.../networkservice/BaremetalDhcpResourceBase.java | 4 +-
.../networkservice/BaremetalDhcpdResource.java | 8 +-
.../networkservice/BaremetalDnsmasqResource.java | 8 +-
.../BaremetalKickStartPxeResource.java | 16 +-
.../BaremetalKickStartServiceImpl.java | 16 +-
.../networkservice/BaremetalPingPxeResource.java | 22 +-
.../networkservice/BaremetalPxeElement.java | 4 +-
.../networkservice/BaremetalPxeManagerImpl.java | 6 +-
.../networkservice/BaremetalPxeResourceBase.java | 4 +-
.../Force10BaremetalSwitchBackend.java | 5 +-
.../networkservice/SecurityGroupHttpClient.java | 5 +-
.../apache/cloudstack/api/AddBaremetalDhcpCmd.java | 4 +-
.../apache/cloudstack/api/AddBaremetalPxeCmd.java | 4 +-
.../apache/cloudstack/api/AddBaremetalRctCmd.java | 4 +-
.../api/BaremetalProvisionDoneNotificationCmd.java | 4 +-
.../cloudstack/api/DeleteBaremetalRctCmd.java | 4 +-
.../cloudstack/api/ListBaremetalDhcpCmd.java | 4 +-
.../cloudstack/api/ListBaremetalPxeServersCmd.java | 4 +-
.../apache/cloudstack/api/ListBaremetalRctCmd.java | 4 +-
plugins/hypervisors/hyperv/conf/log4j-cloud.xml.in | 99 +-
.../main/java/com/cloud/ha/HypervInvestigator.java | 4 +-
.../hyperv/discoverer/HypervServerDiscoverer.java | 46 +-
.../hyperv/manager/HypervManagerImpl.java | 55 +-
.../resource/HypervDirectConnectResource.java | 496 +++++----
.../motion/HypervStorageMotionStrategy.java | 15 +-
.../test/HypervDirectConnectResourceTest.java | 55 +-
.../main/java/com/cloud/ha/KVMInvestigator.java | 16 +-
.../cloud/hypervisor/kvm/dpdk/DpdkDriverImpl.java | 6 +-
.../hypervisor/kvm/resource/BridgeVifDriver.java | 42 +-
.../hypervisor/kvm/resource/DirectVifDriver.java | 2 -
.../hypervisor/kvm/resource/IvsVifDriver.java | 14 +-
.../hypervisor/kvm/resource/KVMGuestOsMapper.java | 9 +-
.../cloud/hypervisor/kvm/resource/KVMHABase.java | 9 +-
.../hypervisor/kvm/resource/KVMHAChecker.java | 8 +-
.../hypervisor/kvm/resource/KVMHAMonitor.java | 20 +-
.../kvm/resource/LibvirtCapXMLParser.java | 8 +-
.../kvm/resource/LibvirtComputingResource.java | 519 +++++----
.../hypervisor/kvm/resource/LibvirtConnection.java | 60 +-
.../kvm/resource/LibvirtDomainXMLParser.java | 24 +-
.../kvm/resource/LibvirtKvmAgentHook.java | 15 +-
.../kvm/resource/LibvirtStoragePoolDef.java | 2 +-
.../kvm/resource/LibvirtStoragePoolXMLParser.java | 11 +-
.../resource/LibvirtStorageVolumeXMLParser.java | 11 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 48 +-
.../hypervisor/kvm/resource/LibvirtXMLParser.java | 13 +-
.../hypervisor/kvm/resource/OvsVifDriver.java | 22 +-
.../hypervisor/kvm/resource/VRouterVifDriver.java | 11 +-
.../hypervisor/kvm/resource/VifDriverBase.java | 4 +
.../RollingMaintenanceAgentExecutor.java | 16 +-
.../RollingMaintenanceExecutorBase.java | 7 +-
.../RollingMaintenanceServiceExecutor.java | 12 +-
.../LibvirtBackupSnapshotCommandWrapper.java | 26 +-
.../LibvirtCheckAndRepairVolumeCommandWrapper.java | 192 ++++
.../wrapper/LibvirtCheckSshCommandWrapper.java | 10 +-
.../LibvirtCheckStorageAvailabilityWrapper.java | 8 +-
.../resource/wrapper/LibvirtCheckUrlCommand.java | 6 +-
.../wrapper/LibvirtCheckVolumeCommandWrapper.java | 5 +-
...nupPersistentNetworkResourceCommandWrapper.java | 2 -
.../LibvirtConsoleProxyLoadCommandWrapper.java | 6 +-
.../LibvirtConvertInstanceCommandWrapper.java | 47 +-
.../LibvirtCopyRemoteVolumeCommandWrapper.java | 7 +-
.../LibvirtCopyToSecondaryStorageWrapper.java | 4 +-
.../wrapper/LibvirtCopyVolumeCommandWrapper.java | 4 +-
.../wrapper/LibvirtCreateCommandWrapper.java | 4 +-
...ePrivateTemplateFromSnapshotCommandWrapper.java | 4 +-
...atePrivateTemplateFromVolumeCommandWrapper.java | 12 +-
.../LibvirtCreateVMSnapshotCommandWrapper.java | 6 +-
.../LibvirtDeleteVMSnapshotCommandWrapper.java | 18 +-
.../wrapper/LibvirtDestroyCommandWrapper.java | 4 +-
.../wrapper/LibvirtFenceCommandWrapper.java | 8 +-
.../wrapper/LibvirtFreezeThawVMCommandWrapper.java | 8 +-
.../wrapper/LibvirtGetHostStatsCommandWrapper.java | 2 -
.../wrapper/LibvirtGetRemoteVmsCommandWrapper.java | 13 +-
...LibvirtGetUnmanagedInstancesCommandWrapper.java | 14 +-
.../LibvirtGetVmDiskStatsCommandWrapper.java | 6 +-
.../LibvirtGetVmIpAddressCommandWrapper.java | 10 +-
.../LibvirtGetVmNetworkStatsCommandWrapper.java | 6 +-
.../wrapper/LibvirtGetVmStatsCommandWrapper.java | 6 +-
.../LibvirtGetVolumeStatsCommandWrapper.java | 2 -
.../LibvirtHandleConfigDriveCommandWrapper.java | 20 +-
.../LibvirtManageSnapshotCommandWrapper.java | 20 +-
.../wrapper/LibvirtMigrateCommandWrapper.java | 82 +-
.../LibvirtMigrateVolumeCommandWrapper.java | 24 +-
.../LibvirtModifySshKeysCommandWrapper.java | 20 +-
.../LibvirtModifyTargetsCommandWrapper.java | 2 -
.../LibvirtNetworkRulesSystemVmCommandWrapper.java | 4 +-
...irtNetworkRulesVmSecondaryIpCommandWrapper.java | 4 +-
.../LibvirtOvsCreateTunnelCommandWrapper.java | 8 +-
.../LibvirtOvsDestroyBridgeCommandWrapper.java | 4 +-
.../LibvirtOvsDestroyTunnelCommandWrapper.java | 8 +-
.../LibvirtOvsFetchInterfaceCommandWrapper.java | 6 +-
.../LibvirtOvsSetupBridgeCommandWrapper.java | 4 +-
...OvsVpcPhysicalTopologyConfigCommandWrapper.java | 6 +-
...irtOvsVpcRoutingPolicyConfigCommandWrapper.java | 6 +-
.../LibvirtPatchSystemVmCommandWrapper.java | 11 +-
.../wrapper/LibvirtPingTestCommandWrapper.java | 6 +-
.../wrapper/LibvirtPlugNicCommandWrapper.java | 10 +-
...ibvirtPostCertificateRenewalCommandWrapper.java | 6 +-
.../LibvirtPrepareForMigrationCommandWrapper.java | 16 +-
...irtPrepareUnmanageVMInstanceCommandWrapper.java | 8 +-
.../wrapper/LibvirtPvlanSetupCommandWrapper.java | 14 +-
.../wrapper/LibvirtReadyCommandWrapper.java | 6 +-
.../wrapper/LibvirtRebootCommandWrapper.java | 4 +-
.../wrapper/LibvirtReplugNicCommandWrapper.java | 12 +-
.../wrapper/LibvirtResizeVolumeCommandWrapper.java | 22 +-
.../LibvirtRestoreVMSnapshotCommandWrapper.java | 10 +-
.../LibvirtRevertSnapshotCommandWrapper.java | 20 +-
.../LibvirtRevertToVMSnapshotCommandWrapper.java | 6 +-
...virtRevokeDirectDownloadCertificateWrapper.java | 10 +-
.../LibvirtRollingMaintenanceCommandWrapper.java | 12 +-
.../LibvirtSecurityGroupRulesCommandWrapper.java | 8 +-
...tupDirectDownloadCertificateCommandWrapper.java | 14 +-
...ibvirtSetupPersistentNetworkCommandWrapper.java | 2 -
.../wrapper/LibvirtStartCommandWrapper.java | 20 +-
.../wrapper/LibvirtStopCommandWrapper.java | 22 +-
.../wrapper/LibvirtUnPlugNicCommandWrapper.java | 6 +-
.../resource/wrapper/LibvirtUtilitiesHelper.java | 9 +-
.../kvm/storage/FiberChannelAdapter.java | 6 +-
.../kvm/storage/IscsiAdmStorageAdaptor.java | 59 +-
.../kvm/storage/IscsiStorageCleanupMonitor.java | 27 +-
.../hypervisor/kvm/storage/KVMStoragePool.java | 9 +
.../kvm/storage/KVMStoragePoolManager.java | 92 +-
.../kvm/storage/KVMStorageProcessor.java | 259 ++---
.../kvm/storage/LibvirtStorageAdaptor.java | 264 ++---
.../hypervisor/kvm/storage/LibvirtStoragePool.java | 27 +-
.../kvm/storage/ManagedNfsStorageAdaptor.java | 34 +-
.../kvm/storage/MultipathSCSIAdapterBase.java | 7 +-
.../kvm/storage/ScaleIOStorageAdaptor.java | 85 +-
.../hypervisor/kvm/storage/StorageAdaptor.java | 9 +
.../hypervisor/kvm/storage/StorageAdaptorInfo.java | 3 -
.../apache/cloudstack/kvm/ha/KVMHAProvider.java | 10 +-
.../cloudstack/kvm/ha/KVMHostActivityChecker.java | 38 +-
.../org/apache/cloudstack/utils/linux/CPUStat.java | 9 +-
.../apache/cloudstack/utils/linux/KVMHostInfo.java | 5 +-
.../org/apache/cloudstack/utils/qemu/QemuImg.java | 46 +-
.../cloud/hypervisor/kvm/dpdk/DpdkDriverTest.java | 10 +-
.../kvm/resource/LibvirtComputingResourceTest.java | 6 +-
.../kvm/resource/LibvirtDomainXMLParserTest.java | 122 +++
.../hypervisor/kvm/resource/LibvirtVMDefTest.java | 37 +
...virtCheckAndRepairVolumeCommandWrapperTest.java | 98 ++
.../LibvirtConvertInstanceCommandWrapperTest.java | 1 -
.../LibvirtMigrateVolumeCommandWrapperTest.java | 8 +-
.../kvm/storage/LibvirtStoragePoolTest.java | 3 +
.../kvm/storage/ScaleIOStoragePoolTest.java | 7 +-
.../apache/cloudstack/kvm/ha/KVMHostHATest.java | 2 +-
.../apache/cloudstack/utils/qemu/QemuImgTest.java | 17 +
.../org.mockito.plugins.MockMaker | 1 -
.../com/cloud/ovm/hypervisor/OvmDiscoverer.java | 22 +-
.../java/com/cloud/ovm/hypervisor/OvmFencer.java | 16 +-
.../com/cloud/ovm/hypervisor/OvmResourceBase.java | 111 +-
.../main/java/com/cloud/ovm/object/Connection.java | 9 +-
plugins/hypervisors/ovm3/pom.xml | 8 +-
.../main/java/com/cloud/ha/Ovm3Investigator.java | 8 +-
.../hypervisor/ovm3/objects/CloudstackPlugin.java | 9 +-
.../cloud/hypervisor/ovm3/objects/Connection.java | 21 +-
.../com/cloud/hypervisor/ovm3/objects/Linux.java | 5 +-
.../com/cloud/hypervisor/ovm3/objects/Network.java | 8 +-
.../cloud/hypervisor/ovm3/objects/OvmObject.java | 10 +-
.../com/cloud/hypervisor/ovm3/objects/Pool.java | 3 -
.../cloud/hypervisor/ovm3/objects/PoolOCFS2.java | 5 +-
.../cloud/hypervisor/ovm3/objects/Repository.java | 2 -
.../com/cloud/hypervisor/ovm3/objects/Xen.java | 28 +-
.../hypervisor/ovm3/resources/Ovm3Discoverer.java | 54 +-
.../ovm3/resources/Ovm3FenceBuilder.java | 14 +-
.../ovm3/resources/Ovm3HypervisorGuru.java | 4 +-
.../ovm3/resources/Ovm3HypervisorResource.java | 58 +-
.../ovm3/resources/Ovm3StorageProcessor.java | 135 +--
.../ovm3/resources/Ovm3VirtualRoutingResource.java | 6 +-
.../ovm3/resources/helpers/Ovm3Configuration.java | 12 +-
.../resources/helpers/Ovm3HypervisorNetwork.java | 40 +-
.../resources/helpers/Ovm3HypervisorSupport.java | 101 +-
.../ovm3/resources/helpers/Ovm3StoragePool.java | 92 +-
.../helpers/Ovm3VirtualRoutingSupport.java | 24 +-
.../ovm3/resources/helpers/Ovm3VmSupport.java | 65 +-
.../hypervisor/ovm3/objects/ConnectionTest.java | 10 +-
.../cloud/agent/manager/MockAgentManagerImpl.java | 26 +-
.../agent/manager/MockNetworkManagerImpl.java | 16 +-
.../cloud/agent/manager/MockStorageManager.java | 3 +
.../agent/manager/MockStorageManagerImpl.java | 34 +-
.../com/cloud/agent/manager/MockVmManagerImpl.java | 32 +-
.../cloud/agent/manager/SimulatorManagerImpl.java | 19 +-
.../api/commands/CleanupSimulatorMockCmd.java | 2 -
.../cloud/api/commands/ConfigureSimulatorCmd.java | 2 -
.../cloud/api/commands/QuerySimulatorMockCmd.java | 2 -
.../main/java/com/cloud/ha/SimulatorFencer.java | 16 +-
.../java/com/cloud/ha/SimulatorInvestigator.java | 12 +-
.../java/com/cloud/resource/AgentResourceBase.java | 21 +-
.../com/cloud/resource/AgentRoutingResource.java | 6 +-
.../com/cloud/resource/AgentStorageResource.java | 4 +-
.../com/cloud/resource/SimulatorDiscoverer.java | 28 +-
.../resource/SimulatorSecondaryDiscoverer.java | 4 +-
.../cloud/resource/SimulatorStorageProcessor.java | 9 +-
.../com/cloud/simulator/MockStoragePoolVO.java | 6 +-
.../simulator/dao/MockConfigurationDaoImpl.java | 4 +-
.../simulator/dao/MockStoragePoolDaoImpl.java | 2 +-
.../driver/SimulatorImageStoreDriverImpl.java | 4 +-
.../SimulatorImageStoreLifeCycleImpl.java | 7 +-
.../java/com/cloud/ucs/manager/UcsManagerImpl.java | 15 +-
.../apache/cloudstack/api/AddUcsManagerCmd.java | 4 +-
.../api/AssociateUcsProfileToBladeCmd.java | 4 +-
.../apache/cloudstack/api/DeleteUcsManagerCmd.java | 2 -
.../org/apache/cloudstack/api/ListUcsBladeCmd.java | 4 +-
.../apache/cloudstack/api/ListUcsManagerCmd.java | 4 +-
.../apache/cloudstack/api/ListUcsProfileCmd.java | 4 +-
.../cloud/api/commands/DeleteCiscoNexusVSMCmd.java | 2 -
.../api/commands/DisableCiscoNexusVSMCmd.java | 2 -
.../cloud/api/commands/EnableCiscoNexusVSMCmd.java | 2 -
.../cloud/api/commands/ListCiscoNexusVSMsCmd.java | 2 -
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 99 +-
.../cloud/hypervisor/guru/VmwareVmImplementer.java | 21 +-
.../cloud/hypervisor/vmware/VmwareCleanupMaid.java | 9 +-
.../hypervisor/vmware/VmwareServerDiscoverer.java | 72 +-
.../hypervisor/vmware/dao/LegacyZoneDaoImpl.java | 2 -
.../manager/CleanupFullyClonedTemplatesTask.java | 34 +-
.../vmware/manager/VmwareManagerImpl.java | 206 ++--
.../vmware/manager/VmwareStorageManagerImpl.java | 189 ++--
.../vmware/resource/VmwareContextFactory.java | 11 +-
.../hypervisor/vmware/resource/VmwareResource.java | 885 ++++++++--------
.../network/CiscoNexusVSMDeviceManagerImpl.java | 8 +-
.../network/dao/CiscoNexusVSMDeviceDaoImpl.java | 2 -
.../network/element/CiscoNexusVSMElement.java | 10 +-
.../resource/PremiumSecondaryStorageResource.java | 14 +-
.../VmwareSecondaryStorageContextFactory.java | 7 +-
.../VmwareSecondaryStorageResourceHandler.java | 43 +-
.../resource/VmwareStorageLayoutHelper.java | 54 +-
.../storage/resource/VmwareStorageProcessor.java | 308 +++---
.../VmwareStorageSubsystemCommandHandler.java | 12 +-
.../api/command/admin/zone/AddVmwareDcCmd.java | 6 +-
.../zone/ImportVsphereStoragePoliciesCmd.java | 2 -
.../api/command/admin/zone/ListVmwareDcsCmd.java | 2 -
.../admin/zone/ListVsphereStoragePoliciesCmd.java | 2 -
.../api/command/admin/zone/RemoveVmwareDcCmd.java | 4 +-
.../api/command/admin/zone/UpdateVmwareDcCmd.java | 2 -
.../motion/VmwareStorageMotionStrategy.java | 35 +-
.../org.mockito.plugins.MockMaker | 1 -
.../main/java/com/cloud/ha/XenServerFencer.java | 18 +-
.../java/com/cloud/hypervisor/XenServerGuru.java | 6 +-
.../xenserver/discoverer/XcpServerDiscoverer.java | 62 +-
.../xenserver/resource/CitrixResourceBase.java | 692 ++++++------
.../xenserver/resource/XcpServerResource.java | 6 +-
.../xenserver/resource/XenServer56Resource.java | 14 +-
.../xenserver/resource/XenServer610Resource.java | 4 +-
.../xenserver/resource/XenServer620Resource.java | 4 +-
.../resource/XenServer620SP1Resource.java | 14 +-
.../resource/XenServerConnectionPool.java | 57 +-
.../resource/XenServerStorageProcessor.java | 137 +--
.../xenserver/resource/Xenserver625Resource.java | 6 +-
.../resource/Xenserver625StorageProcessor.java | 96 +-
.../xenserver/resource/XsLocalNetwork.java | 9 +-
...XcpServerGetAutoScaleMetricsCommandWrapper.java | 4 +-
.../xcp/XcpServerNetworkUsageCommandWrapper.java | 4 +-
.../XenServer56CheckOnHostCommandWrapper.java | 4 +-
.../xen56/XenServer56FenceCommandWrapper.java | 14 +-
...nServer56GetAutoScaleMetricsCommandWrapper.java | 4 +-
.../XenServer56NetworkUsageCommandWrapper.java | 6 +-
.../xen56p1/XenServer56FP1FenceCommandWrapper.java | 14 +-
.../XenServer610MigrateVolumeCommandWrapper.java | 4 +-
...nServer610MigrateWithStorageCommandWrapper.java | 10 +-
...10MigrateWithStorageCompleteCommandWrapper.java | 6 +-
...610MigrateWithStorageReceiveCommandWrapper.java | 6 +-
...ver610MigrateWithStorageSendCommandWrapper.java | 12 +-
.../XenServer620SP1GetGPUStatsCommandWrapper.java | 4 +-
.../xenbase/CitrixAttachIsoCommandWrapper.java | 6 +-
...ixAttachOrDettachConfigDriveCommandWrapper.java | 12 +-
.../CitrixCheckGuestOsMappingCommandWrapper.java | 11 +-
.../xenbase/CitrixCheckNetworkCommandWrapper.java | 12 +-
.../xenbase/CitrixCheckSshCommandWrapper.java | 10 +-
.../CitrixCheckVirtualMachineCommandWrapper.java | 4 +-
.../CitrixCleanupNetworkRulesCmdWrapper.java | 6 +-
...nupPersistentNetworkResourceCommandWrapper.java | 4 +-
.../CitrixClusterVMMetaDataSyncCommandWrapper.java | 4 +-
.../CitrixConsoleProxyLoadCommandWrapper.java | 6 +-
...itrixCoppyToSecondaryStorageCommandWrapper.java | 4 +-
.../xenbase/CitrixCreateCommandWrapper.java | 6 +-
.../CitrixCreateStoragePoolCommandWrapper.java | 4 +-
.../CitrixCreateVMSnapshotCommandWrapper.java | 8 +-
.../CitrixDeleteStoragePoolCommandWrapper.java | 4 +-
.../CitrixDeleteVMSnapshotCommandWrapper.java | 6 +-
.../xenbase/CitrixDestroyCommandWrapper.java | 8 +-
.../xenbase/CitrixGetHostStatsCommandWrapper.java | 4 +-
...rixGetHypervisorGuestOsNamesCommandWrapper.java | 7 +-
.../CitrixGetStorageStatsCommandWrapper.java | 10 +-
.../CitrixGetVmIpAddressCommandWrapper.java | 8 +-
.../xenbase/CitrixGetVmStatsCommandWrapper.java | 6 +-
.../xenbase/CitrixGetVncPortCommandWrapper.java | 4 +-
.../CitrixGetVolumeStatsCommandWrapper.java | 6 +-
.../CitrixListDataStoreObjectsCommandWrapper.java | 9 +-
.../xenbase/CitrixMaintainCommandWrapper.java | 8 +-
.../xenbase/CitrixMigrateCommandWrapper.java | 12 +-
.../CitrixModifyStoragePoolCommandWrapper.java | 12 +-
.../CitrixNetworkElementCommandWrapper.java | 2 -
.../CitrixOvsCreateGreTunnelCommandWrapper.java | 8 +-
.../CitrixOvsCreateTunnelCommandWrapper.java | 8 +-
.../xenbase/CitrixOvsDeleteFlowCommandWrapper.java | 8 +-
.../CitrixOvsDestroyBridgeCommandWrapper.java | 6 +-
.../CitrixOvsDestroyTunnelCommandWrapper.java | 6 +-
.../CitrixOvsFetchInterfaceCommandWrapper.java | 14 +-
.../CitrixOvsSetTagAndFlowCommandWrapper.java | 10 +-
.../CitrixOvsSetupBridgeCommandWrapper.java | 4 +-
...OvsVpcPhysicalTopologyConfigCommandWrapper.java | 4 +-
...rixOvsVpcRoutingPolicyConfigCommandWrapper.java | 4 +-
.../xenbase/CitrixPatchSystemVmCommandWrapper.java | 10 +-
.../xenbase/CitrixPlugNicCommandWrapper.java | 8 +-
.../CitrixPrepareForMigrationCommandWrapper.java | 10 +-
...CitrixPrimaryStorageDownloadCommandWrapper.java | 6 +-
.../xenbase/CitrixPvlanSetupCommandWrapper.java | 16 +-
.../wrapper/xenbase/CitrixReadyCommandWrapper.java | 6 +-
.../xenbase/CitrixRebootCommandWrapper.java | 12 +-
.../xenbase/CitrixResizeVolumeCommandWrapper.java | 8 +-
.../CitrixRevertToVMSnapshotCommandWrapper.java | 4 +-
.../xenbase/CitrixScaleVmCommandWrapper.java | 14 +-
.../CitrixSecurityGroupRulesCommandWrapper.java | 12 +-
.../wrapper/xenbase/CitrixSetupCommandWrapper.java | 38 +-
...CitrixSetupPersistentNetworkCommandWrapper.java | 4 +-
.../wrapper/xenbase/CitrixStartCommandWrapper.java | 34 +-
.../wrapper/xenbase/CitrixStopCommandWrapper.java | 24 +-
.../xenbase/CitrixUnPlugNicCommandWrapper.java | 4 +-
.../CitrixUpdateHostPasswordCommandWrapper.java | 4 +-
.../CitrixUpgradeSnapshotCommandWrapper.java | 4 +-
.../xenserver/ExtraConfigurationUtility.java | 17 +-
.../xenserver/XenServerResourceNewBase.java | 36 +-
.../motion/XenServerStorageMotionStrategy.java | 35 +-
.../com/cloud/hypervisor/XenServerGuruTest.java | 2 +-
.../discoverer/XcpServerDiscovererTest.java | 2 +-
.../xenbase/CitrixMigrateCommandWrapperTest.java | 2 +-
.../org.mockito.plugins.MockMaker | 1 -
.../cloudstack/cloudian/CloudianConnectorImpl.java | 46 +-
.../cloudstack/cloudian/client/CloudianClient.java | 49 +-
.../cloudstack/cloudian/client/CloudianUtils.java | 7 +-
plugins/integrations/kubernetes-service/pom.xml | 9 +-
.../cluster/KubernetesClusterHelperImpl.java | 13 +
.../cluster/KubernetesClusterManagerImpl.java | 201 ++--
.../cluster/KubernetesClusterService.java | 6 +
.../KubernetesClusterActionWorker.java | 61 +-
.../KubernetesClusterDestroyWorker.java | 36 +-
...ernetesClusterResourceModifierActionWorker.java | 90 +-
.../KubernetesClusterScaleWorker.java | 20 +-
.../KubernetesClusterStartWorker.java | 50 +-
.../actionworkers/KubernetesClusterStopWorker.java | 8 +-
.../KubernetesClusterUpgradeWorker.java | 75 +-
.../cluster/dao/KubernetesClusterVmMapDao.java | 2 +
.../cluster/dao/KubernetesClusterVmMapDaoImpl.java | 12 +
.../cluster/utils/KubernetesClusterUtil.java | 5 +-
.../version/KubernetesVersionManagerImpl.java | 14 +-
.../version/AddKubernetesSupportedVersionCmd.java | 2 -
.../DeleteKubernetesSupportedVersionCmd.java | 2 -
.../UpdateKubernetesSupportedVersionCmd.java | 2 -
.../AddVirtualMachinesToKubernetesClusterCmd.java | 2 -
.../cluster/CreateKubernetesClusterCmd.java | 2 -
.../cluster/DeleteKubernetesClusterCmd.java | 2 -
.../cluster/GetKubernetesClusterConfigCmd.java | 2 -
.../cluster/ListKubernetesClustersCmd.java | 2 -
...oveVirtualMachinesFromKubernetesClusterCmd.java | 2 -
.../cluster/ScaleKubernetesClusterCmd.java | 2 -
.../cluster/StartKubernetesClusterCmd.java | 2 -
.../cluster/StopKubernetesClusterCmd.java | 2 -
.../cluster/UpgradeKubernetesClusterCmd.java | 2 -
.../ListKubernetesSupportedVersionsCmd.java | 2 -
.../main/resources/conf/k8s-control-node-add.yml | 4 +
.../main/resources/script/deploy-cloudstack-secret | 4 +-
.../org.mockito.plugins.MockMaker | 1 -
.../cloudstack/metrics/PrometheusExporterImpl.java | 30 +-
.../metrics/PrometheusExporterServerImpl.java | 18 +-
.../org/apache/cloudstack/api/MetricConstants.java | 2 +-
.../cloudstack/metrics/MetricsServiceImpl.java | 55 +-
.../response/ClusterMetricsResponse.java | 12 +
.../response/ManagementServerMetricsResponse.java | 2 +-
.../cloudstack/metrics/MetricsServiceImplTest.java | 10 +-
.../api/commands/ListBigSwitchBcfDevicesCmd.java | 2 -
.../cloud/network/bigswitch/BigSwitchBcfApi.java | 19 +-
.../cloud/network/bigswitch/BigSwitchBcfUtils.java | 11 +-
.../cloud/network/element/BigSwitchBcfElement.java | 21 +-
.../network/guru/BigSwitchBcfGuestNetworkGuru.java | 24 +-
.../network/resource/BigSwitchBcfResource.java | 18 +-
.../cloud/network/bigswitch/BigSwitchApiTest.java | 2 +-
.../network/bigswitch/BigSwitchBcfUtilsTest.java | 9 +-
.../network/resource/BigSwitchBcfResourceTest.java | 2 +-
.../commands/ListBrocadeVcsDeviceNetworksCmd.java | 2 -
.../com/cloud/network/brocade/BrocadeVcsApi.java | 37 +-
.../cloud/network/element/BrocadeVcsElement.java | 12 +-
.../network/guru/BrocadeVcsGuestNetworkGuru.java | 37 +-
.../cloud/network/resource/BrocadeVcsResource.java | 13 +-
.../guru/BrocadeVcsGuestNetworkGuruTest.java | 14 +-
.../api/commands/AddCiscoAsa1000vResourceCmd.java | 2 -
.../api/commands/AddCiscoVnmcResourceCmd.java | 2 -
.../commands/DeleteCiscoAsa1000vResourceCmd.java | 2 -
.../api/commands/DeleteCiscoVnmcResourceCmd.java | 2 -
.../commands/ListCiscoAsa1000vResourcesCmd.java | 2 -
.../api/commands/ListCiscoVnmcResourcesCmd.java | 2 -
.../network/cisco/CiscoVnmcConnectionImpl.java | 9 +-
.../cloud/network/element/CiscoVnmcElement.java | 64 +-
.../cloud/network/resource/CiscoVnmcResource.java | 29 +-
.../network/element/CiscoVnmcElementTest.java | 4 +-
.../network/resource/CiscoVnmcResourceTest.java | 6 +-
.../element/ElasticLoadBalancerElement.java | 6 +-
.../network/lb/ElasticLoadBalancerManagerImpl.java | 50 +-
.../cloud/network/lb/LoadBalanceRuleHandler.java | 43 +-
.../org.mockito.plugins.MockMaker | 1 -
.../cloudstack/element/GloboDnsElement.java | 6 +-
.../cloudstack/resource/GloboDnsResource.java | 32 +-
.../cloudstack/element/GloboDnsElementTest.java | 4 +-
.../cloudstack/resource/GloboDnsResourceTest.java | 2 +-
.../element/InternalLoadBalancerElement.java | 56 +-
.../network/lb/InternalLoadBalancerVMManager.java | 2 +-
.../lb/InternalLoadBalancerVMManagerImpl.java | 80 +-
.../InternalLbElementServiceTest.java | 4 +-
.../internallbelement/InternalLbElementTest.java | 6 +-
.../internallbvmmgr/InternalLBVMManagerTest.java | 12 +-
.../internallbvmmgr/InternalLBVMServiceTest.java | 4 +-
plugins/network-elements/juniper-contrail/pom.xml | 4 +
.../contrail/management/ContrailElementImpl.java | 129 ++-
.../network/contrail/management/ContrailGuru.java | 59 +-
.../contrail/management/ContrailManagerImpl.java | 56 +-
.../management/ContrailVpcElementImpl.java | 30 +-
.../network/contrail/management/DBSyncGeneric.java | 25 +-
.../network/contrail/management/EventUtils.java | 11 +-
.../contrail/management/ManagementNetworkGuru.java | 12 +-
.../contrail/management/ServerDBSyncImpl.java | 107 +-
.../management/ServerEventHandlerImpl.java | 53 +-
.../contrail/management/ServiceManagerImpl.java | 25 +-
.../network/contrail/model/FloatingIpModel.java | 10 +-
.../contrail/model/FloatingIpPoolModel.java | 8 +-
.../network/contrail/model/InstanceIpModel.java | 4 +-
.../network/contrail/model/ModelObject.java | 5 +-
.../network/contrail/model/ModelObjectBase.java | 4 +
.../network/contrail/model/NetworkPolicyModel.java | 12 +-
.../contrail/model/ServiceInstanceModel.java | 18 +-
.../network/contrail/model/VMInterfaceModel.java | 6 +-
.../contrail/model/VirtualMachineModel.java | 22 +-
.../contrail/model/VirtualNetworkModel.java | 34 +-
.../contrail/management/ApiConnectorMockito.java | 13 -
.../management/IntegrationTestConfiguration.java | 18 +-
.../contrail/management/ManagementServerMock.java | 20 +-
.../contrail/management/MockAccountManager.java | 4 +-
.../contrail/management/NetworkProviderTest.java | 15 +-
.../contrail/management/PublicNetworkTest.java | 6 -
.../contrail/model/InstanceIpModelTest.java | 9 +-
.../contrail/model/VMInterfaceModelTest.java | 9 +-
.../contrail/model/VirtualMachineModelTest.java | 6 +-
.../contrail/model/VirtualNetworkModelTest.java | 4 -
.../api/commands/AddNetscalerLoadBalancerCmd.java | 2 -
.../ConfigureNetscalerLoadBalancerCmd.java | 2 -
.../commands/DeleteNetscalerControlCenterCmd.java | 2 -
.../commands/DeleteNetscalerLoadBalancerCmd.java | 2 -
.../commands/DeleteServicePackageOfferingCmd.java | 2 -
.../cloud/api/commands/DeployNetscalerVpxCmd.java | 2 -
.../commands/ListNetscalerControlCenterCmd.java | 2 -
.../ListNetscalerLoadBalancerNetworksCmd.java | 2 -
.../commands/ListNetscalerLoadBalancersCmd.java | 2 -
.../commands/ListRegisteredServicePackageCmd.java | 2 -
.../RegisterNetscalerControlCenterCmd.java | 5 -
.../api/commands/RegisterServicePackageCmd.java | 2 -
.../com/cloud/api/commands/StopNetScalerVMCmd.java | 2 -
.../cloud/network/element/NetscalerElement.java | 64 +-
.../resource/NetScalerControlCenterResource.java | 127 +--
.../cloud/network/resource/NetscalerResource.java | 225 ++--
.../cloud/network/vm/NetScalerVMManagerImpl.java | 18 +-
.../commands/ListNiciraNvpDeviceNetworksCmd.java | 2 -
.../cloud/network/element/NiciraNvpElement.java | 66 +-
.../network/guru/NiciraNvpGuestNetworkGuru.java | 42 +-
.../com/cloud/network/nicira/NiciraNvpTag.java | 9 +-
.../com/cloud/network/nicira/NiciraRestClient.java | 10 +-
.../cloud/network/resource/NiciraNvpResource.java | 11 +-
.../wrapper/NiciraCheckHealthCommandWrapper.java | 6 +-
...ConfigurePortForwardingRulesCommandWrapper.java | 18 +-
...vpConfigureSharedNetworkUuidCommandWrapper.java | 58 +-
...ConfigureSharedNetworkVlanIdCommandWrapper.java | 28 +-
...raNvpConfigureStaticNatRulesCommandWrapper.java | 18 +-
...NiciraNvpCreateLogicalRouterCommandWrapper.java | 4 +-
...raNvpCreateLogicalSwitchPortCommandWrapper.java | 4 +-
...raNvpDeleteLogicalRouterPortCommandWrapper.java | 4 +-
...iciraNvpFindL2GatewayServiceCommandWrapper.java | 6 +-
...ciraNvpFindLogicalRouterPortCommandWrapper.java | 6 +-
.../cloud/network/utils/CommandRetryUtility.java | 7 +-
.../network/element/NiciraNvpElementTest.java | 8 +-
.../guru/NiciraNvpGuestNetworkGuruTest.java | 14 +-
.../com/cloud/network/nicira/NiciraNvpApiTest.java | 2 +-
.../org.mockito.plugins.MockMaker | 1 -
plugins/network-elements/nsx/pom.xml | 59 ++
.../main/java/org/apache/cloudstack/NsxAnswer.java | 31 +
.../org/apache/cloudstack/StartupNsxCommand.java | 26 +
.../agent/api/CreateNsxDhcpRelayConfigCommand.java | 77 ++
.../CreateNsxDistributedFirewallRulesCommand.java | 67 ++
.../api/CreateNsxLoadBalancerRuleCommand.java | 87 ++
.../agent/api/CreateNsxPortForwardRuleCommand.java | 71 ++
.../agent/api/CreateNsxSegmentCommand.java | 79 ++
.../agent/api/CreateNsxStaticNatCommand.java | 25 +
.../agent/api/CreateNsxTier1GatewayCommand.java | 67 ++
.../api/CreateOrUpdateNsxTier1NatRuleCommand.java | 69 ++
.../DeleteNsxDistributedFirewallRulesCommand.java | 27 +
.../api/DeleteNsxLoadBalancerRuleCommand.java | 58 +
.../agent/api/DeleteNsxNatRuleCommand.java | 73 ++
.../agent/api/DeleteNsxSegmentCommand.java | 70 ++
.../agent/api/DeleteNsxTier1GatewayCommand.java | 63 ++
.../apache/cloudstack/agent/api/NsxCommand.java | 67 ++
.../cloudstack/agent/api/NsxNetworkCommand.java | 117 ++
.../cloudstack/agent/api/StartupNsxCommand.java | 27 +
.../api/command/AddNsxControllerCmd.java | 130 +++
.../api/command/DeleteNsxControllerCmd.java | 87 ++
.../api/command/ListNsxControllersCmd.java | 68 ++
.../api/response/NsxControllerResponse.java | 136 +++
.../cloudstack/resource/NsxLoadBalancerMember.java | 41 +
.../apache/cloudstack/resource/NsxNetworkRule.java | 397 +++++++
.../apache/cloudstack/resource/NsxOpObject.java | 129 +++
.../apache/cloudstack/resource/NsxResource.java | 486 +++++++++
.../apache/cloudstack/service/NsxApiClient.java | 1067 +++++++++++++++++++
.../org/apache/cloudstack/service/NsxElement.java | 902 ++++++++++++++++
.../cloudstack/service/NsxGuestNetworkGuru.java | 342 ++++++
.../cloudstack/service/NsxProviderService.java | 35 +
.../cloudstack/service/NsxProviderServiceImpl.java | 213 ++++
.../cloudstack/service/NsxPublicNetworkGuru.java | 170 +++
.../apache/cloudstack/service/NsxServiceImpl.java | 193 ++++
.../cloudstack/utils/NsxControllerUtils.java | 148 +++
.../org/apache/cloudstack/utils/NsxHelper.java | 53 +
.../core/spring-nsx-core-managers-context.xml | 32 +
.../META-INF/cloudstack/nsx/module.properties | 21 +
.../META-INF/cloudstack/nsx/spring-nsx-context.xml | 39 +
.../cloudstack/resource/NsxResourceTest.java | 293 +++++
.../cloudstack/service/NsxApiClientTest.java | 96 ++
.../apache/cloudstack/service/NsxElementTest.java | 493 +++++++++
.../service/NsxGuestNetworkGuruTest.java | 329 ++++++
.../service/NsxProviderServiceImplTest.java | 174 +++
.../service/NsxPublicNetworkGuruTest.java | 178 ++++
.../cloudstack/service/NsxServiceImplTest.java | 162 +++
.../cloudstack/utils/NsxControllerUtilsTest.java | 198 ++++
.../network/opendaylight/OpendaylightElement.java | 2 -
.../opendaylight/OpendaylightGuestNetworkGuru.java | 38 +-
.../agent/OpenDaylightControllerResource.java | 19 +-
.../OpenDaylightControllerResourceManagerImpl.java | 5 +-
.../network/opendaylight/api/NeutronRestApi.java | 25 +-
.../network/opendaylight/api/resources/Action.java | 27 +-
.../java/com/cloud/network/element/OvsElement.java | 24 +-
.../cloud/network/guru/OvsGuestNetworkGuru.java | 17 +-
.../cloud/network/ovs/OvsTunnelManagerImpl.java | 104 +-
.../ovs/dao/VpcDistributedRouterSeqNoDaoImpl.java | 2 -
.../cloud/api/commands/AddPaloAltoFirewallCmd.java | 2 -
.../api/commands/ConfigurePaloAltoFirewallCmd.java | 2 -
.../api/commands/DeletePaloAltoFirewallCmd.java | 2 -
.../commands/ListPaloAltoFirewallNetworksCmd.java | 2 -
.../api/commands/ListPaloAltoFirewallsCmd.java | 2 -
.../element/PaloAltoExternalFirewallElement.java | 16 +-
.../cloud/network/resource/PaloAltoResource.java | 71 +-
.../network/resource/PaloAltoResourceTest.java | 2 +-
.../apache/cloudstack/api/commands/AddSspCmd.java | 4 +-
.../cloudstack/api/commands/DeleteSspCmd.java | 4 +-
.../cloudstack/network/dao/SspUuidDaoImpl.java | 2 -
.../cloudstack/network/element/SspClient.java | 19 +-
.../cloudstack/network/element/SspElement.java | 72 +-
.../network/guru/SspGuestNetworkGuru.java | 22 +-
plugins/network-elements/tungsten/pom.xml | 4 +
...stenFabricNetworkGatewayToLogicalRouterCmd.java | 2 -
.../command/AddTungstenFabricPolicyRuleCmd.java | 2 -
.../api/command/ApplyTungstenFabricPolicyCmd.java | 2 -
.../api/command/ApplyTungstenFabricTagCmd.java | 2 -
.../command/ConfigTungstenFabricServiceCmd.java | 8 +-
.../CreateTungstenFabricAddressGroupCmd.java | 2 -
...reateTungstenFabricApplicationPolicySetCmd.java | 2 -
.../CreateTungstenFabricFirewallPolicyCmd.java | 2 -
.../CreateTungstenFabricFirewallRuleCmd.java | 2 -
.../CreateTungstenFabricLogicalRouterCmd.java | 2 -
.../CreateTungstenFabricManagementNetworkCmd.java | 2 -
.../api/command/CreateTungstenFabricPolicyCmd.java | 2 -
.../command/CreateTungstenFabricProviderCmd.java | 2 -
.../CreateTungstenFabricPublicNetworkCmd.java | 2 -
.../CreateTungstenFabricServiceGroupCmd.java | 2 -
.../api/command/CreateTungstenFabricTagCmd.java | 2 -
.../command/CreateTungstenFabricTagTypeCmd.java | 2 -
.../DeleteTungstenFabricAddressGroupCmd.java | 2 -
...eleteTungstenFabricApplicationPolicySetCmd.java | 2 -
.../DeleteTungstenFabricFirewallPolicyCmd.java | 2 -
.../DeleteTungstenFabricFirewallRuleCmd.java | 2 -
.../DeleteTungstenFabricLogicalRouterCmd.java | 2 -
.../api/command/DeleteTungstenFabricPolicyCmd.java | 2 -
.../DeleteTungstenFabricServiceGroupCmd.java | 2 -
.../api/command/DeleteTungstenFabricTagCmd.java | 2 -
.../command/DeleteTungstenFabricTagTypeCmd.java | 2 -
.../command/GetLoadBalancerSslCertificateCmd.java | 2 -
.../command/ListTungstenFabricAddressGroupCmd.java | 2 -
.../ListTungstenFabricApplictionPolicySetCmd.java | 2 -
.../ListTungstenFabricFirewallPolicyCmd.java | 2 -
.../command/ListTungstenFabricFirewallRuleCmd.java | 2 -
.../ListTungstenFabricLBHealthMonitorCmd.java | 2 -
.../ListTungstenFabricLogicalRouterCmd.java | 2 -
.../api/command/ListTungstenFabricNetworkCmd.java | 2 -
.../api/command/ListTungstenFabricNicCmd.java | 2 -
.../api/command/ListTungstenFabricPolicyCmd.java | 2 -
.../command/ListTungstenFabricPolicyRuleCmd.java | 2 -
.../command/ListTungstenFabricProvidersCmd.java | 2 -
.../command/ListTungstenFabricServiceGroupCmd.java | 2 -
.../api/command/ListTungstenFabricTagCmd.java | 2 -
.../api/command/ListTungstenFabricTagTypeCmd.java | 2 -
.../api/command/ListTungstenFabricVmCmd.java | 2 -
...enFabricNetworkGatewayFromLogicalRouterCmd.java | 2 -
.../api/command/RemoveTungstenFabricPolicyCmd.java | 2 -
.../command/RemoveTungstenFabricPolicyRuleCmd.java | 2 -
.../api/command/RemoveTungstenFabricTagCmd.java | 2 -
.../command/SynchronizeTungstenFabricDataCmd.java | 2 -
.../UpdateTungstenFabricLBHealthMonitorCmd.java | 2 -
.../tungsten/resource/TungstenResource.java | 11 +-
.../network/tungsten/service/TungstenApi.java | 27 +-
.../network/tungsten/service/TungstenElement.java | 6 +-
.../tungsten/service/TungstenFabricUtils.java | 9 +-
.../tungsten/service/TungstenGuestNetworkGuru.java | 9 +-
.../tungsten/service/TungstenServiceImpl.java | 40 +-
.../tungsten/service/TungstenVRouterApi.java | 7 +-
.../vrouter/IntrospectApiConnectorImpl.java | 11 +-
.../tungsten/vrouter/VRouterApiConnectorImpl.java | 19 +-
.../network/tungsten/service/TungstenApiTest.java | 699 ++++++------
.../service/TungstenGuestNetworkGuruTest.java | 2 +-
.../org.mockito.plugins.MockMaker | 1 -
.../cloud/network/guru/VxlanGuestNetworkGuru.java | 10 +-
.../network/guru/VxlanGuestNetworkGuruTest.java | 8 +-
.../IpmitoolOutOfBandManagementDriver.java | 20 +-
.../driver/ipmitool/IpmitoolWrapper.java | 9 +-
.../driver/ipmitool/IpmitoolWrapperTest.java | 2 +-
.../NestedCloudStackOutOfBandManagementDriver.java | 6 +-
...tedCloudStackOutOfBandManagementDriverTest.java | 2 +-
plugins/pom.xml | 1 +
.../cloudstack/api/command/CancelShutdownCmd.java | 2 -
.../api/command/PrepareForShutdownCmd.java | 2 -
.../api/command/ReadyForShutdownCmd.java | 2 -
.../cloudstack/api/command/TriggerShutdownCmd.java | 2 -
.../cloudstack/shutdown/ShutdownManagerImpl.java | 3 -
.../allocator/RandomStoragePoolAllocator.java | 14 +-
.../driver/CloudStackImageStoreDriverImpl.java | 12 +-
.../CloudStackImageStoreLifeCycleImpl.java | 7 +-
.../datastore/driver/S3ImageStoreDriverImpl.java | 8 +-
.../lifecycle/S3ImageStoreLifeCycleImpl.java | 7 +-
.../driver/SwiftImageStoreDriverImpl.java | 8 +-
.../lifecycle/SwiftImageStoreLifeCycleImpl.java | 7 +-
.../driver/MinIOObjectStoreDriverImpl.java | 20 +-
.../lifecycle/MinIOObjectStoreLifeCycleImpl.java | 9 +-
.../driver/MinIOObjectStoreDriverImplTest.java | 10 +-
.../provider/MinIOObjectStoreProviderImplTest.java | 10 +-
.../driver/SimulatorObjectStoreDriverImpl.java | 2 -
.../SimulatorObjectStoreLifeCycleImpl.java | 3 -
.../SimulatorObjectStoreProviderImplTest.java | 10 +-
.../driver/AdaptiveDataStoreDriverImpl.java | 57 +-
.../lifecycle/AdaptiveDataStoreLifeCycleImpl.java | 45 +-
.../AdaptivePrimaryDatastoreAdapterFactoryMap.java | 5 +-
.../AdaptivePrimaryDatastoreProviderImpl.java | 9 +-
.../provider/AdaptivePrimaryHostListener.java | 17 +-
.../driver/ElastistorPrimaryDataStoreDriver.java | 20 +-
.../ElastistorPrimaryDataStoreLifeCycle.java | 51 +-
.../datastore/provider/ElastistorHostListener.java | 7 +-
.../ElastistorPrimaryDataStoreProvider.java | 9 +-
.../storage/datastore/util/ElastistorUtil.java | 45 +-
.../util/ElastistorVolumeApiServiceImpl.java | 10 +-
.../datastore/util/ListElastistorInterfaceCmd.java | 2 -
.../datastore/util/ListElastistorPoolCmd.java | 2 -
.../datastore/util/ListElastistorVolumeCmd.java | 2 -
.../driver/DateraPrimaryDataStoreDriver.java | 135 +--
.../lifecycle/DateraPrimaryDataStoreLifeCycle.java | 23 +-
.../datastore/provider/DateraHostListener.java | 13 +-
.../storage/datastore/util/DateraUtil.java | 9 +-
.../CloudStackPrimaryDataStoreDriverImpl.java | 45 +-
.../CloudStackPrimaryDataStoreLifeCycleImpl.java | 49 +-
...loudStackPrimaryDataStoreLifeCycleImplTest.java | 8 +-
.../adapter/flasharray/FlashArrayAdapter.java | 5 +-
.../LinstorBackupSnapshotCommandWrapper.java | 17 +-
.../LinstorRevertBackupSnapshotCommandWrapper.java | 7 +-
.../kvm/storage/LinstorStorageAdaptor.java | 183 ++--
.../hypervisor/kvm/storage/LinstorStoragePool.java | 133 ++-
.../driver/LinstorPrimaryDataStoreDriverImpl.java | 143 ++-
.../LinstorPrimaryDataStoreLifeCycleImpl.java | 19 +-
.../datastore/provider/LinstorHostListener.java | 32 +
.../LinstorPrimaryDatastoreProviderImpl.java | 2 +-
.../storage/datastore/util/LinstorUtil.java | 72 +-
.../driver/NexentaPrimaryDataStoreDriver.java | 5 +-
.../NexentaPrimaryDataStoreLifeCycle.java | 6 +-
.../datastore/provider/NexentaHostListener.java | 15 +-
.../storage/datastore/util/NexentaNmsClient.java | 5 +-
.../datastore/util/NexentaStorAppliance.java | 6 +-
.../datastore/util/NexentaStorApplianceTest.java | 2 +-
.../datastore/adapter/primera/PrimeraAdapter.java | 5 +-
.../driver/SamplePrimaryDataStoreDriverImpl.java | 7 +-
.../client/ScaleIOGatewayClientConnectionPool.java | 9 +-
.../datastore/client/ScaleIOGatewayClientImpl.java | 91 +-
.../driver/ScaleIOPrimaryDataStoreDriver.java | 138 +--
.../ScaleIOPrimaryDataStoreLifeCycle.java | 35 +-
.../datastore/provider/ScaleIOHostListener.java | 21 +-
.../provider/ScaleIOPrimaryDatastoreProvider.java | 5 +-
.../storage/datastore/util/ScaleIOUtil.java | 5 +-
.../driver/ScaleIOPrimaryDataStoreDriverTest.java | 11 +-
.../ScaleIOPrimaryDataStoreLifeCycleTest.java | 11 +-
.../org.mockito.plugins.MockMaker | 1 -
.../driver/SolidFirePrimaryDataStoreDriver.java | 27 +-
.../SolidFirePrimaryDataStoreLifeCycle.java | 17 +-
.../SolidFireSharedPrimaryDataStoreLifeCycle.java | 31 +-
.../datastore/provider/SolidFireHostListener.java | 11 +-
.../provider/SolidFireSharedHostListener.java | 11 +-
.../storage/datastore/util/SolidFireUtil.java | 7 +-
.../apache/cloudstack/storage/test/VolumeTest.java | 4 +-
plugins/storage/volume/storpool/README.md | 2 +
plugins/storage/volume/storpool/pom.xml | 11 +-
.../StorPoolBackupSnapshotCommandWrapper.java | 6 +-
...olBackupTemplateFromSnapshotCommandWrapper.java | 6 +-
...torPoolCopyVolumeToSecondaryCommandWrapper.java | 6 +-
.../StorPoolDownloadTemplateCommandWrapper.java | 6 +-
.../StorPoolDownloadVolumeCommandWrapper.java | 6 +-
.../StorPoolModifyStorageCommandWrapper.java | 12 +-
.../StorPoolResizeVolumeCommandWrapper.java | 10 +-
.../StorPoolSetVolumeEncryptionCommandWrapper.java | 2 -
.../kvm/storage/StorPoolStorageAdaptor.java | 37 +-
.../kvm/storage/StorPoolStoragePool.java | 13 +-
.../collector/StorPoolAbandonObjectsCollector.java | 34 +-
.../driver/StorPoolPrimaryDataStoreDriver.java | 49 +-
.../datastore/driver/StorPoolStatsCollector.java | 13 +-
.../StorPoolPrimaryDataStoreLifeCycle.java | 29 +-
.../datastore/provider/StorPoolHostListener.java | 9 +-
.../storage/datastore/util/StorPoolHelper.java | 55 +-
.../storage/datastore/util/StorPoolUtil.java | 46 +-
.../storage/motion/StorPoolDataMotionStrategy.java | 25 +-
.../storage/snapshot/StorPoolSnapshotStrategy.java | 31 +-
.../snapshot/StorPoolVMSnapshotStrategy.java | 30 +-
plugins/user-authenticators/ldap/pom.xml | 2 +-
.../cloudstack/api/command/LDAPConfigCmd.java | 2 -
.../cloudstack/api/command/LDAPRemoveCmd.java | 2 -
.../api/command/LdapAddConfigurationCmd.java | 2 -
.../api/command/LdapCreateAccountCmd.java | 2 -
.../api/command/LdapDeleteConfigurationCmd.java | 2 -
.../cloudstack/api/command/LdapImportUsersCmd.java | 12 +-
.../api/command/LdapListConfigurationCmd.java | 2 -
.../cloudstack/api/command/LdapListUsersCmd.java | 46 +-
.../cloudstack/api/command/LdapUserSearchCmd.java | 4 +-
.../api/command/LinkAccountToLdapCmd.java | 12 +-
.../api/command/LinkDomainToLdapCmd.java | 12 +-
.../cloudstack/ldap/ADLdapUserManagerImpl.java | 4 +-
.../apache/cloudstack/ldap/LdapAuthenticator.java | 40 +-
.../apache/cloudstack/ldap/LdapContextFactory.java | 9 +-
.../apache/cloudstack/ldap/LdapManagerImpl.java | 46 +-
.../cloudstack/ldap/LdapUserManagerFactory.java | 5 +-
.../cloudstack/ldap/OpenLdapUserManagerImpl.java | 21 +-
.../api/command/LdapImportUsersCmdTest.java | 6 +-
.../api/command/LdapListUsersCmdTest.java | 2 +-
.../api/command/LinkAccountToLdapCmdTest.java | 8 +-
.../api/command/LinkDomainToLdapCmdTest.java | 8 +-
.../cloudstack/ldap/ADLdapUserManagerImplTest.java | 2 +-
.../cloudstack/ldap/LdapAuthenticatorTest.java | 2 +-
.../cloudstack/ldap/LdapConfigurationTest.java | 2 +-
.../ldap/LdapUnboundidZapdotConnectionTest.java | 2 +-
.../cloudstack/ldap/LdapUnitConnectionTest.java | 2 +-
.../ldap/LdapUserManagerFactoryTest.java | 2 +-
.../ldap/src/test/resources/log4j.xml | 100 +-
.../org.mockito.plugins.MockMaker | 1 -
.../cloudstack/auth/MD5UserAuthenticator.java | 12 +-
.../cloudstack/auth/MD5UserAuthenticatorTest.java | 2 +-
.../cloudstack/oauth2/OAuth2AuthManagerImpl.java | 6 +-
.../cloudstack/oauth2/OAuth2UserAuthenticator.java | 8 +-
.../oauth2/api/command/DeleteOAuthProviderCmd.java | 2 -
.../oauth2/api/command/ListOAuthProvidersCmd.java | 4 +-
.../api/command/OauthLoginAPIAuthenticatorCmd.java | 9 +-
.../oauth2/api/command/UpdateOAuthProviderCmd.java | 2 -
.../api/command/VerifyOAuthCodeAndGetUserCmd.java | 4 +-
.../oauth2/google/GoogleOAuth2Provider.java | 2 -
.../oauth2/OAuth2UserAuthenticatorTest.java | 10 +-
.../api/command/DeleteOAuthProviderCmdTest.java | 12 +-
.../command/OauthLoginAPIAuthenticatorCmdTest.java | 11 +-
.../api/command/RegisterOAuthProviderCmdTest.java | 12 +-
.../oauth2/google/GoogleOAuth2ProviderTest.java | 10 +-
.../server/auth/PBKDF2UserAuthenticator.java | 14 +-
.../server/auth/PBKD2UserAuthenticatorTest.java | 2 +-
.../auth/PlainTextUserAuthenticator.java | 12 +-
.../api/command/AuthorizeSAMLSSOCmd.java | 2 -
.../api/command/GetServiceProviderMetaDataCmd.java | 8 +-
.../api/command/ListAndSwitchSAMLAccountCmd.java | 6 +-
.../apache/cloudstack/api/command/ListIdpsCmd.java | 4 +-
.../api/command/ListSamlAuthorizationCmd.java | 2 -
.../api/command/SAML2LoginAPIAuthenticatorCmd.java | 18 +-
.../command/SAML2LogoutAPIAuthenticatorCmd.java | 16 +-
.../cloudstack/saml/SAML2AuthManagerImpl.java | 46 +-
.../cloudstack/saml/SAML2UserAuthenticator.java | 10 +-
.../java/org/apache/cloudstack/saml/SAMLUtils.java | 17 +-
.../GetServiceProviderMetaDataCmdTest.java | 2 +-
.../cloudstack/SAML2AuthManagerImplTest.java | 2 +-
.../command/ListAndSwitchSAMLAccountCmdTest.java | 2 +-
.../SAML2LogoutAPIAuthenticatorCmdTest.java | 2 +-
.../cloudstack/saml/SAML2AuthManagerImplTest.java | 2 +-
.../auth/SHA256SaltedUserAuthenticator.java | 12 +-
.../cloudstack/auth/test/AuthenticatorTest.java | 2 +-
.../auth/StaticPinUserTwoFactorAuthenticator.java | 4 +-
.../auth/TotpUserTwoFactorAuthenticator.java | 4 +-
pom.xml | 33 +-
scripts/installer/cloudstack-help-text | 6 +
scripts/storage/secondary/swift | 2 +-
scripts/vm/hypervisor/xenserver/swift | 2 +-
server/conf/log4j-cloud.xml.in | 242 ++---
.../src/main/java/com/cloud/acl/DomainChecker.java | 2 -
.../manager/allocator/impl/FirstFitAllocator.java | 104 +-
.../allocator/impl/FirstFitRoutingAllocator.java | 8 +-
.../allocator/impl/RecreateHostAllocator.java | 14 +-
.../allocator/impl/UserConcentratedAllocator.java | 36 +-
.../manager/authn/impl/BasicAgentAuthManager.java | 4 +-
.../java/com/cloud/alert/AlertManagerImpl.java | 7 +-
.../java/com/cloud/alert/ClusterAlertAdapter.java | 36 +-
.../com/cloud/alert/ConsoleProxyAlertAdapter.java | 42 +-
.../alert/SecondaryStorageVmAlertAdapter.java | 42 +-
.../java/com/cloud/api/ApiAsyncJobDispatcher.java | 4 +-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 43 +-
.../src/main/java/com/cloud/api/ApiDispatcher.java | 7 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 57 +-
.../java/com/cloud/api/ApiSerializerHelper.java | 9 +-
server/src/main/java/com/cloud/api/ApiServer.java | 131 +--
server/src/main/java/com/cloud/api/ApiServlet.java | 82 +-
.../java/com/cloud/api/ApiSessionListener.java | 21 +-
.../com/cloud/api/EncodedStringTypeAdapter.java | 9 +-
.../com/cloud/api/ResponseObjectTypeAdapter.java | 17 +-
.../api/auth/APIAuthenticationManagerImpl.java | 8 +-
.../api/auth/DefaultLoginAPIAuthenticatorCmd.java | 8 +-
.../api/auth/DefaultLogoutAPIAuthenticatorCmd.java | 2 -
.../auth/SetupUserTwoFactorAuthenticationCmd.java | 2 -
...ValidateUserTwoFactorAuthenticationCodeCmd.java | 6 +-
.../api/dispatch/ParamGenericValidationWorker.java | 7 +-
.../com/cloud/api/dispatch/ParamProcessWorker.java | 33 +-
.../com/cloud/api/dispatch/ParamUnpackWorker.java | 7 +-
.../java/com/cloud/api/doc/ApiXmlDocWriter.java | 13 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 100 +-
.../com/cloud/api/query/ViewResponseHelper.java | 13 +-
.../cloud/api/query/dao/AccountJoinDaoImpl.java | 2 -
.../api/query/dao/AffinityGroupJoinDaoImpl.java | 2 -
.../cloud/api/query/dao/AsyncJobJoinDaoImpl.java | 2 -
.../cloud/api/query/dao/DataCenterJoinDaoImpl.java | 12 +-
.../api/query/dao/DiskOfferingJoinDaoImpl.java | 2 -
.../com/cloud/api/query/dao/DomainJoinDaoImpl.java | 2 -
.../api/query/dao/DomainRouterJoinDaoImpl.java | 2 -
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 4 +-
.../com/cloud/api/query/dao/HostTagDaoImpl.java | 2 -
.../cloud/api/query/dao/ImageStoreJoinDaoImpl.java | 2 -
.../api/query/dao/InstanceGroupJoinDaoImpl.java | 2 -
.../api/query/dao/NetworkOfferingJoinDaoImpl.java | 9 +-
.../api/query/dao/ProjectAccountJoinDaoImpl.java | 2 -
.../query/dao/ProjectInvitationJoinDaoImpl.java | 2 -
.../cloud/api/query/dao/ProjectJoinDaoImpl.java | 2 -
.../api/query/dao/ResourceTagJoinDaoImpl.java | 2 -
.../api/query/dao/SecurityGroupJoinDaoImpl.java | 4 +-
.../api/query/dao/ServiceOfferingJoinDaoImpl.java | 8 +-
.../cloud/api/query/dao/SnapshotJoinDaoImpl.java | 5 +-
.../api/query/dao/StoragePoolJoinDaoImpl.java | 44 +-
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 2 -
.../api/query/dao/UserAccountJoinDaoImpl.java | 2 -
.../com/cloud/api/query/dao/UserVmJoinDao.java | 5 +-
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 29 +-
.../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 2 -
.../api/query/dao/VpcOfferingJoinDaoImpl.java | 4 +-
.../cloud/api/query/vo/NetworkOfferingJoinVO.java | 24 +
.../com/cloud/api/query/vo/StoragePoolJoinVO.java | 4 +-
.../java/com/cloud/api/query/vo/UserVmJoinVO.java | 5 +-
.../com/cloud/api/query/vo/VpcOfferingJoinVO.java | 16 +
.../cloud/api/response/ApiResponseSerializer.java | 13 +-
.../com/cloud/capacity/CapacityManagerImpl.java | 164 ++-
.../main/java/com/cloud/configuration/Config.java | 4 +-
.../configuration/ConfigurationManagerImpl.java | 467 ++++----
.../AgentBasedConsoleProxyManager.java | 22 +-
.../AgentBasedStandaloneConsoleProxyManager.java | 18 +-
.../java/com/cloud/consoleproxy/AgentHookBase.java | 68 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 248 +++--
.../com/cloud/dc/dao/DedicatedResourceDaoImpl.java | 9 +-
.../deploy/DeploymentPlanningManagerImpl.java | 932 ++++++++--------
.../java/com/cloud/deploy/FirstFitPlanner.java | 90 +-
.../java/com/cloud/event/ActionEventUtils.java | 15 +-
.../main/java/com/cloud/event/AlertGenerator.java | 7 +-
.../java/com/cloud/event/dao/EventJoinDaoImpl.java | 2 -
.../com/cloud/ha/AbstractInvestigatorImpl.java | 22 +-
.../com/cloud/ha/CheckOnAgentInvestigator.java | 10 +-
.../cloud/ha/HighAvailabilityManagerExtImpl.java | 10 +-
.../com/cloud/ha/HighAvailabilityManagerImpl.java | 192 ++--
server/src/main/java/com/cloud/ha/KVMFencer.java | 10 +-
.../cloud/ha/ManagementIPSystemVMInvestigator.java | 28 +-
.../main/java/com/cloud/ha/RecreatableFencer.java | 14 +-
.../java/com/cloud/ha/UserVmDomRInvestigator.java | 50 +-
.../java/com/cloud/ha/XenServerInvestigator.java | 4 +-
.../com/cloud/ha/dao/HighAvailabilityDaoImpl.java | 2 -
.../hypervisor/CloudZonesStartupProcessor.java | 10 +-
.../com/cloud/hypervisor/HypervisorGuruBase.java | 59 +-
.../hypervisor/HypervisorGuruManagerImpl.java | 2 -
.../main/java/com/cloud/hypervisor/KVMGuru.java | 30 +-
.../kvm/discoverer/KvmServerDiscoverer.java | 2 -
.../kvm/discoverer/LibvirtServerDiscoverer.java | 46 +-
.../kvm/discoverer/LxcServerDiscoverer.java | 2 -
.../cloud/hypervisor/kvm/dpdk/DpdkHelperImpl.java | 7 +-
.../metadata/ResourceMetaDataManagerImpl.java | 2 -
.../network/ExternalDeviceUsageManagerImpl.java | 78 +-
.../network/ExternalFirewallDeviceManagerImpl.java | 38 +-
.../cloud/network/ExternalIpAddressAllocator.java | 10 +-
.../ExternalLoadBalancerDeviceManagerImpl.java | 86 +-
.../network/ExternalNetworkDeviceManagerImpl.java | 4 +-
.../com/cloud/network/IpAddressManagerImpl.java | 190 ++--
.../com/cloud/network/Ipv6AddressManagerImpl.java | 6 +-
.../java/com/cloud/network/Ipv6ServiceImpl.java | 30 +-
.../cloud/network/NetworkMigrationManagerImpl.java | 39 +-
.../java/com/cloud/network/NetworkModelImpl.java | 100 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 386 ++++---
.../com/cloud/network/NetworkUsageManagerImpl.java | 36 +-
.../com/cloud/network/PortProfileManagerImpl.java | 11 +-
.../com/cloud/network/SshKeysDistriMonitor.java | 11 +-
.../cloud/network/StorageNetworkManagerImpl.java | 8 +-
.../com/cloud/network/as/AutoScaleManagerImpl.java | 238 +++--
.../network/element/ConfigDriveNetworkElement.java | 36 +-
.../network/element/VirtualRouterElement.java | 62 +-
.../network/element/VpcVirtualRouterElement.java | 89 +-
.../network/firewall/FirewallManagerImpl.java | 96 +-
.../com/cloud/network/guru/ControlNetworkGuru.java | 34 +-
.../com/cloud/network/guru/DirectNetworkGuru.java | 31 +-
.../network/guru/DirectPodBasedNetworkGuru.java | 14 +-
.../network/guru/ExternalGuestNetworkGuru.java | 10 +-
.../com/cloud/network/guru/GuestNetworkGuru.java | 23 +-
.../cloud/network/guru/PodBasedNetworkGuru.java | 15 +-
.../com/cloud/network/guru/PrivateNetworkGuru.java | 15 +-
.../com/cloud/network/guru/PublicNetworkGuru.java | 19 +-
.../com/cloud/network/guru/StorageNetworkGuru.java | 10 +-
.../cloud/network/lb/LBHealthCheckManagerImpl.java | 16 +-
.../network/lb/LoadBalancingRulesManagerImpl.java | 186 ++--
.../cloud/network/router/CommandSetupHelper.java | 46 +-
.../cloud/network/router/NetworkHelperImpl.java | 92 +-
.../cloud/network/router/NicProfileHelperImpl.java | 10 +-
.../cloud/network/router/RouterControlHelper.java | 5 +-
.../router/VirtualNetworkApplianceManager.java | 99 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 421 ++++----
.../cloud/network/router/VpcNetworkHelperImpl.java | 12 +-
.../VpcVirtualNetworkApplianceManagerImpl.java | 127 ++-
.../com/cloud/network/rules/AdvancedVpnRules.java | 4 +-
.../com/cloud/network/rules/DhcpSubNetRules.java | 6 +-
.../com/cloud/network/rules/NicPlugInOutRules.java | 22 +-
.../cloud/network/rules/PrivateGatewayRules.java | 24 +-
.../java/com/cloud/network/rules/RuleApplier.java | 4 +
.../com/cloud/network/rules/RulesManagerImpl.java | 126 ++-
.../cloud/network/rules/VpcIpAssociationRules.java | 4 +-
.../security/LocalSecurityGroupWorkQueue.java | 5 +-
.../network/security/SecurityGroupListener.java | 25 +-
.../network/security/SecurityGroupManagerImpl.java | 142 ++-
.../security/SecurityGroupManagerImpl2.java | 54 +-
.../network/security/SecurityGroupWorkTracker.java | 7 +-
.../cloud/network/vpc/NetworkACLManagerImpl.java | 55 +-
.../cloud/network/vpc/NetworkACLServiceImpl.java | 110 +-
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 374 ++++---
.../vpc/VpcPrivateGatewayTransactionCallable.java | 11 +-
.../network/vpn/RemoteAccessVpnManagerImpl.java | 34 +-
.../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 8 +-
.../com/cloud/projects/ProjectManagerImpl.java | 86 +-
.../java/com/cloud/resource/DiscovererBase.java | 20 +-
.../com/cloud/resource/DummyHostDiscoverer.java | 4 +-
.../com/cloud/resource/ResourceManagerImpl.java | 228 ++--
.../resource/RollingMaintenanceManagerImpl.java | 36 +-
.../resourceicon/ResourceIconManagerImpl.java | 7 +-
.../cloud/resourcelimit/CheckedReservation.java | 142 ++-
.../resourcelimit/ResourceLimitManagerImpl.java | 1115 ++++++++++++++++----
.../com/cloud/server/ConfigurationServerImpl.java | 198 ++--
.../com/cloud/server/ManagementServerImpl.java | 484 +++++----
.../main/java/com/cloud/server/StatsCollector.java | 232 ++--
.../com/cloud/servlet/CloudStartupServlet.java | 2 -
.../ConsoleProxyPasswordBasedEncryptor.java | 5 +-
.../com/cloud/servlet/ConsoleProxyServlet.java | 81 +-
.../cloud/storage/CheckAndRepairVolumePayload.java | 41 +
.../com/cloud/storage/ImageStoreServiceImpl.java | 12 +-
.../cloud/storage/ImageStoreUploadMonitorImpl.java | 60 +-
.../java/com/cloud/storage/OCFS2ManagerImpl.java | 12 +-
.../java/com/cloud/storage/StorageManagerImpl.java | 461 ++++----
.../cloud/storage/StoragePoolAutomationImpl.java | 33 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 408 +++++--
.../storage/download/DownloadActiveState.java | 8 +-
.../cloud/storage/download/DownloadErrorState.java | 2 +-
.../cloud/storage/download/DownloadListener.java | 19 +-
.../storage/download/DownloadMonitorImpl.java | 28 +-
.../com/cloud/storage/download/DownloadState.java | 11 +-
.../storage/listener/SnapshotStateListener.java | 7 +-
.../cloud/storage/listener/StoragePoolMonitor.java | 23 +-
.../storage/listener/StorageSyncListener.java | 11 +-
.../storage/listener/VolumeStateListener.java | 7 +-
.../resource/DummySecondaryStorageResource.java | 2 -
.../secondary/SecondaryStorageListener.java | 9 +-
.../storage/snapshot/SnapshotManagerImpl.java | 114 +-
.../storage/snapshot/SnapshotSchedulerImpl.java | 42 +-
.../cloud/storage/upload/UploadActiveState.java | 8 +-
.../com/cloud/storage/upload/UploadErrorState.java | 3 +-
.../com/cloud/storage/upload/UploadListener.java | 19 +-
.../cloud/storage/upload/UploadMonitorImpl.java | 36 +-
.../java/com/cloud/storage/upload/UploadState.java | 11 +-
.../com/cloud/tags/TaggedResourceManagerImpl.java | 20 +-
.../cloud/template/HypervisorTemplateAdapter.java | 49 +-
.../com/cloud/template/TemplateAdapterBase.java | 12 +-
.../com/cloud/template/TemplateManagerImpl.java | 112 +-
.../main/java/com/cloud/test/DatabaseConfig.java | 63 +-
.../src/main/java/com/cloud/test/TestAppender.java | 181 ----
.../java/com/cloud/usage/UsageServiceImpl.java | 27 +-
.../java/com/cloud/user/AccountManagerImpl.java | 301 +++---
.../java/com/cloud/user/DomainManagerImpl.java | 112 +-
.../java/com/cloud/user/PasswordPolicyImpl.java | 5 +-
.../java/com/cloud/vm/SystemVmLoadScanner.java | 13 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 1046 ++++++++++--------
.../java/com/cloud/vm/UserVmStateListener.java | 7 +-
.../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 32 +-
.../cloudstack/acl/ProjectRoleManagerImpl.java | 12 +-
.../org/apache/cloudstack/acl/RoleManagerImpl.java | 3 -
.../affinity/AffinityGroupServiceImpl.java | 16 +-
.../agent/lb/IndirectAgentLBServiceImpl.java | 26 +-
.../annotation/AnnotationManagerImpl.java | 34 +-
.../cloudstack/backup/BackupManagerImpl.java | 107 +-
.../org/apache/cloudstack/ca/CAManagerImpl.java | 26 +-
.../cloudstack/cluster/ClusterDrsServiceImpl.java | 31 +-
.../consoleproxy/ConsoleAccessManagerImpl.java | 83 +-
.../cloudstack/diagnostics/DiagnosticsHelper.java | 7 +-
.../diagnostics/DiagnosticsServiceImpl.java | 20 +-
.../direct/download/DirectDownloadManagerImpl.java | 70 +-
.../org/apache/cloudstack/ha/HAManagerImpl.java | 30 +-
.../ha/provider/host/HAAbstractHostProvider.java | 8 +-
.../cloudstack/ha/task/ActivityCheckTask.java | 2 -
.../org/apache/cloudstack/ha/task/BaseHATask.java | 9 +-
.../apache/cloudstack/ha/task/HealthCheckTask.java | 2 -
.../lb/ApplicationLoadBalancerManagerImpl.java | 10 +-
.../deployment/RouterDeploymentDefinition.java | 24 +-
.../RouterDeploymentDefinitionBuilder.java | 4 +
.../deployment/VpcRouterDeploymentDefinition.java | 27 +-
.../cloudstack/network/ssl/CertServiceImpl.java | 9 +-
.../network/topology/AdvancedNetworkTopology.java | 32 +-
.../network/topology/AdvancedNetworkVisitor.java | 14 +-
.../network/topology/BasicNetworkTopology.java | 61 +-
.../network/topology/BasicNetworkVisitor.java | 4 +-
.../network/topology/NetworkTopologyVisitor.java | 4 +
.../OutOfBandManagementServiceImpl.java | 30 +-
.../outofbandmanagement/PowerOperationTask.java | 7 +-
.../cloudstack/poll/BackgroundPollManagerImpl.java | 6 +-
.../cloudstack/region/RegionManagerImpl.java | 2 -
.../cloudstack/region/RegionServiceImpl.java | 2 -
.../apache/cloudstack/region/RegionsApiUtil.java | 39 +-
.../gslb/GlobalLoadBalancingRulesServiceImpl.java | 27 +-
.../apache/cloudstack/snapshot/SnapshotHelper.java | 5 +-
.../cloudstack/storage/NfsMountManagerImpl.java | 33 +-
.../storage/heuristics/HeuristicRuleHelper.java | 11 +-
.../storage/object/BucketApiServiceImpl.java | 14 +-
.../storage/template/VnfTemplateManagerImpl.java | 17 +-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 184 ++--
.../vm/schedule/VMScheduleManagerImpl.java | 7 +-
.../cloudstack/vm/schedule/VMSchedulerImpl.java | 40 +-
.../core/spring-server-core-managers-context.xml | 6 +-
.../com/cloud/alert/AlertControlsUnitTest.java | 23 +-
.../java/com/cloud/alert/AlertManagerImplTest.java | 2 +-
.../java/com/cloud/api/ApiResponseHelperTest.java | 29 +
.../dispatch/ParamGenericValidationWorkerTest.java | 40 +-
.../cloud/api/dispatch/ParamProcessWorkerTest.java | 2 +-
.../query/MutualExclusiveIdsManagerBaseTest.java | 2 +-
.../com/cloud/api/query/QueryManagerImplTest.java | 54 +
.../GenericDaoBaseWithTagInformationBaseTest.java | 6 +-
.../query/dao/SecurityGroupJoinDaoImplTest.java | 11 +-
.../cloud/api/query/dao/UserVmJoinDaoImplTest.java | 6 +-
.../com/cloud/capacity/CapacityManagerTest.java | 6 +-
.../ConfigurationManagerImplTest.java | 314 ++++++
.../configuration/ConfigurationManagerTest.java | 22 +-
.../cloud/configuration/ValidateIpRangeTest.java | 9 +-
.../consoleproxy/ConsoleProxyManagerTest.java | 33 +-
.../deploy/DeploymentPlanningManagerImplTest.java | 34 +-
.../com/cloud/event/EventControlsUnitTest.java | 21 +-
.../cloud/ha/HighAvailabilityManagerImplTest.java | 20 +-
.../src/test/java/com/cloud/ha/KVMFencerTest.java | 10 +-
.../java/com/cloud/hypervisor/KVMGuruTest.java | 2 +-
.../hypervisor/kvm/dpdk/DpdkHelperImplTest.java | 2 +-
.../test/java/com/cloud/keystore/KeystoreTest.java | 2 -
.../metadata/ResourceMetaDataManagerTest.java | 15 +-
.../cloud/network/CreatePrivateNetworkTest.java | 29 +-
.../cloud/network/DedicateGuestVlanRangesTest.java | 20 +-
.../ExternalLoadBalancerDeviceManagerImplTest.java | 2 +-
.../com/cloud/network/IpAddressManagerTest.java | 4 +-
.../com/cloud/network/Ipv6AddressManagerTest.java | 10 +-
.../com/cloud/network/Ipv6ServiceImplTest.java | 5 +-
.../com/cloud/network/NetworkModelImplTest.java | 144 ++-
.../java/com/cloud/network/NetworkModelTest.java | 17 +-
.../com/cloud/network/NetworkServiceImplTest.java | 4 +
.../cloud/network/UpdatePhysicalNetworkTest.java | 4 +-
.../element/ConfigDriveNetworkElementTest.java | 2 +-
.../network/element/VirtualRouterElementTest.java | 14 +-
.../element/VpcVirtualRouterElementTest.java | 2 +-
.../network/firewall/FirewallManagerTest.java | 22 +-
.../cloud/network/guru/DirectNetworkGuruTest.java | 14 +-
.../network/guru/ExternalGuestNetworkGuruTest.java | 2 +-
.../cloud/network/lb/AssignLoadBalancerTest.java | 6 +-
.../cloud/network/lb/UpdateLoadBalancerTest.java | 6 +-
.../network/router/CommandSetupHelperTest.java | 114 ++
.../network/router/NetworkHelperImplTest.java | 26 +-
.../network/router/RouterControlHelperTest.java | 2 +-
.../VirtualNetworkApplianceManagerImplTest.java | 8 +-
.../network/vpc/NetworkACLManagerImplTest.java | 2 +-
.../cloud/network/vpc/NetworkACLManagerTest.java | 8 +-
.../network/vpc/NetworkACLServiceImplTest.java | 161 ++-
.../RollingMaintenanceManagerImplTest.java | 10 +-
.../resourcelimit/CheckedReservationTest.java | 68 +-
.../ResourceLimitManagerImplTest.java | 1063 ++++++++++++++++++-
.../cloud/server/ConfigurationServerImplTest.java | 2 +-
.../com/cloud/server/ManagementServerImplTest.java | 6 +-
.../com/cloud/storage/StorageManagerImplTest.java | 271 ++++-
.../cloud/storage/VolumeApiServiceImplTest.java | 186 +++-
.../com/cloud/storage/dao/AsyncJobJoinDaoTest.java | 2 +-
.../storage/listener/StoragePoolMonitorTest.java | 2 +
.../storage/snapshot/SnapshotManagerTest.java | 4 +-
.../template/HypervisorTemplateAdapterTest.java | 67 +-
.../cloud/template/TemplateManagerImplTest.java | 6 +-
.../com/cloud/user/AccountManagerImplTest.java | 44 +
.../AccountManagerImplVolumeDeleteEventTest.java | 25 +-
.../java/com/cloud/user/DomainManagerImplTest.java | 24 +-
.../java/com/cloud/vm/FirstFitPlannerTest.java | 6 +-
.../java/com/cloud/vm/UserVmManagerImplTest.java | 458 +++++++-
.../test/java/com/cloud/vm/UserVmManagerTest.java | 14 +-
.../cloud/vm/snapshot/VMSnapshotManagerTest.java | 30 +-
.../cloud/vpc/MockConfigurationManagerImpl.java | 4 +-
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 31 +-
.../cloud/vpc/MockResourceLimitManagerImpl.java | 165 ++-
.../java/com/cloud/vpc/NetworkACLServiceTest.java | 16 +-
.../test/java/com/cloud/vpc/Site2SiteVpnTest.java | 10 +-
.../cloud/vpc/dao/MockNetworkOfferingDaoImpl.java | 6 +-
.../java/com/cloud/vpc/dao/MockVpcDaoImpl.java | 6 +-
.../apache/cloudstack/acl/RoleManagerImplTest.java | 2 +-
.../cloudstack/affinity/AffinityApiUnitTest.java | 22 +-
.../affinity/AffinityGroupServiceImplTest.java | 37 +-
.../agent/lb/IndirectAgentLBServiceImplTest.java | 9 +-
.../cloudstack/backup/BackupManagerTest.java | 82 +-
.../apache/cloudstack/ca/CABackgroundTaskTest.java | 2 +-
.../cluster/ClusterDrsServiceImplTest.java | 8 +-
.../DiagnosticsFilesListFactoryTest.java | 2 +-
.../diagnostics/DiagnosticsServiceImplTest.java | 2 +-
.../download/DirectDownloadManagerImplTest.java | 2 +-
.../network/lb/ApplicationLoadBalancerTest.java | 12 +-
.../deployment/RouterDeploymentDefinitionTest.java | 11 +-
.../VpcRouterDeploymentDefinitionTest.java | 9 +-
.../cloudstack/network/ssl/CertServiceTest.java | 26 +-
.../networkoffering/CreateNetworkOfferingTest.java | 23 +-
.../OutOfBandManagementServiceTest.java | 2 +-
.../cloudstack/privategw/AclOnPrivateGwTest.java | 6 +-
.../cloudstack/region/RegionManagerTest.java | 4 +-
.../GlobalLoadBalancingRulesServiceImplTest.java | 30 +-
.../cloudstack/service/ServiceOfferingVOTest.java | 9 +-
.../heuristics/HeuristicRuleHelperTest.java | 24 +-
.../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 183 ++--
.../vm/schedule/VMScheduleManagerImplTest.java | 10 +-
.../vm/schedule/VMSchedulerImplTest.java | 9 -
.../src/test/resources/createNetworkOffering.xml | 25 +-
.../org.mockito.plugins.MockMaker | 1 -
.../java/common/BufferedImagePixelsAdapter.java | 11 +-
.../src/main/java/rdpclient/rdp/ClientInfoPDU.java | 6 +-
.../src/main/java/streamer/BaseElement.java | 4 +
.../src/main/java/streamer/InputStreamSource.java | 6 +-
.../src/main/java/streamer/OutputStreamSink.java | 6 +-
.../src/main/java/streamer/PipelineImpl.java | 4 +
.../src/main/java/streamer/SocketWrapperImpl.java | 10 +-
.../src/main/java/streamer/SyncLink.java | 29 +-
.../src/main/java/streamer/apr/AprSocketSink.java | 4 +-
.../main/java/streamer/apr/AprSocketSource.java | 4 +-
.../java/streamer/apr/AprSocketWrapperImpl.java | 8 +-
.../java/streamer/bco/BcoSocketWrapperImpl.java | 10 +-
.../src/main/java/streamer/debug/FakeSource.java | 4 +-
.../src/main/java/streamer/debug/MockServer.java | 11 +-
.../src/test/java/streamer/BaseElementTest.java | 2 +-
.../org.mockito.plugins.MockMaker | 1 -
services/console-proxy/server/pom.xml | 8 +-
.../com/cloud/consoleproxy/AjaxFIFOImageCache.java | 18 +-
.../java/com/cloud/consoleproxy/ConsoleProxy.java | 124 +--
.../consoleproxy/ConsoleProxyAjaxHandler.java | 78 +-
.../consoleproxy/ConsoleProxyAjaxImageHandler.java | 24 +-
.../ConsoleProxyBaseServerFactoryImpl.java | 10 +-
.../cloud/consoleproxy/ConsoleProxyClientBase.java | 23 +-
.../cloud/consoleproxy/ConsoleProxyCmdHandler.java | 12 +-
.../cloud/consoleproxy/ConsoleProxyGCThread.java | 19 +-
.../ConsoleProxyHttpHandlerHelper.java | 30 +-
.../consoleproxy/ConsoleProxyLoggerFactory.java | 7 +-
.../cloud/consoleproxy/ConsoleProxyMonitor.java | 26 +-
.../consoleproxy/ConsoleProxyNoVNCHandler.java | 14 +-
.../consoleproxy/ConsoleProxyNoVNCServer.java | 6 +-
.../consoleproxy/ConsoleProxyNoVncClient.java | 51 +-
.../ConsoleProxyPasswordBasedEncryptor.java | 5 +-
.../cloud/consoleproxy/ConsoleProxyRdpClient.java | 16 +-
.../consoleproxy/ConsoleProxyResourceHandler.java | 42 +-
.../ConsoleProxySecureServerFactoryImpl.java | 27 +-
.../consoleproxy/ConsoleProxyThumbnailHandler.java | 28 +-
.../cloud/consoleproxy/ConsoleProxyVncClient.java | 18 +-
.../consoleproxy/rdp/RdpBufferedImageCanvas.java | 6 +-
.../java/com/cloud/consoleproxy/util/RawHTTP.java | 12 +-
.../consoleproxy/vnc/BufferedImageCanvas.java | 6 +-
.../com/cloud/consoleproxy/vnc/NoVncClient.java | 56 +-
.../java/com/cloud/consoleproxy/vnc/VncClient.java | 38 +-
.../consoleproxy/vnc/VncClientPacketSender.java | 6 +-
.../consoleproxy/vnc/VncServerPacketReceiver.java | 8 +-
.../cloud/consoleproxy/vnc/network/NioSocket.java | 21 +-
.../vnc/network/NioSocketHandlerImpl.java | 8 +-
.../consoleproxy/vnc/network/NioSocketStream.java | 9 +-
.../vnc/network/NioSocketTLSInputStream.java | 5 +-
.../vnc/network/NioSocketTLSOutputStream.java | 6 +-
.../vnc/packet/server/AbstractRect.java | 4 +
.../consoleproxy/vnc/packet/server/RawRect.java | 4 +-
.../vnc/packet/server/ServerCutText.java | 4 +-
.../consoleproxy/vnc/security/VncAuthSecurity.java | 8 +-
.../consoleproxy/vnc/security/VncTLSSecurity.java | 4 +-
.../websocket/WebSocketReverseProxy.java | 2 +-
.../org.mockito.plugins.MockMaker | 1 -
.../PremiumSecondaryStorageManagerImpl.java | 14 +-
.../SecondaryStorageManagerImpl.java | 208 ++--
.../SecondaryStorageManagerTest.java | 10 +-
services/secondary-storage/server/pom.xml | 8 +-
.../storage/resource/HttpUploadServerHandler.java | 5 +-
.../resource/LocalNfsSecondaryStorageResource.java | 10 +-
.../resource/LocalSecondaryStorageResource.java | 6 +-
.../resource/NfsSecondaryStorageResource.java | 437 ++++----
.../resource/SecondaryStorageDiscoverer.java | 32 +-
.../storage/template/DownloadManagerImpl.java | 101 +-
.../storage/template/UploadManagerImpl.java | 68 +-
.../LocalNfsSecondaryStorageResourceTest.java | 3 -
.../resource/NfsSecondaryStorageResourceTest.java | 18 +-
.../org.mockito.plugins.MockMaker | 1 -
setup/bindir/cloud-setup-databases.in | 3 +-
setup/dev/advdualzone.cfg | 60 +-
systemvm/agent/conf/log4j-cloud.xml | 198 ++--
.../noVNC/keymaps/generate-language-keymaps.py | 2 +-
systemvm/agent/packages/packages.ini | 11 +
.../packages/python-is-python3_3.9.2-1_all.deb | Bin 0 -> 2800 bytes
.../packages/python3-netaddr_0.7.19-5_all.deb | Bin 0 -> 253016 bytes
systemvm/agent/scripts/consoleproxy.sh | 33 -
systemvm/agent/scripts/secstorage.sh | 33 -
systemvm/debian/etc/apache2/vhost.template | 2 +-
systemvm/debian/etc/vpcdnsmasq.conf | 2 +-
systemvm/debian/opt/cloud/bin/baremetal-vr.py | 4 +-
systemvm/debian/opt/cloud/bin/configure.py | 106 +-
systemvm/debian/opt/cloud/bin/cs/CsAddress.py | 37 +-
systemvm/debian/opt/cloud/bin/cs/CsApp.py | 4 +-
systemvm/debian/opt/cloud/bin/cs/CsConfig.py | 4 +-
systemvm/debian/opt/cloud/bin/cs/CsDatabag.py | 16 +-
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 4 +-
systemvm/debian/opt/cloud/bin/cs/CsFile.py | 4 +-
systemvm/debian/opt/cloud/bin/cs/CsGuestNetwork.py | 6 +-
systemvm/debian/opt/cloud/bin/cs/CsHelper.py | 10 +-
systemvm/debian/opt/cloud/bin/cs/CsLoadBalancer.py | 10 +-
systemvm/debian/opt/cloud/bin/cs/CsMonitor.py | 2 +-
systemvm/debian/opt/cloud/bin/cs/CsNetfilter.py | 47 +-
systemvm/debian/opt/cloud/bin/cs/CsProcess.py | 2 +-
systemvm/debian/opt/cloud/bin/cs/CsRedundant.py | 19 +-
systemvm/debian/opt/cloud/bin/cs/CsRoute.py | 2 +-
systemvm/debian/opt/cloud/bin/cs/CsRule.py | 2 +-
systemvm/debian/opt/cloud/bin/cs/CsStaticRoutes.py | 4 +-
.../debian/opt/cloud/bin/cs/CsVpcGuestNetwork.py | 17 +-
systemvm/debian/opt/cloud/bin/cs_dhcp.py | 6 +-
systemvm/debian/opt/cloud/bin/cs_firewallrules.py | 6 +-
.../debian/opt/cloud/bin/cs_forwardingrules.py | 8 +-
systemvm/debian/opt/cloud/bin/cs_guestnetwork.py | 8 +-
systemvm/debian/opt/cloud/bin/cs_ip.py | 2 +-
.../debian/opt/cloud/bin/cs_remoteaccessvpn.py | 4 +-
systemvm/debian/opt/cloud/bin/cs_site2sitevpn.py | 4 +-
systemvm/debian/opt/cloud/bin/cs_vpnusers.py | 12 +-
systemvm/debian/opt/cloud/bin/diagnostics.py | 4 +-
.../opt/cloud/bin/filesystem_writable_check.py | 6 +-
.../debian/opt/cloud/bin/get_diagnostics_files.py | 8 +-
systemvm/debian/opt/cloud/bin/merge.py | 8 +-
systemvm/debian/opt/cloud/bin/passwd_server_ip.py | 18 +-
systemvm/debian/opt/cloud/bin/setup/cksnode.sh | 1 +
.../debian/opt/cloud/bin/setup/consoleproxy.sh | 4 +-
systemvm/debian/opt/cloud/bin/setup/dhcpsrvr.sh | 1 +
systemvm/debian/opt/cloud/bin/setup/elbvm.sh | 1 +
systemvm/debian/opt/cloud/bin/setup/ilbvm.sh | 1 +
systemvm/debian/opt/cloud/bin/setup/patch.sh | 128 +++
systemvm/debian/opt/cloud/bin/setup/router.sh | 1 +
systemvm/debian/opt/cloud/bin/setup/secstorage.sh | 2 +
systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh | 1 +
systemvm/debian/opt/cloud/bin/update_config.py | 2 +-
systemvm/debian/opt/cloud/bin/vmdata.py | 25 +-
.../debian/root/health_checks/cpu_usage_check.py | 14 +-
systemvm/debian/root/health_checks/dhcp_check.py | 6 +-
.../debian/root/health_checks/disk_space_check.py | 6 +-
systemvm/debian/root/health_checks/dns_check.py | 6 +-
.../debian/root/health_checks/gateways_check.py | 8 +-
.../debian/root/health_checks/haproxy_check.py | 22 +-
.../debian/root/health_checks/iptables_check.py | 8 +-
.../root/health_checks/memory_usage_check.py | 16 +-
.../root/health_checks/router_version_check.py | 20 +-
.../debian/root/health_checks/utility/__init__.py | 2 +-
systemvm/debian/root/monitorServices.py | 16 +-
systemvm/patch-sysvms.sh | 16 +-
systemvm/systemvm-agent-descriptor.xml | 7 +
systemvm/test/__init__.py | 20 +
systemvm/test/runtests.sh | 2 +-
.../component/test_affinity_groups_projects.py | 2 +-
.../component/test_deploy_vm_userdata_multi_nic.py | 2 +-
.../component/test_resource_limit_tags.py | 648 ++++++++++++
.../plugins/storpool/TestTagsOnStorPool.py | 75 +-
.../smoke/test_backup_recovery_veeam.py | 308 ++++++
test/integration/smoke/test_guest_os.py | 2 +-
test/integration/smoke/test_kubernetes_clusters.py | 48 +-
test/integration/smoke/test_list_accounts.py | 379 +++++++
test/integration/smoke/test_list_disk_offerings.py | 319 ++++++
test/integration/smoke/test_list_domains.py | 216 ++++
test/integration/smoke/test_list_hosts.py | 372 +++++++
.../smoke/test_list_service_offerings.py | 559 ++++++++++
test/integration/smoke/test_list_storage_pools.py | 396 +++++++
test/integration/smoke/test_list_volumes.py | 615 +++++++++++
test/integration/smoke/test_metrics_api.py | 3 +-
test/integration/smoke/test_migration.py | 2 +-
test/integration/smoke/test_network_ipv6.py | 9 +-
test/integration/smoke/test_routers.py | 79 +-
test/integration/smoke/test_routers_network_ops.py | 32 +-
test/integration/smoke/test_secondary_storage.py | 2 +-
test/integration/smoke/test_templates.py | 16 +-
test/integration/smoke/test_vpc_ipv6.py | 5 +-
test/integration/smoke/test_vpc_vpn.py | 2 +-
test/metadata/func/loadbalancers.xml | 2 +-
test/pom.xml | 18 +-
.../com/cloud/test/longrun/BuildGuestNetwork.java | 21 +-
.../java/com/cloud/test/longrun/GuestNetwork.java | 23 +-
.../com/cloud/test/longrun/PerformanceWithAPI.java | 39 +-
.../main/java/com/cloud/test/longrun/User.java | 17 +-
.../com/cloud/test/longrun/VirtualMachine.java | 15 +-
.../java/com/cloud/test/regression/ApiCommand.java | 81 +-
.../java/com/cloud/test/regression/ConfigTest.java | 26 +-
.../cloud/test/regression/DelegatedAdminTest.java | 18 +-
.../java/com/cloud/test/regression/Deploy.java | 12 +-
.../com/cloud/test/regression/EventsApiTest.java | 38 +-
.../main/java/com/cloud/test/regression/HA.java | 12 +-
.../cloud/test/regression/LoadBalancingTest.java | 28 +-
.../cloud/test/regression/PortForwardingTest.java | 30 +-
.../java/com/cloud/test/regression/SanityTest.java | 14 +-
.../main/java/com/cloud/test/regression/Test.java | 8 +-
.../java/com/cloud/test/regression/TestCase.java | 15 +-
.../com/cloud/test/regression/TestCaseEngine.java | 27 +-
.../java/com/cloud/test/regression/VMApiTest.java | 16 +-
.../main/java/com/cloud/test/stress/SshTest.java | 17 +-
.../cloud/test/stress/StressTestDirectAttach.java | 301 +++---
.../com/cloud/test/stress/TestClientWithAPI.java | 523 ++++-----
.../main/java/com/cloud/test/stress/WgetTest.java | 25 +-
.../java/com/cloud/test/ui/AddAndDeleteAISO.java | 6 +-
.../com/cloud/test/ui/AddAndDeleteATemplate.java | 6 +-
.../java/com/cloud/test/ui/UIScenarioTest.java | 4 +-
.../java/com/cloud/test/utils/ConsoleProxy.java | 8 +-
.../java/com/cloud/test/utils/IpSqlGenerator.java | 2 +-
.../java/com/cloud/test/utils/ProxyLoadTemp.java | 24 +-
.../main/java/com/cloud/test/utils/SignEC2.java | 25 +-
.../com/cloud/test/utils/SqlDataGenerator.java | 2 +-
.../main/java/com/cloud/test/utils/SubmitCert.java | 25 +-
.../main/java/com/cloud/test/utils/TestClient.java | 73 +-
tools/apidoc/gen_toc.py | 3 +
tools/appliance/systemvmtemplate/http/preseed.cfg | 2 +-
.../systemvmtemplate/scripts/apt_upgrade.sh | 4 +-
.../scripts/configure_systemvm_services.sh | 2 +-
.../scripts/install_systemvm_packages.sh | 18 +-
tools/appliance/systemvmtemplate/template.json | 4 +-
tools/docker/Dockerfile | 2 +-
tools/docker/Dockerfile.marvin | 2 +-
tools/marvin/marvin/cloudstackTestCase.py | 23 +-
tools/marvin/marvin/lib/base.py | 74 +-
ui/public/config.json | 2 +
ui/public/index.html | 12 +-
ui/public/locales/en.json | 72 +-
ui/public/locales/pt_BR.json | 3 +
ui/src/components/CheckBoxSelectPair.vue | 17 +-
ui/src/components/view/DetailsTab.vue | 10 +-
ui/src/components/view/ListView.vue | 7 +-
ui/src/components/view/ResourceCountUsage.vue | 140 ++-
ui/src/components/view/ResourceLimitTab.vue | 94 +-
ui/src/components/view/ResourceView.vue | 22 +-
ui/src/components/view/SearchView.vue | 54 +-
ui/src/components/view/TreeView.vue | 6 +-
ui/src/components/widgets/ResourceLabel.vue | 4 +-
ui/src/config/section/compute.js | 4 +-
ui/src/config/section/image.js | 2 +-
ui/src/config/section/infra/clusters.js | 4 +-
ui/src/config/section/infra/phynetworks.js | 5 +
ui/src/config/section/network.js | 2 +-
ui/src/config/section/offering.js | 13 +-
ui/src/config/section/storage.js | 56 +-
ui/src/config/section/user.js | 16 +-
ui/src/utils/plugins.js | 31 +-
ui/src/views/AutogenView.vue | 36 +-
ui/src/views/compute/DeployVM.vue | 64 +-
ui/src/views/compute/InstanceSchedules.vue | 247 +++--
ui/src/views/compute/backup/BackupSchedule.vue | 8 +-
.../views/compute/wizard/DiskOfferingSelection.vue | 1 +
ui/src/views/image/RegisterOrUploadTemplate.vue | 9 +
ui/src/views/image/UpdateTemplate.vue | 14 +
ui/src/views/infra/ClusterDRSTab.vue | 18 +-
ui/src/views/infra/Resources.vue | 93 +-
ui/src/views/infra/network/IpRangesTabPublic.vue | 6 +
ui/src/views/infra/network/ServiceProvidersTab.vue | 45 +
ui/src/views/infra/zone/IpAddressRangeForm.vue | 24 +-
ui/src/views/infra/zone/ZoneWizard.vue | 2 +-
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 91 +-
.../infra/zone/ZoneWizardNetworkSetupStep.vue | 102 +-
.../zone/ZoneWizardPhysicalNetworkSetupStep.vue | 70 +-
ui/src/views/network/CreateIsolatedNetworkForm.vue | 10 +-
ui/src/views/network/CreateL2NetworkForm.vue | 13 +-
ui/src/views/network/CreateNetwork.vue | 1 -
ui/src/views/network/CreateSharedNetworkForm.vue | 13 +-
ui/src/views/network/CreateVpc.vue | 6 +-
ui/src/views/network/PublicIpResource.vue | 35 +-
ui/src/views/network/VpcTiersTab.vue | 49 +-
ui/src/views/offering/AddNetworkOffering.vue | 208 +++-
ui/src/views/offering/AddVpcOffering.vue | 300 ++++--
ui/src/views/storage/CreateVolume.vue | 11 +-
usage/conf/log4j-cloud_usage.xml.in | 91 +-
.../com/cloud/usage/UsageAlertManagerImpl.java | 7 +-
.../java/com/cloud/usage/UsageManagerImpl.java | 527 ++++-----
.../java/com/cloud/usage/UsageSanityChecker.java | 58 +-
.../src/main/java/com/cloud/usage/UsageServer.java | 9 +-
.../com/cloud/usage/parser/BackupUsageParser.java | 5 +-
.../com/cloud/usage/parser/BucketUsageParser.java | 9 +-
.../cloud/usage/parser/IPAddressUsageParser.java | 24 +-
.../usage/parser/LoadBalancerUsageParser.java | 24 +-
.../usage/parser/NetworkOfferingUsageParser.java | 24 +-
.../com/cloud/usage/parser/NetworkUsageParser.java | 23 +-
.../usage/parser/PortForwardingUsageParser.java | 24 +-
.../usage/parser/SecurityGroupUsageParser.java | 24 +-
.../com/cloud/usage/parser/StorageUsageParser.java | 24 +-
.../java/com/cloud/usage/parser/UsageParser.java | 4 +-
.../cloud/usage/parser/VMInstanceUsageParser.java | 22 +-
.../usage/parser/VMSnapshotOnPrimaryParser.java | 28 +-
.../cloud/usage/parser/VMSnapshotUsageParser.java | 24 +-
.../com/cloud/usage/parser/VPNUserUsageParser.java | 24 +-
.../com/cloud/usage/parser/VmDiskUsageParser.java | 24 +-
.../com/cloud/usage/parser/VolumeUsageParser.java | 24 +-
.../com/cloud/usage/UsageAlertManagerImplTest.java | 2 +-
utils/conf/log4j-vmops.xml | 158 ++-
utils/pom.xml | 16 +-
.../java/com/cloud/utils/AutoCloseableUtil.java | 7 +-
utils/src/main/java/com/cloud/utils/DateUtil.java | 17 +-
.../main/java/com/cloud/utils/EncryptionUtil.java | 7 +-
utils/src/main/java/com/cloud/utils/FileUtil.java | 9 +-
utils/src/main/java/com/cloud/utils/HttpUtils.java | 11 +-
.../java/com/cloud/utils/HumanReadableJson.java | 5 +-
utils/src/main/java/com/cloud/utils/Journal.java | 6 +-
utils/src/main/java/com/cloud/utils/LogUtils.java | 35 +-
.../src/main/java/com/cloud/utils/ProcessUtil.java | 13 +-
.../main/java/com/cloud/utils/PropertiesUtil.java | 11 +-
.../src/main/java/com/cloud/utils/ReflectUtil.java | 14 +-
.../src/main/java/com/cloud/utils/StringUtils.java | 22 +
utils/src/main/java/com/cloud/utils/SwiftUtil.java | 27 +-
utils/src/main/java/com/cloud/utils/UriUtils.java | 25 +-
.../utils/backoff/impl/ConstantTimeBackoff.java | 4 +-
.../cloud/utils/cisco/n1kv/vsm/NetconfHelper.java | 9 +-
.../com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java | 49 +-
.../utils/cisco/n1kv/vsm/VsmPolicyMapResponse.java | 4 +-
.../cisco/n1kv/vsm/VsmPortProfileResponse.java | 4 +-
.../cloud/utils/cisco/n1kv/vsm/VsmResponse.java | 15 +-
.../cloud/utils/component/ComponentContext.java | 43 +-
.../ComponentInstantiationPostProcessor.java | 5 +-
.../utils/component/ComponentLifecycleBase.java | 5 +-
.../cloud/utils/compression/CompressionUtil.java | 5 +-
.../utils/concurrency/SynchronizationEvent.java | 9 +-
.../com/cloud/utils/crypt/CloudStackEncryptor.java | 19 +-
.../com/cloud/utils/crypt/DBEncryptionUtil.java | 9 +-
.../utils/crypt/EncryptionSecretKeyChecker.java | 11 +-
.../main/java/com/cloud/utils/crypt/RSAHelper.java | 7 +-
.../main/java/com/cloud/utils/db/DbProperties.java | 15 +-
.../com/cloud/utils/events/SubscriptionMgr.java | 11 +-
.../utils/exception/CSExceptionErrorCode.java | 7 +-
.../cloud/utils/log/CglibThrowableRenderer.java | 82 --
utils/src/main/java/com/cloud/utils/net/Dhcp.java | 2 +-
.../main/java/com/cloud/utils/net/HTTPUtils.java | 5 +-
.../main/java/com/cloud/utils/net/MacAddress.java | 9 +-
.../main/java/com/cloud/utils/net/NetUtils.java | 90 +-
.../nicira/nvp/plugin/NiciraNvpApiVersion.java | 7 +-
utils/src/main/java/com/cloud/utils/nio/Link.java | 63 +-
.../main/java/com/cloud/utils/nio/NioClient.java | 12 +-
.../java/com/cloud/utils/nio/NioConnection.java | 95 +-
.../main/java/com/cloud/utils/nio/NioServer.java | 6 +-
.../java/com/cloud/utils/rest/BasicRestClient.java | 9 +-
.../com/cloud/utils/rest/RESTServiceConnector.java | 19 +-
.../com/cloud/utils/script/OutputInterpreter.java | 8 +-
.../main/java/com/cloud/utils/script/Script.java | 179 +++-
.../main/java/com/cloud/utils/script/Script2.java | 2 +-
.../com/cloud/utils/server/ServerProperties.java | 5 +-
.../java/com/cloud/utils/ssh/SSHCmdHelper.java | 21 +-
.../main/java/com/cloud/utils/ssh/SshHelper.java | 35 +-
.../java/com/cloud/utils/storage/QCOW2Utils.java | 5 +-
.../java/com/cloud/utils/storage/S3/S3Utils.java | 5 +-
.../com/cloud/utils/storage/encoding/Decoder.java | 9 +-
.../java/com/cloud/utils/time/InaccurateClock.java | 11 +-
.../java/com/cloud/utils/xmlobject/XmlObject.java | 5 +-
.../utils/hypervisor/HypervisorUtils.java | 11 +-
.../utils/identity/ManagementServerNode.java | 4 +-
.../utils/imagestore/ImageStoreUtil.java | 19 +-
.../utils/jsinterpreter/JsInterpreter.java | 5 +-
.../utils/jsinterpreter/TagAsRuleHelper.java | 5 +-
.../cloudstack/utils/mailing/SMTPMailSender.java | 5 +-
.../cloudstack/utils/process/ProcessRunner.java | 21 +-
.../cloudstack/utils/redfish/RedfishClient.java | 19 +-
.../ReflectionToStringBuilderUtils.java | 5 +-
.../cloudstack/utils/security/CertUtils.java | 7 +-
.../cloudstack/utils/security/DigestHelper.java | 5 +-
.../cloudstack/utils/security/ParserUtils.java | 5 +-
.../apache/cloudstack/utils/security/SSLUtils.java | 5 +-
.../utils/security/SecureSSLSocketFactory.java | 7 +-
.../contrib/ssl/EasySSLProtocolSocketFactory.java | 9 +-
.../contrib/ssl/EasyX509TrustManager.java | 11 +-
.../src/test/java/com/cloud/utils/ScriptTest.java | 9 +-
.../backoff/impl/ConstantTimeBackoffTest.java | 13 +-
.../utils/log/CglibThrowableRendererTest.java | 85 --
.../java/com/cloud/utils/net/NetUtilsTest.java | 6 +-
.../com/cloud/utils/net/NetworkProtocolsTest.java | 2 +-
.../com/cloud/utils/rest/BasicRestClientTest.java | 2 +-
.../com/cloud/utils/rest/HttpRequestMatcher.java | 2 +-
.../cloud/utils/rest/RESTServiceConnectorTest.java | 2 +-
.../com/cloud/utils/security/SSLUtilsTest.java | 2 +-
.../java/com/cloud/utils/ssh/SshHelperTest.java | 2 +-
.../cloud/utils/testcase/Log4jEnabledTestCase.java | 5 +-
.../java/com/cloud/utils/testcase/NioTest.java | 43 +-
.../utils/hypervisor/HypervisorUtilsTest.java | 2 +-
.../utils/mailing/SMTPMailSenderTest.java | 15 +-
.../cloudstack/utils/process/ProcessTest.java | 2 +-
.../ReflectionToStringBuilderUtilsTest.java | 10 +-
.../utils/volume/VirtualMachineDiskInfoTest.java | 2 +-
utils/src/test/resources/log4j.xml | 137 +--
.../org.mockito.plugins.MockMaker | 1 -
vmware-base/pom.xml | 10 +
.../com/cloud/hypervisor/vmware/mo/BaseMO.java | 9 +-
.../com/cloud/hypervisor/vmware/mo/ClusterMO.java | 172 ++-
.../cloud/hypervisor/vmware/mo/DatacenterMO.java | 10 +-
.../cloud/hypervisor/vmware/mo/DatastoreMO.java | 40 +-
.../vmware/mo/DistributedVirtualSwitchMO.java | 10 +-
.../vmware/mo/HostDatastoreBrowserMO.java | 30 +-
.../hypervisor/vmware/mo/HostFirewallSystemMO.java | 2 -
.../com/cloud/hypervisor/vmware/mo/HostMO.java | 168 ++-
.../hypervisor/vmware/mo/HostNetworkSystemMO.java | 2 -
.../cloud/hypervisor/vmware/mo/HttpNfcLeaseMO.java | 16 +-
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 253 ++---
.../vmware/mo/LicenseAssignmentManagerMO.java | 2 -
.../hypervisor/vmware/mo/LicenseManagerMO.java | 2 -
.../hypervisor/vmware/mo/PbmPlacementSolverMO.java | 2 -
.../hypervisor/vmware/mo/PbmProfileManagerMO.java | 8 +-
.../hypervisor/vmware/mo/SnapshotDescriptor.java | 9 +-
.../cloud/hypervisor/vmware/mo/StoragepodMO.java | 2 -
.../com/cloud/hypervisor/vmware/mo/TaskMO.java | 8 +-
.../hypervisor/vmware/mo/VirtualDiskManagerMO.java | 2 -
.../hypervisor/vmware/mo/VirtualMachineMO.java | 417 ++++----
.../vmware/mo/VirtualStorageObjectManagerMO.java | 4 +-
.../hypervisor/vmware/mo/VmdkFileDescriptor.java | 68 +-
.../vmware/util/VcenterSessionHandler.java | 9 +-
.../cloud/hypervisor/vmware/util/VmwareClient.java | 41 +-
.../hypervisor/vmware/util/VmwareContext.java | 47 +-
.../hypervisor/vmware/util/VmwareContextPool.java | 19 +-
.../cloud/hypervisor/vmware/util/VmwareHelper.java | 39 +-
.../vmware/mo/HypervisorHostHelperTest.java | 44 +
.../vmware/mo/TestVmwareContextFactory.java | 9 +-
.../org.mockito.plugins.MockMaker | 1 -
2745 files changed, 51407 insertions(+), 28185 deletions(-)
delete mode 100644 agent/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
create mode 100644 api/src/main/java/com/cloud/network/nsx/NsxProvider.java
create mode 100644 api/src/main/java/com/cloud/network/nsx/NsxService.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/volume/CheckAndRepairVolumeCmd.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/TaggedResourceLimitAndCountResponse.java
create mode 100644 api/src/main/java/org/apache/cloudstack/quota/QuotaTariff.java
create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/domain/ListDomainsCmdTest.java
create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmdTest.java
create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/account/ListAccountsCmdTest.java
create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmdTest.java
create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmdTest.java
create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmdTest.java
create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmdTest.java
create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmdTest.java
create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/template/UpdateTemplateCmdTest.java
create mode 100644 api/src/test/java/org/apache/cloudstack/cluster/ClusterDrsAlgorithmTest.java
delete mode 100644 api/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
create mode 100644 core/src/main/java/com/cloud/agent/api/storage/CheckAndRepairVolumeAnswer.java
create mode 100644 core/src/main/java/com/cloud/agent/api/storage/CheckAndRepairVolumeCommand.java
create mode 100644 core/src/main/java/com/cloud/agent/transport/StoragePoolTypeAdaptor.java
create mode 100644 core/src/main/java/org/apache/cloudstack/backup/PrepareForBackupRestorationCommand.java
create mode 100644 core/src/test/java/com/cloud/agent/transport/LoggingExclusionStrategyTest.java
delete mode 100644 core/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
create mode 100644 engine/components-api/src/main/java/com/cloud/vm/VmWorkCheckAndRepairVolume.java
create mode 100644 engine/orchestration/src/test/java/com/cloud/vm/VmWorkRebootTest.java
create mode 100644 engine/orchestration/src/test/java/com/cloud/vm/VmWorkStartTest.java
delete mode 100644 engine/orchestration/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
create mode 100644 engine/schema/src/main/java/com/cloud/network/dao/NsxProviderDao.java
create mode 100644 engine/schema/src/main/java/com/cloud/network/dao/NsxProviderDaoImpl.java
create mode 100644 engine/schema/src/main/java/com/cloud/network/element/NsxProviderVO.java
create mode 100644 engine/schema/src/main/java/com/cloud/upgrade/dao/DbUpgradeAbstractImpl.java
create mode 100644 engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41900to41910.java
create mode 100644 engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41900to42000.java
create mode 100644 engine/schema/src/main/java/com/cloud/util/StoragePoolTypeConverter.java
create mode 100644 engine/schema/src/main/resources/META-INF/db/schema-41900to41910-cleanup.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/schema-41900to41910.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/schema-41900to42000-cleanup.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/schema-41900to42000.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.account_netstats_view.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.account_view.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.account_vmstats_view.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.affinity_group_view.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.domain_view.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.event_view.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.free_ip_view.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.image_store_view.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.instance_group_view.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.last_annotation_view.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.mshost_view.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.project_account_view.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.project_invitation_view.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.project_view.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.resource_tag_view.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.security_group_view.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.volume_view.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/views/cloud.vpc_offering_view.sql
delete mode 100644 engine/schema/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 engine/storage/configdrive/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 engine/storage/object/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 engine/storage/snapshot/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 plugins/acl/project-role-based/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
create mode 100644 plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/BackupFile.java
create mode 100644 plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/BackupFiles.java
create mode 100644 plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/VmRestorePoint.java
create mode 100644 plugins/backup/veeam/src/main/java/org/apache/cloudstack/backup/veeam/api/VmRestorePoints.java
delete mode 100644 plugins/database/quota/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
create mode 100644 plugins/host-allocators/random/src/test/java/com/cloud/agent/manager/allocator/impl/RandomAllocatorTest.java
create mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckAndRepairVolumeCommandWrapper.java
create mode 100644 plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckAndRepairVolumeCommandWrapperTest.java
delete mode 100644 plugins/hypervisors/kvm/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 plugins/hypervisors/vmware/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 plugins/hypervisors/xenserver/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 plugins/integrations/kubernetes-service/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 plugins/network-elements/elastic-loadbalancer/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 plugins/network-elements/nicira-nvp/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
create mode 100644 plugins/network-elements/nsx/pom.xml
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/NsxAnswer.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/StartupNsxCommand.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/CreateNsxDhcpRelayConfigCommand.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/CreateNsxDistributedFirewallRulesCommand.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/CreateNsxLoadBalancerRuleCommand.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/CreateNsxPortForwardRuleCommand.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/CreateNsxSegmentCommand.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/CreateNsxStaticNatCommand.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/CreateNsxTier1GatewayCommand.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/CreateOrUpdateNsxTier1NatRuleCommand.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/DeleteNsxDistributedFirewallRulesCommand.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/DeleteNsxLoadBalancerRuleCommand.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/DeleteNsxNatRuleCommand.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/DeleteNsxSegmentCommand.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/DeleteNsxTier1GatewayCommand.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/NsxCommand.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/NsxNetworkCommand.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/StartupNsxCommand.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/api/command/AddNsxControllerCmd.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/api/command/DeleteNsxControllerCmd.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/api/command/ListNsxControllersCmd.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/api/response/NsxControllerResponse.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxLoadBalancerMember.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxNetworkRule.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxOpObject.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxResource.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxGuestNetworkGuru.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxProviderService.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxProviderServiceImpl.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxPublicNetworkGuru.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxServiceImpl.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/utils/NsxControllerUtils.java
create mode 100644 plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/utils/NsxHelper.java
create mode 100644 plugins/network-elements/nsx/src/main/resources/META-INF/cloudstack/core/spring-nsx-core-managers-context.xml
create mode 100644 plugins/network-elements/nsx/src/main/resources/META-INF/cloudstack/nsx/module.properties
create mode 100644 plugins/network-elements/nsx/src/main/resources/META-INF/cloudstack/nsx/spring-nsx-context.xml
create mode 100644 plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/resource/NsxResourceTest.java
create mode 100644 plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxApiClientTest.java
create mode 100644 plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxElementTest.java
create mode 100644 plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxGuestNetworkGuruTest.java
create mode 100644 plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxProviderServiceImplTest.java
create mode 100644 plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxPublicNetworkGuruTest.java
create mode 100644 plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/service/NsxServiceImplTest.java
create mode 100644 plugins/network-elements/nsx/src/test/java/org/apache/cloudstack/utils/NsxControllerUtilsTest.java
delete mode 100644 plugins/network-elements/tungsten/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
create mode 100644 plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/provider/LinstorHostListener.java
delete mode 100644 plugins/storage/volume/scaleio/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 plugins/user-authenticators/ldap/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
create mode 100644 server/src/main/java/com/cloud/storage/CheckAndRepairVolumePayload.java
delete mode 100644 server/src/main/java/com/cloud/test/TestAppender.java
delete mode 100644 server/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 services/console-proxy/rdpconsole/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 services/console-proxy/server/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 services/secondary-storage/server/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
create mode 100644 systemvm/agent/packages/packages.ini
create mode 100644 systemvm/agent/packages/python-is-python3_3.9.2-1_all.deb
create mode 100644 systemvm/agent/packages/python3-netaddr_0.7.19-5_all.deb
delete mode 100755 systemvm/agent/scripts/consoleproxy.sh
delete mode 100755 systemvm/agent/scripts/secstorage.sh
create mode 100755 systemvm/debian/opt/cloud/bin/setup/patch.sh
create mode 100755 systemvm/test/__init__.py
create mode 100644 test/integration/component/test_resource_limit_tags.py
create mode 100644 test/integration/smoke/test_backup_recovery_veeam.py
create mode 100644 test/integration/smoke/test_list_accounts.py
create mode 100644 test/integration/smoke/test_list_disk_offerings.py
create mode 100644 test/integration/smoke/test_list_domains.py
create mode 100644 test/integration/smoke/test_list_hosts.py
create mode 100644 test/integration/smoke/test_list_service_offerings.py
create mode 100644 test/integration/smoke/test_list_storage_pools.py
create mode 100644 test/integration/smoke/test_list_volumes.py
delete mode 100644 utils/src/main/java/com/cloud/utils/log/CglibThrowableRenderer.java
delete mode 100644 utils/src/test/java/com/cloud/utils/log/CglibThrowableRendererTest.java
delete mode 100644 utils/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
delete mode 100644 vmware-base/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker