From 466dff8757ab93e6a9340c135b7aced5fd1dd7d3 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Wed, 29 Dec 2010 18:36:24 -0800
Subject: [PATCH] bug 7751: if discover is not found for a hypervisor type,
 print meaningful message here

status 7751: resolved fixed
---
 server/src/com/cloud/agent/manager/AgentManagerImpl.java | 9 +++++++--
 .../storage/secondary/SecondaryStorageDiscoverer.java    | 6 +++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
index 0bf509d5c92..9f9137a2dd4 100755
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -758,6 +758,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, ResourceS
         List<HostVO> hosts = new ArrayList<HostVO>();
         s_logger.info("Trying to add a new host at " + url + " in data center " + dcId);
         Enumeration<Discoverer> en = _discoverers.enumeration();
+        boolean isHypervisorTypeSupported = false;
         while (en.hasMoreElements()) {
             Discoverer discoverer = en.nextElement();
             if(hypervisorType != null) {
@@ -765,7 +766,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, ResourceS
                     continue;
                 }
             }
-            
+            isHypervisorTypeSupported = true;
             Map<? extends ServerResource, Map<String, String>> resources = null;
             
             try {
@@ -800,7 +801,11 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, ResourceS
                 return hosts;
             }
         }
-
+        if ( !isHypervisorTypeSupported ) {
+            String msg = "Do not support HypervisorType " + hypervisorType + " for " + url; 
+            s_logger.warn(msg);
+            throw new DiscoveryException(msg);
+        }
         s_logger.warn("Unable to find the server resources at " + url);
         throw new DiscoveryException("Unable to add the host");
     }
diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java b/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java
index 92a9ac75493..6a1434b6e72 100644
--- a/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java
+++ b/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java
@@ -241,7 +241,11 @@ public class SecondaryStorageDiscoverer extends DiscovererBase implements Discov
     
     @Override
 	public boolean matchHypervisor(String hypervisor) {
-    	return true;
+        if( hypervisor == null || hypervisor.isEmpty()) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     @Override