From 7a0ad69b89b45f8ecf474a35e05b7d98c4832d19 Mon Sep 17 00:00:00 2001 From: abhishek Date: Mon, 30 Aug 2010 10:40:45 -0700 Subject: [PATCH] Incremental checkin --- .../com/cloud/api/commands/ListVolumesCmd.java | 2 +- .../com/cloud/server/ManagementServerImpl.java | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/server/src/com/cloud/api/commands/ListVolumesCmd.java b/server/src/com/cloud/api/commands/ListVolumesCmd.java index 1eee0aad45a..85d93f39223 100755 --- a/server/src/com/cloud/api/commands/ListVolumesCmd.java +++ b/server/src/com/cloud/api/commands/ListVolumesCmd.java @@ -143,7 +143,7 @@ public class ListVolumesCmd extends BaseCmd{ List volumes = getManagementServer().searchForVolumes(c); - if (volumes == null) { + if (volumes == null || volumes.size()==0) { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "unable to find volumes"); } diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index a3c3a86b9a4..4b1d6a5859b 100644 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -5633,14 +5633,26 @@ public class ManagementServerImpl implements ManagementServer { } // Don't return DomR and ConsoleProxy volumes + /* sc.setParameters("domRNameLabel", "r-%"); sc.setParameters("domPNameLabel", "v-%"); sc.setParameters("domSNameLabel", "s-%"); - + */ + // Only return volumes that are not destroyed sc.setParameters("destroyed", false); - return _volumeDao.search(sc, searchFilter); + List allVolumes = _volumeDao.search(sc, searchFilter); + List returnableVolumes = new ArrayList(); //these are ones without domr and console proxy + + for(VolumeVO v:allVolumes) + { + VMTemplateVO template = _templateDao.findById(v.getTemplateId()); + if(!template.getUniqueName().equalsIgnoreCase("routing")) + returnableVolumes.add(v); + } + + return returnableVolumes; } @Override