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 F250617C87 for ; Sun, 27 Sep 2015 12:11:21 +0000 (UTC) Received: (qmail 3019 invoked by uid 500); 27 Sep 2015 12:11:20 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 2873 invoked by uid 500); 27 Sep 2015 12:11:20 -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 2135 invoked by uid 99); 27 Sep 2015 12:11:20 -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; Sun, 27 Sep 2015 12:11:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4B47AE0103; Sun, 27 Sep 2015 12:11:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: remi@apache.org To: commits@cloudstack.apache.org Date: Sun, 27 Sep 2015 12:11:28 -0000 Message-Id: <142c6a7ad2c747dc9e788929e2fc15be@git.apache.org> In-Reply-To: <24ffe84b6e0d419ea6ae11c1c730dc56@git.apache.org> References: <24ffe84b6e0d419ea6ae11c1c730dc56@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/21] git commit: updated refs/heads/master to 3ded3e9 Merge pull request #851 from SudharmaJain/cs-8864 CLOUDSTACK-8864: Not able to add TCP port forwarding rule in VPN for specific ports Setting port forwarding rules for port 500,1701 and 4500 after enabling VPN, gives the error message "The range specified, xxxx, conflicts with rule xxxx which has xxxx." This happens because the rules added for vpn doesn't have a matching condition to allow port forwarding rules. Added a unit test to verify the detectRulesConflict function of FirewallManagerImpl. * pr/851: CLOUDSTACK-8864: Not able to add TCP port forwarding rule in VPN for specific ports Signed-off-by: Remi Bergsma Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7d555542 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7d555542 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7d555542 Branch: refs/heads/master Commit: 7d5555429b90fcb9e1456ea858d5163b41ee41ab Parents: 8367911 96c38bf Author: Remi Bergsma Authored: Thu Sep 24 15:35:16 2015 +0200 Committer: Remi Bergsma Committed: Thu Sep 24 15:35:16 2015 +0200 ---------------------------------------------------------------------- .../network/firewall/FirewallManagerImpl.java | 3 +- .../network/firewall/FirewallManagerTest.java | 83 +++++++++++++++++--- 2 files changed, 76 insertions(+), 10 deletions(-) ----------------------------------------------------------------------