From 3642aef4c670061838dc2bbdc9ab4632c8c38cb1 Mon Sep 17 00:00:00 2001
From: Edison Su <edison@cloud.com>
Date: Fri, 24 Jun 2011 14:44:41 -0400
Subject: [PATCH] bug 10423: agent in ssvm needs to add default keystore, as we
 copying templates through https://**realhostip.** status 10423: resolved
 fixed

---
 console-proxy/scripts/_run.sh                    |  2 +-
 .../cloud/agent/manager/AgentManagerImpl.java    |  6 +++---
 server/src/com/cloud/host/dao/HostDao.java       |  2 ++
 server/src/com/cloud/host/dao/HostDaoImpl.java   | 16 ++++++++++++++++
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/console-proxy/scripts/_run.sh b/console-proxy/scripts/_run.sh
index 2a76271fd54..82121af78e8 100755
--- a/console-proxy/scripts/_run.sh
+++ b/console-proxy/scripts/_run.sh
@@ -60,4 +60,4 @@ then
   maxmem=$eightypcnt
 fi
 
-java -mx${maxmem}m -cp $CP com.cloud.agent.AgentShell $keyvalues $@
+java -Djavax.net.ssl.trustStore=./certs/realhostip.keystore -mx${maxmem}m -cp $CP com.cloud.agent.AgentShell $keyvalues $@
diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
index 230490a2054..878ee0162fa 100755
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -507,7 +507,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
             return  ssHost;
         } else if ( ssHost.getType() == Host.Type.SecondaryStorage) {
             Long dcId = ssHost.getDataCenterId();
-            List<HostVO> ssAHosts = _hostDao.listBy(Host.Type.SecondaryStorageVM, dcId);
+            List<HostVO> ssAHosts = _hostDao.listSecondaryStorageVM(dcId);
             if (ssAHosts == null || ssAHosts.isEmpty() ) {
                 return null;
             }
@@ -532,7 +532,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
 
 
     private long sendToSSVM(final long dcId, final Command cmd, final Listener listener) {
-        List<HostVO> ssAHosts = _hostDao.listBy(Host.Type.SecondaryStorageVM, dcId);
+        List<HostVO> ssAHosts = _hostDao.listSecondaryStorageVM(dcId);
         if (ssAHosts == null || ssAHosts.isEmpty() ) {
             return -1;
         }
@@ -546,7 +546,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
     }
 
     private Answer sendToSSVM(final long dcId, final Command cmd) {
-        List<HostVO> ssAHosts = _hostDao.listByTypeDataCenter(Host.Type.SecondaryStorageVM, dcId);
+        List<HostVO> ssAHosts = _hostDao.listSecondaryStorageVM(dcId);
         if (ssAHosts == null || ssAHosts.isEmpty() ) {
             return new Answer(cmd, false, "can not find secondary storage VM agent for data center " + dcId);
         }
diff --git a/server/src/com/cloud/host/dao/HostDao.java b/server/src/com/cloud/host/dao/HostDao.java
index 95607033b3d..311b23bfdac 100644
--- a/server/src/com/cloud/host/dao/HostDao.java
+++ b/server/src/com/cloud/host/dao/HostDao.java
@@ -182,4 +182,6 @@ public interface HostDao extends GenericDao<HostVO, Long> {
     List<HostVO> listAllSecondaryStorageHosts(long dataCenterId);
 
     List<HostVO> listByManagementServer(long msId);
+
+    List<HostVO> listSecondaryStorageVM(long dcId);
 }
diff --git a/server/src/com/cloud/host/dao/HostDaoImpl.java b/server/src/com/cloud/host/dao/HostDaoImpl.java
index 06717dbfd27..58b4b06c63d 100644
--- a/server/src/com/cloud/host/dao/HostDaoImpl.java
+++ b/server/src/com/cloud/host/dao/HostDaoImpl.java
@@ -92,6 +92,7 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
     protected final SearchBuilder<HostVO> DirectConnectSearch;
     protected final SearchBuilder<HostVO> ManagedDirectConnectSearch;
     protected final SearchBuilder<HostVO> ManagedRoutingServersSearch;
+    protected final SearchBuilder<HostVO> SecondaryStorageVMSearch;
 
     protected final GenericSearchBuilder<HostVO, Long> HostsInStatusSearch;
     protected final GenericSearchBuilder<HostVO, Long> CountRoutingByDc;
@@ -138,6 +139,12 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
         TypeDcSearch.and("type", TypeDcSearch.entity().getType(), SearchCriteria.Op.EQ);
         TypeDcSearch.and("dc", TypeDcSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ);
         TypeDcSearch.done();
+        
+        SecondaryStorageVMSearch = createSearchBuilder();
+        SecondaryStorageVMSearch.and("type", SecondaryStorageVMSearch.entity().getType(), SearchCriteria.Op.EQ);
+        SecondaryStorageVMSearch.and("dc", SecondaryStorageVMSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ);
+        SecondaryStorageVMSearch.and("status", SecondaryStorageVMSearch.entity().getStatus(), SearchCriteria.Op.EQ);
+        SecondaryStorageVMSearch.done();
 
         TypeDcStatusSearch = createSearchBuilder();
         TypeDcStatusSearch.and("type", TypeDcStatusSearch.entity().getType(), SearchCriteria.Op.EQ);
@@ -673,7 +680,16 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
 
         return listBy(sc);
     }
+    
+    @Override
+    public List<HostVO> listSecondaryStorageVM(long dcId) {
+        SearchCriteria<HostVO> sc = SecondaryStorageVMSearch.create();
+        sc.setParameters("type", Type.SecondaryStorageVM);
+        sc.setParameters("status", Status.Up);
+        sc.setParameters("dc", dcId);
 
+        return listBy(sc);
+    }
     @Override
     public List<HostVO> listByType(Type type) {
         SearchCriteria<HostVO> sc = TypeSearch.create();