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 B94141798A for ; Fri, 3 Oct 2014 11:11:51 +0000 (UTC) Received: (qmail 26888 invoked by uid 500); 3 Oct 2014 11:11:41 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 26764 invoked by uid 500); 3 Oct 2014 11:11:41 -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 26633 invoked by uid 99); 3 Oct 2014 11:11:41 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Oct 2014 11:11:41 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DBD6BA1F028; Fri, 3 Oct 2014 11:11:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dahn@apache.org To: commits@cloudstack.apache.org Date: Fri, 03 Oct 2014 11:12:15 -0000 Message-Id: <21ed95f5f69b47bf8224aa8e728acde1@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [37/50] [abbrv] git commit: updated refs/heads/vpc-refactor to a8cb7c1 Fix: VpcRouter has always PublicIp setup as it did before refactoring Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/961e7156 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/961e7156 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/961e7156 Branch: refs/heads/vpc-refactor Commit: 961e71562bc7621ff7ae9c6d6ba9dd32a58e093a Parents: a18e01c Author: Antonio Fornie Authored: Wed Aug 27 19:39:53 2014 -0500 Committer: Wilder Rodrigues Committed: Fri Oct 3 06:21:28 2014 +0200 ---------------------------------------------------------------------- .../router/deployment/VpcRouterDeploymentDefinition.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/961e7156/server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java ---------------------------------------------------------------------- diff --git a/server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java b/server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java index 8e8a6ea..acd764b 100644 --- a/server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java +++ b/server/src/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java @@ -71,6 +71,11 @@ public class VpcRouterDeploymentDefinition extends RouterDeploymentDefinition { } @Override + public boolean isPublicNetwork() { + return true; + } + + @Override protected void lock() { Vpc vpcLock = vpcDao.acquireInLockTable(vpc.getId()); if (vpcLock == null) {