Repository: cloudstack Updated Branches: refs/heads/4.3-forward 444e8f6bb -> cd0d16f05
CLOUDSTACK-6194: Failed to increase Shared network IP Range Submitted-by:Saksham Srivastava <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cd0d16f0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cd0d16f0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cd0d16f0 Branch: refs/heads/4.3-forward Commit: cd0d16f05a2be02e3de1a327bba9a5acd112e4f2 Parents: 444e8f6 Author: Marcus Sorensen <[email protected]> Authored: Tue Mar 4 22:19:08 2014 -0700 Committer: Marcus Sorensen <[email protected]> Committed: Tue Mar 4 22:20:25 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/cd0d16f0/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()
