etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
dahn 2018-05-23 17:10:34 +02:00 committed by Rohit Yadav
parent ebb22a4818
commit 7a3a882d12
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/com/cloud/network/IpAddressManagerImpl.java
View File

@ -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()))