CLOUDSTACK-6194: Failed to increase Shared network IP Range Submitted-by:Saksham Srivastava <saksham.srivast...@citrix.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b8413b94 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b8413b94 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b8413b94 Branch: refs/heads/resize-root Commit: b8413b9413eb39053c378309195469a4d5d4fec0 Parents: f291951 Author: Marcus Sorensen <mar...@betterservers.com> Authored: Tue Mar 4 22:19:08 2014 -0700 Committer: Marcus Sorensen <mar...@betterservers.com> Committed: Tue Mar 4 22:19:08 2014 -0700 ---------------------------------------------------------------------- server/src/com/cloud/configuration/ConfigurationManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8413b94/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 1c1da1f..283aeea 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -2555,7 +2555,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati List<VlanVO> vlans = _vlanDao.listVlansByNetworkId(network.getId()); if (vlans != null && vlans.size() > 0) { VlanVO vlan = vlans.get(0); - if (vlanId == null) { + if (vlanId == null || vlanId.contains(Vlan.UNTAGGED)) { vlanId = vlan.getVlanTag(); } else if (!NetUtils.isSameIsolationId(vlan.getVlanTag(), vlanId)) { throw new InvalidParameterValueException("there is already one vlan " + vlan.getVlanTag() + " on network :" + +network.getId()
