Updated Branches: refs/heads/master 2b1feadb2 -> 9ec89b924
Allow EIP/ELB network creation only in Basic zone Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9ec89b92 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9ec89b92 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9ec89b92 Branch: refs/heads/master Commit: 9ec89b92400524993eb8cc998efde0e7dafdc883 Parents: 2b1fead Author: Alena Prokharchyk <[email protected]> Authored: Mon Jul 30 13:33:17 2012 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Mon Jul 30 13:39:42 2012 -0700 ---------------------------------------------------------------------- .../src/com/cloud/network/NetworkManagerImpl.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9ec89b92/server/src/com/cloud/network/NetworkManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 5a2b017..4dd5eab 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -2553,6 +2553,11 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag throw new InvalidParameterValueException("Only Account specific Isolated network with sourceNat service disabled are allowed in security group enabled zone"); } } + + //don't allow eip/elb networks in Advance zone + if (ntwkOff.getElasticIp() || ntwkOff.getElasticLb()) { + throw new InvalidParameterValueException("Elastic IP and Elastic LB services are supported in zone of type " + NetworkType.Basic); + } } // VlanId can be specified only when network offering supports it
