This is an automated email from the ASF dual-hosted git repository. dahn pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 9b6f9b5f7d809b4a72b786289a7b1c673b6f1e58 Merge: da94ae2c1c5 da542345855 Author: Daan Hoogland <[email protected]> AuthorDate: Tue Dec 3 16:33:51 2024 +0100 Merge release branch 4.20 to main * 4.20: UI: Tooltip on the host information card to display the CPU speed in MHz and the memory value in MB (to 3 decimal places) (#9971) UI: Allow accounts of the `User` type to add other accounts or users to projects through UI (#9927) enable to create VPC portfowarding rules with source cidr (#7081) Add new column `last_id` to the table volumes (#9759) Allow VMWare import via another host (#9787) Linstor: add support for ISO block devices and direct download (#9792) get expunged VM data for job result (#9949) fix section divider display on auth page (#9966) .../cloud/agent/api/to/PortForwardingRuleTO.java | 13 + .../java/com/cloud/network/rules/RulesService.java | 5 +- .../org/apache/cloudstack/api/ApiConstants.java | 2 + .../api/command/admin/vm/ImportVmCmd.java | 12 +- .../user/firewall/CreatePortForwardingRuleCmd.java | 22 +- .../user/firewall/UpdatePortForwardingRuleCmd.java | 15 +- .../loadbalancer/CreateLoadBalancerRuleCmd.java | 2 +- .../com/cloud/agent/api/ConvertInstanceAnswer.java | 11 + ...wer.java => ImportConvertedInstanceAnswer.java} | 8 +- .../agent/api/ImportConvertedInstanceCommand.java | 63 +++++ .../facade/SetPortForwardingRulesConfigItem.java | 2 +- .../virtualnetwork/model/ForwardingRule.java | 9 +- .../cloud/network/dao/FirewallRulesCidrsDao.java | 2 + .../network/dao/FirewallRulesCidrsDaoImpl.java | 21 +- .../cloud/network/dao/FirewallRulesDaoImpl.java | 3 - .../cloud/network/rules/PortForwardingRuleVO.java | 29 +- .../rules/dao/PortForwardingRulesDaoImpl.java | 44 +++- .../src/main/java/com/cloud/storage/VolumeVO.java | 11 + .../resources/META-INF/db/schema-41900to41910.sql | 3 + .../motion/StorageSystemDataMotionStrategy.java | 2 + .../storage/volume/VolumeServiceImpl.java | 1 + .../kvm/resource/LibvirtComputingResource.java | 31 ++- .../kvm/resource/LibvirtDomainXMLParser.java | 24 +- .../hypervisor/kvm/resource/LibvirtVMDef.java | 24 +- .../LibvirtConvertInstanceCommandWrapper.java | 27 +- ...virtImportConvertedInstanceCommandWrapper.java} | 164 +----------- .../kvm/storage/KVMStorageProcessor.java | 5 +- .../kvm/storage/LibvirtStorageAdaptor.java | 6 +- .../LibvirtConvertInstanceCommandWrapperTest.java | 47 ---- ...ImportConvertedInstanceCommandWrapperTest.java} | 115 +++----- ...ernetesClusterResourceModifierActionWorker.java | 2 +- plugins/storage/volume/linstor/CHANGELOG.md | 6 + .../kvm/storage/LinstorStorageAdaptor.java | 59 ++++- .../network/firewall/FirewallManagerImpl.java | 78 ++++-- .../cloud/network/router/CommandSetupHelper.java | 2 + .../com/cloud/network/rules/RulesManagerImpl.java | 52 +++- .../cloudstack/vm/UnmanagedVMsManagerImpl.java | 163 ++++++++++-- .../network/firewall/FirewallManagerTest.java | 132 +++++++--- .../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 293 +++++++++++++++++++-- systemvm/debian/opt/cloud/bin/configure.py | 10 +- systemvm/debian/opt/cloud/bin/cs/CsNetfilter.py | 2 +- .../debian/opt/cloud/bin/cs_forwardingrules.py | 22 +- ui/public/locales/en.json | 9 +- ui/public/locales/pt_BR.json | 3 +- ui/src/components/view/InfoCard.vue | 20 +- ui/src/views/auth/Login.vue | 2 +- ui/src/views/network/LoadBalancing.vue | 6 +- ui/src/views/network/PortForwarding.vue | 27 +- ui/src/views/project/AddAccountOrUserToProject.vue | 95 ++++--- ui/src/views/tools/ImportUnmanagedInstance.vue | 59 ++++- ui/src/views/tools/ManageInstances.vue | 3 +- 51 files changed, 1237 insertions(+), 531 deletions(-)
