[cloudstack] branch 4.11 updated: server: Fixes #2545 revert dedicate vlan code removal (#2664)

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.11
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.11 by this push:
     new 7a3a882  server: Fixes #2545 revert dedicate vlan code removal (#2664)
7a3a882 is described below

commit 7a3a882d1281ecd4baa7664473a6f8e77facf80e
Author: dahn <da...@gmail.com>
AuthorDate: Wed May 23 17:10:34 2018 +0200

    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 c00359c..71acc83 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<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()))

-- 
To stop receiving notification emails like this one, please contact
rohit@apache.org.