From b3de780e7b2d78ca841e77d7f2f4b88525fb933a Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan.hoogland@shapeblue.com>
Date: Wed, 23 May 2018 10:17:58 +0200
Subject: [PATCH] revert dedicate vlan code removal

---
 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 c00359c92f00..71acc834d9a9 100644
--- a/server/src/com/cloud/network/IpAddressManagerImpl.java
+++ b/server/src/com/cloud/network/IpAddressManagerImpl.java
@@ -29,6 +29,7 @@
 
 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 IPAddressVO doInTransaction(TransactionStatus status) throws Insufficient
                             dedicatedVlanDbIds.add(map.getVlanDbId());
                     }
                 }
+                List<DomainVlanMapVO> domainMaps = _domainVlanMapDao.listDomainVlanMapsByDomain(owner.getDomainId());
+                for (DomainVlanMapVO map : domainMaps) {
+                    if (vlanDbIds == null || vlanDbIds.contains(map.getVlanDbId()))
+                        dedicatedVlanDbIds.add(map.getVlanDbId());
+                }
                 List<VlanVO> nonDedicatedVlans = _vlanDao.listZoneWideNonDedicatedVlans(dcId);
                 for (VlanVO nonDedicatedVlan : nonDedicatedVlans) {
                     if (vlanDbIds == null || vlanDbIds.contains(nonDedicatedVlan.getId()))