CLOUDSTACK-6232 allow expansion of ip on isolated networks as well (cherry picked from commit edf97ac86c94741ae8964b640bdfc0234929c1e4)
Signed-off-by: Animesh Chaturvedi <anim...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6a6ec648 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6a6ec648 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6a6ec648 Branch: refs/heads/4.3 Commit: 6a6ec648099553a42f830dcd566eab2452428908 Parents: 4161650 Author: Daan Hoogland <dhoogl...@schubergphilis.com> Authored: Wed Mar 12 19:36:11 2014 +0100 Committer: Animesh Chaturvedi <anim...@apache.org> Committed: Wed Mar 12 14:05:10 2014 -0700 ---------------------------------------------------------------------- .../src/com/cloud/configuration/ConfigurationManagerImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a6ec648/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 2e2c39f..662eaae 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -2643,9 +2643,10 @@ ConfigurationManagerImpl extends ManagerBase implements ConfigurationManager, Co networkId = network.getId(); zoneId = network.getDataCenterId(); } - } else if (network.getGuestType() == null || network.getGuestType() == Network.GuestType.Isolated) { - throw new InvalidParameterValueException("Can't create direct vlan for network id=" + networkId - + " with type: " + network.getGuestType()); + } else if (network.getGuestType() == null || + (network.getGuestType() == Network.GuestType.Isolated + && _ntwkOffServiceMapDao.areServicesSupportedByNetworkOffering(network.getNetworkOfferingId(), Service.SourceNat))) { + throw new InvalidParameterValueException("Can't create direct vlan for network id=" + networkId + " with type: " + network.getGuestType()); } }
