Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 037F710CAA for ; Tue, 28 Jan 2014 09:26:49 +0000 (UTC) Received: (qmail 55090 invoked by uid 500); 28 Jan 2014 09:26:48 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 54779 invoked by uid 500); 28 Jan 2014 09:26:47 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 53146 invoked by uid 99); 28 Jan 2014 09:26:33 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Jan 2014 09:26:33 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CFD5B909706; Tue, 28 Jan 2014 09:26:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: muralireddy@apache.org To: commits@cloudstack.apache.org Date: Tue, 28 Jan 2014 09:26:48 -0000 Message-Id: <95789c3abfb54a9cb872b25041167c4d@git.apache.org> In-Reply-To: <078475a9f9984d83ae3e9cac8be9385a@git.apache.org> References: <078475a9f9984d83ae3e9cac8be9385a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [17/17] git commit: updated refs/heads/regionvpc to cf18fe1 in region level vpc, let the network/tier to be created in any zone of the region Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cf18fe19 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cf18fe19 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cf18fe19 Branch: refs/heads/regionvpc Commit: cf18fe1928fe2921adbac8b614309009657a8d36 Parents: 843a04c Author: Murali Reddy Authored: Mon Jan 27 14:55:36 2014 +0530 Committer: Murali Reddy Committed: Mon Jan 27 14:55:36 2014 +0530 ---------------------------------------------------------------------- server/src/com/cloud/network/vpc/VpcManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cf18fe19/server/src/com/cloud/network/vpc/VpcManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java index 1906bc5..78197c3 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -2190,7 +2190,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis networkDomain = vpc.getNetworkDomain(); } - if (vpc.getZoneId() != zoneId) { + if (!vpc.isRegionLevelVpc() && vpc.getZoneId() != zoneId) { throw new InvalidParameterValueException("New network doesn't belong to vpc zone"); }