diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java index 5c07efa078d..5e0328bb671 100644 --- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java @@ -859,15 +859,12 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian List staticRouteProfiles = new ArrayList(routes.size()); Map gatewayMap = new HashMap(); for (StaticRoute route : routes) { - if (route.getState() != StaticRoute.State.Revoke) { - //skip static route in revoke state - VpcGateway gateway = gatewayMap.get(route.getVpcGatewayId()); - if (gateway == null) { - gateway = _vpcMgr.getVpcGateway(route.getVpcGatewayId()); - gatewayMap.put(gateway.getId(), gateway); - } - staticRouteProfiles.add(new StaticRouteProfile(route, gateway)); + VpcGateway gateway = gatewayMap.get(route.getVpcGatewayId()); + if (gateway == null) { + gateway = _vpcMgr.getVpcGateway(route.getVpcGatewayId()); + gatewayMap.put(gateway.getId(), gateway); } + staticRouteProfiles.add(new StaticRouteProfile(route, gateway)); } s_logger.debug("Found " + staticRouteProfiles.size() + " static routes to apply as a part of vpc route " @@ -1046,16 +1043,6 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian return true; } - //exclude static route in Revoke state - Iterator it = staticRoutes.iterator(); - while (it.hasNext()) { - StaticRouteProfile profile = it.next(); - if (profile.getState() == StaticRoute.State.Revoke) { - s_logger.debug("Not sending static route " + profile + " because its in " + StaticRoute.State.Revoke + " state"); - it.remove(); - } - } - boolean result = true; for (VirtualRouter router : routers) { if (router.getState() == State.Running) {