You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2014/09/28 11:40:17 UTC
[17/50] [abbrv] git commit: updated
refs/heads/statscollector-graphite to 621156c
CLOUDSTACK-7622: Fixed deleting network when provider is disable
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8c8c54f9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8c8c54f9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8c8c54f9
Branch: refs/heads/statscollector-graphite
Commit: 8c8c54f9f59249c47ff5985626579b4f9565d9fd
Parents: 4317a85
Author: Jayapal <ja...@apache.org>
Authored: Wed Sep 24 15:42:27 2014 +0530
Committer: Jayapal <ja...@apache.org>
Committed: Thu Sep 25 10:31:51 2014 +0530
----------------------------------------------------------------------
.../orchestration/NetworkOrchestrator.java | 19 -------------------
1 file changed, 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8c8c54f9/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
----------------------------------------------------------------------
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 9bb23a9..ab5a21c 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<Provider> 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<Provider> 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);
}