From 92f4a88c68c366342e8286d14bfa5cf7962a7808 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Fri, 4 Nov 2011 16:39:31 -0700
Subject: [PATCH] Swift : list template in secondry storage as well

---
 server/src/com/cloud/server/ManagementServerImpl.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index dc0bc3ae177..38d738e5511 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -1396,13 +1396,22 @@ public class ManagementServerImpl implements ManagementServer {
             if (template == null) {
                 templateZonePairSet = _templateDao.searchSwiftTemplates(name, keyword, templateFilter, isIso, hypers, bootable, domain, pageSize, startIndex, zoneId, hyperType, onlyReady, showDomr,
                         permittedAccounts, caller);
+                Set<Pair<Long, Long>> templateZonePairSet2 = new HashSet<Pair<Long, Long>>();
+                templateZonePairSet2 = _templateDao.searchTemplates(name, keyword, templateFilter, isIso, hypers, bootable, domain, pageSize, startIndex, zoneId, hyperType, onlyReady, showDomr,
+                        permittedAccounts, caller);
+                for (Pair<Long, Long> tmpltPair : templateZonePairSet2) {
+                    if (!templateZonePairSet.contains(new Pair<Long, Long>(tmpltPair.first(), 0L))) {
+                        templateZonePairSet.add(tmpltPair);
+                    }
+                }
+
             } else {
                 // if template is not public, perform permission check here
                 if (!template.isPublicTemplate() && caller.getType() != Account.ACCOUNT_TYPE_ADMIN) {
                     Account owner = _accountMgr.getAccount(template.getAccountId());
                     _accountMgr.checkAccess(caller, null, owner);
                 }
-                templateZonePairSet.add(new Pair<Long, Long>(template.getId(), 0L));
+                templateZonePairSet.add(new Pair<Long, Long>(template.getId(), zoneId));
             }
         } else {
             if (template == null) {