FIX S2S VPN rVPC: Check only redundant routers in state MASTER
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/230c9cf5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/230c9cf5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/230c9cf5 Branch: refs/heads/master Commit: 230c9cf59e6e3d462a47a3329077ed728ddf5ddf Parents: ecc8cc0 Author: Michael Andersen <[email protected]> Authored: Tue Dec 22 20:38:18 2015 +0100 Committer: Michael Andersen <[email protected]> Committed: Tue Jan 12 11:24:35 2016 +0100 ---------------------------------------------------------------------- .../cloud/network/router/VirtualNetworkApplianceManagerImpl.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/230c9cf5/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index 41cc558..ac8b868 100644 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -907,6 +907,9 @@ Configurable, StateListener<VirtualMachine.State, VirtualMachine.Event, VirtualM if (conns == null || conns.isEmpty()) { continue; } + if (router.getIsRedundantRouter() && router.getRedundantState() != RedundantState.MASTER){ + continue; + } if (router.getState() != VirtualMachine.State.Running) { for (final Site2SiteVpnConnectionVO conn : conns) { if (conn.getState() != Site2SiteVpnConnection.State.Error) {
