This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a change to branch clvm-enhancements
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 34b0729e8bc add test for pre/post migration
add 4f93ba888c3 Refactor Quota Summary API (#10505)
add 131ea9f7ace Fix PowerFlex 4.x issues with take & revert instance
snapshots (#12880)
add 6ca6aa1c3f0 Fix NPE in NASBackupProvider when no running KVM host is
available (#12805)
add 68030df10b1 VM start error handling improvements and config to expose
error to users (#12894)
add 71bd26ff7cd PowerFlex/ScaleIO storage - the MDMs validation
improvements (#12893)
add 4ebe3349b77 add user-agent header to template downloader request
(#12791)
add 59b6c32b60c [UI] Fix create backup notification (#12903)
add b805766f4ba Fix Host setup when persistent networks exist (#12751)
add e10c066cc14 Fix NPE during VM setup for pvlan (#12781)
add 470812100ea server: set template type to ROUTING or USER if template
type is not specified when upload a template (#12768)
add e2d18c07484 Merge branch '4.22'
add 30dd234b000 fix: NsxResource.executeRequest DeleteNsxNatRuleCommand
comparison bug (#12833)
add abdf926219a Revert "Use lateral join (introduced in MySQL 8.0.14) with
subquery on user_statistics table in account_view for netstats (#12631)"
(#12965)
add 03de62bf389 Support Linstor Primary Storage for NAS BnR (#12796)
add c3614098da2 Merge branch '4.22'
add 7ba5240b311 Block backup deletion while create-VM-from-backup or
restore jobs are in progress (#12792)
add 1ff9eec9977 Load arch data for backup from template during create
instance from backup (#12801)
add b5858029bb5 Fix listing service offerings with different host tags
(#12919)
add b0b3dc91f53 fix: support SharedMountPoint volume checks for importVm
(#12946)
add b1bc5380a28 fix: support SharedMountPoint for KVM volume import and
unmanage (#12956)
add 416679fae13 Fix domain parsing for GPU & add Display controller in the
supported PCI class (#12981)
add 4ba4bd33c3c replace GROUP_CONCAT with JSON_ARRAYAGG to avoid errors
like Row 19 was cut by GROUP_CONCAT (#12777)
add 68bd0563061 Support timeout configuration for Create and Restore NAS
backup (#12964)
add 7b467496cb9 Do not include snapshots with Group type in snapshots
resource count (#12945)
add 2a60305792c Fix snapshot chaining on Xen (#12597)
add 11538df7102 Merge branch '4.22'
add 9f57a4dd19f Unhide setting `js.interpretation.enabled` (#12605)
add 5b696c0ec7a Create, Delete, Enable, Disable, Enter, Cancel maintenance
of Primary StoragePool with ONTAP storage (#12563)
add ed575cc0a10 New config.json variable to set the ACS default language
(#12863)
add be2994db0fd Merge branch 'main' of
https://github.com/apache/cloudstack into clvm-enhancements
No new revisions were added by this update.
Summary of changes:
.github/CODEOWNERS | 1 +
.../java/com/cloud/server/ManagementService.java | 11 -
.../main/java/com/cloud/user/AccountService.java | 2 +
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../volume/VolumeImportUnmanageService.java | 2 +-
client/pom.xml | 5 +
.../storage/template/HttpTemplateDownloader.java | 2 +
.../template/MetalinkTemplateDownloader.java | 4 +
.../template/SimpleHttpMultiFileDownloader.java | 3 +
.../cloudstack/backup/RestoreBackupCommand.java | 9 +
.../download/HttpDirectTemplateDownloader.java | 5 +
.../com/cloud/vm/VirtualMachineManagerImpl.java | 53 +-
.../java/com/cloud/domain/dao/DomainDaoImpl.java | 2 +-
.../main/java/com/cloud/host/dao/HostTagsDao.java | 5 +
.../java/com/cloud/host/dao/HostTagsDaoImpl.java | 20 +
.../java/com/cloud/network/dao/NetworkDaoImpl.java | 1 +
.../com/cloud/storage/dao/SnapshotDaoImpl.java | 2 +
.../com/cloud/upgrade/dao/Upgrade42210to42300.java | 47 ++
.../storage/datastore/db/SnapshotDataStoreDao.java | 2 +
.../datastore/db/SnapshotDataStoreDaoImpl.java | 14 +
.../resources/META-INF/db/schema-42010to42100.sql | 62 +--
.../META-INF/db/schema-42200to42210-cleanup.sql | 2 -
.../resources/META-INF/db/schema-42200to42210.sql | 3 +
.../cloud.account_netstats_view.sql} | 15 +-
.../META-INF/db/views/cloud.account_view.sql | 15 +-
.../db/views/cloud_usage.quota_summary_view.sql | 48 ++
.../storage/snapshot/DefaultSnapshotStrategy.java | 2 +-
.../vmsnapshot/ScaleIOVMSnapshotStrategy.java | 33 +-
.../snapshot/DefaultSnapshotStrategyTest.java | 7 +-
.../cloudstack/quota/QuotaAccountStateFilter.java | 28 +-
.../cloudstack/quota/dao/QuotaSummaryDao.java | 17 +-
.../cloudstack/quota/dao/QuotaSummaryDaoImpl.java | 80 +++
.../apache/cloudstack/quota/vo/QuotaSummaryVO.java | 140 +++---
.../quota/spring-framework-quota-context.xml | 3 +-
.../cloudstack/backup/NASBackupProvider.java | 31 +-
.../cloudstack/api/command/QuotaSummaryCmd.java | 88 ++--
.../api/response/QuotaResponseBuilder.java | 7 +-
.../api/response/QuotaResponseBuilderImpl.java | 187 ++++---
.../api/response/QuotaSummaryResponse.java | 105 ++--
.../org/apache/cloudstack/quota/QuotaService.java | 2 -
.../apache/cloudstack/quota/QuotaServiceImpl.java | 16 +-
.../api/response/QuotaResponseBuilderImplTest.java | 116 +++--
.../cloudstack/quota/QuotaServiceImplTest.java | 43 +-
.../hypervisor/kvm/resource/LibvirtGpuDef.java | 47 +-
.../wrapper/LibvirtCheckVolumeCommandWrapper.java | 5 +-
.../LibvirtGetVolumesOnStorageCommandWrapper.java | 2 +-
.../LibvirtRestoreBackupCommandWrapper.java | 99 ++--
.../wrapper/LibvirtTakeBackupCommandWrapper.java | 3 +-
.../kvm/storage/ScaleIOStorageAdaptor.java | 31 +-
.../hypervisor/kvm/resource/LibvirtGpuDefTest.java | 139 ++++++
.../LibvirtRestoreBackupCommandWrapperTest.java | 59 ++-
.../contrail/management/MockAccountManager.java | 6 +
.../agent/api/DeleteNsxNatRuleCommand.java | 7 +
.../apache/cloudstack/resource/NsxResource.java | 6 +-
.../cloudstack/resource/NsxResourceTest.java | 6 +
plugins/pom.xml | 1 +
plugins/storage/volume/ontap/README.md | 123 +++++
plugins/storage/volume/ontap/pom.xml | 169 +++++++
.../driver/OntapPrimaryDatastoreDriver.java | 155 +++---
.../storage/feign/FeignClientFactory.java | 45 ++
.../storage/feign/FeignConfiguration.java | 158 ++++++
.../storage/feign/client/AggregateFeignClient.java | 20 +-
.../storage/feign/client/ClusterFeignClient.java | 17 +-
.../storage/feign/client/JobFeignClient.java | 19 +-
.../storage/feign/client/NASFeignClient.java | 86 ++++
.../storage/feign/client/NetworkFeignClient.java | 23 +-
.../storage/feign/client/SANFeignClient.java | 91 ++++
.../storage/feign/client/SvmFeignClient.java | 40 +-
.../storage/feign/client/VolumeFeignClient.java | 56 +++
.../cloudstack/storage/feign/model/Aggregate.java | 165 +++++++
.../storage/feign/model/AntiRansomware.java | 16 +-
.../cloudstack/storage/feign/model/Cluster.java | 134 ++++++
.../storage/feign/model/ExportPolicy.java | 122 +++++
.../cloudstack/storage/feign/model/ExportRule.java | 195 ++++++++
.../cloudstack/storage/feign/model/FileInfo.java | 297 ++++++++++++
.../cloudstack/storage/feign/model/Igroup.java | 257 ++++++++++
.../cloudstack/storage/feign/model/Initiator.java | 32 +-
.../storage/feign/model/IpInterface.java | 155 ++++++
.../storage/feign/model/IscsiService.java | 111 +++++
.../apache/cloudstack/storage/feign/model/Job.java | 121 +++++
.../apache/cloudstack/storage/feign/model/Lun.java | 341 +++++++++++++
.../cloudstack/storage/feign/model/LunMap.java | 111 +++++
.../cloudstack/storage/feign/model/LunSpace.java | 97 ++++
.../apache/cloudstack/storage/feign/model/Nas.java | 35 +-
.../storage/feign/model/OntapStorage.java | 70 +++
.../cloudstack/storage/feign/model/Policy.java | 60 +++
.../apache/cloudstack/storage/feign/model/Qos.java | 36 +-
.../apache/cloudstack/storage/feign/model/Svm.java | 146 ++++++
.../cloudstack/storage/feign/model/Version.java | 108 +++++
.../cloudstack/storage/feign/model/Volume.java | 142 ++++++
.../storage/feign/model/VolumeQosPolicy.java | 83 ++++
.../storage/feign/model/VolumeSpace.java | 61 +++
.../feign/model/VolumeSpaceLogicalSpace.java | 45 +-
.../storage/feign/model/response/JobResponse.java | 14 +-
.../feign/model/response/OntapResponse.java | 64 +++
.../lifecycle/OntapPrimaryDatastoreLifecycle.java | 536 +++++++++++++++++++++
.../storage/listener/OntapHostListener.java | 186 +++++++
.../provider/OntapPrimaryDatastoreProvider.java} | 61 +--
.../storage/provider/StorageProviderFactory.java | 60 +++
.../cloudstack/storage/service/NASStrategy.java} | 12 +-
.../cloudstack/storage/service/SANStrategy.java} | 12 +-
.../storage/service/StorageStrategy.java | 456 ++++++++++++++++++
.../storage/service/UnifiedNASStrategy.java | 303 ++++++++++++
.../storage/service/UnifiedSANStrategy.java | 309 ++++++++++++
.../storage/service/model/AccessGroup.java | 73 +++
.../storage/service/model/CloudStackVolume.java | 59 +++
.../storage/service/model/ProtocolType.java | 6 +-
.../storage/utils/OntapStorageConstants.java | 93 ++++
.../storage/utils/OntapStorageUtils.java | 76 +++
.../storage-volume-ontap/logback-spring.xml | 44 ++
.../storage-volume-ontap}/module.properties | 2 +-
.../spring-storage-volume-ontap-context.xml | 5 +-
.../OntapPrimaryDatastoreLifecycleTest.java | 324 +++++++++++++
.../OntapPrimaryDatastoreProviderTest.java | 215 +++++++++
.../datastore/client/ScaleIOGatewayClientImpl.java | 61 ++-
scripts/vm/hypervisor/kvm/gpudiscovery.sh | 204 ++++++--
scripts/vm/hypervisor/kvm/nasbackup.sh | 59 ++-
.../com/cloud/api/dispatch/ParamProcessWorker.java | 15 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 30 +-
.../configuration/ConfigurationManagerImpl.java | 6 +-
.../com/cloud/resource/ResourceManagerImpl.java | 8 +-
.../com/cloud/server/ManagementServerImpl.java | 23 +-
.../java/com/cloud/storage/StorageManagerImpl.java | 15 +-
.../com/cloud/template/TemplateManagerImpl.java | 4 +-
.../java/com/cloud/user/AccountManagerImpl.java | 44 ++
.../src/main/java/com/cloud/vm/UserVmManager.java | 3 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 2 +-
.../cloudstack/backup/BackupManagerImpl.java | 14 +
.../cloudstack/gui/theme/GuiThemeServiceImpl.java | 2 +-
.../jsinterpreter/JsInterpreterHelper.java | 27 +-
.../com/cloud/api/query/QueryManagerImplTest.java | 40 ++
.../cloudstack/backup/BackupManagerTest.java | 30 ++
ui/public/config.json | 3 +-
ui/src/components/header/TranslationMenu.vue | 3 +-
ui/src/components/view/DeployVMFromBackup.vue | 46 +-
ui/src/utils/guiTheme.js | 7 +
ui/src/views/compute/StartBackup.vue | 2 +-
.../compute/wizard/ComputeOfferingSelection.vue | 23 +-
ui/src/views/storage/CreateVMFromBackup.vue | 25 +-
utils/src/main/java/com/cloud/utils/HttpUtils.java | 5 +
utils/src/main/java/com/cloud/utils/UriUtils.java | 3 +
.../HttpClientCloudStackUserAgent.java} | 22 +-
.../java/com/cloud/utils/storage/QCOW2Utils.java | 2 +
143 files changed, 8335 insertions(+), 897 deletions(-)
copy
engine/schema/src/main/resources/META-INF/db/{schema-42200to42210-cleanup.sql
=> views/cloud.account_netstats_view.sql} (65%)
create mode 100644
engine/schema/src/main/resources/META-INF/db/views/cloud_usage.quota_summary_view.sql
copy core/src/main/java/org/apache/cloudstack/ca/SetupKeystoreAnswer.java =>
framework/quota/src/main/java/org/apache/cloudstack/quota/QuotaAccountStateFilter.java
(66%)
copy
engine/schema/src/main/java/org/apache/cloudstack/gui/theme/dao/GuiThemeJoinDao.java
=>
framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaSummaryDao.java
(63%)
create mode 100644
framework/quota/src/main/java/org/apache/cloudstack/quota/dao/QuotaSummaryDaoImpl.java
copy server/src/main/java/com/cloud/api/query/vo/ProjectAccountJoinVO.java =>
framework/quota/src/main/java/org/apache/cloudstack/quota/vo/QuotaSummaryVO.java
(55%)
create mode 100644 plugins/storage/volume/ontap/README.md
create mode 100644 plugins/storage/volume/ontap/pom.xml
copy
engine/storage/integration-test/src/test/java/org/apache/cloudstack/storage/test/FakePrimaryDataStoreDriver.java
=>
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java
(50%)
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/FeignClientFactory.java
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/FeignConfiguration.java
copy api/src/main/java/com/cloud/agent/api/to/DataStoreTO.java =>
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/AggregateFeignClient.java
(54%)
copy api/src/main/java/com/cloud/agent/api/to/DataStoreTO.java =>
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/ClusterFeignClient.java
(64%)
copy api/src/main/java/com/cloud/event/ActionEvents.java =>
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/JobFeignClient.java
(67%)
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/NASFeignClient.java
copy
core/src/main/java/org/apache/cloudstack/agent/directdownload/HttpDirectDownloadCommand.java
=>
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/NetworkFeignClient.java
(60%)
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/SANFeignClient.java
copy
engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreProvider.java
=>
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/SvmFeignClient.java
(53%)
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/VolumeFeignClient.java
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Aggregate.java
copy
framework/ipc/src/main/java/org/apache/cloudstack/framework/rpc/RpcTimeoutException.java
=>
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/AntiRansomware.java
(72%)
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Cluster.java
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/ExportPolicy.java
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/ExportRule.java
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/FileInfo.java
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Igroup.java
copy
core/src/main/java/com/cloud/agent/api/storage/DeleteDiskOnlyVmSnapshotCommand.java
=>
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Initiator.java
(62%)
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/IpInterface.java
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/IscsiService.java
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Job.java
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Lun.java
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/LunMap.java
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/LunSpace.java
copy
engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/CreateCmdResult.java
=>
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Nas.java
(58%)
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/OntapStorage.java
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Policy.java
copy api/src/main/java/org/apache/cloudstack/cluster/ClusterDrsPlan.java =>
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Qos.java
(61%)
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Svm.java
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Version.java
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Volume.java
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/VolumeQosPolicy.java
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/VolumeSpace.java
copy
framework/spring/lifecycle/src/main/java/org/apache/cloudstack/spring/lifecycle/AbstractSmartLifeCycle.java
=>
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/VolumeSpaceLogicalSpace.java
(53%)
copy api/src/main/java/com/cloud/storage/DataStoreProviderApiService.java =>
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/response/JobResponse.java
(70%)
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/response/OntapResponse.java
create mode 100755
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/listener/OntapHostListener.java
copy
plugins/storage/volume/{nexenta/src/main/java/org/apache/cloudstack/storage/datastore/provider/NexentaPrimaryDataStoreProvider.java
=>
ontap/src/main/java/org/apache/cloudstack/storage/provider/OntapPrimaryDatastoreProvider.java}
(53%)
mode change 100644 => 100755
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/provider/StorageProviderFactory.java
copy
plugins/{hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServer650Resource.java
=>
storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/NASStrategy.java}
(76%)
copy
plugins/{hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServer650Resource.java
=>
storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/SANStrategy.java}
(76%)
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/StorageStrategy.java
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/UnifiedNASStrategy.java
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/UnifiedSANStrategy.java
create mode 100755
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/model/AccessGroup.java
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/model/CloudStackVolume.java
copy
engine/api/src/main/java/org/apache/cloudstack/engine/exception/InsufficientCapacityException.java
=>
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/model/ProtocolType.java
(88%)
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/OntapStorageConstants.java
create mode 100644
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/OntapStorageUtils.java
create mode 100644
plugins/storage/volume/ontap/src/main/resources/META-INF/cloudstack/storage-volume-ontap/logback-spring.xml
copy {engine/storage/src/main/resources/META-INF/cloudstack/storage-allocator
=>
plugins/storage/volume/ontap/src/main/resources/META-INF/cloudstack/storage-volume-ontap}/module.properties
(96%)
copy
engine/storage/datamotion/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-datamotion-core-context.xml
=>
plugins/storage/volume/ontap/src/main/resources/META-INF/cloudstack/storage-volume-ontap/spring-storage-volume-ontap-context.xml
(91%)
create mode 100644
plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycleTest.java
create mode 100644
plugins/storage/volume/ontap/src/test/java/org/apache/cloudstack/storage/provider/OntapPrimaryDatastoreProviderTest.java
copy
utils/src/main/java/com/cloud/utils/{exception/HypervisorVersionChangedException.java
=> net/HttpClientCloudStackUserAgent.java} (61%)
