From 7ea6082f22c0672bbb508f3c49302422f0f86255 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Tue, 29 Nov 2011 10:46:11 -0800 Subject: [PATCH] PhysicalNetworkId is not required in listNetworkServiceProvider call --- api/src/com/cloud/api/commands/CreateVolumeCmd.java | 2 -- server/src/com/cloud/async/AsyncJobManagerImpl.java | 2 +- .../src/com/cloud/configuration/ConfigurationManagerImpl.java | 2 +- server/src/com/cloud/network/NetworkManagerImpl.java | 4 ---- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/api/src/com/cloud/api/commands/CreateVolumeCmd.java b/api/src/com/cloud/api/commands/CreateVolumeCmd.java index 5cac715ddd0..75713fdfe24 100644 --- a/api/src/com/cloud/api/commands/CreateVolumeCmd.java +++ b/api/src/com/cloud/api/commands/CreateVolumeCmd.java @@ -27,13 +27,11 @@ import com.cloud.api.IdentityMapper; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; -import com.cloud.api.BaseCmd.CommandType; import com.cloud.api.response.VolumeResponse; import com.cloud.async.AsyncJob; import com.cloud.event.EventTypes; import com.cloud.exception.ResourceAllocationException; import com.cloud.storage.Volume; -import com.cloud.user.Account; import com.cloud.user.UserContext; @Implementation(responseObject=VolumeResponse.class, description="Creates a disk volume from a disk offering. This disk volume must still be attached to a virtual machine to make use of it.") diff --git a/server/src/com/cloud/async/AsyncJobManagerImpl.java b/server/src/com/cloud/async/AsyncJobManagerImpl.java index ced590a7964..df7eaaa787d 100644 --- a/server/src/com/cloud/async/AsyncJobManagerImpl.java +++ b/server/src/com/cloud/async/AsyncJobManagerImpl.java @@ -630,7 +630,7 @@ public class AsyncJobManagerImpl implements AsyncJobManager, ClusterManagerListe if(blockItems != null && blockItems.size() > 0) { for(SyncQueueItemVO item : blockItems) { if(item.getContentType().equalsIgnoreCase("AsyncJob")) { - completeAsyncJob(item.getContentId(), 2, 0, getResetResultResponse("Job is cancelled as it has been blocking others for too long")); + completeAsyncJob(item.getContentId(), AsyncJobResult.STATUS_FAILED, 0, getResetResultResponse("Job is cancelled as it has been blocking others for too long")); } // purge the item and resume queue processing diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index 085ed7bc676..c2b983f743f 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -1383,7 +1383,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura // Create default Physical Network long physicalNetworkId = createDefaultPhysicalNetwork(zone, domainId); - //add VirtualRouter as the defualt network service provider + //add VirtualRouter as the default network service provider _networkMgr.addDefaultVirtualRouterToPhysicalNetwork(physicalNetworkId); //add security group provider to the physical network diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index d60e16f88c3..4d03db28e82 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -4211,10 +4211,6 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag @Override public List listNetworkServiceProviders(Long physicalNetworkId, String name, String state, Long startIndex, Long pageSize) { - PhysicalNetworkVO network = _physicalNetworkDao.findById(physicalNetworkId); - if (network == null) { - throw new InvalidParameterValueException("Physical Network id=" + physicalNetworkId + "doesn't exist in the system"); - } Filter searchFilter = new Filter(PhysicalNetworkServiceProviderVO.class, "id", false, startIndex, pageSize); SearchBuilder sb = _pNSPDao.createSearchBuilder();