From cb6c1424ef4e78df4cc74cc913df03c0fb82282a Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@cloud.com>
Date: Thu, 17 Nov 2011 12:03:17 -0800
Subject: [PATCH] NaaS: Add virtual router state check for virtual router
 element

---
 .../network/element/VirtualRouterElement.java     | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/com/cloud/network/element/VirtualRouterElement.java
index baf77b071c5..79044acd217 100644
--- a/server/src/com/cloud/network/element/VirtualRouterElement.java
+++ b/server/src/com/cloud/network/element/VirtualRouterElement.java
@@ -104,16 +104,15 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
     @Inject VirtualRouterProviderDao _vrProviderDao;
     
     protected boolean canHandle(Network network, Service service) {
-        boolean result = false;
-       
-        if (_networkMgr.isProviderSupportedInNetwork(network.getId(), service, getProvider())) {
-            result = true;
+        if (!_networkMgr.isProviderAvailable(_networkMgr.getPhysicalNetworkId(network), "VirtualRouter")) {
+            return false;
+        }
+        
+        if (!_networkMgr.isProviderSupportedInNetwork(network.getId(), service, getProvider())) {
+            return false;
         }
 
-        if (!result) {
-            s_logger.trace("Virtual router element only takes care of type " + Network.GuestType.Isolated + " for provider " + getProvider().getName());
-        }
-        return result;
+        return true;
     }
 
     @Override