File tree Expand file tree Collapse file tree
server/src/com/cloud/network Expand file tree Collapse file tree Original file line number Diff line number Diff line change 2929
3030import javax .inject .Inject ;
3131
32+ import com .cloud .dc .DomainVlanMapVO ;
3233import org .apache .log4j .Logger ;
3334
3435import org .apache .cloudstack .acl .ControlledEntity .ACLType ;
@@ -727,6 +728,11 @@ public IPAddressVO doInTransaction(TransactionStatus status) throws Insufficient
727728 dedicatedVlanDbIds .add (map .getVlanDbId ());
728729 }
729730 }
731+ List <DomainVlanMapVO > domainMaps = _domainVlanMapDao .listDomainVlanMapsByDomain (owner .getDomainId ());
732+ for (DomainVlanMapVO map : domainMaps ) {
733+ if (vlanDbIds == null || vlanDbIds .contains (map .getVlanDbId ()))
734+ dedicatedVlanDbIds .add (map .getVlanDbId ());
735+ }
730736 List <VlanVO > nonDedicatedVlans = _vlanDao .listZoneWideNonDedicatedVlans (dcId );
731737 for (VlanVO nonDedicatedVlan : nonDedicatedVlans ) {
732738 if (vlanDbIds == null || vlanDbIds .contains (nonDedicatedVlan .getId ()))
You can’t perform that action at this time.
0 commit comments