summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <solj@ices.utexas.edu>2009-01-22 20:35:36 +0000
committerSol Jerome <solj@ices.utexas.edu>2009-01-22 20:35:36 +0000
commitf7f0b49a8d6e7ffef6690184bf083a678dc2e5fb (patch)
treec98c0b6d78970ae45008c37f2712b1f4f20e7c02
parentd26cf84715bfb2d33379f9b13bda5570ea449b77 (diff)
downloadbcfg2-f7f0b49a8d6e7ffef6690184bf083a678dc2e5fb.tar.gz
bcfg2-f7f0b49a8d6e7ffef6690184bf083a678dc2e5fb.tar.bz2
bcfg2-f7f0b49a8d6e7ffef6690184bf083a678dc2e5fb.zip
Add Pull Source support to Minestruct (with aggregation of all extra entries)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5039 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--src/lib/Server/Admin/Minestruct.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/Server/Admin/Minestruct.py b/src/lib/Server/Admin/Minestruct.py
index e86d2bec4..350833080 100644
--- a/src/lib/Server/Admin/Minestruct.py
+++ b/src/lib/Server/Admin/Minestruct.py
@@ -1,6 +1,7 @@
'''Minestruct Admin Mode'''
import Bcfg2.Server.Admin
import lxml.etree, sys, getopt
+import sets
class Minestruct(Bcfg2.Server.Admin.StructureMode):
'''Pull extra entries out of statistics'''
@@ -46,7 +47,11 @@ class Minestruct(Bcfg2.Server.Admin.StructureMode):
groups = optarg.split(':')
try:
- extra = self.statistics.GetExtra(client)
+ extra = set()
+ for source in self.bcore.pull_sources:
+ for item in source.GetExtra(client):
+ extra.add(item)
+ print extra
except:
self.log.error("Failed to find extra entry info for client %s" %
client)