apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.19' of https://github.com/apache/cloudstack into 4.20

Browse Source
This commit is contained in:
Pearl Dsilva 2025-05-27 19:27:33 +05:30
commit 16fc2cd1f0
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
View File

@ -596,6 +596,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworks, offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworks,
"Offering for Isolated VPC networks with Source Nat service enabled", TrafficType.Guest, null, false, Availability.Optional, null, "Offering for Isolated VPC networks with Source Nat service enabled", TrafficType.Guest, null, false, Availability.Optional, null,
defaultVPCOffProviders, true, Network.GuestType.Isolated, false, null, true, null, false, false, null, false, null, true, true, false, false, null, null, null,true, null, null, false); defaultVPCOffProviders, true, Network.GuestType.Isolated, false, null, true, null, false, false, null, false, null, true, true, false, false, null, null, null,true, null, null, false);
} }
//#6 - default vpc offering with no LB service //#6 - default vpc offering with no LB service

3
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixStartCommandWrapper.java
View File

@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.Set; import java.util.Set;
import com.cloud.agent.resource.virtualnetwork.VRScripts; import com.cloud.agent.resource.virtualnetwork.VRScripts;
@ -247,7 +248,7 @@ public final class CitrixStartCommandWrapper extends CommandWrapper<StartCommand
List<DiskTO> disks = new ArrayList<DiskTO>(vmSpec.getDisks().length); List<DiskTO> disks = new ArrayList<DiskTO>(vmSpec.getDisks().length);
int index = 0; int index = 0;
for (final DiskTO disk : vmSpec.getDisks()) { 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); disks.add(0, disk);
} else { } else {
disks.add(index, disk); disks.add(index, disk);

4
server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
View File

@ -3540,7 +3540,9 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
SearchCriteria<DiskOfferingVO> sc = diskOfferingSearch.create(); SearchCriteria<DiskOfferingVO> sc = diskOfferingSearch.create();
sc.setParameters("computeOnly", false); sc.setParameters("computeOnly", false);
sc.setParameters("activeState", DiskOffering.State.Active); if (state != null) {
sc.setParameters("state", state);
}
sc.setJoinParameters("domainDetailsSearch", "domainId", domainId); sc.setJoinParameters("domainDetailsSearch", "domainId", domainId);