Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A0D6C2007D1 for ; Thu, 12 May 2016 17:05:31 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9F8A2160A10; Thu, 12 May 2016 15:05:31 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id ED3381602BF for ; Thu, 12 May 2016 17:05:30 +0200 (CEST) Received: (qmail 18297 invoked by uid 500); 12 May 2016 15:05:29 -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 17883 invoked by uid 99); 12 May 2016 15:05:29 -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; Thu, 12 May 2016 15:05:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 67BF4DF9F1; Thu, 12 May 2016 15:05:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: swill@apache.org To: commits@cloudstack.apache.org Date: Thu, 12 May 2016 15:05:42 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [14/18] git commit: updated refs/heads/master to 103d62e archived-at: Thu, 12 May 2016 15:05:31 -0000 Merge pull request #1483 from remibergsma/pr1413-wilder-47 CLOUDSTACK-9287 - Fix unique mac address per rVPC routerThis is work by @wilderrodrigues, see PR #1413 It contains important fixes and I think it needs to be included so I send the PR again. * pr/1483: CLOUDSTACK-9287 - Improve test by checking if pvt gw is removed and fix typos CLOUDSTACK-9287 - Fix RVR public interface CLOUDSTACK-9287 - Add integration test to cover the private gateway related changes CLOUDSTACK-9287 - Refactor the interface state configuration CLOUDSTACK-9287 - Check if the nic profile has already been removed from a certain router CLOUDSTACK-9287 - Bring up the private gw interface on state change to master CLOUDSTACK-9287 - Make sure private gw interface is not used for default gw CLOUDSTACK-9287 - Add integration test to cover the private gw interface/mac address issues CLOUDSTACK-9287 - Put private gateway interface down on backup router CLOUDSTACK-9287 - Generate new mac address if router is redundant and nic profile exists Signed-off-by: Will Stevens Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/309a60ea Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/309a60ea Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/309a60ea Branch: refs/heads/master Commit: 309a60ea71d4954cb3d75dcc5976c084b8b939b8 Parents: 5a79c2b 799b9f2 Author: Will Stevens Authored: Thu May 12 11:00:39 2016 -0400 Committer: Will Stevens Committed: Thu May 12 11:00:40 2016 -0400 ---------------------------------------------------------------------- .../network/element/VirtualRouterElement.java | 26 +- .../element/VpcVirtualRouterElement.java | 25 +- .../network/router/CommandSetupHelper.java | 4 +- .../network/router/NicProfileHelperImpl.java | 5 + .../VpcVirtualNetworkApplianceManagerImpl.java | 14 +- .../network/vpc/NetworkACLManagerImpl.java | 16 +- .../topology/AdvancedNetworkTopology.java | 13 +- .../debian/config/opt/cloud/bin/configure.py | 30 +- .../debian/config/opt/cloud/bin/cs/CsAddress.py | 58 ++-- .../debian/config/opt/cloud/bin/cs/CsHelper.py | 24 ++ .../config/opt/cloud/bin/cs/CsRedundant.py | 80 ++--- test/integration/smoke/test_privategw_acl.py | 336 +++++++++++++++++-- 12 files changed, 462 insertions(+), 169 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/309a60ea/systemvm/patches/debian/config/opt/cloud/bin/configure.py ----------------------------------------------------------------------