From 7a4a0d7aaa4dba7a1ccb1712bbc4e76d5cba8547 Mon Sep 17 00:00:00 2001 From: Jayapal Date: Wed, 24 Sep 2014 15:42:27 +0530 Subject: [PATCH] CLOUDSTACK-7622: Fixed deleting network when provider is disable --- .../orchestration/NetworkOrchestrator.java | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java index 9bb23a96763..ab5a21c7406 100755 --- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java @@ -1557,10 +1557,6 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra List providersToImplement = getNetworkProviders(network.getId()); for (NetworkElement element : networkElements) { if (providersToImplement.contains(element.getProvider())) { - if (!_networkModel.isProviderEnabledInPhysicalNetwork(_networkModel.getPhysicalNetworkId(network), element.getProvider().getName())) { - throw new CloudRuntimeException("Service provider " + element.getProvider().getName() + " either doesn't exist or is not enabled in physical network id: " - + network.getPhysicalNetworkId()); - } if (s_logger.isDebugEnabled()) { s_logger.debug("Asking " + element.getName() + " to release " + profile); } @@ -1615,10 +1611,6 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra List providersToImplement = getNetworkProviders(network.getId()); for (NetworkElement element : networkElements) { if (providersToImplement.contains(element.getProvider())) { - if (!_networkModel.isProviderEnabledInPhysicalNetwork(_networkModel.getPhysicalNetworkId(network), element.getProvider().getName())) { - throw new CloudRuntimeException("Service provider " + element.getProvider().getName() + " either doesn't exist or is not enabled in physical network id: " - + network.getPhysicalNetworkId()); - } if (s_logger.isDebugEnabled()) { s_logger.debug("Asking " + element.getName() + " to release " + nic); } @@ -2150,11 +2142,6 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra for (NetworkElement element : networkElements) { if (providersToShutdown.contains(element.getProvider())) { try { - if (!_networkModel.isProviderEnabledInPhysicalNetwork(_networkModel.getPhysicalNetworkId(network), element.getProvider().getName())) { - s_logger.warn("Unable to complete shutdown of the network elements due to element: " + element.getName() - + " either doesn't exist or not enabled in the physical network " + _networkModel.getPhysicalNetworkId(network)); - success = false; - } if (s_logger.isDebugEnabled()) { s_logger.debug("Sending network shutdown to " + element.getName()); } @@ -2238,12 +2225,6 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra for (NetworkElement element : networkElements) { if (providersToDestroy.contains(element.getProvider())) { try { - if (!_networkModel.isProviderEnabledInPhysicalNetwork(_networkModel.getPhysicalNetworkId(network), element.getProvider().getName())) { - s_logger.warn("Unable to complete destroy of the network elements due to element: " + element.getName() - + " either doesn't exist or not enabled in the physical network " + _networkModel.getPhysicalNetworkId(network)); - success = false; - } - if (s_logger.isDebugEnabled()) { s_logger.debug("Sending destroy to " + element); }