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 02be2cdf67d Merge release branch 4.18 to main
add d66f83ba2fb UI: fix wrong vpcid when create network in VPC (#7707)
add 0cbe77024a8 Fix foreign key constraints and the mysql procedure that
is used (#7381)
add acc6f4e725e NPE guard (#7691)
add e6ef8a5225b use `Files.createTempDirectory()` instead of `new File()`
(#7713)
add c733a23c905 Fix direct download URL checks (#7693)
add 939ee9e1534 server,engine-orchestration: allocate vm without
transaction (#7695)
new 2132f46fcb3 Merge branch '4.18'
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:
.../download/HttpsDirectTemplateDownloader.java | 131 -----------
.../download/MetalinkDirectTemplateDownloader.java | 101 --------
.../java/com/cloud/storage/JavaStorageLayer.java | 9 +-
.../direct/download/DirectDownloadHelper.java | 83 +++++++
.../direct/download/DirectTemplateDownloader.java | 30 ++-
.../download/DirectTemplateDownloaderImpl.java | 34 ++-
.../download/HttpDirectTemplateDownloader.java | 89 ++++++-
.../download/HttpsDirectTemplateDownloader.java | 252 ++++++++++++++++++++
.../direct/download/HttpsMultiTrustManager.java | 102 ++++++++
.../download/MetalinkDirectTemplateDownloader.java | 177 ++++++++++++++
.../download/NfsDirectTemplateDownloader.java | 33 ++-
.../com/cloud/storage/JavaStorageLayerTest.java | 24 +-
.../download/BaseDirectTemplateDownloaderTest.java | 72 ++++++
.../HttpsDirectTemplateDownloaderTest.java | 21 +-
.../MetalinkDirectTemplateDownloaderTest.java | 22 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 111 ++++-----
.../cloud/upgrade/dao/DatabaseAccessObject.java | 11 +
.../java/com/cloud/upgrade/dao/DbUpgradeUtils.java | 5 +-
.../com/cloud/upgrade/dao/Upgrade41800to41810.java | 29 +++
.../storage/datastore/db/TemplateDataStoreVO.java | 2 +-
.../resources/META-INF/db/schema-41720to41800.sql | 14 --
.../resource/wrapper/LibvirtCheckUrlCommand.java | 19 +-
.../kvm/storage/KVMStorageProcessor.java | 35 +--
.../com/cloud/storage/VolumeApiServiceImpl.java | 3 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 258 ++++++++++-----------
ui/src/views/network/CreateIsolatedNetworkForm.vue | 3 +
utils/src/main/java/com/cloud/utils/UriUtils.java | 87 +------
27 files changed, 1148 insertions(+), 609 deletions(-)
delete mode 100644
agent/src/main/java/com/cloud/agent/direct/download/HttpsDirectTemplateDownloader.java
delete mode 100644
agent/src/main/java/com/cloud/agent/direct/download/MetalinkDirectTemplateDownloader.java
create mode 100644
core/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadHelper.java
rename {agent/src/main/java/com/cloud/agent =>
core/src/main/java/org/apache/cloudstack}/direct/download/DirectTemplateDownloader.java
(58%)
rename {agent/src/main/java/com/cloud/agent =>
core/src/main/java/org/apache/cloudstack}/direct/download/DirectTemplateDownloaderImpl.java
(80%)
rename {agent/src/main/java/com/cloud/agent =>
core/src/main/java/org/apache/cloudstack}/direct/download/HttpDirectTemplateDownloader.java
(61%)
create mode 100644
core/src/main/java/org/apache/cloudstack/direct/download/HttpsDirectTemplateDownloader.java
create mode 100644
core/src/main/java/org/apache/cloudstack/direct/download/HttpsMultiTrustManager.java
create mode 100644
core/src/main/java/org/apache/cloudstack/direct/download/MetalinkDirectTemplateDownloader.java
rename {agent/src/main/java/com/cloud/agent =>
core/src/main/java/org/apache/cloudstack}/direct/download/NfsDirectTemplateDownloader.java
(77%)
copy
engine/storage/configdrive/src/test/java/org/apache/cloudstack/storage/configdrive/ConfigDriveTest.java
=> core/src/test/java/com/cloud/storage/JavaStorageLayerTest.java (62%)
create mode 100644
core/src/test/java/org/apache/cloudstack/direct/download/BaseDirectTemplateDownloaderTest.java
copy utils/src/test/java/com/cloud/utils/encoding/UrlEncoderTest.java =>
core/src/test/java/org/apache/cloudstack/direct/download/HttpsDirectTemplateDownloaderTest.java
(62%)
copy
api/src/test/java/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmdTest.java
=>
core/src/test/java/org/apache/cloudstack/direct/download/MetalinkDirectTemplateDownloaderTest.java
(64%)
