diff --git a/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java b/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java index 25e2793cc42..da07bb5dff5 100644 --- a/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java +++ b/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java @@ -376,8 +376,13 @@ public class NetworkHelperImpl implements NetworkHelper { final List networkIds = _routerDao.getRouterNetworks(router.getId()); DomainRouterVO routerToBeAvoid = null; + List routerList = null; if (networkIds.size() != 0) { - final List routerList = _routerDao.findByNetwork(networkIds.get(0)); + routerList = _routerDao.findByNetwork(networkIds.get(0)); + } else if (router.getVpcId() != null) { + routerList = _routerDao.listByVpcId(router.getVpcId()); + } + if (routerList != null) { for (final DomainRouterVO rrouter : routerList) { if (rrouter.getHostId() != null && rrouter.getIsRedundantRouter() && rrouter.getState() == State.Running) { if (routerToBeAvoid != null) {