CLOUDSTACK-6194: Failed to increase Shared network IP Range Submitted-by:Saksham Srivastava <[email protected]> (cherry picked from commit 135247afd114c1dfc6dde22184430237e79aafc5)
Signed-off-by: Animesh Chaturvedi <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/859a78e1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/859a78e1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/859a78e1 Branch: refs/heads/4.3 Commit: 859a78e1d321a936efd18dc6f0a55ab336cd3b70 Parents: 3b92031 Author: Marcus Sorensen <[email protected]> Authored: Tue Mar 4 22:19:08 2014 -0700 Committer: Animesh Chaturvedi <[email protected]> Committed: Mon Mar 10 10:15:04 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/859a78e1/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 d2e5aaa..2e2c39f 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -2666,7 +2666,7 @@ ConfigurationManagerImpl extends ManagerBase implements ConfigurationManager, Co 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()
