From d4990c82ca03c227fe3b8b355f13782087d4da5b Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@cloud.com>
Date: Sat, 13 Aug 2011 00:08:21 -0700
Subject: [PATCH] bug 11122: Fix router startup

The new created router got hostId = 0.

status 11122: resolved fixed
---
 .../cloud/network/element/VirtualRouterElement.java    |  3 +++
 .../router/VirtualNetworkApplianceManagerImpl.java     | 10 ++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/com/cloud/network/element/VirtualRouterElement.java
index f7fe4354b53..c6862261354 100644
--- a/server/src/com/cloud/network/element/VirtualRouterElement.java
+++ b/server/src/com/cloud/network/element/VirtualRouterElement.java
@@ -123,6 +123,9 @@ public class VirtualRouterElement extends DhcpElement implements NetworkElement,
             @SuppressWarnings("unchecked")
             VirtualMachineProfile<UserVm> uservm = (VirtualMachineProfile<UserVm>)vm;
             List<DomainRouterVO> routers = _routerMgr.deployVirtualRouter(network, dest, _accountMgr.getAccount(network.getAccountId()), uservm.getParameters(), isRedundant);
+            if ((routers == null) || (routers.size() == 0)) {
+                throw new ResourceUnavailableException("Can't find at least one running router!", this.getClass(), 0);
+            }
             List<VirtualRouter> rets = _routerMgr.addVirtualMachineIntoNetwork(network, nic, uservm, dest, context, routers);                                                                                                                      
             return (rets != null) && (!rets.isEmpty());
         } else {
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index b7cc90b7b95..de765267380 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -1053,8 +1053,14 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
         }
         
         for (DomainRouterVO router : routers) {
-            HostVO host = _hostDao.findById(router.getHostId());
-            if (host != null && host.getStatus() == Status.Up) {
+            boolean skip = false;
+            if (router.getHostId() != null) {
+                HostVO host = _hostDao.findById(router.getHostId());
+                if (host == null || host.getStatus() != Status.Up) {
+                    skip = true;
+                }
+            }
+            if (!skip) {
                 State state = router.getState();
                 if (state != State.Running) {
                     router = startVirtualRouter(router, _accountService.getSystemUser(), _accountService.getSystemAccount(), params);