From 7a3a882d1281ecd4baa7664473a6f8e77facf80e Mon Sep 17 00:00:00 2001 From: dahn Date: Wed, 23 May 2018 17:10:34 +0200 Subject: [PATCH] server: Fixes #2545 revert dedicate vlan code removal (#2664) This re-adds logic to allow dedication of public ip/range to a domain and its usage. --- server/src/com/cloud/network/IpAddressManagerImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/src/com/cloud/network/IpAddressManagerImpl.java b/server/src/com/cloud/network/IpAddressManagerImpl.java index c00359c92f0..71acc834d9a 100644 --- a/server/src/com/cloud/network/IpAddressManagerImpl.java +++ b/server/src/com/cloud/network/IpAddressManagerImpl.java @@ -29,6 +29,7 @@ import java.util.UUID; import javax.inject.Inject; +import com.cloud.dc.DomainVlanMapVO; import org.apache.log4j.Logger; import org.apache.cloudstack.acl.ControlledEntity.ACLType; @@ -727,6 +728,11 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage dedicatedVlanDbIds.add(map.getVlanDbId()); } } + List domainMaps = _domainVlanMapDao.listDomainVlanMapsByDomain(owner.getDomainId()); + for (DomainVlanMapVO map : domainMaps) { + if (vlanDbIds == null || vlanDbIds.contains(map.getVlanDbId())) + dedicatedVlanDbIds.add(map.getVlanDbId()); + } List nonDedicatedVlans = _vlanDao.listZoneWideNonDedicatedVlans(dcId); for (VlanVO nonDedicatedVlan : nonDedicatedVlans) { if (vlanDbIds == null || vlanDbIds.contains(nonDedicatedVlan.getId()))