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 <[email protected]> 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 <[email protected]> Authored: Thu Sep 24 15:35:16 2015 +0200 Committer: Remi Bergsma <[email protected]> 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(-) ----------------------------------------------------------------------
