bcfg2-admin: Migrate query to new Metadata query interface

Signed-off-by: Sol Jerome <solj@ices.utexas.edu>

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5288 ce84e21b-d406-0410-9b95-82705330c041

2 files changed, 3 insertions, 13 deletions

diff --git a/src/lib/Server/Admin/Query.py b/src/lib/Server/Admin/Query.py
index 2e2ab4dc5..b5af9bad2 100644
--- a/src/lib/Server/Admin/Query.py
+++ b/src/lib/Server/Admin/Query.py
@@ -51,15 +51,15 @@ class Query(Bcfg2.Server.Admin.Mode):
                 print "Unknown argument %s" % arg
                 continue
             if k == 'p':
-                nc = self.meta.GetClientByProfile(v)
+                nc = self.meta.get_client_names_by_profiles(v.split(','))
             elif k == 'g':
-                nc = self.meta.GetClientByGroup(v)
+                nc = self.meta.get_client_names_by_groups(v.split(','))
                 # add probed groups (if present)
                 for conn in self.bcore.connectors:
                     if isinstance(conn, Bcfg2.Server.Plugins.Probes.Probes):
                         for c, glist in conn.cgroups.items():
                             for g in glist:
-                                if g == v:
+                                if g in v.split(','):
                                     nc.append(c)
             else:
                 print "One of g= or p= must be specified"
diff --git a/src/lib/Server/Plugins/Metadata.py b/src/lib/Server/Plugins/Metadata.py
index be98d3894..438d2eae6 100644
--- a/src/lib/Server/Plugins/Metadata.py
+++ b/src/lib/Server/Plugins/Metadata.py
@@ -512,16 +512,6 @@ class Metadata(Bcfg2.Server.Plugin.Plugin,
             self.session_cache[address] = (time.time(), user)
         return True
 
-    def GetClientByGroup(self, group):
-        '''Return a list of clients that are in a given group'''
-        return [client for client in self.clients \
-                if group in self.groups[self.clients[client]][1]]
-
-    def GetClientByProfile(self, profile):
-        '''Return a list of clients that are members of a given profile'''
-        return [client for client in self.clients \
-                if self.clients[client] == profile]
-
     def process_statistics(self, meta, _):
         '''Hook into statistics interface to toggle clients in bootstrap mode'''
         client = meta.hostname