This is an automated email from the ASF dual-hosted git repository.
fabricio pushed a change to branch fix-preset-variable-injection
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from d2ca3ef450b Address copilot review
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 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 dd0b863e225 sensitive information leak to log (#12018)
add 70d4c9d1baa Consider secondary storage selectors during cold volume
migration (#10957)
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 f920c7f19e9 Merge remote-tracking branch 'upstream/4.20' into
fix-preset-variable-injection
No new revisions were added by this update.
Summary of changes:
.../consoleproxy/ConsoleProxyResource.java | 2 +-
.../java/com/cloud/network/NetworkService.java | 4 +
.../org/apache/cloudstack/alert/AlertService.java | 4 +-
.../command/admin/host/AddSecondaryStorageCmd.java | 24 ++-
.../api/command/admin/host/ListHostsCmd.java | 7 +
.../api/command/admin/management/ListMgmtsCmd.java | 8 +
.../command/user/snapshot/CreateSnapshotCmd.java | 3 +-
.../api/command/user/vm/DeployVnfApplianceCmd.java | 2 +-
.../org/apache/cloudstack/query/QueryService.java | 2 +-
.../storage/template/VnfTemplateManager.java | 4 +-
.../storage/template/VnfTemplateUtils.java | 18 ++
.../service/StorageOrchestrationService.java | 3 +-
.../subsystem/api/storage/TemplateService.java | 4 +-
.../main/java/com/cloud/alert/AlertManager.java | 1 -
.../java/com/cloud/storage/StorageManager.java | 5 +-
.../java/com/cloud/template/TemplateManager.java | 2 +
.../cloud/vm/VirtualMachinePowerStateSyncImpl.java | 6 +-
.../engine/orchestration/StorageOrchestrator.java | 45 ++--
.../main/java/com/cloud/storage/dao/VolumeDao.java | 6 +-
.../java/com/cloud/storage/dao/VolumeDaoImpl.java | 6 +-
.../main/java/com/cloud/usage/dao/UsageJobDao.java | 2 +
.../java/com/cloud/usage/dao/UsageJobDaoImpl.java | 3 +-
.../storage/datastore/db/SnapshotDataStoreDao.java | 14 ++
.../datastore/db/SnapshotDataStoreDaoImpl.java | 29 ++-
.../resources/META-INF/db/schema-42020to42030.sql | 3 +
.../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 ++++++++++++++++++---
.../storage/datastore/PrimaryDataStoreImpl.java | 2 +-
.../cloudstack/framework/config/ConfigKey.java | 28 ++-
packaging/el8/cloud.spec | 2 +-
.../apache/cloudstack/sioc/SiocManagerImpl.java | 2 +-
.../networkservice/BaremetalDnsmasqResource.java | 4 +-
.../BaremetalKickStartPxeResource.java | 6 +-
.../networkservice/BaremetalPingPxeResource.java | 10 +-
.../kvm/resource/LibvirtDomainXMLParser.java | 4 +-
.../LibvirtUpdateHostPasswordCommandWrapper.java | 3 +-
.../com/cloud/ovm/hypervisor/OvmResourceBase.java | 2 +-
.../CitrixUpdateHostPasswordCommandWrapper.java | 4 +-
.../cluster/KubernetesClusterManagerImpl.java | 7 +-
.../driver/DateraPrimaryDataStoreDriver.java | 2 +-
.../datastore/provider/DateraHostListener.java | 4 +-
.../driver/SolidFirePrimaryDataStoreDriver.java | 2 +-
.../datastore/provider/SolidFireHostListener.java | 4 +-
.../driver/StorPoolPrimaryDataStoreDriver.java | 2 +-
.../apache/cloudstack/saml/SAML2AuthManager.java | 3 +
.../cloudstack/saml/SAML2AuthManagerImpl.java | 9 +-
scripts/storage/secondary/cloud-install-sys-tmplt | 1 +
scripts/storage/secondary/setup-sysvm-tmplt | 1 +
.../java/com/cloud/api/query/QueryManagerImpl.java | 16 ++
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 79 +++----
.../main/java/com/cloud/event/AlertGenerator.java | 5 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 12 ++
.../router/VirtualNetworkApplianceManagerImpl.java | 6 +-
.../com/cloud/resource/ResourceManagerImpl.java | 4 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 10 +-
.../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 +-
.../storage/snapshot/SnapshotManagerImpl.java | 30 +--
.../cloud/template/HypervisorTemplateAdapter.java | 15 +-
.../com/cloud/template/TemplateManagerImpl.java | 34 +++-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 4 +-
.../storage/heuristics/HeuristicRuleHelper.java | 16 +-
.../storage/template/VnfTemplateManagerImpl.java | 21 +-
.../cloud/resource/ResourceManagerImplTest.java | 12 +-
.../ResourceLimitManagerImplTest.java | 10 +-
.../com/cloud/storage/StorageManagerImplTest.java | 56 ++++-
.../template/HypervisorTemplateAdapterTest.java | 27 +--
.../cloud/template/TemplateManagerImplTest.java | 28 +++
.../java/com/cloud/vm/UserVmManagerImplTest.java | 7 +-
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 7 +
.../template/VnfTemplateManagerImplTest.java | 8 +-
tools/marvin/marvin/lib/base.py | 3 +-
ui/public/locales/en.json | 7 +-
ui/src/views/compute/DeployVnfAppliance.vue | 14 +-
ui/src/views/compute/wizard/VnfNicsSelection.vue | 5 +
ui/src/views/infra/AddSecondaryStorage.vue | 82 +++++++-
ui/src/views/infra/zone/ZoneWizardAddResources.vue | 25 ++-
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 5 +
.../java/com/cloud/usage/UsageManagerImpl.java | 5 +
utils/src/main/java/com/cloud/utils/UriUtils.java | 8 +-
.../main/java/com/cloud/utils/script/Script.java | 99 +++++----
.../main/java/com/cloud/utils/ssh/SshHelper.java | 73 ++++++-
.../java/com/cloud/utils/script/ScriptTest.java | 30 +++
.../java/com/cloud/utils/ssh/SshHelperTest.java | 60 ++++++
91 files changed, 1282 insertions(+), 344 deletions(-)
