Return-Path: 
 <dev-return-87160-apmail-cloudstack-dev-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-dev-archive@www.apache.org
Delivered-To: apmail-cloudstack-dev-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3899218362
	for <apmail-cloudstack-dev-archive@www.apache.org>;
 Tue, 22 Dec 2015 19:43:10 +0000 (UTC)
Received: (qmail 53896 invoked by uid 500); 22 Dec 2015 19:43:04 -0000
Delivered-To: apmail-cloudstack-dev-archive@cloudstack.apache.org
Received: (qmail 53841 invoked by uid 500); 22 Dec 2015 19:43:04 -0000
Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:dev@cloudstack.apache.org>
List-Id: <dev.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list dev@cloudstack.apache.org
Received: (qmail 53830 invoked by uid 99); 22 Dec 2015 19:43:04 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Dec 2015 19:43:04 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 5EAEDE0525; Tue, 22 Dec 2015 19:43:04 +0000 (UTC)
From: michaelandersen <git@git.apache.org>
To: dev@cloudstack.apache.org
Reply-To: dev@cloudstack.apache.org
References: <git-pr-1276-cloudstack@git.apache.org>
In-Reply-To: <git-pr-1276-cloudstack@git.apache.org>
Subject: [GitHub] cloudstack pull request: [4.7] FIX Site2SiteVPN on redundant
 VPC
Content-Type: text/plain
Message-Id: <20151222194304.5EAEDE0525@git1-us-west.apache.org>
Date: Tue, 22 Dec 2015 19:43:04 +0000 (UTC)

Github user michaelandersen commented on a diff in the pull request:

    https://github.com/apache/cloudstack/pull/1276#discussion_r48290122
  
    --- Diff: server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java ---
    @@ -916,6 +916,9 @@ protected void updateSite2SiteVpnConnectionState(final List<DomainRouterVO> rout
                     }
                     continue;
                 }
    +            if (router.getIsRedundantRouter() && router.getRedundantState() != RedundantState.MASTER){
    --- End diff --
    
    ok @pdube so getConnectionsForRouter() returns vpn connections based on the vpcid of the router. As both the backup and master router have the same vpcid assigned it makes sense to first exclude backup routers and then to exclude non-running routers. 
    
    I forced pushed the change. @pdube could you test?


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---