--- a/launcher/src/main/java/com/redhat/thermostat/launcher/internal/AgentIdsFinder.java	Mon Jun 29 16:29:08 2015 -0400
+++ b/launcher/src/main/java/com/redhat/thermostat/launcher/internal/AgentIdsFinder.java	Thu Jul 02 12:35:54 2015 -0400
@@ -40,8 +40,8 @@
 import java.util.Collection;
 import java.util.List;
 
-import com.redhat.thermostat.storage.core.HostRef;
-import com.redhat.thermostat.storage.dao.HostInfoDAO;
+import com.redhat.thermostat.storage.dao.AgentInfoDAO;
+import com.redhat.thermostat.storage.model.AgentInformation;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 
@@ -56,14 +56,14 @@
     @Override
     public List<String> findIds() {
         List<String> agentIds = new ArrayList<>();
-        ServiceReference hostsDAORef = context.getServiceReference(HostInfoDAO.class.getName());
-        HostInfoDAO hostsDAO = (HostInfoDAO) context.getService(hostsDAORef);
+        ServiceReference agentInfoDAORef = context.getServiceReference(AgentInfoDAO.class.getName());
+        AgentInfoDAO agentInfoDAO = (AgentInfoDAO) context.getService(agentInfoDAORef);
 
-        Collection<HostRef> hosts = hostsDAO.getHosts();
-        context.ungetService(hostsDAORef);
+        Collection<AgentInformation> agentInfos = agentInfoDAO.getAllAgentInformation();
+        context.ungetService(agentInfoDAORef);
 
-        for (HostRef host : hosts) {
-            agentIds.add(host.getAgentId());
+        for (AgentInformation agentInfo : agentInfos) {
+            agentIds.add(agentInfo.getAgentId());
         }
 
         return agentIds;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/launcher/src/test/java/com/redhat/thermostat/launcher/internal/AgentIdsFinderTest.java	Thu Jul 02 12:35:54 2015 -0400
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2012-2015 Red Hat, Inc.
+ *
+ * This file is part of Thermostat.
+ *
+ * Thermostat is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2, or (at your
+ * option) any later version.
+ *
+ * Thermostat is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Thermostat; see the file COPYING.  If not see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Linking this code with other modules is making a combined work
+ * based on this code.  Thus, the terms and conditions of the GNU
+ * General Public License cover the whole combination.
+ *
+ * As a special exception, the copyright holders of this code give
+ * you permission to link this code with independent modules to
+ * produce an executable, regardless of the license terms of these
+ * independent modules, and to copy and distribute the resulting
+ * executable under terms of your choice, provided that you also
+ * meet, for each linked independent module, the terms and conditions
+ * of the license of that module.  An independent module is a module
+ * which is not derived from or based on this code.  If you modify
+ * this code, you may extend this exception to your version of the
+ * library, but you are not obligated to do so.  If you do not wish
+ * to do so, delete this exception statement from your version.
+ */
+
+package com.redhat.thermostat.launcher.internal;
+
+import static junit.framework.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import com.redhat.thermostat.storage.dao.AgentInfoDAO;
+import com.redhat.thermostat.storage.model.AgentInformation;
+import com.redhat.thermostat.testutils.StubBundleContext;
+import org.junit.Test;
+
+public class AgentIdsFinderTest {
+
+    @Test
+    public void testFindIds() {
+        StubBundleContext context = new StubBundleContext();
+        AgentInfoDAO agentInfoDAO = mock(AgentInfoDAO.class);
+        context.registerService(AgentInfoDAO.class, agentInfoDAO, null);
+        AgentIdsFinder agentIdsFinder = new AgentIdsFinder(context);
+
+        String id1 = "012345-56789";
+        String id2 = "111111-22222";
+        String id3 = "98765-543210";
+        String id4 = "abcdef-01234564-848156";
+        AgentInformation agentInfo1 = mock(AgentInformation.class);
+        agentInfo1.setAgentId(id1);
+        AgentInformation agentInfo2 = mock(AgentInformation.class);
+        agentInfo2.setAgentId(id2);
+        AgentInformation agentInfo3 = mock(AgentInformation.class);
+        agentInfo3.setAgentId(id3);
+        AgentInformation agentInfo4 = mock(AgentInformation.class);
+        agentInfo4.setAgentId(id4);
+
+        Collection<AgentInformation> collection = new ArrayList<>();
+        collection.add(agentInfo1);
+        collection.add(agentInfo2);
+        collection.add(agentInfo3);
+        collection.add(agentInfo4);
+        when(agentInfoDAO.getAllAgentInformation()).thenReturn((List<AgentInformation>) collection);
+
+        List<String> result = agentIdsFinder.findIds();
+        assertEquals(4, result.size());
+        assertEquals(id1, result.get(0));
+        assertEquals(id2, result.get(1));
+        assertEquals(id3, result.get(2));
+        assertEquals(id4, result.get(3));
+    }
+}