You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2022/09/27 08:24:01 UTC
[cloudstack] branch 4.18-vm-autoscaling updated (145e55b629 -> edaa2e3f5f)
This is an automated email from the ASF dual-hosted git repository.
weizhou pushed a change to branch 4.18-vm-autoscaling
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 145e55b629 AS DB: fix error code in IDEMPOTENT_CHANGE_COLUMN and create IDEMPOTENT_DROP_FOREIGN_KEY
add 1a0a61fd9f Allow option of exposing VM domain info via instance metadata (#6710)
add dcffdc1c0b DatabaseUpgradeChecker: add upgrade path from 4.17.0.1 to 4.17.1.0 (#6759)
add 7905a76bd2 Merge remote-tracking branch 'apache/4.17' into main
add 3889e46eb6 fix description of configuration `max.data.migration.wait.time` (#6749)
add efbf74ee06 Added new logs to volume creation (#6689)
add d4c6586546 Return vm userdata (#6683)
add 697e12f8f7 kvm: volume encryption feature (#6522)
add edaa2e3f5f Merge remote-tracking branch 'apache/main' into 4.18-vm-autoscaling
No new revisions were added by this update.
Summary of changes:
.../main/java/com/cloud/agent/api/to/DiskTO.java | 1 +
.../com/cloud/agent/api/to/StorageFilerTO.java | 2 +
api/src/main/java/com/cloud/host/Host.java | 1 +
.../main/java/com/cloud/network/NetworkModel.java | 17 +-
.../main/java/com/cloud/offering/DiskOffering.java | 4 +
.../java/com/cloud/storage/MigrationOptions.java | 9 +-
api/src/main/java/com/cloud/storage/Storage.java | 46 +-
api/src/main/java/com/cloud/storage/Volume.java | 8 +
api/src/main/java/com/cloud/vm/DiskProfile.java | 12 +-
.../org/apache/cloudstack/api/ApiConstants.java | 3 +
.../admin/offering/CreateDiskOfferingCmd.java | 12 +
.../admin/offering/CreateServiceOfferingCmd.java | 11 +
.../user/offering/ListDiskOfferingsCmd.java | 9 +-
.../user/offering/ListServiceOfferingsCmd.java | 8 +
.../command/user/snapshot/CreateSnapshotCmd.java | 4 +
.../cloudstack/api/command/user/vm/ListVMsCmd.java | 8 +
.../api/response/DiskOfferingResponse.java | 7 +
.../cloudstack/api/response/HostResponse.java | 15 +
.../api/response/ServiceOfferingResponse.java | 7 +
.../cloudstack/api/response/UserVmResponse.java | 12 +
.../agent/api/storage/ResizeVolumeCommand.java | 24 +
.../StorageSubsystemCommandHandlerBase.java | 4 +-
.../cloudstack/storage/to/VolumeObjectTO.java | 27 +
debian/control | 4 +-
.../java/com/cloud/vm/VirtualMachineManager.java | 3 +
.../subsystem/api/storage/EndPointSelector.java | 8 +
.../engine/subsystem/api/storage/VolumeInfo.java | 2 +
.../java/com/cloud/storage/StorageManager.java | 2 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 4 +-
.../engine/orchestration/VolumeOrchestrator.java | 72 ++-
.../java/com/cloud/storage/DiskOfferingVO.java | 9 +
.../src/main/java/com/cloud/storage/VolumeVO.java | 18 +-
.../main/java/com/cloud/storage/dao/VolumeDao.java | 7 +
.../java/com/cloud/storage/dao/VolumeDaoImpl.java | 10 +
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 1 +
.../org/apache/cloudstack/secret/PassphraseVO.java | 73 +++
.../cloudstack/secret/dao/PassphraseDao.java} | 8 +-
.../cloudstack/secret/dao/PassphraseDaoImpl.java} | 6 +-
.../spring-engine-schema-core-daos-context.xml | 1 +
.../resources/META-INF/db/schema-41710to41800.sql | 196 ++++++++
.../storage/motion/AncientDataMotionStrategy.java | 73 +--
.../storage/motion/DataMotionServiceImpl.java | 10 +
.../motion/StorageSystemDataMotionStrategy.java | 28 +-
.../allocator/AbstractStoragePoolAllocator.java | 72 ++-
.../ClusterScopeStoragePoolAllocator.java | 29 +-
.../GarbageCollectingStoragePoolAllocator.java | 2 +-
.../allocator/LocalStoragePoolAllocator.java | 21 +-
.../allocator/ZoneWideStoragePoolAllocator.java | 14 +-
.../storage/endpoint/DefaultEndPointSelector.java | 56 ++-
.../cloudstack/storage/volume/VolumeObject.java | 70 ++-
.../storage/volume/VolumeServiceImpl.java | 8 +
packaging/centos7/cloud.spec | 11 +-
packaging/centos8/cloud.spec | 11 +-
packaging/suse15/cloud.spec | 11 +-
plugins/hypervisors/kvm/pom.xml | 45 +-
.../kvm/resource/LibvirtComputingResource.java | 116 ++++-
.../kvm/resource/LibvirtDomainXMLParser.java | 10 +
.../hypervisor/kvm/resource/LibvirtSecretDef.java | 4 +
.../hypervisor/kvm/resource/LibvirtVMDef.java | 29 +-
.../wrapper/LibvirtCreateCommandWrapper.java | 4 +-
...atePrivateTemplateFromVolumeCommandWrapper.java | 2 +-
.../wrapper/LibvirtMigrateCommandWrapper.java | 13 +
.../LibvirtPrepareForMigrationCommandWrapper.java | 20 +-
.../wrapper/LibvirtResizeVolumeCommandWrapper.java | 139 ++++-
.../wrapper/LibvirtStopCommandWrapper.java | 4 +
.../kvm/storage/IscsiAdmStorageAdaptor.java | 20 +-
.../kvm/storage/IscsiAdmStoragePool.java | 4 +-
.../hypervisor/kvm/storage/KVMPhysicalDisk.java | 14 +
.../hypervisor/kvm/storage/KVMStoragePool.java | 4 +-
.../kvm/storage/KVMStoragePoolManager.java | 27 +-
.../kvm/storage/KVMStorageProcessor.java | 124 +++--
.../kvm/storage/LibvirtStorageAdaptor.java | 120 +++--
.../hypervisor/kvm/storage/LibvirtStoragePool.java | 8 +-
.../kvm/storage/LinstorStorageAdaptor.java | 57 ++-
.../hypervisor/kvm/storage/LinstorStoragePool.java | 11 +-
.../kvm/storage/ManagedNfsStorageAdaptor.java | 11 +-
.../kvm/storage/ScaleIOStorageAdaptor.java | 205 +++++++-
.../hypervisor/kvm/storage/ScaleIOStoragePool.java | 6 +-
.../hypervisor/kvm/storage/StorageAdaptor.java | 7 +-
.../cloudstack/utils/cryptsetup/CryptSetup.java | 124 +++++
.../utils/cryptsetup/CryptSetupException.java | 12 +-
.../cloudstack/utils/cryptsetup/KeyFile.java | 76 +++
.../cloudstack/utils/qemu/QemuImageOptions.java | 78 +++
.../org/apache/cloudstack/utils/qemu/QemuImg.java | 336 +++++++++++--
.../apache/cloudstack/utils/qemu/QemuObject.java | 128 +++++
.../kvm/resource/LibvirtComputingResourceTest.java | 41 +-
.../kvm/resource/LibvirtDomainXMLParserTest.java | 20 +
.../hypervisor/kvm/resource/LibvirtVMDefTest.java | 20 +
.../wrapper/LibvirtMigrateCommandWrapperTest.java | 35 ++
.../kvm/storage/ScaleIOStorageAdaptorTest.java | 17 +-
.../utils/cryptsetup/CryptSetupTest.java | 71 +++
.../cloudstack/utils/cryptsetup/KeyFileTest.java | 32 +-
.../utils/qemu/QemuImageOptionsTest.java | 61 +++
.../apache/cloudstack/utils/qemu/QemuImgTest.java | 59 ++-
.../cloudstack/utils/qemu/QemuObjectTest.java} | 26 +-
.../storage/resource/VmwareStorageProcessor.java | 14 +-
.../allocator/RandomStoragePoolAllocator.java | 20 +-
.../CloudStackPrimaryDataStoreDriverImpl.java | 58 ++-
.../driver/ScaleIOPrimaryDataStoreDriver.java | 217 ++++++--
...torPoolCopyVolumeToSecondaryCommandWrapper.java | 2 +-
.../kvm/storage/StorPoolStorageAdaptor.java | 11 +-
.../kvm/storage/StorPoolStoragePool.java | 8 +-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 9 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 13 +-
.../com/cloud/api/query/ViewResponseHelper.java | 16 +-
.../api/query/dao/DiskOfferingJoinDaoImpl.java | 1 +
.../api/query/dao/ServiceOfferingJoinDaoImpl.java | 1 +
.../com/cloud/api/query/dao/UserVmJoinDao.java | 5 +-
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 9 +-
.../com/cloud/api/query/vo/DiskOfferingJoinVO.java | 6 +
.../cloud/api/query/vo/ServiceOfferingJoinVO.java | 5 +
.../configuration/ConfigurationManagerImpl.java | 20 +-
.../deploy/DeploymentPlanningManagerImpl.java | 56 ++-
.../java/com/cloud/network/NetworkModelImpl.java | 14 +
.../network/element/CloudZonesNetworkElement.java | 270 ----------
.../cloud/network/router/CommandSetupHelper.java | 21 +-
.../java/com/cloud/storage/StorageManagerImpl.java | 10 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 53 +-
.../storage/snapshot/SnapshotManagerImpl.java | 12 +
.../com/cloud/template/TemplateManagerImpl.java | 10 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 5 +
.../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 6 +
.../deploy/DeploymentPlanningManagerImplTest.java | 358 ++++++++++++-
.../element/ConfigDriveNetworkElementTest.java | 8 +
.../cloud/storage/VolumeApiServiceImplTest.java | 56 ++-
.../src/test/resources/createNetworkOffering.xml | 1 +
systemvm/debian/var/www/html/latest/.htaccess | 2 +
test/integration/component/test_configdrive.py | 42 ++
test/integration/smoke/test_disk_offerings.py | 50 +-
test/integration/smoke/test_service_offerings.py | 54 +-
test/integration/smoke/test_volumes.py | 557 ++++++++++++++++++++-
ui/public/locales/en.json | 3 +
ui/src/config/section/offering.js | 4 +-
ui/src/utils/util.js | 7 +
ui/src/views/compute/DeployVM.vue | 11 +-
ui/src/views/compute/EditVM.vue | 21 +-
ui/src/views/infra/HostInfo.vue | 8 +
ui/src/views/offering/AddComputeOffering.vue | 13 +-
ui/src/views/offering/AddDiskOffering.vue | 21 +-
utils/src/main/java/com/cloud/utils/UuidUtils.java | 11 +-
.../com/cloud/hypervisor/vmware/mo/ClusterMO.java | 16 +-
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 2 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 65 +--
143 files changed, 4497 insertions(+), 916 deletions(-)
create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/secret/PassphraseVO.java
copy engine/{api/src/main/java/org/apache/cloudstack/engine/datacenter/entity/api/OrganizationScope.java => schema/src/main/java/org/apache/cloudstack/secret/dao/PassphraseDao.java} (79%)
copy engine/{api/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/EdgeService.java => schema/src/main/java/org/apache/cloudstack/secret/dao/PassphraseDaoImpl.java} (77%)
create mode 100644 plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/cryptsetup/CryptSetup.java
copy engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotProfile.java => plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/cryptsetup/CryptSetupException.java (75%)
create mode 100644 plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/cryptsetup/KeyFile.java
create mode 100644 plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImageOptions.java
create mode 100644 plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuObject.java
copy utils/src/test/java/com/cloud/utils/TernaryTest.java => plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptorTest.java (56%)
create mode 100644 plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/cryptsetup/CryptSetupTest.java
copy framework/spring/module/src/test/java/org/apache/cloudstack/spring/module/locator/impl/ClasspathModuleDefinitionSetLocatorTest.java => plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/cryptsetup/KeyFileTest.java (52%)
create mode 100644 plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/qemu/QemuImageOptionsTest.java
copy plugins/hypervisors/kvm/src/{main/java/org/apache/cloudstack/utils/qemu/QemuImgException.java => test/java/org/apache/cloudstack/utils/qemu/QemuObjectTest.java} (51%)
delete mode 100644 server/src/main/java/com/cloud/network/element/CloudZonesNetworkElement.java