Updated Branches: refs/heads/master d84a8601e -> 667a1d18a
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/667a1d18 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/667a1d18 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/667a1d18 Branch: refs/heads/master Commit: 667a1d18a4a1d88e9d2c7d6585f5c25ebf032575 Parents: d84a860 Author: Sheng Yang <[email protected]> Authored: Thu Feb 21 14:42:42 2013 -0800 Committer: Sheng Yang <[email protected]> Committed: Thu Feb 21 14:46:22 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/667a1d18/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 f586865..2e19fa1 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -3070,7 +3070,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; }
