From 6ea66248dd2672932f359d6f8fce656a96f64447 Mon Sep 17 00:00:00 2001 From: alena Date: Wed, 21 Sep 2011 09:48:51 -0700 Subject: [PATCH] bug 11515: reapply all firewall rules for the IP address when VPN related rules are being revoked status 11515: resolved fixed Reviewed-by: will@cloud.com --- .../com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java index 98a3e9bef49..1c856ca058d 100755 --- a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java +++ b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java @@ -250,11 +250,13 @@ public class RemoteAccessVpnManagerImpl implements RemoteAccessVpnService, Manag fwRules.add(_rulesDao.findByRelatedId(vpnFwRule.getId())); } + s_logger.debug("Marked " + fwRules.size() + " firewall rules as Revoked as a part of disable remote access vpn"); + txn.commit(); //now apply vpn rules on the backend - s_logger.debug("Applying " + fwRules.size() + " firewall rules as a part of disable remote access vpn"); - success = _firewallMgr.applyFirewallRules(fwRules, false, caller); + s_logger.debug("Reapplying firewall rules for ip id=" + ipId + " as a part of disable remote access vpn"); + success = _firewallMgr.applyFirewallRules(ipId, caller); } if (success) {