From eee79d56a30543db8789172d31c6c17b757323bc Mon Sep 17 00:00:00 2001
From: Murali Reddy <murali@cloud.com>
Date: Fri, 18 Nov 2011 11:10:08 -0800
Subject: [PATCH] permit adding external devices when service provider is in
 disabled state

---
 .../com/cloud/network/ExternalFirewallDeviceManagerImpl.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java b/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
index a10ee077988..e61feeead07 100644
--- a/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
+++ b/server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
@@ -159,8 +159,7 @@ public abstract class ExternalFirewallDeviceManagerImpl extends AdapterBase impl
         if (ntwkSvcProvider == null ) {
             throw new CloudRuntimeException("Network Service Provider: " + ntwkDevice.getNetworkServiceProvder() + 
                     " is not enabled in the physical network: " + physicalNetworkId + "to add this device" );
-        } else if ((ntwkSvcProvider.getState() == PhysicalNetworkServiceProvider.State.Shutdown)
-                || (ntwkSvcProvider.getState() == PhysicalNetworkServiceProvider.State.Disabled)) {
+        } else if (ntwkSvcProvider.getState() == PhysicalNetworkServiceProvider.State.Shutdown) {
             throw new CloudRuntimeException("Network Service Provider: " + ntwkSvcProvider.getProviderName() + 
                     " is not added or in shutdown state in the physical network: " + physicalNetworkId + "to add this device" );
         }