Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A52EFD7D0 for ; Mon, 30 Jul 2012 20:39:59 +0000 (UTC) Received: (qmail 23399 invoked by uid 500); 30 Jul 2012 20:39:59 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 23376 invoked by uid 500); 30 Jul 2012 20:39:59 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 23367 invoked by uid 99); 30 Jul 2012 20:39:59 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Jul 2012 20:39:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 278F71A252; Mon, 30 Jul 2012 20:39:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: alena1108@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: Allow EIP/ELB network creation only in Basic zone Message-Id: <20120730203959.278F71A252@tyr.zones.apache.org> Date: Mon, 30 Jul 2012 20:39:59 +0000 (UTC) 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 Authored: Mon Jul 30 13:33:17 2012 -0700 Committer: Alena Prokharchyk 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