From c66c3c5bf01e9ae042a721cdbaf8bde2862aaa15 Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Fri, 10 Jun 2011 10:39:00 -0700
Subject: [PATCH] bug 9655: removed restriction for Direct networks - now can
 create 2 networks with diff vlans and the same subnet status 9655: resolved
 fixed

---
 .../com/cloud/configuration/ConfigurationManagerImpl.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index da346ef3732..fa325b595da 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -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;