move "func list_minions" to be a cmd module

So now it also respects the hostnamegoo glob, so you
can use it to test glob patterns

func "*.redhat.com" list_minions

will show all the minions that match that pattern

2 files changed, 63 insertions, 16 deletions

diff --git a/func/overlord/cmd_modules/listminions.py b/func/overlord/cmd_modules/listminions.py
new file mode 100644
index 0000000..95f0bc9
--- /dev/null
+++ b/func/overlord/cmd_modules/listminions.py
@@ -0,0 +1,53 @@
+#!/usr/bin/python
+
+"""
+copyfile command line
+
+Copyright 2007, Red Hat, Inc
+see AUTHORS
+
+This software may be freely redistributed under the terms of the GNU
+general public license.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+
+
+import optparse
+import os
+
+from func.overlord import command
+from func.overlord import client
+DEFAULT_PORT = 51234
+
+class ListMinions(client.command.Command):
+    name = "list_minions"
+    useage = "show known minions"
+
+    def addOptions(self):
+        self.parser.add_option("-v", "--verbose", dest="verbose",
+                               action="store_true")
+
+    def handleOptions(self, options):
+        self.port = DEFAULT_PORT
+        if options.verbose:
+            self.verbose = self.options.verbose
+    
+    def do(self, args):
+        self.server_spec = self.parentCommand.server_spec
+
+        client_obj = client.Client(self.server_spec,
+                                   port=self.port,
+                                   interactive=False,
+                                   verbose=self.options.verbose,
+                                   config=self.config)
+
+        servers = client_obj.servers
+        print servers
+        for server in servers:
+            # just cause I hate regex'es -akl
+            host = server.split(':')[-2]
+            host = host.split('/')[-1]
+            print host
diff --git a/func/overlord/func_command.py b/func/overlord/func_command.py
index 507a52f..b33565c 100644
--- a/func/overlord/func_command.py
+++ b/func/overlord/func_command.py
@@ -10,6 +10,7 @@ import command
 from cmd_modules import call
 from cmd_modules import show
 from cmd_modules import copyfile
+from cmd_modules import listminions
 
 from func.overlord import client
 
@@ -18,7 +19,7 @@ class FuncCommandLine(command.Command):
     useage = "func is the commandline interface to a func minion"
 
     subCommandClasses = [call.Call, show.Show,
-                         copyfile.CopyFile]
+                         copyfile.CopyFile, listminions.ListMinions]
 
     def __init__(self):
 
@@ -30,13 +31,18 @@ class FuncCommandLine(command.Command):
     def addOptions(self):
         self.parser.add_option('', '--version', action="store_true",
             help="show version information")
-        self.parser.add_option("--list-minions", dest="list_minions",
-            action="store_true", help="list all available minions")
 
+    # just some ugly goo to try to guess if arg[1] is hostnamegoo or
+    # a command name
+    def _isGlob(self, str):
+        if str.find("*") or str.find("?") or str.find("[") or str.find("]"):
+            return True
+        return False
+        
     def handleArguments(self, args):
         server_string = args[0]
         # try to be clever about this for now
-        if client.isServer(server_string):
+        if client.isServer(server_string) or self._isGlob(server_string):
             self.server_spec = server_string
             args.pop(0)
         # if it doesn't look like server, assume it
@@ -48,15 +54,3 @@ class FuncCommandLine(command.Command):
         if options.version:
             #FIXME
             print "version is NOT IMPLEMENTED YET"
-        if options.list_minions:
-            self.list_minions()
-
-            sys.exit(0) # stop execution
-
-    def list_minions(self):
-        print "Minions:"
-        gloob = "%s/%s.cert" % (self.config.certroot, "*")
-        certs = glob.glob(gloob)
-        for cert in certs:
-            host = cert.replace(self.config.certroot, "")[1:-5]
-            print "   %s" % host