apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 9655: removed restriction for Direct networks - now can create 2 networks with diff vlans and the same subnet

Browse Source 
status 9655: resolved fixed
This commit is contained in:
alena 2011-06-10 10:39:00 -07:00
parent 85af11fac9
commit c66c3c5bf0
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -3013,9 +3013,8 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
}
private boolean allowIpRangeOverlap(VlanVO vlan, boolean forVirtualNetwork, long networkId) {
Network vlanNetwork = _networkMgr.getNetwork(vlan.getNetworkId());
Network network = _networkMgr.getNetwork(networkId);
if (vlan.getVlanType() == VlanType.DirectAttached && !forVirtualNetwork && network.getAccountId() != vlanNetwork.getAccountId()) {
//FIXME - delete restriction for virtual network in the future
if (vlan.getVlanType() == VlanType.DirectAttached && !forVirtualNetwork) {
return true;
} else {
return false;