From 96c7bbeb86fa0bf2cca720a11da74ba7f19bc0a3 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@citrix.com>
Date: Wed, 14 Nov 2012 14:23:47 -0800
Subject: [PATCH] Update the router status after start network

Start network can possible start the router as well. If it's already started by
start network, then we won't need to start it again.
---
 .../network/router/VirtualNetworkApplianceManagerImpl.java  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index a91eda6cd31..966c32de6c2 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -2690,6 +2690,12 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
             }
         }
 
+        //After start network, check if it's already running
+        router = _routerDao.findById(routerId);
+        if (router.getState() == State.Running) {
+            return router;
+        }
+
         UserVO user = _userDao.findById(UserContext.current().getCallerUserId());
         Map<Param, Object> params = new HashMap<Param, Object>();
         if (reprogramNetwork) {