Swift : list template in secondry storage as well

anthonyxu · anthonyxu · commit 92f4a88c68c3 · 2011-11-04T16:40:42.000-07:00
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -1396,13 +1396,22 @@ private Set<Pair<Long, Long>> listTemplates(Long templateId, String name, String
             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) {
