RvR: VPC redundant vrs run on same hypervisor

Author: ustcweizhou

server/src/com/cloud/network/router/NetworkHelperImpl.java

@@ -388,6 +388,19 @@ public DomainRouterVO startVirtualRouter(final DomainRouterVO router, final User
                     routerToBeAvoid = rrouter;
                 }
             }
+        } else if (router.getVpcId() != null) {
+            final List<DomainRouterVO> routerList = _routerDao.listByVpcId(router.getVpcId());
+            for (final DomainRouterVO rrouter : routerList) {
+                if (rrouter.getHostId() != null && rrouter.getIsRedundantRouter() && rrouter.getState() == State.Running) {
+                    if (routerToBeAvoid != null) {
+                        throw new ResourceUnavailableException("Try to start router " + router.getInstanceName() + "(" + router.getId() + ")"
+                                + ", but there are already two redundant routers with IP " + router.getPublicIpAddress() + ", they are " + rrouter.getInstanceName() + "("
+                                + rrouter.getId() + ") and " + routerToBeAvoid.getInstanceName() + "(" + routerToBeAvoid.getId() + ")", DataCenter.class,
+                                rrouter.getDataCenterId());
+                    }
+                    routerToBeAvoid = rrouter;
+                }
+            }
         }
         if (routerToBeAvoid == null) {
             return start(router, user, caller, params, null);