Implement persistent probe data (so that templates can be debugged in bcfg2-info)

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

2 files changed, 34 insertions, 0 deletions

diff --git a/src/lib/Server/Plugins/Metadata.py b/src/lib/Server/Plugins/Metadata.py
index ea681d13e..7374aadad 100644
--- a/src/lib/Server/Plugins/Metadata.py
+++ b/src/lib/Server/Plugins/Metadata.py
@@ -57,6 +57,7 @@ class Metadata(Bcfg2.Server.Plugin.Plugin):
         self.session_cache = {}
         self.clientdata = None
         self.default = None
+        self.pdirty = False
         try:
             loc = datastore + "/Probes"
             self.probes = Bcfg2.Server.Plugin.DirectoryBacked(loc, core.fam)
@@ -225,6 +226,36 @@ class Metadata(Bcfg2.Server.Plugin.Plugin):
         datafile.write(lxml.etree.tostring(self.clientdata.getroot()))
         datafile.close()
 
+    def write_probedata(self):
+        '''write probe data out for use with bcfg2-info'''
+        if self.pdirty:
+            top = lxml.etree.Element("Probed")
+            for client, probed in self.probedata.iteritems():
+                cx = lxml.etree.SubElement(top, 'Client', name=client)
+                for probe in probed:
+                    lxml.etree.SubElement(cx, 'Probe', name=probe,
+                                          value=self.probedata[client][probe])
+            data = lxml.etree.tostring(top)
+            try:
+                datafile = open("%s/%s" % (self.data, 'probed.xml'), 'w')
+            except IOError:
+                self.logger.error("Failed to write clients.xml")
+                raise MetadataRuntimeError
+            datafile.write(data)
+            self.pdirty = False
+
+    def load_probedata(self):
+        try:
+            data = lxml.etree.parse(self.data + '/probed.xml').getroot()
+        except:
+            self.logger.error("Failed to read file probed.xml")
+            return
+        self.probedata={}
+        for client in data.getchildren():
+            self.probedata[client.get('name')] = {}
+            for pdata in client:
+                self.probedata[client.get('name')][pdata.get('name')] = pdata.get('value')
+
     def find_toolset(self, client):
         '''Find the toolset for a given client'''
         tgroups = [self.toolsets[group] for group in self.groups[client][1] if self.toolsets.has_key(group)]
@@ -349,7 +380,9 @@ class Metadata(Bcfg2.Server.Plugin.Plugin):
             self.probedata[client.hostname].update({ data.get('name'):dtext })
         except KeyError:
             self.probedata[client.hostname] = { data.get('name'):dtext }
+        self.pdirty = True
         self.ptimes[client.hostname] = time.time()
+        self.write_probedata()
 
     def AuthenticateConnection(self, user, password, address):
         '''This function checks user and password'''
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info
index dcd78fd24..c74118f76 100755
--- a/src/sbin/bcfg2-info
+++ b/src/sbin/bcfg2-info
@@ -248,6 +248,7 @@ if __name__ == '__main__':
         cfile = '/etc/bcfg2.conf'
 
     loop = infoCore(cfile)
+    loop.plugins['Metadata'].load_probedata()
     while loop.cont:
         try:
             loop.cmdloop()