This is an automated email from the ASF dual-hosted git repository.
weizhou pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 3e6900ac1a5 api,server: purge expunged resources (#8999)
add 8b02624e610 User data content size validation, and related code
improvements (#8418)
add 227c15624d9 vxlan: do not create duplicated network for private
gateway (#9232)
add 7a0cd55e989 ui: fix user create featured template from volume (#9253)
add 2315a73a209 User friendly name of Downloaded Templates Volumes and
ISOs (#9252)
add 81269ad62af VNF: add API listVnfAppliances (#8994)
add cc52b38e54d Update extraconfig for platform param in xen/xcpng (#9248)
add 3997e596786 Merge release branch 4.18 to 4.19
add 84b91cc9a3d assertion improvement on cluster DRS (#8508)
new d81ffd2d864 Merge remote-tracking branch 'apache/4.19'
new fbeee491377 fix build errors after forward-merge
The 2 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:
PULL_REQUEST_TEMPLATE.md | 1 +
...Admin.java => ListVnfAppliancesCmdByAdmin.java} | 18 ++---
.../autoscale/CreateAutoScaleVmProfileCmd.java | 2 +-
.../autoscale/UpdateAutoScaleVmProfileCmd.java | 2 +-
.../command/user/userdata/RegisterUserDataCmd.java | 9 ++-
.../api/command/user/vm/DeployVMCmd.java | 6 +-
.../ListVnfAppliancesCmd.java} | 20 ++++--
.../api/command/user/vm/ResetVMUserDataCmd.java | 2 +-
.../api/command/user/vm/UpdateVMCmd.java | 2 +-
.../api/response/AutoScaleVmProfileResponse.java | 2 +-
.../api/response/VMUserDataResponse.java | 2 +-
.../cloudstack/userdata/UserDataManager.java | 5 ++
.../storage/CreateEntityDownloadURLCommand.java | 27 +++++---
.../engine/subsystem/api/storage/DataObject.java | 2 +
.../cloud/configuration/ConfigurationManager.java | 3 -
.../cloudstack/userdata/UserDataManagerImpl.java | 81 ++++++++++++----------
.../xenserver/ExtraConfigurationUtility.java | 50 +++++++++----
.../xenserver/ExtraConfigurationUtilityTest.java | 52 ++++++++++++++
.../cloud/network/guru/VxlanGuestNetworkGuru.java | 2 +-
.../driver/CloudStackImageStoreDriverImpl.java | 44 +++++++++---
.../configuration/ConfigurationManagerImpl.java | 7 +-
.../com/cloud/network/as/AutoScaleManagerImpl.java | 7 +-
.../cloud/storage/upload/UploadMonitorImpl.java | 4 +-
.../src/main/java/com/cloud/vm/UserVmManager.java | 2 -
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 55 +--------------
.../diagnostics/to/DiagnosticsDataObject.java | 5 ++
.../storage/template/VnfTemplateManagerImpl.java | 4 ++
.../cloud/network/as/AutoScaleManagerImplTest.java | 10 ++-
.../storage/template/UploadManagerImpl.java | 5 +-
test/integration/smoke/test_cluster_drs.py | 61 +++++++++++++---
ui/src/config/section/image.js | 2 +-
ui/src/config/section/network.js | 4 +-
ui/src/config/section/storage.js | 8 ++-
ui/src/views/network/VnfAppliancesTab.vue | 2 +-
34 files changed, 330 insertions(+), 178 deletions(-)
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/vm/{DeployVnfApplianceCmdByAdmin.java
=> ListVnfAppliancesCmdByAdmin.java} (71%)
copy
api/src/main/java/org/apache/cloudstack/api/command/user/{template/ListVnfTemplatesCmd.java
=> vm/ListVnfAppliancesCmd.java} (68%)
create mode 100644
plugins/hypervisors/xenserver/src/test/java/org/apache/cloudstack/hypervisor/xenserver/ExtraConfigurationUtilityTest.java