This is an automated email from the ASF dual-hosted git repository.

dahn pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


    from e2d37733623 Merge release branch 4.22 to main
     add b394b5ba74e Fix terms, typos and grammar mistakes in the API, error 
messages, events, etc. (#7857)
     add 55ab7c5589e Merge branch '4.20' into 4.22
     new 22da57f922d Merge branch '4.22'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../consoleproxy/ConsoleProxyResource.java         |   4 +-
 .../com/cloud/agent/api/storage/OVFHelper.java     |   8 +-
 .../commands/ListRecurringSnapshotScheduleCmd.java |   4 +-
 .../main/java/com/cloud/network/Ipv6Service.java   |   2 +-
 api/src/main/java/com/cloud/network/Network.java   |   6 +-
 .../java/com/cloud/network/NetworkService.java     |   2 +-
 .../com/cloud/network/as/AutoScaleVmGroup.java     |   2 +-
 .../java/com/cloud/user/ResourceLimitService.java  |   2 +-
 .../java/com/cloud/vm/snapshot/VMSnapshot.java     |   6 +-
 .../java/org/apache/cloudstack/acl/RoleType.java   |   4 +-
 .../cloudstack/affinity/AffinityGroupResponse.java |  20 +-
 .../affinity/AffinityGroupTypeResponse.java        |   2 +-
 .../cloudstack/api/AbstractGetUploadParamsCmd.java |  14 +-
 .../cloudstack/api/BaseAsyncCreateCustomIdCmd.java |   2 +-
 .../cloudstack/api/BaseAsyncCustomIdCmd.java       |   2 +-
 .../org/apache/cloudstack/api/BaseCustomIdCmd.java |   2 +-
 .../api/BaseListAccountResourcesCmd.java           |   2 +-
 .../cloudstack/api/BaseListDomainResourcesCmd.java |   4 +-
 .../api/BaseListProjectAndAccountResourcesCmd.java |   2 +-
 .../api/BaseListRetrieveOnlyResourceCountCmd.java  |   2 +-
 .../api/BaseListTemplateOrIsoPermissionsCmd.java   |   2 +-
 .../org/apache/cloudstack/api/BaseResponse.java    |   4 +-
 .../api/BaseResponseWithAnnotations.java           |   2 +-
 .../api/BaseResponseWithAssociatedNetwork.java     |   4 +-
 .../api/BaseResponseWithTagInformation.java        |   2 +-
 .../cloudstack/api/BaseUpdateTemplateOrIsoCmd.java |  26 +--
 .../api/BaseUpdateTemplateOrIsoPermissionsCmd.java |  16 +-
 .../command/admin/account/CreateAccountCmd.java    |  18 +-
 .../command/admin/account/DeleteAccountCmd.java    |   6 +-
 .../command/admin/account/DisableAccountCmd.java   |  10 +-
 .../command/admin/account/EnableAccountCmd.java    |   6 +-
 .../admin/account/ListAccountsCmdByAdmin.java      |   2 +-
 .../api/command/admin/account/LockAccountCmd.java  |   6 +-
 .../command/admin/account/UpdateAccountCmd.java    |  16 +-
 .../api/command/admin/acl/CreateRoleCmd.java       |   2 +-
 .../api/command/admin/acl/UpdateRoleCmd.java       |   2 +-
 .../command/admin/acl/UpdateRolePermissionCmd.java |   2 +-
 .../admin/acl/project/CreateProjectRoleCmd.java    |   2 +-
 .../admin/acl/project/UpdateProjectRoleCmd.java    |   2 +-
 .../project/UpdateProjectRolePermissionCmd.java    |   2 +-
 .../admin/address/AcquirePodIpCmdByAdmin.java      |   2 +-
 .../admin/address/AssociateIPAddrCmdByAdmin.java   |   2 +-
 .../address/ListPublicIpAddressesCmdByAdmin.java   |   2 +-
 .../admin/address/ReleasePodIpCmdByAdmin.java      |   2 +-
 .../UpdateVMAffinityGroupCmdByAdmin.java           |   2 +-
 .../command/admin/annotation/AddAnnotationCmd.java |  10 +-
 .../admin/annotation/ListAnnotationsCmd.java       |  10 +-
 .../admin/annotation/RemoveAnnotationCmd.java      |   4 +-
 .../annotation/UpdateAnnotationVisibilityCmd.java  |   6 +-
 .../command/admin/autoscale/CreateCounterCmd.java  |   4 +-
 .../command/admin/autoscale/DeleteCounterCmd.java  |   4 +-
 .../admin/backup/ImportBackupOfferingCmd.java      |   4 +-
 .../command/admin/ca/ProvisionCertificateCmd.java  |   4 +-
 .../api/command/admin/ca/RevokeCertificateCmd.java |   2 +-
 .../api/command/admin/cluster/AddClusterCmd.java   |  26 +--
 .../command/admin/cluster/DeleteClusterCmd.java    |   2 +-
 .../api/command/admin/cluster/ListClustersCmd.java |  18 +-
 .../command/admin/cluster/UpdateClusterCmd.java    |  10 +-
 .../command/admin/config/ListCfgGroupsByCmd.java   |   2 +-
 .../api/command/admin/config/ListCfgsByCmd.java    |  22 +-
 .../config/ListHypervisorCapabilitiesCmd.java      |   2 +-
 .../api/command/admin/config/ResetCfgCmd.java      |  14 +-
 .../api/command/admin/config/UpdateCfgCmd.java     |  16 +-
 .../config/UpdateHypervisorCapabilitiesCmd.java    |  16 +-
 .../admin/diagnostics/GetDiagnosticsDataCmd.java   |   8 +-
 .../admin/diagnostics/RunDiagnosticsCmd.java       |   8 +-
 .../ListTemplateDirectDownloadCertificatesCmd.java |   8 +-
 ...visionTemplateDirectDownloadCertificateCmd.java |   4 +-
 ...RevokeTemplateDirectDownloadCertificateCmd.java |  10 +-
 ...UploadTemplateDirectDownloadCertificateCmd.java |   4 +-
 .../api/command/admin/domain/CreateDomainCmd.java  |   4 +-
 .../api/command/admin/domain/DeleteDomainCmd.java  |   4 +-
 .../admin/domain/ListDomainChildrenCmd.java        |   8 +-
 .../api/command/admin/domain/ListDomainsCmd.java   |   4 +-
 .../api/command/admin/domain/UpdateDomainCmd.java  |   2 +-
 .../api/command/admin/guest/AddGuestOsCmd.java     |   4 +-
 .../command/admin/guest/AddGuestOsMappingCmd.java  |   4 +-
 .../admin/guest/GetHypervisorGuestOsNamesCmd.java  |   4 +-
 .../command/admin/guest/ListGuestOsMappingCmd.java |  12 +-
 .../command/admin/ha/ConfigureHAForHostCmd.java    |   2 +-
 .../command/admin/ha/DisableHAForClusterCmd.java   |   2 +-
 .../api/command/admin/ha/DisableHAForHostCmd.java  |   2 +-
 .../api/command/admin/ha/DisableHAForZoneCmd.java  |   2 +-
 .../command/admin/ha/EnableHAForClusterCmd.java    |   2 +-
 .../api/command/admin/ha/EnableHAForHostCmd.java   |   2 +-
 .../api/command/admin/ha/EnableHAForZoneCmd.java   |   2 +-
 .../api/command/admin/host/AddHostCmd.java         |  18 +-
 .../command/admin/host/AddSecondaryStorageCmd.java |   4 +-
 .../admin/host/CancelHostAsDegradedCmd.java        |   2 +-
 .../admin/host/CancelHostMaintenanceCmd.java       |   4 +-
 .../admin/host/DeclareHostAsDegradedCmd.java       |   4 +-
 .../api/command/admin/host/DeleteHostCmd.java      |   6 +-
 .../admin/host/FindHostsForMigrationCmd.java       |   4 +-
 .../api/command/admin/host/ListHostsCmd.java       |  28 +--
 .../admin/host/PrepareForHostMaintenanceCmd.java   |   2 +-
 .../api/command/admin/host/ReconnectHostCmd.java   |   2 +-
 .../admin/host/ReleaseHostReservationCmd.java      |   2 +-
 .../api/command/admin/host/UpdateHostCmd.java      |   8 +-
 .../command/admin/host/UpdateHostPasswordCmd.java  |  10 +-
 .../ConfigureInternalLoadBalancerElementCmd.java   |   2 +-
 .../CreateInternalLoadBalancerElementCmd.java      |   2 +-
 .../admin/internallb/ListInternalLBVMsCmd.java     |  22 +-
 .../ListInternalLoadBalancerElementsCmd.java       |   6 +-
 .../admin/internallb/StartInternalLBVMCmd.java     |  14 +-
 .../admin/internallb/StopInternalLBVMCmd.java      |  16 +-
 .../api/command/admin/iso/AttachIsoCmdByAdmin.java |   2 +-
 .../api/command/admin/iso/CopyIsoCmdByAdmin.java   |   2 +-
 .../api/command/admin/iso/DetachIsoCmdByAdmin.java |   2 +-
 .../admin/iso/ListIsoPermissionsCmdByAdmin.java    |   2 +-
 .../ListLoadBalancerRuleInstancesCmdByAdmin.java   |   2 +-
 .../api/command/admin/management/ListMgmtsCmd.java |   4 +-
 .../command/admin/network/AddNetworkDeviceCmd.java |   2 +-
 .../network/AddNetworkServiceProviderCmd.java      |   8 +-
 .../admin/network/CreateNetworkCmdByAdmin.java     |  14 +-
 .../admin/network/CreateNetworkOfferingCmd.java    |  52 ++---
 .../admin/network/CreatePhysicalNetworkCmd.java    |  26 +--
 .../network/CreateStorageNetworkIpRangeCmd.java    |  14 +-
 .../admin/network/DedicateGuestVlanRangeCmd.java   |  10 +-
 .../admin/network/DeleteNetworkOfferingCmd.java    |   2 +-
 .../network/DeleteNetworkServiceProviderCmd.java   |   2 +-
 .../admin/network/DeletePhysicalNetworkCmd.java    |   2 +-
 .../network/DeleteStorageNetworkIpRangeCmd.java    |   2 +-
 .../network/ListDedicatedGuestVlanRangesCmd.java   |  14 +-
 .../command/admin/network/ListGuestVlansCmd.java   |  10 +-
 .../admin/network/ListNetworkDeviceCmd.java        |   2 +-
 .../network/ListNetworkServiceProvidersCmd.java    |   6 +-
 .../admin/network/ListNetworksCmdByAdmin.java      |   2 +-
 .../admin/network/ListPhysicalNetworksCmd.java     |   6 +-
 .../network/ListStorageNetworkIpRangeCmd.java      |   8 +-
 .../network/ListSupportedNetworkServicesCmd.java   |   4 +-
 .../command/admin/network/MigrateNetworkCmd.java   |   8 +-
 .../api/command/admin/network/MigrateVPCCmd.java   |  14 +-
 .../network/ReleaseDedicatedGuestVlanRangeCmd.java |   2 +-
 .../admin/network/UpdateNetworkCmdByAdmin.java     |   2 +-
 .../admin/network/UpdateNetworkOfferingCmd.java    |  22 +-
 .../network/UpdateNetworkServiceProviderCmd.java   |   4 +-
 .../admin/network/UpdatePhysicalNetworkCmd.java    |   8 +-
 .../network/UpdateStorageNetworkIpRangeCmd.java    |   6 +-
 .../admin/offering/CreateDiskOfferingCmd.java      |  55 +++--
 .../admin/offering/CreateServiceOfferingCmd.java   |  79 ++++---
 .../admin/offering/DeleteServiceOfferingCmd.java   |   2 +-
 .../admin/offering/UpdateDiskOfferingCmd.java      |  40 ++--
 .../admin/offering/UpdateServiceOfferingCmd.java   |  16 +-
 .../ChangeOutOfBandManagementPasswordCmd.java      |   4 +-
 .../ConfigureOutOfBandManagementCmd.java           |  12 +-
 .../DisableOutOfBandManagementForClusterCmd.java   |   2 +-
 .../DisableOutOfBandManagementForHostCmd.java      |   2 +-
 .../DisableOutOfBandManagementForZoneCmd.java      |   2 +-
 .../EnableOutOfBandManagementForClusterCmd.java    |   2 +-
 .../EnableOutOfBandManagementForHostCmd.java       |   2 +-
 .../EnableOutOfBandManagementForZoneCmd.java       |   2 +-
 .../IssueOutOfBandManagementPowerActionCmd.java    |   6 +-
 .../api/command/admin/pod/CreatePodCmd.java        |  12 +-
 .../api/command/admin/pod/DeletePodCmd.java        |   2 +-
 .../api/command/admin/pod/ListPodsByCmd.java       |  10 +-
 .../api/command/admin/pod/UpdatePodCmd.java        |  12 +-
 .../admin/region/CreatePortableIpRangeCmd.java     |  10 +-
 .../admin/region/DeletePortableIpRangeCmd.java     |   2 +-
 .../admin/region/ListPortableIpRangesCmd.java      |   2 +-
 .../api/command/admin/region/UpdateRegionCmd.java  |   4 +-
 .../command/admin/resource/ArchiveAlertsCmd.java   |   8 +-
 .../admin/resource/CleanVMReservationsCmd.java     |   6 +-
 .../command/admin/resource/DeleteAlertsCmd.java    |   8 +-
 .../api/command/admin/resource/ListAlertsCmd.java  |   6 +-
 .../command/admin/resource/ListCapacityCmd.java    |  10 +-
 .../admin/resource/StartRollingMaintenanceCmd.java |  14 +-
 .../admin/resource/icon/DeleteResourceIconCmd.java |   6 +-
 .../admin/resource/icon/ListResourceIconCmd.java   |   4 +-
 .../admin/resource/icon/UploadResourceIconCmd.java |   4 +-
 .../admin/router/ConfigureOvsElementCmd.java       |   2 +-
 .../router/ConfigureVirtualRouterElementCmd.java   |   2 +-
 .../router/CreateVirtualRouterElementCmd.java      |   2 +-
 .../api/command/admin/router/DestroyRouterCmd.java |   2 +-
 .../router/GetRouterHealthCheckResultsCmd.java     |   4 +-
 .../command/admin/router/ListOvsElementsCmd.java   |   6 +-
 .../api/command/admin/router/ListRoutersCmd.java   |  24 +--
 .../admin/router/ListVirtualRouterElementsCmd.java |   6 +-
 .../api/command/admin/router/RebootRouterCmd.java  |   2 +-
 .../api/command/admin/router/StartRouterCmd.java   |   2 +-
 .../api/command/admin/router/StopRouterCmd.java    |   4 +-
 .../api/command/admin/router/UpgradeRouterCmd.java |   2 +-
 .../admin/router/UpgradeRouterTemplateCmd.java     |  18 +-
 .../command/admin/storage/AddImageStoreCmd.java    |  10 +-
 .../CancelPrimaryStorageMaintenanceCmd.java        |   2 +-
 .../storage/CreateSecondaryStagingStoreCmd.java    |  12 +-
 .../admin/storage/CreateStoragePoolCmd.java        |  24 +--
 .../storage/DeleteSecondaryStagingStoreCmd.java    |   2 +-
 .../storage/FindStoragePoolsForMigrationCmd.java   |   2 +-
 .../command/admin/storage/ListImageStoresCmd.java  |  12 +-
 .../storage/ListSecondaryStagingStoresCmd.java     |  10 +-
 .../command/admin/storage/ListStoragePoolsCmd.java |  18 +-
 .../admin/storage/ListStorageProvidersCmd.java     |   2 +-
 .../storage/MigrateSecondaryStorageDataCmd.java    |   6 +-
 .../storage/UpdateCloudToUseObjectStoreCmd.java    |   8 +-
 .../admin/storage/UpdateStoragePoolCmd.java        |   8 +-
 .../api/command/admin/swift/AddSwiftCmd.java       |   6 +-
 .../api/command/admin/swift/ListSwiftsCmd.java     |   2 +-
 .../command/admin/systemvm/DestroySystemVmCmd.java |   6 +-
 .../command/admin/systemvm/ListSystemVMsCmd.java   |  18 +-
 .../command/admin/systemvm/MigrateSystemVMCmd.java |  16 +-
 .../command/admin/systemvm/PatchSystemVMCmd.java   |   2 +-
 .../command/admin/systemvm/RebootSystemVmCmd.java  |   4 +-
 .../command/admin/systemvm/ScaleSystemVMCmd.java   |   4 +-
 .../command/admin/systemvm/StartSystemVMCmd.java   |   4 +-
 .../command/admin/systemvm/StopSystemVmCmd.java    |   6 +-
 .../command/admin/systemvm/UpgradeSystemVMCmd.java |   6 +-
 .../admin/template/CopyTemplateCmdByAdmin.java     |   2 +-
 .../admin/template/CreateTemplateCmdByAdmin.java   |   4 +-
 .../ListTemplatePermissionsCmdByAdmin.java         |   2 +-
 .../admin/template/ListTemplatesCmdByAdmin.java    |   2 +-
 .../command/admin/template/PrepareTemplateCmd.java |   8 +-
 .../admin/template/RegisterTemplateCmdByAdmin.java |   2 +-
 .../admin/template/UpdateTemplateCmdByAdmin.java   |   2 +-
 .../api/command/admin/usage/AddTrafficTypeCmd.java |   6 +-
 .../command/admin/usage/DeleteTrafficTypeCmd.java  |   2 +-
 .../admin/usage/ListTrafficMonitorsCmd.java        |   2 +-
 .../command/admin/usage/ListTrafficTypesCmd.java   |   2 +-
 .../command/admin/usage/UpdateTrafficTypeCmd.java  |   2 +-
 .../api/command/admin/user/CreateUserCmd.java      |   6 +-
 .../api/command/admin/user/DeleteUserCmd.java      |   2 +-
 .../api/command/admin/user/ListUsersCmd.java       |   2 +-
 .../api/command/admin/user/MoveUserCmd.java        |   2 +-
 .../api/command/admin/user/UpdateUserCmd.java      |   6 +-
 .../command/admin/vlan/CreateVlanIpRangeCmd.java   |  38 ++--
 .../admin/vlan/DedicatePublicIpRangeCmd.java       |   8 +-
 .../command/admin/vlan/DeleteVlanIpRangeCmd.java   |   2 +-
 .../command/admin/vlan/ListVlanIpRangesCmd.java    |  20 +-
 .../admin/vlan/ReleasePublicIpRangeCmd.java        |   2 +-
 .../command/admin/vlan/UpdateVlanIpRangeCmd.java   |  22 +-
 .../api/command/admin/vm/AddNicToVMCmdByAdmin.java |   2 +-
 .../api/command/admin/vm/AssignVMCmd.java          |  18 +-
 .../api/command/admin/vm/DeployVMCmdByAdmin.java   |   6 +-
 .../api/command/admin/vm/DestroyVMCmdByAdmin.java  |   2 +-
 .../api/command/admin/vm/ExpungeVMCmd.java         |   8 +-
 .../api/command/admin/vm/GetVMUserDataCmd.java     |   4 +-
 .../admin/vm/ImportUnmanagedInstanceCmd.java       |  34 +--
 .../admin/vm/ListUnmanagedInstancesCmd.java        |   6 +-
 .../api/command/admin/vm/ListVMsCmdByAdmin.java    |  10 +-
 .../api/command/admin/vm/MigrateVMCmd.java         |  26 +--
 .../vm/MigrateVirtualMachineWithVolumeCmd.java     |  16 +-
 .../api/command/admin/vm/RebootVMCmdByAdmin.java   |   2 +-
 .../api/command/admin/vm/RecoverVMCmd.java         |   6 +-
 .../admin/vm/RemoveNicFromVMCmdByAdmin.java        |   2 +-
 .../admin/vm/ResetVMPasswordCmdByAdmin.java        |   4 +-
 .../command/admin/vm/ResetVMSSHKeyCmdByAdmin.java  |   4 +-
 .../command/admin/vm/ResetVMUserDataCmdAdmin.java  |   4 +-
 .../api/command/admin/vm/RestoreVMCmdByAdmin.java  |   2 +-
 .../api/command/admin/vm/ScaleVMCmdByAdmin.java    |   2 +-
 .../api/command/admin/vm/StartVMCmdByAdmin.java    |   2 +-
 .../api/command/admin/vm/StopVMCmdByAdmin.java     |   2 +-
 .../command/admin/vm/UnmanageVMInstanceCmd.java    |   6 +-
 .../admin/vm/UpdateDefaultNicForVMCmdByAdmin.java  |   2 +-
 .../api/command/admin/vm/UpdateVMCmdByAdmin.java   |   6 +-
 .../api/command/admin/vm/UpgradeVMCmdByAdmin.java  |   4 +-
 .../vmsnapshot/RevertToVMSnapshotCmdByAdmin.java   |   2 +-
 .../admin/volume/AttachVolumeCmdByAdmin.java       |   2 +-
 .../admin/volume/CreateVolumeCmdByAdmin.java       |   2 +-
 .../admin/volume/DetachVolumeCmdByAdmin.java       |   2 +-
 .../admin/vpc/CreatePrivateGatewayByAdminCmd.java  |   6 +-
 .../command/admin/vpc/CreateVPCOfferingCmd.java    |  20 +-
 .../command/admin/vpc/DeletePrivateGatewayCmd.java |   2 +-
 .../command/admin/vpc/DeleteVPCOfferingCmd.java    |   2 +-
 .../command/admin/vpc/UpdateVPCOfferingCmd.java    |  14 +-
 .../api/command/admin/zone/CreateZoneCmd.java      |  26 +--
 .../api/command/admin/zone/DeleteZoneCmd.java      |   2 +-
 .../api/command/admin/zone/UpdateZoneCmd.java      |  30 +--
 .../user/account/AddAccountToProjectCmd.java       |  14 +-
 .../command/user/account/AddUserToProjectCmd.java  |  14 +-
 .../user/account/DeleteAccountFromProjectCmd.java  |  10 +-
 .../user/account/DeleteUserFromProjectCmd.java     |  12 +-
 .../api/command/user/account/ListAccountsCmd.java  |  16 +-
 .../user/account/ListProjectAccountsCmd.java       |  10 +-
 .../command/user/address/AssociateIPAddrCmd.java   |  32 +--
 .../user/address/DisassociateIPAddrCmd.java        |   4 +-
 .../user/address/ListPublicIpAddressesCmd.java     |  28 +--
 .../api/command/user/address/ReleaseIPAddrCmd.java |   4 +-
 .../api/command/user/address/ReserveIPAddrCmd.java |  12 +-
 .../api/command/user/address/UpdateIPAddrCmd.java  |   4 +-
 .../user/affinitygroup/CreateAffinityGroupCmd.java |  10 +-
 .../user/affinitygroup/DeleteAffinityGroupCmd.java |   6 +-
 .../user/affinitygroup/ListAffinityGroupsCmd.java  |   8 +-
 .../affinitygroup/UpdateVMAffinityGroupCmd.java    |  16 +-
 .../user/autoscale/CreateAutoScalePolicyCmd.java   |  12 +-
 .../user/autoscale/CreateAutoScaleVmGroupCmd.java  |  30 +--
 .../autoscale/CreateAutoScaleVmProfileCmd.java     |  28 +--
 .../command/user/autoscale/CreateConditionCmd.java |   8 +-
 .../user/autoscale/DeleteAutoScalePolicyCmd.java   |   2 +-
 .../user/autoscale/DeleteAutoScaleVmGroupCmd.java  |  12 +-
 .../autoscale/DeleteAutoScaleVmProfileCmd.java     |  12 +-
 .../command/user/autoscale/DeleteConditionCmd.java |   4 +-
 .../user/autoscale/DisableAutoScaleVmGroupCmd.java |   8 +-
 .../user/autoscale/EnableAutoScaleVmGroupCmd.java  |   8 +-
 .../user/autoscale/ListAutoScalePoliciesCmd.java   |  10 +-
 .../user/autoscale/ListAutoScaleVmGroupsCmd.java   |  16 +-
 .../user/autoscale/ListAutoScaleVmProfilesCmd.java |  14 +-
 .../command/user/autoscale/ListConditionsCmd.java  |   4 +-
 .../command/user/autoscale/ListCountersCmd.java    |   2 +-
 .../user/autoscale/UpdateAutoScalePolicyCmd.java   |  10 +-
 .../user/autoscale/UpdateAutoScaleVmGroupCmd.java  |  22 +-
 .../autoscale/UpdateAutoScaleVmProfileCmd.java     |  22 +-
 .../command/user/autoscale/UpdateConditionCmd.java |   4 +-
 .../AssignVirtualMachineToBackupOfferingCmd.java   |   8 +-
 .../api/command/user/backup/CreateBackupCmd.java   |   8 +-
 .../user/backup/CreateBackupScheduleCmd.java       |  10 +-
 .../api/command/user/backup/DeleteBackupCmd.java   |   8 +-
 .../user/backup/DeleteBackupScheduleCmd.java       |   4 +-
 .../command/user/backup/ListBackupScheduleCmd.java |   5 +-
 .../api/command/user/backup/ListBackupsCmd.java    |   8 +-
 .../RemoveVirtualMachineFromBackupOfferingCmd.java |  10 +-
 .../api/command/user/backup/RestoreBackupCmd.java  |   6 +-
 .../RestoreVolumeFromBackupAndAttachToVMCmd.java   |  10 +-
 .../user/backup/UpdateBackupScheduleCmd.java       |   2 +-
 .../consoleproxy/CreateConsoleEndpointCmd.java     |   6 +-
 .../api/command/user/event/ArchiveEventsCmd.java   |   8 +-
 .../api/command/user/event/DeleteEventsCmd.java    |   8 +-
 .../api/command/user/event/ListEventsCmd.java      |  22 +-
 .../user/firewall/CreateEgressFirewallRuleCmd.java |  20 +-
 .../user/firewall/CreateFirewallRuleCmd.java       |  20 +-
 .../user/firewall/CreatePortForwardingRuleCmd.java |  28 +--
 .../user/firewall/DeleteEgressFirewallRuleCmd.java |   2 +-
 .../user/firewall/DeleteFirewallRuleCmd.java       |   2 +-
 .../user/firewall/DeletePortForwardingRuleCmd.java |   2 +-
 .../user/firewall/ListEgressFirewallRulesCmd.java  |   6 +-
 .../user/firewall/ListFirewallRulesCmd.java        |   6 +-
 .../user/firewall/ListPortForwardingRulesCmd.java  |   6 +-
 .../user/firewall/UpdateEgressFirewallRuleCmd.java |   4 +-
 .../user/firewall/UpdateFirewallRuleCmd.java       |   4 +-
 .../user/firewall/UpdatePortForwardingRuleCmd.java |  14 +-
 .../user/guest/ListGuestOsCategoriesCmd.java       |   2 +-
 .../api/command/user/guest/ListGuestOsCmd.java     |   6 +-
 .../user/ipv6/CreateIpv6FirewallRuleCmd.java       |  26 +--
 .../user/ipv6/DeleteIpv6FirewallRuleCmd.java       |   2 +-
 .../user/ipv6/ListIpv6FirewallRulesCmd.java        |   8 +-
 .../user/ipv6/UpdateIpv6FirewallRuleCmd.java       |  20 +-
 .../api/command/user/iso/AttachIsoCmd.java         |  10 +-
 .../api/command/user/iso/DeleteIsoCmd.java         |   4 +-
 .../api/command/user/iso/DetachIsoCmd.java         |   8 +-
 .../api/command/user/iso/ExtractIsoCmd.java        |   8 +-
 .../command/user/iso/GetUploadParamsForIsoCmd.java |  14 +-
 .../command/user/iso/ListIsoPermissionsCmd.java    |   2 +-
 .../api/command/user/iso/ListIsosCmd.java          |  34 +--
 .../api/command/user/iso/RegisterIsoCmd.java       |  30 +--
 .../api/command/user/job/ListAsyncJobsCmd.java     |   2 +-
 .../command/user/job/QueryAsyncJobResultCmd.java   |   2 +-
 .../loadbalancer/AssignCertToLoadBalancerCmd.java  |   4 +-
 .../loadbalancer/AssignToLoadBalancerRuleCmd.java  |  12 +-
 .../CreateApplicationLoadBalancerCmd.java          |  20 +-
 .../loadbalancer/CreateLBHealthCheckPolicyCmd.java |  10 +-
 .../loadbalancer/CreateLBStickinessPolicyCmd.java  |  12 +-
 .../loadbalancer/CreateLoadBalancerRuleCmd.java    |  40 ++--
 .../DeleteApplicationLoadBalancerCmd.java          |   2 +-
 .../loadbalancer/DeleteLBHealthCheckPolicyCmd.java |   2 +-
 .../loadbalancer/DeleteLBStickinessPolicyCmd.java  |   2 +-
 .../loadbalancer/DeleteLoadBalancerRuleCmd.java    |   2 +-
 .../ListApplicationLoadBalancersCmd.java           |  14 +-
 .../loadbalancer/ListLBHealthCheckPoliciesCmd.java |   6 +-
 .../loadbalancer/ListLBStickinessPoliciesCmd.java  |   6 +-
 .../ListLoadBalancerRuleInstancesCmd.java          |   8 +-
 .../loadbalancer/ListLoadBalancerRulesCmd.java     |  14 +-
 .../RemoveCertFromLoadBalancerCmd.java             |   2 +-
 .../RemoveFromLoadBalancerRuleCmd.java             |  14 +-
 .../UpdateApplicationLoadBalancerCmd.java          |   4 +-
 .../loadbalancer/UpdateLBHealthCheckPolicyCmd.java |   2 +-
 .../loadbalancer/UpdateLBStickinessPolicyCmd.java  |   4 +-
 .../loadbalancer/UpdateLoadBalancerRuleCmd.java    |  10 +-
 .../user/loadbalancer/UploadSslCertCmd.java        |   6 +-
 .../user/nat/CreateIpForwardingRuleCmd.java        |  16 +-
 .../user/nat/DeleteIpForwardingRuleCmd.java        |   2 +-
 .../api/command/user/nat/DisableStaticNatCmd.java  |   2 +-
 .../api/command/user/nat/EnableStaticNatCmd.java   |  12 +-
 .../command/user/nat/ListIpForwardingRulesCmd.java |   4 +-
 .../command/user/network/CreateNetworkACLCmd.java  |  24 +--
 .../user/network/CreateNetworkACLListCmd.java      |  12 +-
 .../api/command/user/network/CreateNetworkCmd.java |  58 +++---
 .../user/network/CreateNetworkPermissionsCmd.java  |   8 +-
 .../command/user/network/DeleteNetworkACLCmd.java  |   6 +-
 .../user/network/DeleteNetworkACLListCmd.java      |   2 +-
 .../api/command/user/network/DeleteNetworkCmd.java |   4 +-
 .../user/network/ListNetworkACLListsCmd.java       |   8 +-
 .../command/user/network/ListNetworkACLsCmd.java   |  12 +-
 .../user/network/ListNetworkOfferingsCmd.java      |  36 ++--
 .../user/network/ListNetworkPermissionsCmd.java    |   4 +-
 .../api/command/user/network/ListNetworksCmd.java  |  42 ++--
 .../user/network/MoveNetworkAclItemCmd.java        |   4 +-
 .../user/network/RemoveNetworkPermissionsCmd.java  |  12 +-
 .../user/network/ReplaceNetworkACLListCmd.java     |   6 +-
 .../user/network/ResetNetworkPermissionsCmd.java   |   6 +-
 .../command/user/network/RestartNetworkCmd.java    |   2 +-
 .../user/network/UpdateNetworkACLItemCmd.java      |  22 +-
 .../user/network/UpdateNetworkACLListCmd.java      |   6 +-
 .../api/command/user/network/UpdateNetworkCmd.java |  24 +--
 .../user/offering/ListDiskOfferingsCmd.java        |   6 +-
 .../user/offering/ListServiceOfferingsCmd.java     |  18 +-
 .../command/user/project/ActivateProjectCmd.java   |   2 +-
 .../api/command/user/project/CreateProjectCmd.java |  10 +-
 .../api/command/user/project/DeleteProjectCmd.java |   4 +-
 .../user/project/DeleteProjectInvitationCmd.java   |   2 +-
 .../user/project/ListProjectInvitationsCmd.java    |  10 +-
 .../api/command/user/project/ListProjectsCmd.java  |  12 +-
 .../command/user/project/SuspendProjectCmd.java    |   2 +-
 .../api/command/user/project/UpdateProjectCmd.java |  18 +-
 .../user/project/UpdateProjectInvitationCmd.java   |   8 +-
 .../ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java |   4 +-
 .../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java   |  16 +-
 .../ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java   |   2 +-
 .../ha/gslb/ListGlobalLoadBalancerRuleCmd.java     |   4 +-
 .../gslb/RemoveFromGlobalLoadBalancerRuleCmd.java  |   2 +-
 .../ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java   |  10 +-
 .../user/resource/GetCloudIdentifierCmd.java       |   2 +-
 .../user/resource/ListDetailOptionsCmd.java        |   6 +-
 .../command/user/resource/ListHypervisorsCmd.java  |   2 +-
 .../user/resource/ListResourceLimitsCmd.java       |  12 +-
 .../user/resource/UpdateResourceCountCmd.java      |   6 +-
 .../user/resource/UpdateResourceLimitCmd.java      |  10 +-
 .../AuthorizeSecurityGroupEgressCmd.java           |  22 +-
 .../AuthorizeSecurityGroupIngressCmd.java          |  24 +--
 .../user/securitygroup/CreateSecurityGroupCmd.java |   8 +-
 .../user/securitygroup/DeleteSecurityGroupCmd.java |   8 +-
 .../user/securitygroup/ListSecurityGroupsCmd.java  |   6 +-
 .../user/securitygroup/UpdateSecurityGroupCmd.java |   2 +-
 .../command/user/snapshot/ArchiveSnapshotCmd.java  |   8 +-
 .../command/user/snapshot/CreateSnapshotCmd.java   |  24 +--
 .../snapshot/CreateSnapshotFromVMSnapshotCmd.java  |  30 +--
 .../user/snapshot/CreateSnapshotPolicyCmd.java     |  16 +-
 .../command/user/snapshot/DeleteSnapshotCmd.java   |   8 +-
 .../user/snapshot/DeleteSnapshotPoliciesCmd.java   |   8 +-
 .../user/snapshot/ListSnapshotPoliciesCmd.java     |   8 +-
 .../command/user/snapshot/ListSnapshotsCmd.java    |  16 +-
 .../command/user/snapshot/RevertSnapshotCmd.java   |   8 +-
 .../user/snapshot/UpdateSnapshotPolicyCmd.java     |  16 +-
 .../api/command/user/ssh/CreateSSHKeyPairCmd.java  |   6 +-
 .../api/command/user/ssh/DeleteSSHKeyPairCmd.java  |   6 +-
 .../api/command/user/ssh/ListSSHKeyPairsCmd.java   |   2 +-
 .../command/user/ssh/RegisterSSHKeyPairCmd.java    |   6 +-
 .../api/command/user/tag/CreateTagsCmd.java        |   6 +-
 .../api/command/user/tag/ListTagsCmd.java          |  10 +-
 .../api/command/user/template/CopyTemplateCmd.java |  18 +-
 .../command/user/template/CreateTemplateCmd.java   |  42 ++--
 .../command/user/template/DeleteTemplateCmd.java   |  12 +-
 .../command/user/template/ExtractTemplateCmd.java  |  14 +-
 .../template/GetUploadParamsForTemplateCmd.java    |  34 +--
 .../user/template/ListTemplatePermissionsCmd.java  |   2 +-
 .../command/user/template/ListTemplatesCmd.java    |  36 ++--
 .../command/user/template/RegisterTemplateCmd.java |  58 +++---
 .../command/user/template/UpdateTemplateCmd.java   |   6 +-
 .../template/UpdateTemplatePermissionsCmd.java     |   6 +-
 .../command/user/userdata/DeleteUserDataCmd.java   |   8 +-
 .../user/userdata/LinkUserDataToTemplateCmd.java   |  14 +-
 .../api/command/user/userdata/ListUserDataCmd.java |   2 +-
 .../command/user/userdata/RegisterUserDataCmd.java |  13 +-
 .../api/command/user/vm/AddIpToVmNicCmd.java       |  16 +-
 .../api/command/user/vm/AddNicToVMCmd.java         |  14 +-
 .../api/command/user/vm/CreateVMScheduleCmd.java   |  16 +-
 .../api/command/user/vm/DeleteVMScheduleCmd.java   |  12 +-
 .../api/command/user/vm/DeployVMCmd.java           |  17 +-
 .../api/command/user/vm/DestroyVMCmd.java          |  10 +-
 .../api/command/user/vm/GetVMPasswordCmd.java      |   6 +-
 .../api/command/user/vm/ListNicsCmd.java           |  12 +-
 .../api/command/user/vm/ListVMScheduleCmd.java     |   8 +-
 .../cloudstack/api/command/user/vm/ListVMsCmd.java |  52 ++---
 .../api/command/user/vm/RebootVMCmd.java           |  10 +-
 .../api/command/user/vm/RemoveIpFromVmNicCmd.java  |   6 +-
 .../api/command/user/vm/RemoveNicFromVMCmd.java    |   8 +-
 .../api/command/user/vm/ResetVMPasswordCmd.java    |  10 +-
 .../api/command/user/vm/ResetVMSSHKeyCmd.java      |  20 +-
 .../api/command/user/vm/ResetVMUserDataCmd.java    |  20 +-
 .../api/command/user/vm/RestoreVMCmd.java          |  10 +-
 .../cloudstack/api/command/user/vm/ScaleVMCmd.java |  12 +-
 .../cloudstack/api/command/user/vm/StartVMCmd.java |  20 +-
 .../cloudstack/api/command/user/vm/StopVMCmd.java  |  14 +-
 .../command/user/vm/UpdateDefaultNicForVMCmd.java  |   8 +-
 .../api/command/user/vm/UpdateVMCmd.java           |  50 ++---
 .../api/command/user/vm/UpdateVMScheduleCmd.java   |  12 +-
 .../api/command/user/vm/UpdateVmNicIpCmd.java      |  14 +-
 .../api/command/user/vm/UpgradeVMCmd.java          |  12 +-
 .../api/command/user/vmgroup/CreateVMGroupCmd.java |  12 +-
 .../api/command/user/vmgroup/DeleteVMGroupCmd.java |   6 +-
 .../api/command/user/vmgroup/ListVMGroupsCmd.java  |   6 +-
 .../api/command/user/vmgroup/UpdateVMGroupCmd.java |   6 +-
 .../user/vmsnapshot/CreateVMSnapshotCmd.java       |  20 +-
 .../user/vmsnapshot/DeleteVMSnapshotCmd.java       |   8 +-
 .../command/user/vmsnapshot/ListVMSnapshotCmd.java |  12 +-
 .../user/vmsnapshot/RevertToVMSnapshotCmd.java     |   8 +-
 .../command/user/volume/AddResourceDetailCmd.java  |   6 +-
 .../api/command/user/volume/AssignVolumeCmd.java   |   6 +-
 .../api/command/user/volume/AttachVolumeCmd.java   |  10 +-
 .../user/volume/ChangeOfferingForVolumeCmd.java    |   4 +-
 .../api/command/user/volume/CreateVolumeCmd.java   |  32 +--
 .../api/command/user/volume/DeleteVolumeCmd.java   |   2 +-
 .../api/command/user/volume/DestroyVolumeCmd.java  |   2 +-
 .../api/command/user/volume/DetachVolumeCmd.java   |  10 +-
 .../api/command/user/volume/ExtractVolumeCmd.java  |   8 +-
 .../user/volume/GetUploadParamsForVolumeCmd.java   |   2 +-
 .../user/volume/ListResourceDetailsCmd.java        |  10 +-
 .../api/command/user/volume/ListVolumesCmd.java    |  30 +--
 .../api/command/user/volume/MigrateVolumeCmd.java  |   6 +-
 .../api/command/user/volume/ResizeVolumeCmd.java   |   4 +-
 .../api/command/user/volume/UpdateVolumeCmd.java   |   6 +-
 .../api/command/user/volume/UploadVolumeCmd.java   |  16 +-
 .../command/user/vpc/CreatePrivateGatewayCmd.java  |  22 +-
 .../api/command/user/vpc/CreateStaticRouteCmd.java |   7 +-
 .../api/command/user/vpc/CreateVPCCmd.java         |  38 ++--
 .../api/command/user/vpc/DeleteStaticRouteCmd.java |   2 +-
 .../api/command/user/vpc/DeleteVPCCmd.java         |   2 +-
 .../command/user/vpc/ListPrivateGatewaysCmd.java   |  10 +-
 .../api/command/user/vpc/ListStaticRoutesCmd.java  |   8 +-
 .../api/command/user/vpc/ListVPCOfferingsCmd.java  |  16 +-
 .../api/command/user/vpc/ListVPCsCmd.java          |  24 +--
 .../api/command/user/vpc/RestartVPCCmd.java        |   4 +-
 .../api/command/user/vpc/UpdateVPCCmd.java         |  12 +-
 .../api/command/user/vpn/AddVpnUserCmd.java        |  18 +-
 .../command/user/vpn/CreateRemoteAccessVpnCmd.java |  20 +-
 .../command/user/vpn/CreateVpnConnectionCmd.java   |  16 +-
 .../user/vpn/CreateVpnCustomerGatewayCmd.java      |  18 +-
 .../api/command/user/vpn/CreateVpnGatewayCmd.java  |   8 +-
 .../command/user/vpn/DeleteRemoteAccessVpnCmd.java |  10 +-
 .../command/user/vpn/DeleteVpnConnectionCmd.java   |   6 +-
 .../user/vpn/DeleteVpnCustomerGatewayCmd.java      |   6 +-
 .../api/command/user/vpn/DeleteVpnGatewayCmd.java  |   6 +-
 .../command/user/vpn/ListRemoteAccessVpnsCmd.java  |  10 +-
 .../command/user/vpn/ListVpnConnectionsCmd.java    |   8 +-
 .../user/vpn/ListVpnCustomerGatewaysCmd.java       |   4 +-
 .../api/command/user/vpn/ListVpnGatewaysCmd.java   |   8 +-
 .../api/command/user/vpn/ListVpnUsersCmd.java      |   6 +-
 .../api/command/user/vpn/RemoveVpnUserCmd.java     |  18 +-
 .../command/user/vpn/ResetVpnConnectionCmd.java    |  10 +-
 .../command/user/vpn/UpdateRemoteAccessVpnCmd.java |   8 +-
 .../command/user/vpn/UpdateVpnConnectionCmd.java   |   6 +-
 .../user/vpn/UpdateVpnCustomerGatewayCmd.java      |  16 +-
 .../api/command/user/vpn/UpdateVpnGatewayCmd.java  |   6 +-
 .../api/command/user/zone/ListZonesCmd.java        |  16 +-
 .../cloudstack/api/response/AccountResponse.java   | 116 +++++------
 .../api/response/AcquireIPAddressResponse.java     |  60 +++---
 .../api/response/AcquirePodIpCmdResponse.java      |   8 +-
 .../cloudstack/api/response/AlertResponse.java     |   8 +-
 .../api/response/AnnotationResponse.java           |  18 +-
 .../ApplicationLoadBalancerInstanceResponse.java   |   8 +-
 .../response/ApplicationLoadBalancerResponse.java  |  32 +--
 .../ApplicationLoadBalancerRuleResponse.java       |   6 +-
 .../cloudstack/api/response/AsyncJobResponse.java  |  30 +--
 .../api/response/AutoScalePolicyResponse.java      |  22 +-
 .../api/response/AutoScaleVmGroupResponse.java     |  50 ++---
 .../api/response/AutoScaleVmProfileResponse.java   |  30 +--
 .../api/response/BackupOfferingResponse.java       |  14 +-
 .../api/response/BackupProviderResponse.java       |   4 +-
 .../cloudstack/api/response/BackupResponse.java    |  36 ++--
 .../api/response/BackupRestorePointResponse.java   |   6 +-
 .../api/response/BackupScheduleResponse.java       |  10 +-
 .../api/response/BaseRolePermissionResponse.java   |   6 +-
 .../cloudstack/api/response/BaseRoleResponse.java  |   8 +-
 .../api/response/CAProviderResponse.java           |   4 +-
 .../api/response/CapabilitiesResponse.java         |  46 ++---
 .../api/response/CapabilityResponse.java           |   6 +-
 .../cloudstack/api/response/CapacityResponse.java  |  24 +--
 .../api/response/ChildTemplateResponse.java        |   8 +-
 .../api/response/CloudIdentifierResponse.java      |   6 +-
 .../cloudstack/api/response/ClusterResponse.java   |  24 +--
 .../cloudstack/api/response/ConditionResponse.java |  18 +-
 .../api/response/ConfigurationGroupResponse.java   |   8 +-
 .../api/response/ConfigurationResponse.java        |  30 +--
 .../response/ConfigurationSubGroupResponse.java    |   4 +-
 .../response/ConsoleEndpointWebsocketResponse.java |  10 +-
 .../cloudstack/api/response/CounterResponse.java   |   4 +-
 .../response/CreateConsoleEndpointResponse.java    |   8 +-
 .../api/response/CustomCertificateResponse.java    |   2 +-
 .../DataCenterGuestIpv6PrefixResponse.java         |  14 +-
 ...irectDownloadCertificateHostStatusResponse.java |   8 +-
 .../DirectDownloadCertificateResponse.java         |  22 +-
 .../api/response/DiskOfferingResponse.java         |  66 +++---
 .../cloudstack/api/response/DomainResponse.java    |  94 ++++-----
 .../api/response/DomainRouterResponse.java         | 100 ++++-----
 .../cloudstack/api/response/EventResponse.java     |  34 +--
 .../cloudstack/api/response/ExceptionResponse.java |   8 +-
 .../api/response/ExternalFirewallResponse.java     |  22 +-
 .../api/response/ExternalLoadBalancerResponse.java |  14 +-
 .../cloudstack/api/response/ExtractResponse.java   |  26 +--
 .../cloudstack/api/response/FirewallResponse.java  |  30 +--
 .../api/response/FirewallRuleResponse.java         |  34 +--
 .../api/response/GetUploadParamsResponse.java      |   8 +-
 .../api/response/GetVMPasswordResponse.java        |   2 +-
 .../api/response/GlobalLoadBalancerResponse.java   |  26 +--
 .../cloudstack/api/response/GpuResponse.java       |   2 +-
 .../api/response/GuestOSCategoryResponse.java      |   4 +-
 .../cloudstack/api/response/GuestOSResponse.java   |  14 +-
 .../api/response/GuestOsMappingResponse.java       |  14 +-
 .../api/response/GuestVlanRangeResponse.java       |  18 +-
 .../cloudstack/api/response/GuestVlanResponse.java |  30 +--
 .../api/response/HAProviderResponse.java           |   4 +-
 .../api/response/HostForMigrationResponse.java     |   2 +-
 .../cloudstack/api/response/HostHAResponse.java    |  10 +-
 .../cloudstack/api/response/HostResponse.java      | 114 +++++-----
 .../cloudstack/api/response/HostTagResponse.java   |   6 +-
 .../response/HypervisorCapabilitiesResponse.java   |  18 +-
 .../response/HypervisorGuestOsNamesResponse.java   |   8 +-
 .../api/response/HypervisorGuestOsResponse.java    |   4 +-
 .../cloudstack/api/response/IPAddressResponse.java |  68 +++---
 .../api/response/ImageStoreDetailResponse.java     |   4 +-
 .../api/response/ImageStoreResponse.java           |  22 +-
 .../api/response/InstanceGroupResponse.java        |  16 +-
 .../InternalLoadBalancerElementResponse.java       |   4 +-
 .../api/response/IpForwardingRuleResponse.java     |  20 +-
 .../cloudstack/api/response/IpRangeResponse.java   |  12 +-
 .../cloudstack/api/response/Ipv6RouteResponse.java |   4 +-
 ...ntAllowedToCreateOfferingsWithTagsResponse.java |   2 +-
 .../cloudstack/api/response/IsoVmResponse.java     |  22 +-
 .../api/response/LBHealthCheckPolicyResponse.java  |  14 +-
 .../api/response/LBHealthCheckResponse.java        |  12 +-
 .../api/response/LBStickinessPolicyResponse.java   |  14 +-
 .../api/response/LBStickinessResponse.java         |  18 +-
 .../api/response/LoadBalancerResponse.java         |  42 ++--
 .../response/LoadBalancerRuleVmMapResponse.java    |   4 +-
 .../cloudstack/api/response/LoginCmdResponse.java  |  14 +-
 .../api/response/ManagementServerResponse.java     |  24 +--
 .../cloudstack/api/response/MigrationResponse.java |   2 +-
 .../api/response/NetworkACLItemResponse.java       |  28 +--
 .../api/response/NetworkACLResponse.java           |   6 +-
 .../api/response/NetworkDeviceResponse.java        |   2 +-
 .../api/response/NetworkOfferingResponse.java      |  58 +++---
 .../api/response/NetworkPermissionsResponse.java   |  14 +-
 .../cloudstack/api/response/NetworkResponse.java   | 134 ++++++------
 .../api/response/NicExtraDhcpOptionResponse.java   |  10 +-
 .../cloudstack/api/response/NicResponse.java       |  52 ++---
 .../api/response/NicSecondaryIpResponse.java       |  10 +-
 .../api/response/OutOfBandManagementResponse.java  |  22 +-
 .../api/response/OvsProviderResponse.java          |  16 +-
 .../api/response/PhysicalNetworkResponse.java      |  22 +-
 .../cloudstack/api/response/PodResponse.java       |  26 +--
 .../api/response/PortableIpRangeResponse.java      |  14 +-
 .../api/response/PortableIpResponse.java           |  20 +-
 .../api/response/PrivateGatewayResponse.java       |  32 +--
 .../api/response/ProjectAccountResponse.java       |  24 +--
 .../api/response/ProjectInvitationResponse.java    |  20 +-
 .../cloudstack/api/response/ProjectResponse.java   |  90 ++++----
 .../response/ProjectRolePermissionResponse.java    |   8 +-
 .../api/response/ProjectRoleResponse.java          |   2 +-
 .../cloudstack/api/response/ProviderResponse.java  |  14 +-
 .../cloudstack/api/response/RegionResponse.java    |  10 +-
 .../api/response/RegisterUserKeyResponse.java      |   6 +-
 .../api/response/RemoteAccessVpnResponse.java      |  26 +--
 .../api/response/ResourceCountResponse.java        |  16 +-
 .../api/response/ResourceDetailResponse.java       |   6 +-
 .../api/response/ResourceIconResponse.java         |   6 +-
 .../api/response/ResourceLimitResponse.java        |  18 +-
 .../api/response/ResourceTagResponse.java          |  22 +-
 .../api/response/RolePermissionResponse.java       |   6 +-
 .../cloudstack/api/response/RoleResponse.java      |   4 +-
 .../RollingMaintenanceHostSkippedResponse.java     |   6 +-
 .../RollingMaintenanceHostUpdatedResponse.java     |  10 +-
 .../api/response/RollingMaintenanceResponse.java   |   8 +-
 .../response/RouterHealthCheckResultResponse.java  |  10 +-
 .../RouterHealthCheckResultsListResponse.java      |   4 +-
 .../api/response/RunDiagnosticsResponse.java       |   6 +-
 .../api/response/SSHKeyPairResponse.java           |  12 +-
 .../api/response/SecurityGroupResponse.java        |  26 +--
 .../api/response/SecurityGroupRuleResponse.java    |  20 +-
 .../api/response/ServiceOfferingResponse.java      | 102 ++++-----
 .../cloudstack/api/response/ServiceResponse.java   |   6 +-
 .../response/Site2SiteCustomerGatewayResponse.java |  32 +--
 .../response/Site2SiteVpnConnectionResponse.java   |  40 ++--
 .../api/response/Site2SiteVpnGatewayResponse.java  |  22 +-
 .../api/response/SnapshotPolicyResponse.java       |  14 +-
 .../cloudstack/api/response/SnapshotResponse.java  |  40 ++--
 .../api/response/SnapshotScheduleResponse.java     |   8 +-
 .../cloudstack/api/response/SslCertResponse.java   |  18 +-
 .../api/response/StaticRouteResponse.java          |  18 +-
 .../cloudstack/api/response/StatsResponse.java     |  28 +--
 .../response/StorageNetworkIpRangeResponse.java    |  18 +-
 .../api/response/StoragePoolResponse.java          |  46 ++---
 .../api/response/StorageProviderResponse.java      |   4 +-
 .../api/response/StorageTagResponse.java           |   6 +-
 .../cloudstack/api/response/SuccessResponse.java   |   4 +-
 .../api/response/SystemVmInstanceResponse.java     |  12 +-
 .../cloudstack/api/response/SystemVmResponse.java  |  70 +++----
 .../api/response/TemplateOVFPropertyResponse.java  |  20 +-
 .../api/response/TemplatePermissionsResponse.java  |  10 +-
 .../cloudstack/api/response/TemplateResponse.java  | 100 ++++-----
 .../api/response/TrafficMonitorResponse.java       |  10 +-
 .../response/TrafficTypeImplementorResponse.java   |   4 +-
 .../api/response/TrafficTypeResponse.java          |  16 +-
 .../api/response/UnmanageVMInstanceResponse.java   |   4 +-
 .../response/UnmanagedInstanceDiskResponse.java    |  22 +-
 .../api/response/UnmanagedInstanceResponse.java    |  26 +--
 .../api/response/UsageRecordResponse.java          |  64 +++---
 .../cloudstack/api/response/UserDataResponse.java  |  18 +-
 .../cloudstack/api/response/UserResponse.java      |  48 ++---
 .../UserTwoFactorAuthenticationSetupResponse.java  |   8 +-
 ...UserTwoFactorAuthenticatorProviderResponse.java |   4 +-
 .../cloudstack/api/response/UserVmResponse.java    | 162 +++++++--------
 .../api/response/VMScheduleResponse.java           |   8 +-
 .../api/response/VMSnapshotResponse.java           |  42 ++--
 .../api/response/VMUserDataResponse.java           |   4 +-
 .../cloudstack/api/response/VgpuResponse.java      |   6 +-
 .../response/VirtualRouterProviderResponse.java    |  16 +-
 .../api/response/VlanIpRangeResponse.java          |  50 ++---
 .../api/response/VmwareDatacenterResponse.java     |   2 +-
 .../cloudstack/api/response/VolumeResponse.java    | 114 +++++-----
 .../api/response/VpcOfferingResponse.java          |  34 +--
 .../cloudstack/api/response/VpcResponse.java       |  60 +++---
 .../cloudstack/api/response/VpnUsersResponse.java  |  18 +-
 .../response/VsphereStoragePoliciesResponse.java   |  10 +-
 .../cloudstack/api/response/ZoneResponse.java      |  44 ++--
 .../org/apache/cloudstack/query/QueryService.java  |   4 +-
 .../com/cloud/agent/api/storage/OVFHelperTest.java |  14 +-
 .../admin/vlan/UpdateVlanIpRangeCmdTest.java       |   2 +-
 .../vm/MigrateVirtualMachineWithVolumeCmdTest.java |   8 +-
 .../api/command/test/AddVpnUserCmdTest.java        |   2 +-
 .../test/CreateAutoScaleVmProfileCmdTest.java      |   2 +-
 .../api/command/test/CreateSnapshotCmdTest.java    |   2 +-
 .../api/command/test/ScaleVMCmdTest.java           |   2 +-
 .../test/UpdateAutoScaleVmProfileCmdTest.java      |   2 +-
 .../api/command/test/UpdateVmNicIpTest.java        |   2 +-
 .../virtualnetwork/VirtualRoutingResource.java     |   4 +-
 .../storage/template/HttpTemplateDownloader.java   |   2 +-
 .../com/cloud/storage/template/IsoProcessor.java   |   2 +-
 .../template/MetalinkTemplateDownloader.java       |   2 +-
 .../com/cloud/storage/template/OVAProcessor.java   |  12 +-
 .../com/cloud/storage/template/QCOW2Processor.java |   2 +-
 .../storage/template/S3TemplateDownloader.java     |   4 +-
 .../cloud/storage/template/TemplateLocation.java   |   4 +-
 .../com/cloud/storage/template/VhdProcessor.java   |   2 +-
 .../com/cloud/storage/template/VmdkProcessor.java  |   4 +-
 .../download/DirectTemplateDownloaderImpl.java     |   8 +-
 .../download/HttpDirectTemplateDownloader.java     |   6 +-
 .../download/HttpsDirectTemplateDownloader.java    |   4 +-
 .../download/MetalinkDirectTemplateDownloader.java |  10 +-
 .../service/NetworkOrchestrationService.java       |   8 +-
 .../api/storage/ObjectInDataStoreStateMachine.java |   3 +-
 .../engine/subsystem/api/storage/SnapshotInfo.java |   2 +-
 .../java/com/cloud/template/TemplateManager.java   |   2 +-
 .../agent/manager/ClusteredAgentManagerImpl.java   |   4 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |  74 +++----
 .../engine/orchestration/NetworkOrchestrator.java  |  78 +++----
 .../engine/orchestration/VolumeOrchestrator.java   |  10 +-
 .../cloud/dc/dao/DataCenterIpAddressDaoImpl.java   |  10 +-
 .../dao/DataCenterLinkLocalIpAddressDaoImpl.java   |   2 +-
 .../cloud/storage/dao/LaunchPermissionDaoImpl.java |   2 +-
 .../com/cloud/storage/dao/VMTemplateDaoImpl.java   |   6 +-
 .../upgrade/SystemVmTemplateRegistration.java      |  40 ++--
 .../java/com/cloud/upgrade/dao/Upgrade218to22.java |   6 +-
 .../com/cloud/upgrade/dao/Upgrade222to224.java     |   2 +-
 .../com/cloud/upgrade/dao/Upgrade304to305.java     |   2 +-
 .../com/cloud/upgrade/dao/Upgrade410to420.java     |  12 +-
 .../com/cloud/upgrade/dao/Upgrade41500to41510.java |  18 +-
 .../com/cloud/upgrade/dao/Upgrade41520to41600.java |   8 +-
 .../com/cloud/upgrade/dao/Upgrade41600to41610.java |   4 +-
 .../com/cloud/upgrade/dao/Upgrade41610to41700.java |   4 +-
 .../com/cloud/upgrade/dao/Upgrade41700to41710.java |   4 +-
 .../com/cloud/upgrade/dao/Upgrade41710to41720.java |   4 +-
 .../com/cloud/upgrade/dao/Upgrade41720to41800.java |   4 +-
 .../com/cloud/upgrade/dao/Upgrade41810to41900.java |   4 +-
 .../java/com/cloud/usage/dao/UsageDaoImpl.java     |   4 +-
 .../cloud/usage/dao/UsageVMInstanceDaoImpl.java    |   4 +-
 .../main/java/com/cloud/vm/dao/UserVmDaoImpl.java  |   2 +-
 .../java/com/cloud/vm/dao/VMInstanceDaoImpl.java   |   2 +-
 .../cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java   |   2 +-
 .../upgrade/SystemVmTemplateRegistrationTest.java  |   4 +-
 .../storage/configdrive/ConfigDriveBuilder.java    |   6 +-
 .../storage/image/TemplateServiceImpl.java         |   4 +-
 .../snapshot/StorageSystemSnapshotStrategy.java    |   2 +-
 .../vmsnapshot/DefaultVMSnapshotStrategy.java      |  34 +--
 .../vmsnapshot/ScaleIOVMSnapshotStrategy.java      |  44 ++--
 .../vmsnapshot/StorageVMSnapshotStrategy.java      |  36 ++--
 .../storage/helper/VMSnapshotHelperImpl.java       |   6 +-
 .../storage/volume/VolumeServiceImpl.java          |   2 +-
 .../java/com/cloud/cluster/ClusterManagerImpl.java |   2 +-
 .../api/command/user/discovery/ListApisCmd.java    |   2 +-
 .../api/response/ApiDiscoveryResponse.java         |  16 +-
 .../api/response/ApiParameterResponse.java         |  14 +-
 .../api/response/ApiResponseResponse.java          |   8 +-
 .../command/admin/ratelimit/ResetApiLimitCmd.java  |   2 +-
 .../cloudstack/api/response/ApiLimitResponse.java  |  10 +-
 .../ratelimit/integration/LoginResponse.java       |  18 +-
 .../cloudstack/backup/veeam/VeeamClient.java       |   2 +-
 .../cloudstack/api/command/QuotaBalanceCmd.java    |   2 +-
 .../cloudstack/api/command/QuotaCreditsCmd.java    |   6 +-
 .../api/command/QuotaEmailTemplateListCmd.java     |   2 +-
 .../api/command/QuotaEmailTemplateUpdateCmd.java   |   2 +-
 .../cloudstack/api/command/QuotaStatementCmd.java  |   2 +-
 .../cloudstack/api/command/QuotaSummaryCmd.java    |   4 +-
 .../api/response/QuotaBalanceResponse.java         |  18 +-
 .../api/response/QuotaEnabledResponse.java         |   2 +-
 .../api/response/QuotaStatementItemResponse.java   |  14 +-
 .../api/response/QuotaStatementResponse.java       |  16 +-
 .../api/response/QuotaSummaryResponse.java         |  22 +-
 .../api/response/QuotaTariffResponse.java          |  20 +-
 .../cloudstack/api/response/QuotaTypeResponse.java |   4 +-
 .../api/response/QuotaUpdateResponse.java          |   2 +-
 .../api/commands/DedicateClusterCmd.java           |   6 +-
 .../cloudstack/api/commands/DedicateHostCmd.java   |   6 +-
 .../cloudstack/api/commands/DedicatePodCmd.java    |   6 +-
 .../cloudstack/api/commands/DedicateZoneCmd.java   |   6 +-
 .../api/commands/ListDedicatedClustersCmd.java     |   8 +-
 .../api/commands/ListDedicatedHostsCmd.java        |   8 +-
 .../api/commands/ListDedicatedPodsCmd.java         |   8 +-
 .../api/commands/ListDedicatedZonesCmd.java        |   8 +-
 .../api/commands/ReleaseDedicatedClusterCmd.java   |   2 +-
 .../api/commands/ReleaseDedicatedHostCmd.java      |   2 +-
 .../api/commands/ReleaseDedicatedPodCmd.java       |   2 +-
 .../api/commands/ReleaseDedicatedZoneCmd.java      |   2 +-
 .../api/response/DedicateClusterResponse.java      |  12 +-
 .../api/response/DedicateHostResponse.java         |  12 +-
 .../api/response/DedicatePodResponse.java          |  12 +-
 .../api/response/DedicateZoneResponse.java         |  12 +-
 .../networkservice/BaremetalDhcpResponse.java      |  10 +-
 .../BaremetalKickStartServiceImpl.java             |   8 +-
 .../networkservice/BaremetalPxeManagerImpl.java    |   6 +-
 .../networkservice/BaremetalPxeResponse.java       |   8 +-
 .../networkservice/BaremetalRctResponse.java       |   4 +-
 .../apache/cloudstack/api/AddBaremetalDhcpCmd.java |   4 +-
 .../apache/cloudstack/api/AddBaremetalHostCmd.java |   4 +-
 .../api/AddBaremetalKickStartPxeCmd.java           |   4 +-
 .../apache/cloudstack/api/AddBaremetalPxeCmd.java  |   4 +-
 .../api/AddBaremetalPxePingServerCmd.java          |   6 +-
 .../apache/cloudstack/api/AddBaremetalRctCmd.java  |   4 +-
 .../api/BaremetalProvisionDoneNotificationCmd.java |   4 +-
 .../cloudstack/api/DeleteBaremetalRctCmd.java      |   2 +-
 .../cloudstack/api/ListBaremetalDhcpCmd.java       |   4 +-
 .../cloudstack/api/ListBaremetalPxeServersCmd.java |   4 +-
 .../apache/cloudstack/api/ListBaremetalRctCmd.java |   2 +-
 .../resource/HypervDirectConnectResource.java      |  20 +-
 .../kvm/resource/LibvirtComputingResource.java     |  16 +-
 .../LibvirtBackupSnapshotCommandWrapper.java       |   2 +-
 .../LibvirtCreateVMSnapshotCommandWrapper.java     |   6 +-
 .../LibvirtDeleteVMSnapshotCommandWrapper.java     |  12 +-
 .../LibvirtHandleConfigDriveCommandWrapper.java    |   2 +-
 .../wrapper/LibvirtMigrateCommandWrapper.java      |   4 +-
 .../LibvirtMigrateVolumeCommandWrapper.java        |   4 +-
 .../LibvirtRestoreVMSnapshotCommandWrapper.java    |   6 +-
 .../LibvirtRevertToVMSnapshotCommandWrapper.java   |   4 +-
 .../kvm/storage/KVMStoragePoolManager.java         |   4 +-
 .../kvm/storage/KVMStorageProcessor.java           |  14 +-
 .../com/cloud/hypervisor/ovm3/objects/Network.java |   2 +-
 .../com/cloud/hypervisor/ovm3/objects/Xen.java     |   2 +-
 .../ovm3/resources/helpers/Ovm3StoragePool.java    |   6 +-
 .../agent/manager/MockStorageManagerImpl.java      |  34 +--
 .../com/cloud/agent/manager/MockVmManagerImpl.java |  24 +--
 .../api/commands/CleanupSimulatorMockCmd.java      |   4 +-
 .../cloud/api/commands/ConfigureSimulatorCmd.java  |  18 +-
 .../ConfigureSimulatorHAProviderState.java         |   2 +-
 .../commands/ListSimulatorHAStateTransitions.java  |   2 +-
 .../cloud/api/commands/QuerySimulatorMockCmd.java  |   4 +-
 .../java/com/cloud/api/response/MockResponse.java  |  14 +-
 .../api/response/SimulatorHAStateResponse.java     |  10 +-
 .../apache/cloudstack/api/AddUcsManagerCmd.java    |  10 +-
 .../api/AssociateUcsProfileToBladeCmd.java         |   8 +-
 .../apache/cloudstack/api/DeleteUcsManagerCmd.java |   2 +-
 .../org/apache/cloudstack/api/ListUcsBladeCmd.java |   2 +-
 .../apache/cloudstack/api/ListUcsManagerCmd.java   |   4 +-
 .../apache/cloudstack/api/ListUcsProfileCmd.java   |   2 +-
 .../cloudstack/api/response/UcsBladeResponse.java  |  10 +-
 .../api/response/UcsManagerResponse.java           |   8 +-
 .../api/response/UcsProfileResponse.java           |   2 +-
 .../api/commands/DisableCiscoNexusVSMCmd.java      |   2 +-
 .../cloud/api/response/CiscoNexusVSMResponse.java  |  18 +-
 .../hypervisor/vmware/VmwareServerDiscoverer.java  |   4 +-
 .../manager/CleanupFullyClonedTemplatesTask.java   |   8 +-
 .../hypervisor/vmware/manager/VmwareManager.java   |   2 +-
 .../vmware/manager/VmwareManagerImpl.java          |  26 +--
 .../vmware/manager/VmwareStorageManagerImpl.java   |  12 +-
 .../hypervisor/vmware/resource/VmwareResource.java |   8 +-
 .../java/com/cloud/network/VmwareTrafficLabel.java |   2 +-
 .../motion/VmwareStorageMotionStrategyTest.java    |   4 +-
 .../java/com/cloud/hypervisor/XenServerGuru.java   |   2 +-
 .../xenserver/resource/CitrixResourceBase.java     |  46 ++---
 .../resource/XenServerStorageProcessor.java        |  12 +-
 ...ixAttachOrDettachConfigDriveCommandWrapper.java |  10 +-
 .../CitrixCleanupNetworkRulesCmdWrapper.java       |   2 +-
 .../CitrixCreateVMSnapshotCommandWrapper.java      |   6 +-
 .../wrapper/xenbase/CitrixReadyCommandWrapper.java |  10 +-
 .../CitrixRevertToVMSnapshotCommandWrapper.java    |   2 +-
 .../wrapper/xenbase/CitrixStartCommandWrapper.java |   4 +-
 .../cloudstack/cloudian/CloudianConnectorImpl.java |   8 +-
 .../cloudian/response/CloudianEnabledResponse.java |   4 +-
 .../response/CloudianSsoLoginResponse.java         |   2 +-
 .../cloudian/client/CloudianClientTest.java        |  34 +--
 .../cluster/KubernetesClusterManagerImpl.java      |   4 +-
 .../KubernetesClusterActionWorker.java             |   2 +-
 .../version/AddKubernetesSupportedVersionCmd.java  |  14 +-
 .../DeleteKubernetesSupportedVersionCmd.java       |   2 +-
 .../UpdateKubernetesSupportedVersionCmd.java       |   4 +-
 .../AddVirtualMachinesToKubernetesClusterCmd.java  |   4 +-
 .../cluster/CreateKubernetesClusterCmd.java        |  32 +--
 .../cluster/DeleteKubernetesClusterCmd.java        |   2 +-
 .../cluster/GetKubernetesClusterConfigCmd.java     |   2 +-
 .../cluster/ListKubernetesClustersCmd.java         |   8 +-
 ...oveVirtualMachinesFromKubernetesClusterCmd.java |   4 +-
 .../cluster/ScaleKubernetesClusterCmd.java         |   8 +-
 .../cluster/StartKubernetesClusterCmd.java         |   2 +-
 .../cluster/StopKubernetesClusterCmd.java          |   2 +-
 .../cluster/UpgradeKubernetesClusterCmd.java       |   4 +-
 .../ListKubernetesSupportedVersionsCmd.java        |   8 +-
 .../response/KubernetesClusterConfigResponse.java  |   4 +-
 .../api/response/KubernetesClusterResponse.java    |  56 ++---
 .../KubernetesSupportedVersionResponse.java        |  24 +--
 ...rtualMachinesFromKubernetesClusterResponse.java |   2 +-
 .../api/command/BaseMSMaintenanceActionCmd.java    |   2 +-
 .../api/BaseResourceUsageHistoryCmd.java           |   4 +-
 .../apache/cloudstack/api/ListDbMetricsCmd.java    |   2 +-
 .../apache/cloudstack/api/ListMgmtsMetricsCmd.java |   2 +-
 .../api/ListSystemVMsUsageHistoryCmd.java          |   6 +-
 .../cloudstack/api/ListVMsMetricsCmdByAdmin.java   |   8 +-
 .../cloudstack/api/ListVMsUsageHistoryCmd.java     |   6 +-
 .../cloudstack/api/ListVolumesUsageHistoryCmd.java |   6 +-
 .../response/ClusterMetricsResponse.java           |  36 ++--
 .../cloudstack/response/DbMetricsResponse.java     |  20 +-
 .../cloudstack/response/HostMetricsResponse.java   |  36 ++--
 .../response/ManagementServerMetricsResponse.java  |  26 +--
 .../response/StoragePoolMetricsResponse.java       |  16 +-
 .../response/UsageServerMetricsResponse.java       |  10 +-
 .../cloudstack/response/VmMetricsResponse.java     |  14 +-
 .../response/VmMetricsStatsResponse.java           |   8 +-
 .../cloudstack/response/VolumeMetricsResponse.java |   4 +-
 .../response/VolumeMetricsStatsResponse.java       |   6 +-
 .../cloudstack/response/ZoneMetricsResponse.java   |  36 ++--
 .../api/commands/AddBigSwitchBcfDeviceCmd.java     |   8 +-
 .../api/commands/ListBigSwitchBcfDevicesCmd.java   |   4 +-
 .../api/response/BigSwitchBcfDeviceResponse.java   |  14 +-
 .../cloud/api/commands/AddBrocadeVcsDeviceCmd.java |   4 +-
 .../commands/ListBrocadeVcsDeviceNetworksCmd.java  |   4 +-
 .../api/commands/ListBrocadeVcsDevicesCmd.java     |   2 +-
 .../api/response/BrocadeVcsDeviceResponse.java     |  10 +-
 .../api/commands/AddCiscoAsa1000vResourceCmd.java  |   4 +-
 .../api/commands/AddCiscoVnmcResourceCmd.java      |   2 +-
 .../commands/ListCiscoAsa1000vResourcesCmd.java    |   2 +-
 .../api/commands/ListCiscoVnmcResourcesCmd.java    |   2 +-
 .../response/CiscoAsa1000vResourceResponse.java    |  10 +-
 .../api/response/CiscoVnmcResourceResponse.java    |   6 +-
 .../network/lb/ElasticLoadBalancerManagerImpl.java |  28 +--
 .../cloud/network/lb/LoadBalanceRuleHandler.java   |  22 +-
 .../cloudstack/api/AddGloboDnsHostCmd.java         |   2 +-
 .../cloudstack/resource/GloboDnsResource.java      |   8 +-
 .../element/InternalLoadBalancerElement.java       |  24 +--
 .../lb/InternalLoadBalancerVMManagerImpl.java      |  66 +++---
 .../api/response/ServiceInstanceResponse.java      |  18 +-
 .../contrail/management/ContrailElementImpl.java   |   4 +-
 .../network/contrail/management/ContrailGuru.java  |   2 +-
 .../contrail/management/ServerDBSyncImpl.java      |   4 +-
 .../api/commands/AddNetscalerLoadBalancerCmd.java  |  10 +-
 .../ConfigureNetscalerLoadBalancerCmd.java         |   8 +-
 .../commands/DeleteNetscalerLoadBalancerCmd.java   |   2 +-
 .../commands/DeleteServicePackageOfferingCmd.java  |   2 +-
 .../cloud/api/commands/DeployNetscalerVpxCmd.java  |   6 +-
 .../commands/ListNetscalerControlCenterCmd.java    |   2 +-
 .../ListNetscalerLoadBalancerNetworksCmd.java      |   4 +-
 .../commands/ListNetscalerLoadBalancersCmd.java    |   6 +-
 .../commands/ListRegisteredServicePackageCmd.java  |   2 +-
 .../com/cloud/api/commands/StopNetScalerVMCmd.java |   2 +-
 .../response/NetscalerControlCenterResponse.java   |   8 +-
 .../response/NetscalerLoadBalancerResponse.java    |  28 +--
 .../cloud/network/resource/NetscalerResource.java  |   4 +-
 .../cloud/api/commands/AddNiciraNvpDeviceCmd.java  |   2 +-
 .../commands/ListNiciraNvpDeviceNetworksCmd.java   |   2 +-
 .../api/commands/ListNiciraNvpDevicesCmd.java      |   2 +-
 .../api/response/NiciraNvpDeviceResponse.java      |  16 +-
 .../api/commands/AddOpenDaylightControllerCmd.java |   2 +-
 .../commands/ListOpenDaylightControllersCmd.java   |   4 +-
 .../responses/OpenDaylightControllerResponse.java  |  10 +-
 .../cloud/api/commands/AddPaloAltoFirewallCmd.java |   4 +-
 .../api/commands/ConfigurePaloAltoFirewallCmd.java |   2 +-
 .../commands/ListPaloAltoFirewallNetworksCmd.java  |   4 +-
 .../api/commands/ListPaloAltoFirewallsCmd.java     |   4 +-
 .../api/response/PaloAltoFirewallResponse.java     |  32 +--
 .../apache/cloudstack/api/commands/AddSspCmd.java  |  12 +-
 .../cloudstack/api/commands/DeleteSspCmd.java      |   2 +-
 .../cloudstack/api/response/SspResponse.java       |   8 +-
 ...stenFabricNetworkGatewayToLogicalRouterCmd.java |   4 +-
 .../command/AddTungstenFabricPolicyRuleCmd.java    |   6 +-
 .../api/command/ApplyTungstenFabricPolicyCmd.java  |  12 +-
 .../api/command/ApplyTungstenFabricTagCmd.java     |  18 +-
 .../command/ConfigTungstenFabricServiceCmd.java    |   6 +-
 .../CreateTungstenFabricAddressGroupCmd.java       |   4 +-
 ...reateTungstenFabricApplicationPolicySetCmd.java |   4 +-
 .../CreateTungstenFabricFirewallPolicyCmd.java     |   8 +-
 .../CreateTungstenFabricFirewallRuleCmd.java       |  12 +-
 .../CreateTungstenFabricLogicalRouterCmd.java      |   4 +-
 .../CreateTungstenFabricManagementNetworkCmd.java  |   4 +-
 .../api/command/CreateTungstenFabricPolicyCmd.java |   4 +-
 .../command/CreateTungstenFabricProviderCmd.java   |   2 +-
 .../CreateTungstenFabricPublicNetworkCmd.java      |   4 +-
 .../CreateTungstenFabricServiceGroupCmd.java       |   4 +-
 .../api/command/CreateTungstenFabricTagCmd.java    |   4 +-
 .../command/CreateTungstenFabricTagTypeCmd.java    |   4 +-
 .../DeleteTungstenFabricAddressGroupCmd.java       |   6 +-
 ...eleteTungstenFabricApplicationPolicySetCmd.java |   6 +-
 .../DeleteTungstenFabricFirewallPolicyCmd.java     |   6 +-
 .../DeleteTungstenFabricFirewallRuleCmd.java       |   6 +-
 .../DeleteTungstenFabricLogicalRouterCmd.java      |   6 +-
 .../api/command/DeleteTungstenFabricPolicyCmd.java |   6 +-
 .../DeleteTungstenFabricServiceGroupCmd.java       |   6 +-
 .../api/command/DeleteTungstenFabricTagCmd.java    |   6 +-
 .../command/DeleteTungstenFabricTagTypeCmd.java    |   6 +-
 .../command/GetLoadBalancerSslCertificateCmd.java  |   4 +-
 .../command/ListTungstenFabricAddressGroupCmd.java |   6 +-
 .../ListTungstenFabricApplictionPolicySetCmd.java  |   6 +-
 .../ListTungstenFabricFirewallPolicyCmd.java       |   8 +-
 .../command/ListTungstenFabricFirewallRuleCmd.java |   8 +-
 .../ListTungstenFabricLBHealthMonitorCmd.java      |   4 +-
 .../ListTungstenFabricLogicalRouterCmd.java        |   8 +-
 .../api/command/ListTungstenFabricNetworkCmd.java  |   6 +-
 .../api/command/ListTungstenFabricNicCmd.java      |   6 +-
 .../api/command/ListTungstenFabricPolicyCmd.java   |  10 +-
 .../command/ListTungstenFabricPolicyRuleCmd.java   |   8 +-
 .../command/ListTungstenFabricServiceGroupCmd.java |   6 +-
 .../api/command/ListTungstenFabricTagCmd.java      |  14 +-
 .../api/command/ListTungstenFabricTagTypeCmd.java  |   4 +-
 .../api/command/ListTungstenFabricVmCmd.java       |   6 +-
 ...enFabricNetworkGatewayFromLogicalRouterCmd.java |   4 +-
 .../api/command/RemoveTungstenFabricPolicyCmd.java |   8 +-
 .../command/RemoveTungstenFabricPolicyRuleCmd.java |   8 +-
 .../api/command/RemoveTungstenFabricTagCmd.java    |  16 +-
 .../command/SynchronizeTungstenFabricDataCmd.java  |   2 +-
 .../UpdateTungstenFabricLBHealthMonitorCmd.java    |  22 +-
 .../tungsten/api/response/TlsDataResponse.java     |   2 +-
 .../TungstenFabricAddressGroupResponse.java        |   8 +-
 ...TungstenFabricApplicationPolicySetResponse.java |   4 +-
 .../TungstenFabricFirewallPolicyResponse.java      |   2 +-
 .../TungstenFabricLBHealthMonitorResponse.java     |  22 +-
 .../TungstenFabricLogicalRouterResponse.java       |   2 +-
 .../api/response/TungstenFabricPolicyResponse.java |   2 +-
 .../response/TungstenFabricProviderResponse.java   |   2 +-
 .../api/response/TungstenFabricTagResponse.java    |   8 +-
 .../driver/ElastistorPrimaryDataStoreDriver.java   |   2 +-
 .../datastore/util/ListElastistorInterfaceCmd.java |   2 +-
 .../util/ListElastistorInterfaceResponse.java      |   6 +-
 .../datastore/util/ListElastistorPoolCmd.java      |   2 +-
 .../datastore/util/ListElastistorPoolResponse.java |  14 +-
 .../datastore/util/ListElastistorVolumeCmd.java    |   2 +-
 .../util/ListElastistorVolumeResponse.java         |  10 +-
 .../CloudStackPrimaryDataStoreDriverImpl.java      |   8 +-
 .../datastore/client/ScaleIOGatewayClientImpl.java |   8 +-
 .../driver/ScaleIOPrimaryDataStoreDriver.java      |  10 +-
 .../driver/SolidFirePrimaryDataStoreDriver.java    |   8 +-
 .../SolidFirePrimaryDataStoreLifeCycle.java        |   4 +-
 .../storage/datastore/util/SolidFireUtil.java      |   2 +-
 .../datastore/driver/StorPoolStatsCollector.java   |   4 +-
 .../snapshot/StorPoolVMSnapshotStrategy.java       |  32 +--
 .../api/command/LdapAddConfigurationCmd.java       |   2 +-
 .../api/command/LdapCreateAccountCmd.java          |   2 +-
 .../api/command/LdapDeleteConfigurationCmd.java    |   4 +-
 .../cloudstack/api/command/LdapImportUsersCmd.java |   2 +-
 .../api/command/LdapListConfigurationCmd.java      |   2 +-
 .../cloudstack/api/command/LdapListUsersCmd.java   |   2 +-
 .../cloudstack/api/command/LdapUserSearchCmd.java  |   2 +-
 .../api/command/LinkAccountToLdapCmd.java          |  10 +-
 .../api/command/LinkDomainToLdapCmd.java           |   8 +-
 .../api/response/LdapConfigurationResponse.java    |   6 +-
 .../api/response/LinkAccountToLdapResponse.java    |   8 +-
 .../api/response/LinkDomainToLdapResponse.java     |  10 +-
 .../api/response/SamlAuthorizationResponse.java    |   6 +-
 .../auth/TotpUserTwoFactorAuthenticator.java       |   2 +-
 scripts/vm/network/security_group.py               |   2 +-
 .../src/main/java/com/cloud/acl/DomainChecker.java |   2 +-
 .../auth/SetupUserTwoFactorAuthenticationCmd.java  |   4 +-
 ...ValidateUserTwoFactorAuthenticationCodeCmd.java |   2 +-
 .../main/java/com/cloud/configuration/Config.java  |  20 +-
 .../configuration/ConfigurationManagerImpl.java    |  58 +++---
 .../consoleproxy/ConsoleProxyManagerImpl.java      |   6 +-
 .../com/cloud/ha/HighAvailabilityManagerImpl.java  |   6 +-
 .../kvm/discoverer/LibvirtServerDiscoverer.java    |   8 +-
 .../java/com/cloud/network/NetworkModelImpl.java   |   2 +-
 .../java/com/cloud/network/NetworkServiceImpl.java | 106 +++++-----
 .../com/cloud/network/as/AutoScaleManagerImpl.java |   2 +-
 .../network/element/ConfigDriveNetworkElement.java |  32 +--
 .../com/cloud/network/guru/DirectNetworkGuru.java  |  14 +-
 .../network/guru/ExternalGuestNetworkGuru.java     |   8 +-
 .../com/cloud/network/guru/GuestNetworkGuru.java   |   2 +-
 .../com/cloud/network/guru/PrivateNetworkGuru.java |   2 +-
 .../com/cloud/network/guru/PublicNetworkGuru.java  |   2 +-
 .../network/lb/LoadBalancingRulesManagerImpl.java  |  36 ++--
 .../cloud/network/router/NetworkHelperImpl.java    |  24 +--
 .../VpcVirtualNetworkApplianceManagerImpl.java     |   2 +-
 .../network/security/SecurityGroupManagerImpl.java |   8 +-
 .../security/SecurityGroupManagerImpl2.java        |   6 +-
 .../com/cloud/resource/ResourceManagerImpl.java    |   2 +-
 .../com/cloud/server/ManagementServerImpl.java     |  70 +++----
 .../api/response/BaremetalTemplateResponse.java    |   2 +-
 .../java/com/cloud/storage/StorageManagerImpl.java |  12 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java    |   8 +-
 .../storage/snapshot/SnapshotManagerImpl.java      |  14 +-
 .../storage/snapshot/SnapshotSchedulerImpl.java    |   6 +-
 .../cloud/template/HypervisorTemplateAdapter.java  |   6 +-
 .../com/cloud/template/TemplateAdapterBase.java    |  36 ++--
 .../com/cloud/template/TemplateManagerImpl.java    | 214 +++++++++----------
 .../java/com/cloud/user/AccountManagerImpl.java    |   6 +-
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  | 230 ++++++++++-----------
 .../cloud/vm/snapshot/VMSnapshotManagerImpl.java   | 122 +++++------
 .../diagnostics/DiagnosticsServiceImpl.java        |   4 +-
 .../src/test/java/com/cloud/api/LoginResponse.java |  18 +-
 .../cloud/network/DedicateGuestVlanRangesTest.java |   2 +-
 .../SecondaryStorageManagerImpl.java               |   6 +-
 .../resource/NfsSecondaryStorageResource.java      |  78 +++----
 .../storage/template/DownloadManagerImpl.java      |  12 +-
 .../resource/NfsSecondaryStorageResourceTest.java  |   2 +-
 systemvm/debian/opt/cloud/bin/cs/CsRoute.py        |   2 +-
 .../component/maint/testpath_disablestoragepool.py |  20 +-
 .../component/maint/testpath_vMotion_vmware.py     |  12 +-
 .../component/test_base_image_updation.py          |   2 +-
 .../integration/component/test_browse_templates.py |   6 +-
 .../component/test_browse_templates2.py            |   2 +-
 test/integration/component/test_browse_volumes.py  |   6 +-
 test/integration/component/test_deploy_vgpu_vm.py  |  22 +-
 .../component/test_hypervisor_capabilities.py      |   6 +-
 .../component/test_multiple_nic_support.py         |   4 +-
 .../component/test_rootvolume_resize.py            |   2 +-
 test/integration/smoke/test_routers.py             |   4 +-
 test/integration/smoke/test_ssvm.py                |  18 +-
 .../java/com/cloud/usage/UsageManagerImpl.java     |  84 ++++----
 .../usage/parser/VMSnapshotOnPrimaryParser.java    |   4 +-
 .../cloud/usage/parser/VMSnapshotUsageParser.java  |   2 +-
 .../java/com/cloud/usage/UsageSanityCheckerIT.java |   8 +-
 .../cloud/utils/cisco/n1kv/vsm/NetconfHelper.java  |   2 +-
 .../main/java/com/cloud/utils/net/NetUtils.java    |  14 +-
 .../java/com/cloud/utils/ssh/SSHCmdHelper.java     |   8 +-
 .../utils/imagestore/ImageStoreUtil.java           |   4 +-
 .../cloudstack/utils/security/DigestHelper.java    |  20 +-
 .../hypervisor/vmware/mo/VirtualMachineMO.java     | 102 ++++-----
 .../hypervisor/vmware/util/VmwareContext.java      |   8 +-
 1117 files changed, 6739 insertions(+), 6732 deletions(-)

Reply via email to