Make list_minions use the server_spec APIs versus making a remote test call.

1 files changed, 4 insertions, 8 deletions

diff --git a/func/overlord/cmd_modules/listminions.py b/func/overlord/cmd_modules/listminions.py
index cf52855..5264791 100644
--- a/func/overlord/cmd_modules/listminions.py
+++ b/func/overlord/cmd_modules/listminions.py
@@ -17,6 +17,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 import optparse
 import os
 
+from func.overlord import client
 from func.overlord import base_command
 
 class ListMinions(base_command.BaseCommand):
@@ -36,15 +37,10 @@ class ListMinions(base_command.BaseCommand):
     def do(self, args):
 
         self.server_spec = self.parentCommand.server_spec
-        self.getOverlord()
 
-        results = self.overlord_obj.test.add(1,2)
-        servers = results.keys()
+        minion_set = client.Minions(self.server_spec, port=self.port)
+        servers = minion_set.get_all_hosts()
         servers.sort()
-
-        # print servers
         for server in servers:
-            # just cause I hate regex'es -akl
-            # host = server.split(':')[-2]
-            # host = host.split('/')[-1]
             print server
+