Updated Branches: refs/heads/4.2 a21ec81db -> 524e73c63
allow overlapped subnet in shared network Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/524e73c6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/524e73c6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/524e73c6 Branch: refs/heads/4.2 Commit: 524e73c63e6282b6ced72299d4a4ea1c4e39be52 Parents: a21ec81 Author: Anthony Xu <[email protected]> Authored: Fri Aug 16 10:02:45 2013 -0700 Committer: Anthony Xu <[email protected]> Committed: Fri Aug 16 10:02:45 2013 -0700 ---------------------------------------------------------------------- .../src/com/cloud/configuration/ConfigurationManagerImpl.java | 6 ------ 1 file changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/524e73c6/server/src/com/cloud/configuration/ConfigurationManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index c692e70..d32c693 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -3134,12 +3134,6 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } } - if ( vlan.getNetworkId() != networkId) { - throw new InvalidParameterValueException("This subnet is overlapped with subnet in other network " + vlan.getNetworkId() - + " in zone " + zone.getName() - + " . Please specify a different gateway/netmask."); - - } String[] otherVlanIpRange = vlan.getIpRange().split("\\-"); String otherVlanStartIP = otherVlanIpRange[0]; String otherVlanEndIP = null;
