From bb79f0b727eaaff324e52b76063989341f808012 Mon Sep 17 00:00:00 2001 From: dahn Date: Tue, 27 May 2025 08:17:49 +0200 Subject: [PATCH 1/3] engine/schema: create default network offering for vpc tier with conserve_mode=1 for fresh installation (#10744) (#10843) Co-authored-by: Wei Zhou --- .../cloudstack/engine/orchestration/NetworkOrchestrator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java index 2ec79bc80f1..e2919c5180d 100644 --- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java +++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java @@ -577,7 +577,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra if (_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworks) == null) { offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworks, "Offering for Isolated VPC networks with Source Nat service enabled", TrafficType.Guest, null, false, Availability.Optional, null, - defaultVPCOffProviders, true, Network.GuestType.Isolated, false, null, false, null, false, false, null, false, null, true, true, false, null, null, true, null); + defaultVPCOffProviders, true, Network.GuestType.Isolated, false, null, true, null, false, false, null, false, null, true, true, false, null, null, true, null); } //#6 - default vpc offering with no LB service From b760b0262f2b8577eefce349832a1d563b378eb8 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Tue, 27 May 2025 13:44:04 +0530 Subject: [PATCH 2/3] Fix issue with configdrive on XenServer (#10912) --- .../resource/wrapper/xenbase/CitrixStartCommandWrapper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStartCommandWrapper.java b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStartCommandWrapper.java index 5867a151c85..f6a60d65d6f 100644 --- a/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStartCommandWrapper.java +++ b/plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStartCommandWrapper.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Set; import com.cloud.agent.resource.virtualnetwork.VRScripts; @@ -241,7 +242,7 @@ public final class CitrixStartCommandWrapper extends CommandWrapper disks = new ArrayList(vmSpec.getDisks().length); int index = 0; for (final DiskTO disk : vmSpec.getDisks()) { - if (Volume.Type.ISO.equals(disk.getType())) { + if (Volume.Type.ISO.equals(disk.getType()) && Objects.nonNull(disk.getPath())) { disks.add(0, disk); } else { disks.add(index, disk); From 857ccb0a3b8084d07d440aa61749f61557372912 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 27 May 2025 10:56:35 +0200 Subject: [PATCH 3/3] server: fix list diskoffering by domainid returns Inactive offerings (#10916) --- .../src/main/java/com/cloud/api/query/QueryManagerImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java index 0e99af41338..1a03ea93dcb 100644 --- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java @@ -3485,7 +3485,9 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q SearchCriteria sc = diskOfferingSearch.create(); sc.setParameters("computeOnly", false); - sc.setParameters("activeState", DiskOffering.State.Active); + if (state != null) { + sc.setParameters("state", state); + } sc.setJoinParameters("domainDetailsSearch", "domainId", domainId);