This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a change to branch clone-edit-existing-offerings
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 7b2be104920 extract common code wrt service capability in network &
vpc offering in add/clone operations
add 036489b288c CKS: fix resource limitation check on cpu when scale cks
cluster (#12379)
add a4b1a27c7d2 ui: fix 404 on login after forgot password (#12448)
add 42f1e19362a Mask vncPasswd being logged in agent.log (#12404)
add 2a6ce0c8a81 Adds url kubernetes iso (#10862)
add 03d24ff851d Fix NPE on primary storage delete (#11817)
add da518e90362 CKS: Add image store validation for Kubernetes version
registration (#12418)
add cf36fb00008 Set nfsVersion in ssvm agent.properties only if it is not
null (#12445)
add 496bc0329cd Fix: Condition for aborting migration, resume paused VMs
on destination (#12331)
add 8db7cab7ba4 Storage pool monitor disconnect improvements (#12398)
add b1f870ae833 Merge branch '4.20' into 4.22
add 420bf6dff84 Merge branch '4.22'
add 6e5d78a8a78 Fix NPE on adding new columns in the tables (#12464)
add b5e9178078f UI: fix issues when deploy VNF applicance on network with
SG (#12436)
add cd5bb09d0d1 Fix potential leaks in executePipedCommands (#12478)
add d1eb2822d9d Remove redundant Exceptions from logs for vm schedules
(#12428)
add 6846619a6f1 Fix update network offering domainids size limitation
(#12431)
add 6a9835904cb Fix for zoneids parameters length on updateAPIs (#12440)
add bce3e54a7e4 improve error handling for template upload notifications
(#12412)
add 8db065a14eb limit iso filename to have 251 chars at max (#12430)
add 000919d6e5d Merge branch '4.20' into 4.22
add 4bcf3ea57d9 Merge branch '4.22'
add 315cd52fd1a snapshot: fix listSnapshots for volume which got delete
and whose storage pool got deleted (#12433)
add c8cadcb56e5 NPE fix while deleting storage pool when pool has detached
volumes (#12451)
add 4adb7195701 Allow modification of user vm details if
user.vm.readonly.details is empty (#10456)
add 0958dfc1386 Fix: proper permissions for systemvm template
registrations on hardened systems (#12098)
add d010e9fcf29 Notify user if template upgrade is not required (#12483)
add 63bdc2b9903 Add log for null templateVO (#12406)
add 097c3a018ba ConfigDrive: use file absolute path instead of canonical
path to create ISO (#11623)
add 36edd92e480 Fix snapshot physical size after migration (#12166)
add 44793da58f2 fix Sensitive Data Exposure Through Exception Logging in
OVM Hypervis… (#12032)
add bbc23a74683 fix install path for systemvm templates when introducing
new sec storage (#11605)
add edb62b490c6 Merge branch '4.20' into 4.22
add e3999923a7b Merge release branch 4.22 to main
add d50899427a7 merge forward error
add 7178bfe9ebe Merge release branch 4.22 to main
add 88181ebe722 Standardize and auto add license headers to all cfg files
with pre-commit (#12230)
add f292143af88 Fix/prometheus metadata sorting (#12112)
add ac2242ece23 api,server,ui: support tags for domains (#11964)
add 416568a373f Fix typo in finalyzeAccountId (#11990)
add cd2d71104ed Implement SSVM storage network IP to API response and GUI
details tab (#11979)
add d6c192c0f08 fix template id unmanaged vm (#12288)
add 9b0c28c16da fix regression in the listBackupSchedules API (#12402)
add 128dbe2c0be Refactor configuration SystemVMDefaultHypervisor (#8934)
add ca076637183 Show backup offerings with userDrivenBackupsAllowed=false
to all users (#11889)
add cabd9a98e13 Implemented auto refresh button for VM metrics (#10900)
add 5fd5b625700 server: fix remove management server (#12147)
add 2056c582f1c Fix logging of forwarded IPs in logs (#11854)
add d722c9551a5 ui: fix form data double fetch/reset DeployVMFromBackup
form data by ownership selection (#11706)
add 9dee1372658 debian/control: remove python2 as dependency of build
environment (#12213)
add 7536516e416 add missing label text for label.aclname (#12511)
add 63c8b5fc562 api/server: support deploy-as-is template as VNF template
(#12499)
add fa3dee886ed do not add disk cache mode from an empty string (#12248)
add 5bb5af4c480 4.20: Fix unit test failure (#12520)
add f73362ae48a Fix saml bug unable to login (#10868)
add ff0cfc9148a Add ability to filter by version for listHosts and
listMgmtServers APIs (#12472)
add fce69fbfe0b VM Power state optimization (#12463)
add 0458c5328bf Consider secondary storage selectors during template
synchronization (#10956)
add b6134418eaf server: do not run dhcp and dns check if VR is not
provider (#12272)
add ca5232778da CKS: Use Zone MTUs when network is created at the time of
CKS cluster creation (#12228)
add af9d68630f7 Initialize template status='Processing' (#11970)
add c0b5358d8eb fix Host Password Exposed in Command-Line Logging (#12016)
add 75db42bca6a Merge branch '4.20' into 4.22
add cb822feb724 Merge branch '4.22'
add 5aced732504 ui: reset configuration allowed only when value not
default (#11728)
add 66665b883c1 Changed error message when snapshot is not on secondary
when trying to perform download (#12462)
add 062b98a51ec fix: clean magic value, and update if-else to switch
(#8848)
add 21d5c108501 Apply reordered ACL list to VR router (#12525)
add 572aa195649 ui: show usage server restart message on usage config
change (#11969)
add 2bfc9cb8eb6 CKS: skip default egress policy check for vpc network
offerings (#11998)
add 4761935145e server: add options for kvm.guest.os.machine.type (#12414)
add dd0b863e225 sensitive information leak to log (#12018)
add 70d4c9d1baa Consider secondary storage selectors during cold volume
migration (#10957)
add 276eb8111da Merge remote-tracking branch 'apache/4.20' into 4.22
add 25cb5453259 Merge remote-tracking branch 'apache/4.22'
add 7001d43dbfa Bump org.codehaus.mojo:properties-maven-plugin from
1.0-alpha-2 to 1.2.1 (#12508)
add 434e472ef81 Change to display if public IPs are reserved in the tab
(#12461)
add 0e7f74839ae Add configuration for archiving stale issues (#12293)
add 38e30a116c1 Add support for vTPM for XenServer and XCP-ng 8.3/8.4
(#12263)
add 37507e87990 address warnings in capacity manager (#11971)
add 69c69dc537c server,engine-schema: make config - use.https.to.upload
zone scoped (#11539)
add ded975ceb8f Improve message "Network is unavailable. Please contact
administrator" (#11981)
add d83c2e42253 Bump com.vmware.vapi:vapi-runtime from 2.40.0 to 2.61.2
(#12495)
add 106f478e2c9 Remove unnecessary stubbings in
ManagementServerMaintenanceManagerImplTest (#11914)
add 98debd235f9 gha: fix duplicate key for stale workflow
add 10e0d42f456 ui: introduce section-level “advisories” with quick-fix
actions (#11763)
add 9b4f16b73fa api,server: apis return their http request type (#11382)
add c681d0d0a2f Change `vmsnapshot.max` setting scope to the account level
(#11616)
add 1b2ae13df74 ui: add cache for oslogo request using osId (#11422)
add 8c2ba2b3411 ui: bump nodejs v24 LTS usage (#12471)
add 4d35d68e4ef Fix url in password reset email (#12078)
add 6a04e14f876 VR: fix dns list in redundant VPC VRs (#12161)
add 9fc93af85fb ui: allow actions for other users of root admin (#11319)
add 059debf2125 Add the procedure files for insert extensions and update
guest os category (#12482)
add 9956d325488 Fix delete snapshot policy expunged volume (#12474)
add 7786cf93c28 Veeam: Use restore timeout as an interval as opposed to a
counter (#11772)
add 65e9bebc698 Show parent snapshot (along with the chain size) for
incremental snapshots (#12468)
add 286e406e387 ui: clear selected resource when no items in listview
(#11946)
add bd459a4c4c7 ui: allow viewing hosts from management server connected
agents (#12149)
add a8f1e4a5bac import network acl rules using csv (#12013)
add 0dcbe57a478 Fix that Sensitive information logged in
SshHelper.sshExecute method (#12026)
add 6932cacabc1 Allow copy of templates from secondary storages of other
zone when adding a new secondary storage (#12296)
add ff7ec0cd229 Update alert id for VR public and private interface
(#12527)
add 83ce0067b82 Update the snapshot physical size for the primary storage
resource after snapshot creation and during resource count recalculation
(#12481)
add 35e6d7c5ba8 fix that log sensitive infomation in cmd of script (#12024)
add 95de88a8ffe Usage server should takeover immediately if the other
Usage server has been stopped gracefully (#12507)
add 1300fc5e91a Fix keyword parameter filtering in listBackupOfferings API
(#12540)
add 243872a7710 Use infinite scroll select (#11991)
add b7fc7179fca Add batch deletion support to `removeRawUsageRecords`
(#12522)
add 664f76c7e4b Fix KvmSshToAgentEnabled setting description and make it
dynamic (#12533)
add 26b57655ece Deployment plan fixes for VM with last host, and last host
in maintenance (#12062)
add d700e2db643 Merge branch '4.20' into 4.22
add a55f85af50a Merge branch '4.22'
add 0b62fb5e20c Add cloud image downloader script (#11918)
add 8c2a0308165 Fix query filter and units tests (#12184)
add 3626c515e8e server: fix listing resource limits (#12188)
add 6ba5e082217 Linstor: support live migration from other primary storage
(#12532)
add 3ba5c2b610f Fix logs mismatch between Network GC wait and interval
(#10776)
add aef3df75771 server: pass network label of physical network when plug
nic for private gateway on hypervisor (#11846)
add 7d52cd0e43a Fix calculation of the next time that Usage will execute
in `removeRawUsageRecords` (#12518)
add f5778eaa32a Merge branch '4.20' into 4.22
add ffb8b91ff53 Merge branch '4.22'
add d7bdbcc4ed7 pre-commit: fix inconsistent license (#12551)
add 0e94f7d7717 UI: Show applied search filters (#9520)
add a6ccde44c4b kvm: honour disk controller for vm during attach volume
(#12452)
add 29ce03e9460 Merge remote-tracking branch 'apache/4.20' into 4.22
add 8bea89a80bc Merge remote-tracking branch 'apache/4.22'
add bb8e7d39e6e api,server: allow configuring repetitive alerts (#11325)
add bac3421da43 Fixed: unnecessary regeneration of SSH keys in developer
mode when they already existed. (#12059)
add bb391c3deb1 test: increase timeout in test_human_readable_logs.py
(#11972)
add 9d523cbbfef Bump org.apache.maven.plugins:maven-war-plugin from 3.4.0
to 3.5.1 (#12497)
add 18972caf5f1 api,server: allow cleaning up vm extraconfig (#11974)
add a7178ee687a Fix mvn warnings (#10909)
add a38205ebf0e Add s390x Support for Cloudstack Simulator (#12337)
add 7b94ccc443f eofFix
add 81f16b62616 engine/schema: prepend algorithm to checksum during
systemvm template registration (#12165)
add c1c1b0e7659 extension: improve host vm power reporting (#11619)
add e1d512e5fd1 Set CORS headers for both http/https in SSVM apache config
(#9389)
add ef60aa56015 Restart xl2tpd service when the VPN configuration is
modified (#12422)
add 45d623ec0d8 Update search filter size dynamically (#12552)
add 25eacaa1ff1 set `displayName` to `name` by default (#9719)
add d0e21a7dba8 UI: Prevent extra API calls in search filter on scrolling
(#12553)
add d98511dddd8 Update physical size for the snapshots of the volumes on
ceph primary storage (#12465)
add 6bed3d4e641 Update storage usage / size in backup usage response
(#12539)
add 30d306622a9 Merge branch '4.20' into 4.22
add a5b6bc3be62 Merge branch '4.22'
add 09cdd31cb4d Merge branch 'main' of
https://github.com/apache/cloudstack into clone-edit-existing-offerings
add 6ea054cb01b add some checks to prevent networkmode change when
provider is nsx/netris from the source networkmode
No new revisions were added by this update.
Summary of changes:
.github/workflows/stale.yml | 6 +
.pre-commit-config.yaml | 10 +
.../consoleproxy/ConsoleProxyResource.java | 2 +-
api/src/main/java/com/cloud/event/EventTypes.java | 1 +
.../java/com/cloud/network/NetworkService.java | 4 +
.../com/cloud/network/vpc/NetworkACLService.java | 3 +
.../main/java/com/cloud/server/ResourceTag.java | 10 +-
.../java/com/cloud/storage/VolumeApiService.java | 4 +-
.../main/java/com/cloud/user/AccountService.java | 2 +-
.../org/apache/cloudstack/alert/AlertService.java | 48 +-
.../java/org/apache/cloudstack/api/APICommand.java | 2 +
.../org/apache/cloudstack/api/ApiConstants.java | 4 +
.../cloudstack/api/BaseUpdateTemplateOrIsoCmd.java | 2 +-
.../api/command/admin/domain/ListDomainsCmd.java | 4 +-
.../command/admin/host/AddSecondaryStorageCmd.java | 24 +-
.../api/command/admin/host/ListHostsCmd.java | 7 +
.../api/command/admin/management/ListMgmtsCmd.java | 8 +
.../admin/network/UpdateNetworkOfferingCmd.java | 1 +
...AccountAllowedToCreateOfferingsWithTagsCmd.java | 3 +-
.../admin/offering/UpdateDiskOfferingCmd.java | 1 +
.../admin/offering/UpdateServiceOfferingCmd.java | 1 +
.../command/admin/resource/ListAlertTypesCmd.java | 12 +-
.../admin/vm/ImportUnmanagedInstanceCmd.java | 2 +-
.../api/command/admin/volume/ImportVolumeCmd.java | 2 +-
.../command/admin/vpc/UpdateVPCOfferingCmd.java | 1 +
.../autoscale/CreateAutoScaleVmProfileCmd.java | 2 +-
.../command/user/autoscale/CreateConditionCmd.java | 2 +-
.../command/user/backup/ListBackupScheduleCmd.java | 1 -
.../api/command/user/bucket/CreateBucketCmd.java | 2 +-
.../command/user/config/ListCapabilitiesCmd.java | 1 +
.../command/user/iso/GetUploadParamsForIsoCmd.java | 2 +-
.../api/command/user/iso/RegisterIsoCmd.java | 4 +-
.../command/user/network/CreateNetworkACLCmd.java | 30 +-
.../api/command/user/network/CreateNetworkCmd.java | 2 +-
.../command/user/network/ImportNetworkACLCmd.java | 132 +++++
.../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java | 2 +-
.../user/resource/ListResourceLimitsCmd.java | 2 +-
.../user/resource/UpdateResourceCountCmd.java | 2 +-
.../user/resource/UpdateResourceLimitCmd.java | 4 +-
.../AuthorizeSecurityGroupEgressCmd.java | 2 +-
.../AuthorizeSecurityGroupIngressCmd.java | 2 +-
.../user/securitygroup/DeleteSecurityGroupCmd.java | 2 +-
.../command/user/snapshot/CreateSnapshotCmd.java | 3 +-
.../api/command/user/ssh/CreateSSHKeyPairCmd.java | 2 +-
.../command/user/ssh/RegisterSSHKeyPairCmd.java | 2 +-
.../user/storage/sharedfs/CreateSharedFSCmd.java | 2 +-
.../command/user/template/CreateTemplateCmd.java | 2 +-
.../template/GetUploadParamsForTemplateCmd.java | 2 +-
.../command/user/template/RegisterTemplateCmd.java | 2 +-
.../user/userdata/RegisterCniConfigurationCmd.java | 2 +-
.../command/user/userdata/RegisterUserDataCmd.java | 2 +-
.../api/command/user/vm/BaseDeployVMCmd.java | 2 +-
.../api/command/user/vm/DeployVMCmd.java | 2 +-
.../api/command/user/vm/DeployVnfApplianceCmd.java | 2 +-
.../api/command/user/vm/UpdateVMCmd.java | 23 +-
.../api/command/user/vmgroup/CreateVMGroupCmd.java | 2 +-
.../api/command/user/volume/CreateVolumeCmd.java | 2 +-
.../user/volume/GetUploadParamsForVolumeCmd.java | 2 +-
.../api/command/user/volume/UploadVolumeCmd.java | 2 +-
.../api/command/user/vpc/CreateVPCCmd.java | 2 +-
.../api/command/user/vpn/AddVpnUserCmd.java | 2 +-
.../user/vpn/CreateVpnCustomerGatewayCmd.java | 2 +-
.../api/command/user/vpn/RemoveVpnUserCmd.java | 2 +-
.../command/user/vpn/ResetVpnConnectionCmd.java | 2 +-
.../user/vpn/UpdateVpnCustomerGatewayCmd.java | 2 +-
.../cloudstack/api/response/AlertTypeResponse.java | 12 +-
.../api/response/CapabilitiesResponse.java | 8 +
.../cloudstack/api/response/DomainResponse.java | 18 +-
.../cloudstack/api/response/SnapshotResponse.java | 16 +
.../cloudstack/api/response/SystemVmResponse.java | 12 +
.../org/apache/cloudstack/query/QueryService.java | 2 +-
.../storage/template/VnfTemplateManager.java | 4 +-
.../storage/template/VnfTemplateUtils.java | 18 +
.../command/admin/volume/ImportVolumeCmdTest.java | 2 +-
.../user/userdata/RegisterUserDataCmdTest.java | 2 +-
client/pom.xml | 24 +-
.../java/org/apache/cloudstack/ACSRequestLog.java | 7 +-
.../java/org/apache/cloudstack/ServerDaemon.java | 34 +-
.../command/TemplateOrVolumePostUploadCommand.java | 14 +-
.../cloudstack/storage/to/SnapshotObjectTO.java | 2 -
debian/control | 2 +-
developer/pom.xml | 2 +-
.../service/StorageOrchestrationService.java | 3 +-
.../subsystem/api/storage/TemplateService.java | 4 +-
.../main/java/com/cloud/alert/AlertManager.java | 5 +-
.../java/com/cloud/resource/ResourceManager.java | 9 +-
.../java/com/cloud/storage/StorageManager.java | 5 +-
.../java/com/cloud/template/TemplateManager.java | 2 +
.../com/cloud/vm/snapshot/VMSnapshotManager.java | 2 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 6 +-
.../cloud/vm/VirtualMachinePowerStateSyncImpl.java | 6 +-
.../engine/orchestration/NetworkOrchestrator.java | 13 +-
.../engine/orchestration/StorageOrchestrator.java | 45 +-
.../java/com/cloud/network/dao/NetworkDaoImpl.java | 2 +-
.../dao/PhysicalNetworkTrafficTypeDaoImpl.java | 4 +-
.../main/java/com/cloud/storage/dao/VolumeDao.java | 6 +-
.../java/com/cloud/storage/dao/VolumeDaoImpl.java | 6 +-
.../upgrade/SystemVmTemplateRegistration.java | 4 +-
...grade441to442.java => Upgrade42020to42030.java} | 14 +-
.../main/java/com/cloud/usage/dao/UsageDao.java | 2 +-
.../java/com/cloud/usage/dao/UsageDaoImpl.java | 37 +-
.../main/java/com/cloud/usage/dao/UsageJobDao.java | 2 +
.../java/com/cloud/usage/dao/UsageJobDaoImpl.java | 3 +-
.../com/cloud/vm/dao/VMInstanceDetailsDao.java | 1 +
.../com/cloud/vm/dao/VMInstanceDetailsDaoImpl.java | 17 +
.../storage/datastore/db/SnapshotDataStoreDao.java | 14 +
.../datastore/db/SnapshotDataStoreDaoImpl.java | 42 +-
.../vm/schedule/dao/VMScheduledJobDao.java | 2 +
.../vm/schedule/dao/VMScheduledJobDaoImpl.java | 15 +
.../cloud.insert_category_if_not_exists.sql} | 16 +-
...tension_custom_action_details_if_not_exists.sql | 46 ++
...nsert_extension_custom_action_if_not_exists.sql | 46 ++
...loud.insert_extension_detail_if_not_exists.sql} | 27 +-
...ql => cloud.insert_extension_if_not_exists.sql} | 27 +-
...ql => cloud.update_category_for_guest_oses.sql} | 24 +-
...te_new_and_delete_old_category_for_guest_os.sql | 35 ++
...to41400-cleanup.sql => schema-42020to42030.sql} | 12 +-
.../resources/META-INF/db/schema-42100to42200.sql | 5 +
.../resources/META-INF/db/schema-42200to42210.sql | 8 +
.../com/cloud/network/dao/NetworkDaoImplTest.java | 31 +-
.../cloud/vm/dao/VMInstanceDetailsDaoImplTest.java | 86 ++++
engine/service/pom.xml | 2 +-
.../storage/configdrive/ConfigDriveBuilder.java | 4 +-
.../configdrive/ConfigDriveBuilderTest.java | 12 +-
.../storage/motion/AncientDataMotionStrategy.java | 13 +-
.../storage/image/SecondaryStorageServiceImpl.java | 2 +-
.../storage/image/TemplateDataFactoryImpl.java | 3 +
.../storage/image/TemplateServiceImpl.java | 201 ++++++--
.../storage/image/TemplateServiceImplTest.java | 226 +++++++--
engine/storage/snapshot/pom.xml | 4 +-
.../storage/snapshot/SnapshotObject.java | 5 +-
.../snapshot/StorageSystemSnapshotStrategy.java | 2 +-
.../storage/datastore/PrimaryDataStoreImpl.java | 2 +-
.../storage/volume/VolumeServiceImpl.java | 4 +-
extensions/HyperV/hyperv.py | 24 +
extensions/Proxmox/proxmox.sh | 168 +++---
.../cloudstack/framework/config/ConfigKey.java | 28 +-
framework/db/pom.xml | 4 +-
.../src/main/java/com/cloud/utils/db/Filter.java | 3 +-
.../java/com/cloud/utils/db/GenericDaoBase.java | 19 +-
packaging/el8/cloud.spec | 2 +-
.../api/response/ApiDiscoveryResponse.java | 13 +
.../discovery/ApiDiscoveryServiceImpl.java | 9 +-
.../discovery/ApiDiscoveryServiceImplTest.java | 123 +++++
.../apache/cloudstack/sioc/SiocManagerImpl.java | 2 +-
.../cloudstack/backup/veeam/VeeamClient.java | 7 +-
.../cloudstack/backup/veeam/VeeamClientTest.java | 5 +-
.../cloudstack/api/command/QuotaBalanceCmd.java | 3 +-
.../cloudstack/api/command/QuotaEnabledCmd.java | 3 +-
.../cloudstack/api/command/QuotaStatementCmd.java | 3 +-
.../cloudstack/api/command/QuotaSummaryCmd.java | 3 +-
.../cloudstack/api/command/QuotaTariffListCmd.java | 3 +-
.../networkservice/BaremetalDnsmasqResource.java | 4 +-
.../BaremetalKickStartPxeResource.java | 6 +-
.../networkservice/BaremetalPingPxeResource.java | 10 +-
.../ExternalPathPayloadProvisioner.java | 65 ++-
.../ExternalPathPayloadProvisionerTest.java | 148 ++++++
.../hypervisor/kvm/resource/BridgeVifDriver.java | 2 +-
.../kvm/resource/LibvirtComputingResource.java | 26 +-
.../kvm/resource/LibvirtDomainXMLParser.java | 4 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 9 +
.../wrapper/LibvirtMigrateCommandWrapper.java | 70 ++-
.../wrapper/LibvirtStartCommandWrapper.java | 5 +-
.../LibvirtUpdateHostPasswordCommandWrapper.java | 3 +-
.../kvm/storage/KVMStorageProcessor.java | 202 +++++---
.../wrapper/LibvirtMigrateCommandWrapperTest.java | 26 +-
.../com/cloud/ovm/hypervisor/OvmResourceBase.java | 2 +-
.../xenserver/resource/CitrixResourceBase.java | 79 +++
.../wrapper/xenbase/CitrixReadyCommandWrapper.java | 10 +-
.../wrapper/xenbase/CitrixStartCommandWrapper.java | 8 +
.../CitrixUpdateHostPasswordCommandWrapper.java | 4 +-
.../cloudian/api/CloudianIsEnabledCmd.java | 3 +-
.../cluster/KubernetesClusterManagerImpl.java | 12 +-
.../version/KubernetesVersionManagerImpl.java | 52 +-
.../cluster/CreateKubernetesClusterCmd.java | 2 +-
.../KubernetesSupportedVersionResponse.java | 12 +
.../version/KubernetesVersionManagerImplTest.java | 78 ++-
.../version/KubernetesVersionServiceTest.java | 99 +++-
.../cloudstack/metrics/PrometheusExporterImpl.java | 129 ++++-
.../api/command/ReadyForShutdownCmd.java | 3 +-
...ManagementServerMaintenanceManagerImplTest.java | 2 -
plugins/network-elements/globodns/pom.xml | 4 +-
.../api/command/CreateServiceInstanceCmd.java | 2 +-
.../contrail/management/MockAccountManager.java | 2 +-
plugins/network-elements/nsx/pom.xml | 2 +-
plugins/network-elements/tungsten/pom.xml | 4 +-
.../driver/DateraPrimaryDataStoreDriver.java | 2 +-
.../datastore/provider/DateraHostListener.java | 4 +-
plugins/storage/volume/linstor/CHANGELOG.md | 6 +
.../driver/LinstorPrimaryDataStoreDriverImpl.java | 316 +-----------
.../storage/datastore/util/LinstorUtil.java | 293 ++++++++++-
.../storage/motion/LinstorDataMotionStrategy.java | 437 ++++++++++++++++
.../spring-storage-volume-linstor-context.xml | 2 +
.../LinstorPrimaryDataStoreDriverImplTest.java | 7 +-
.../driver/SolidFirePrimaryDataStoreDriver.java | 2 +-
.../datastore/provider/SolidFireHostListener.java | 4 +-
.../driver/StorPoolPrimaryDataStoreDriver.java | 2 +-
.../api/command/VerifyOAuthCodeAndGetUserCmd.java | 14 +-
.../apache/cloudstack/saml/SAML2AuthManager.java | 3 +
.../cloudstack/saml/SAML2AuthManagerImpl.java | 9 +-
pom.xml | 10 +-
scripts/storage/secondary/cloud-install-sys-tmplt | 1 +
scripts/storage/secondary/setup-sysvm-tmplt | 1 +
.../hypervisor/external/provisioner/provisioner.sh | 11 +
scripts/vm/hypervisor/xenserver/xenserver84/vmops | 40 +-
.../java/com/cloud/alert/AlertManagerImpl.java | 72 ++-
.../main/java/com/cloud/api/ApiResponseHelper.java | 50 +-
server/src/main/java/com/cloud/api/ApiServlet.java | 80 +--
.../java/com/cloud/api/query/QueryManagerImpl.java | 50 ++
.../com/cloud/api/query/dao/DomainJoinDaoImpl.java | 10 +-
.../cloud/api/query/dao/SnapshotJoinDaoImpl.java | 2 +
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 79 +--
.../com/cloud/capacity/CapacityManagerImpl.java | 155 ++----
.../main/java/com/cloud/configuration/Config.java | 7 -
.../configuration/ConfigurationManagerImpl.java | 76 +--
.../deploy/DeploymentPlanningManagerImpl.java | 82 +--
.../main/java/com/cloud/event/AlertGenerator.java | 5 +-
.../com/cloud/ha/HighAvailabilityManagerImpl.java | 4 +-
.../java/com/cloud/network/NetworkModelImpl.java | 6 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 12 +
.../network/element/VpcVirtualRouterElement.java | 10 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 6 +-
.../cloud/network/vpc/NetworkACLServiceImpl.java | 135 ++++-
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 28 +-
.../com/cloud/resource/ResourceManagerImpl.java | 29 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 84 +--
.../com/cloud/server/ConfigurationServerImpl.java | 2 +-
.../com/cloud/server/ManagementServerImpl.java | 18 +-
.../main/java/com/cloud/server/StatsCollector.java | 2 +-
.../com/cloud/storage/ImageStoreDetailsUtil.java | 11 +
.../java/com/cloud/storage/StorageManagerImpl.java | 18 +-
.../cloud/storage/StoragePoolAutomationImpl.java | 2 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 11 +-
.../cloud/storage/listener/StoragePoolMonitor.java | 28 +-
.../storage/snapshot/SnapshotManagerImpl.java | 53 +-
.../cloud/template/HypervisorTemplateAdapter.java | 12 +-
.../com/cloud/template/TemplateAdapterBase.java | 7 +-
.../com/cloud/template/TemplateManagerImpl.java | 36 +-
.../java/com/cloud/usage/UsageServiceImpl.java | 61 ++-
.../java/com/cloud/user/AccountManagerImpl.java | 2 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 32 +-
.../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 7 +-
.../affinity/AffinityGroupServiceImpl.java | 2 +-
.../cloudstack/backup/BackupManagerImpl.java | 2 +-
.../cloudstack/network/RoutedIpv4ManagerImpl.java | 12 +-
.../storage/heuristics/HeuristicRuleHelper.java | 16 +-
.../storage/template/VnfTemplateManagerImpl.java | 21 +-
.../cloudstack/user/UserPasswordResetManager.java | 4 +-
.../user/UserPasswordResetManagerImpl.java | 26 +-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 5 +-
.../cloudstack/vm/schedule/VMSchedulerImpl.java | 8 +-
.../java/com/cloud/alert/AlertManagerImplTest.java | 98 +++-
.../test/java/com/cloud/api/ApiServletTest.java | 214 ++++++--
.../ConfigurationManagerImplTest.java | 89 ++++
.../cloud/resource/ResourceManagerImplTest.java | 28 +-
.../ResourceLimitManagerImplTest.java | 75 ++-
.../com/cloud/storage/StorageManagerImplTest.java | 56 +-
.../storage/snapshot/SnapshotManagerImplTest.java | 92 ++++
.../template/HypervisorTemplateAdapterTest.java | 27 +-
.../cloud/template/TemplateManagerImplTest.java | 28 +
.../java/com/cloud/vm/UserVmManagerImplTest.java | 103 +++-
.../cloud/vm/snapshot/VMSnapshotManagerTest.java | 15 +
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 7 +
.../cloudstack/affinity/AffinityApiUnitTest.java | 2 +-
.../affinity/AffinityGroupServiceImplTest.java | 2 +-
.../network/RoutedIpv4ManagerImplTest.java | 4 +-
.../template/VnfTemplateManagerImplTest.java | 8 +-
.../rdpconsole/src/main/java/common/Client.java | 34 +-
.../SecondaryStorageManagerImpl.java | 8 +-
setup/dev/s3.cfg | 29 +-
systemvm/debian/etc/apache2/vhost.template | 8 +-
systemvm/debian/etc/haproxy/haproxy.cfg | 17 +
systemvm/debian/opt/cloud/bin/configure.py | 20 +-
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 2 +-
systemvm/debian/opt/cloud/bin/setup/common.sh | 3 -
systemvm/debian/opt/cloud/bin/setup/secstorage.sh | 23 +-
test/integration/smoke/test_human_readable_logs.py | 8 +-
.../devcloud-kvm/devcloud-kvm-advanced-fusion.cfg | 30 +-
tools/devcloud-kvm/devcloud-kvm-advanced.cfg | 30 +-
tools/devcloud-kvm/devcloud-kvm.cfg | 30 +-
tools/devcloud-kvm/pom.xml | 2 +-
tools/devcloud4/advanced/marvin.cfg | 30 +-
tools/devcloud4/basic/marvin.cfg | 30 +-
tools/devcloud4/pom.xml | 2 +-
tools/docker/{Dockerfile => Dockerfile.s390x} | 21 +-
.../noVNC/vendor/pako => tools/marvin}/README.md | 14 +-
tools/marvin/marvin/lib/base.py | 3 +-
tools/marvin/mvn-setup.py | 2 +-
tools/marvin/setup.py | 2 +-
tools/utils/cloud-image-downloader.sh | 259 ++++++++++
ui/README.md | 6 +-
ui/package.json | 9 +-
ui/public/config.json | 1 +
ui/public/locales/en.json | 41 +-
ui/public/locales/pt_BR.json | 10 +
ui/src/api/index.js | 4 +
ui/src/components/view/AdvisoriesView.vue | 161 ++++++
ui/src/components/view/DedicateDomain.vue | 129 ++---
ui/src/components/view/DeployVMFromBackup.vue | 4 +-
ui/src/components/view/InfoCard.vue | 2 +-
ui/src/components/view/ListView.vue | 34 +-
ui/src/components/view/SearchFilter.vue | 561 +++++++++++++++++++++
ui/src/components/view/SettingsTab.vue | 10 +-
ui/src/components/view/StatsTab.vue | 68 ++-
ui/src/components/widgets/InfiniteScrollSelect.vue | 91 +++-
ui/src/components/widgets/OsLogo.vue | 78 +--
ui/src/config/router.js | 5 +
ui/src/config/section/compute.js | 178 +++++++
ui/src/config/section/image.js | 6 +-
ui/src/config/section/infra/systemVms.js | 2 +-
ui/src/config/section/network.js | 5 +-
ui/src/config/section/storage.js | 17 +-
ui/src/config/section/user.js | 21 +-
ui/src/utils/acsrepo/index.js | 81 +++
ui/src/utils/plugins.js | 24 +-
ui/src/views/AutogenView.vue | 82 ++-
ui/src/views/auth/ForgotPassword.vue | 2 +-
ui/src/views/compute/DeployVnfAppliance.vue | 16 +-
ui/src/views/compute/EditVM.vue | 2 +
.../compute/wizard/OsBasedImageRadioGroup.vue | 3 +-
ui/src/views/compute/wizard/VnfNicsSelection.vue | 5 +
ui/src/views/iam/AddUser.vue | 121 ++---
ui/src/views/image/RegisterOrUploadTemplate.vue | 6 +-
ui/src/views/infra/AddSecondaryStorage.vue | 82 ++-
ui/src/views/infra/UsageRecords.vue | 112 ++--
ui/src/views/infra/network/IpRangesTabPublic.vue | 11 +-
ui/src/views/infra/zone/ZoneWizardAddResources.vue | 25 +-
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 5 +
ui/src/views/network/AclRulesTab.vue | 32 +-
ui/src/views/network/ImportNetworkACL.vue | 381 ++++++++++++++
ui/src/views/network/VnfAppliancesTab.vue | 2 +-
ui/src/views/setting/ConfigurationHierarchy.vue | 5 +-
ui/src/views/setting/ConfigurationTab.vue | 13 +-
ui/src/views/setting/ConfigurationTable.vue | 8 +-
ui/src/views/setting/ConfigurationValue.vue | 34 +-
ui/src/views/storage/CreateTemplate.vue | 111 ++--
ui/src/views/storage/UploadLocalVolume.vue | 225 ++++-----
ui/src/views/storage/UploadVolume.vue | 218 ++++----
ui/src/views/tools/CreateWebhook.vue | 126 ++---
ui/src/views/tools/ManageVolumes.vue | 157 +++---
ui/tests/unit/views/AutogenView.spec.js | 4 +
.../java/com/cloud/usage/UsageManagerImpl.java | 39 +-
.../com/cloud/usage/parser/BackupUsageParser.java | 3 +-
.../usage/parser/VMSnapshotOnPrimaryParser.java | 2 +-
utils/src/main/java/com/cloud/utils/UriUtils.java | 8 +-
.../main/java/com/cloud/utils/script/Script.java | 121 +++--
.../com/cloud/utils/server/ServerProperties.java | 36 +-
.../main/java/com/cloud/utils/ssh/SshHelper.java | 73 ++-
.../cloudstack/utils/security/DigestHelper.java | 15 +
.../apache/cloudstack/utils/usage/UsageUtils.java | 51 ++
.../java/com/cloud/utils/script/ScriptTest.java | 30 ++
.../java/com/cloud/utils/ssh/SshHelperTest.java | 60 +++
.../cloudstack/utils/usage/UsageUtilsTest.java | 135 +++++
353 files changed, 8389 insertions(+), 2749 deletions(-)
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/user/network/ImportNetworkACLCmd.java
copy engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade441to442.java
=> Upgrade42020to42030.java} (82%)
copy engine/schema/src/main/resources/META-INF/db/{schema-222to224-premium.sql
=> procedures/cloud.insert_category_if_not_exists.sql} (66%)
mode change 100755 => 100644
create mode 100644
engine/schema/src/main/resources/META-INF/db/procedures/cloud.insert_extension_custom_action_details_if_not_exists.sql
create mode 100644
engine/schema/src/main/resources/META-INF/db/procedures/cloud.insert_extension_custom_action_if_not_exists.sql
copy
engine/schema/src/main/resources/META-INF/db/procedures/{cloud.idempotent_add_unique_index.sql
=> cloud.insert_extension_detail_if_not_exists.sql} (52%)
copy
engine/schema/src/main/resources/META-INF/db/procedures/{cloud.idempotent_create_unique_index.sql
=> cloud.insert_extension_if_not_exists.sql} (54%)
copy
engine/schema/src/main/resources/META-INF/db/procedures/{cloud.idempotent_create_unique_index.sql
=> cloud.update_category_for_guest_oses.sql} (56%)
create mode 100644
engine/schema/src/main/resources/META-INF/db/procedures/cloud.update_new_and_delete_old_category_for_guest_os.sql
copy
engine/schema/src/main/resources/META-INF/db/{schema-41310to41400-cleanup.sql
=> schema-42020to42030.sql} (57%)
create mode 100644
engine/schema/src/test/java/com/cloud/vm/dao/VMInstanceDetailsDaoImplTest.java
create mode 100644
plugins/api/discovery/src/test/java/org/apache/cloudstack/discovery/ApiDiscoveryServiceImplTest.java
create mode 100644
plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/motion/LinstorDataMotionStrategy.java
copy tools/docker/{Dockerfile => Dockerfile.s390x} (76%)
copy {systemvm/agent/noVNC/vendor/pako => tools/marvin}/README.md (69%)
create mode 100755 tools/utils/cloud-image-downloader.sh
create mode 100644 ui/src/components/view/AdvisoriesView.vue
create mode 100644 ui/src/components/view/SearchFilter.vue
create mode 100644 ui/src/utils/acsrepo/index.js
create mode 100644 ui/src/views/network/ImportNetworkACL.vue
create mode 100644
utils/src/test/java/org/apache/cloudstack/utils/usage/UsageUtilsTest.java
