Updated Branches: refs/heads/4.1 e219ef951 -> 540f68f4c
CLOUDSTACK-1288: Fix regression on remove LB rules It's a regression caused by: commit 69d24545c4f0e316dba534b6d5d99308795db6d4 Author: Murali Reddy <[email protected]> Date: Fri Feb 8 18:50:18 2013 +0530 CLOUDSTACK-1208: Failed to shutdown guest network Firewall manager was being used instead of LoadBalancingRules manager while applying the load balancer rules in shut down network. Changing it to LoadBalancingRules manager. The parameter transferre to applyRules() should be lbRules, rather than the lbs object. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/540f68f4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/540f68f4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/540f68f4 Branch: refs/heads/4.1 Commit: 540f68f4c31548d7c99e5a9581a2396ae379ae14 Parents: e219ef9 Author: Sheng Yang <[email protected]> Authored: Thu Feb 21 14:42:42 2013 -0800 Committer: Sheng Yang <[email protected]> Committed: Thu Feb 21 14:45:52 2013 -0800 ---------------------------------------------------------------------- .../src/com/cloud/network/NetworkManagerImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/540f68f4/server/src/com/cloud/network/NetworkManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index baee452..f670deb 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -3067,7 +3067,7 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L } try { - if (!_lbMgr.applyRules(network, Purpose.LoadBalancing, lbs)) { + if (!_lbMgr.applyRules(network, Purpose.LoadBalancing, lbRules)) { s_logger.warn("Failed to cleanup lb rules as a part of shutdownNetworkRules"); success = false; }
