This is an automated email from the ASF dual-hosted git repository. winterhazel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 67b849f3efd16f5c353501d176a42e45d87acb44 Merge: 6b831f5196c 21b2025c505 Author: Fabricio Duarte <[email protected]> AuthorDate: Fri May 22 10:30:01 2026 -0300 Merge release branch 4.22 to main * 4.22: VM Deployment using snapshot in new zone (#13178) Change exception treatment on incremental snapshot wait (#12665) Move checkRoleEscalation outside DB transaction in createAccount (#13044) Fix/flasharray delete rename destroy patch conflict (#13049) Fix VPC network offerings listing in isolated network creation form (#12645) systemvm: accept ipv6 established/related return traffic (#13173) update debian change log Updating pom.xml version numbers for release 4.22.2.0-SNAPSHOT Updating pom.xml version numbers for release 4.22.1.0 Update suse15 packaging spec, use qemu-ovmf-x86_64 package instead of edk2-ovmf for agent (#13133) Change disk-only VM snapshot removal message (#11182) Update mysql java connector version to 8.4.0 (matching version for MySQL 8.4) (#12640) adaptive: honor user-provided capacityBytes when provider stats are unavailable (#13059) Flexibilize public IP selection (#11076) .github/workflows/ci.yml | 2 +- debian/changelog | 14 +- .../cloud/network/dao/PublicIpQuarantineDao.java | 12 + .../network/dao/PublicIpQuarantineDaoImpl.java | 22 + packaging/el8/cloud.spec | 2 +- packaging/suse15 | 1 - packaging/suse15/cloud-ipallocator.rc | 1 + packaging/suse15/cloud.limits | 1 + packaging/{el8 => suse15}/cloud.spec | 12 +- packaging/suse15/cloudstack-agent.te | 1 + packaging/suse15/cloudstack-sccs | 1 + packaging/suse15/filelimit.conf | 1 + packaging/suse15/replace.properties | 65 +++ packaging/systemd/cloudstack-management.default | 2 +- packaging/systemd/cloudstack-usage.default | 2 +- .../kvm/storage/KVMStorageProcessor.java | 2 +- .../lifecycle/AdaptiveDataStoreLifeCycleImpl.java | 13 +- .../adapter/flasharray/FlashArrayAdapter.java | 67 ++- pom.xml | 2 +- .../com/cloud/network/IpAddressManagerImpl.java | 91 ++-- .../java/com/cloud/user/AccountManagerImpl.java | 17 +- .../main/java/com/cloud/vm/UserVmManagerImpl.java | 64 ++- .../com/cloud/network/IpAddressManagerTest.java | 1 + .../java/com/cloud/vm/UserVmManagerImplTest.java | 606 ++++++++++++--------- setup/db/deploy-db-dev.sh | 5 +- systemvm/debian/opt/cloud/bin/cs/CsNetfilter.py | 2 +- test/integration/smoke/test_quarantined_ips.py | 8 +- tools/docker/Dockerfile | 2 +- tools/marvin/setup.py | 2 +- ui/public/locales/en.json | 2 + ui/public/locales/pt_BR.json | 2 +- ui/src/config/section/compute.js | 7 +- ui/src/views/AutogenView.vue | 14 +- ui/src/views/network/CreateIsolatedNetworkForm.vue | 22 +- .../java/com/cloud/usage/UsageSanityChecker.java | 2 +- 35 files changed, 681 insertions(+), 389 deletions(-) diff --cc debian/changelog index 02251137e9d,c0f1255b33c..41f97748a0b --- a/debian/changelog +++ b/debian/changelog @@@ -1,15 -1,27 +1,21 @@@ -cloudstack (4.22.2.0-SNAPSHOT) unstable; urgency=low +cloudstack (4.23.0.0-SNAPSHOT) unstable; urgency=low - * Update the version to 4.22.2.0-SNAPSHOT + * Update the version to 4.23.0.0-SNAPSHOT - -- the Apache CloudStack project <[email protected]> Thu, 30 Oct 2025 19:23:55 +0530 - -- the Apache CloudStack project <[email protected]> Mon, 18 May 2026 17:17:25 +0530 ++ -- the Apache CloudStack project <[email protected]> Fri, 22 May 2026 10:20:00 -0300 + + cloudstack (4.22.1.0) unstable; urgency=low + + * Update the version to 4.22.1.0 - cloudstack (4.23.0.0-SNAPSHOT-SNAPSHOT) unstable; urgency=low + -- the Apache CloudStack project <[email protected]> Mon, 11 May 2026 20:26:07 +0530 - * Update the version to 4.23.0.0-SNAPSHOT-SNAPSHOT -cloudstack (4.22.1.0-SNAPSHOT) unstable; urgency=low ++cloudstack (4.22.0.0) unstable; urgency=low - -- the Apache CloudStack project <[email protected]> Thu, Aug 28 11:58:36 2025 +0530 - * Update the version to 4.22.1.0-SNAPSHOT ++ * Update the version to 4.22.0.0 + + -- the Apache CloudStack project <[email protected]> Thu, 30 Oct 2025 19:23:55 +0530 -cloudstack (4.22.1.0-SNAPSHOT-SNAPSHOT) unstable; urgency=low - - * Update the version to 4.22.1.0-SNAPSHOT-SNAPSHOT - - -- the Apache CloudStack project <[email protected]> Thu, Aug 28 11:58:36 2025 +0530 - cloudstack (4.21.0.0) unstable; urgency=low * Update the version to 4.21.0.0 diff --cc server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java index ff67d73c0f4,f752dc31f18..93a06ef2097 --- a/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java +++ b/server/src/test/java/com/cloud/vm/UserVmManagerImplTest.java @@@ -144,8 -133,15 +139,14 @@@ import com.cloud.host.Host import com.cloud.host.HostVO; import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor; -import com.cloud.kubernetes.cluster.KubernetesServiceHelper; import com.cloud.network.Network; import com.cloud.network.NetworkModel; + import com.cloud.network.as.AutoScaleManager; + import com.cloud.network.dao.FirewallRulesDao; + import com.cloud.network.dao.IPAddressDao; + import com.cloud.network.dao.IPAddressVO; + import com.cloud.network.dao.LoadBalancerVMMapDao; + import com.cloud.network.dao.LoadBalancerVMMapVO; import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.PhysicalNetworkDao; @@@ -466,11 -456,9 +467,11 @@@ public class UserVmManagerImplTest @Mock ServiceOfferingDetailsDao serviceOfferingDetailsDao; - private static final long vmId = 1l; + private static final long vmId = 1L; private static final long zoneId = 2L; private static final long accountId = 3L; + private static final long nicId = 4L; + private static final long networkId = 5L; private static final long serviceOfferingId = 10L; private static final long templateId = 11L; private static final long volumeId = 1L; diff --cc ui/public/locales/en.json index 83422cd4101,fe3678c9f37..3a16d613f37 --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@@ -4167,8 -4092,8 +4168,9 @@@ "message.warn.importing.instance.without.nic": "WARNING: This Instance is being imported without NICs and many Network resources will not be available. Consider creating a NIC via vCenter before importing or as soon as the Instance is imported. For KVM host, allocate a NIC to Instance after import.", "message.warn.select.template": "Please select a Template for Registration.", "message.warn.zone.mtu.update": "Please note that this limit won't affect pre-existing Network's MTU settings", + "message.warn.vpc.offerings": "VPC offerings will only be shown if the selected account has at least one VPC.", "message.webhook.deliveries.time.filter": "Webhook deliveries list can be filtered based on date-time. Select 'Custom' for specifying start and end date range.", +"message.webhook.filter.add": "Webhook deliveries can be controlled using filters (currently by Event type). Please select the parameters to add to the applied filters list.", "message.zone.creation.complete": "Zone creation complete.", "message.zone.detail.description": "Populate Zone details.", "message.zone.detail.hint": "A Zone is the largest organizational unit in CloudStack, and it typically corresponds to a single datacenter. Zones provide physical isolation and redundancy. A zone consists of one or more Pods (each of which contains hosts and primary storage servers) and a secondary storage server which is shared by all pods in the zone.", diff --cc ui/public/locales/pt_BR.json index dee353ec589,e31c863560a..91f0fd895e5 --- a/ui/public/locales/pt_BR.json +++ b/ui/public/locales/pt_BR.json @@@ -2765,9 -1914,7 +2765,9 @@@ "message.action.unmanage.instance": "Por favor, confirme que voc\u00ea deseja parar de gerenciar a inst\u00e2ncia.", "message.action.unmanage.instances": "Por favor, confirme que voc\u00ea deseja parar de gerenciar as inst\u00e2ncias.", "message.action.unmanage.virtualmachine": "Por favor, confirme que voc\u00ea deseja parar de gerenciar a VM.", - "message.action.vmsnapshot.delete": "Por favor, confirme que voc\u00ea deseja excluir esta snapshot de VM.", +"message.action.unmanage.volume": "Por favor, confirme que voc\u00ea deseja parar de gerenciar o Volume.", +"message.action.unmanage.volumes": "Por favor, confirme que voc\u00ea deseja parar de gerenciar os Volumes.", + "message.action.vmsnapshot.delete": "Por favor, confirme que voc\u00ea deseja excluir esta snapshot de VM. <br>Saiba que caso a instância execute em um hypervisor KVM, ela será pausada antes da deleç\u00e3o, e continuada após a deleç\u00e3o.", "message.action.vmsnapshot.disk-only.delete": "Por favor, confirme que voc\u00ea deseja excluir esta snapshot de VM.", "message.activate.project": "Voc\u00ea tem certeza que deseja ativar este projeto?", "message.add.egress.rule.failed": "Falha ao adicionar uma nova regra de sa\u00edda",
