From 9e858992de2105acaa0d8bc4b0b7d9d06f6558c1 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Thu, 3 Feb 2011 19:06:54 -0800
Subject: [PATCH] attachISO can be done when SSVM is down

---
 core/src/com/cloud/host/dao/HostDao.java             | 4 +++-
 core/src/com/cloud/host/dao/HostDaoImpl.java         | 9 +++++++++
 server/src/com/cloud/storage/StorageManagerImpl.java | 2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/core/src/com/cloud/host/dao/HostDao.java b/core/src/com/cloud/host/dao/HostDao.java
index ef775c1dccd..9e329fe1ff8 100644
--- a/core/src/com/cloud/host/dao/HostDao.java
+++ b/core/src/com/cloud/host/dao/HostDao.java
@@ -137,5 +137,7 @@ public interface HostDao extends GenericDao<HostVO, Long> {
     
     void loadDetails(HostVO host);
 
-    void loadHostTags(HostVO host);
+    void loadHostTags(HostVO host);
+
+    List<HostVO> listSecondaryStorageHosts(long dcId);
 }
diff --git a/core/src/com/cloud/host/dao/HostDaoImpl.java b/core/src/com/cloud/host/dao/HostDaoImpl.java
index 27bc6814c33..13587acddff 100644
--- a/core/src/com/cloud/host/dao/HostDaoImpl.java
+++ b/core/src/com/cloud/host/dao/HostDaoImpl.java
@@ -223,6 +223,15 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
     	}
     }
     
+    @Override
+    public List<HostVO> listSecondaryStorageHosts(long dcId) {
+        SearchCriteria sc = TypeDcSearch.create();
+        sc.setParameters("type", Host.Type.SecondaryStorage);
+        sc.setParameters("dc", dcId);
+        return listActiveBy(sc);
+        
+    }
+    
     @Override
     public List<HostVO> listSecondaryStorageHosts() {
     	SearchCriteria sc = TypeSearch.create();
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index 0fc127d056c..c92f2f9b83c 100644
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -1054,7 +1054,7 @@ public class StorageManagerImpl implements StorageManager {
     public String getAbsoluteIsoPath(long templateId, long dataCenterId) {
         String isoPath = null;
 
-        List<HostVO> storageHosts = _hostDao.listBy(Host.Type.SecondaryStorage, dataCenterId);
+        List<HostVO> storageHosts = _hostDao.listSecondaryStorageHosts(dataCenterId);
         if (storageHosts != null) {
             for (HostVO storageHost : storageHosts) {
                 VMTemplateHostVO templateHostVO = _vmTemplateHostDao.findByHostTemplate(storageHost.getId(), templateId);