Get Snapshots working for Service entries

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

1 files changed, 25 insertions, 17 deletions

diff --git a/src/lib/Server/Plugins/Snapshots.py b/src/lib/Server/Plugins/Snapshots.py
index f5b69d18f..6f33fff4d 100644
--- a/src/lib/Server/Plugins/Snapshots.py
+++ b/src/lib/Server/Plugins/Snapshots.py
@@ -13,7 +13,7 @@ class Snapshots(Bcfg2.Server.Plugin.Statistics,
     def __init__(self, core, datastore):
         Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore)
         Bcfg2.Server.Plugin.Statistics.__init__(self)
-        self.session = Bcfg2.Server.Snapshots.db_from_config()
+        self.session = Bcfg2.Server.Snapshots.setup_session()
 
     def process_statistics(self, metadata, data):
         return self.statistics_from_old_stats(metadata, data)
@@ -26,28 +26,36 @@ class Snapshots(Bcfg2.Server.Plugin.Statistics,
                         ('Service', dict()), ('Path', dict())])
         extra = dict([('Package', list()), ('Service', list()),
                       ('Path', list())])
+        pdisp = {'Package': 'version',
+                 'Service': 'status'}
         for entry in xdata.find('.//Bad'):
-            print entry.tag, entry.get('name')
-            if entry.tag == 'Package':
+            if entry.tag not in pdisp:
+                print "Not Found", entry.tag, entry.get('name')
+                continue
+            else:
                 data = [False, False, unicode(entry.get('type')),
-                        unicode(entry.get('current_version')),
-                        unicode(entry.get('current_version'))]
-                entries['Package'][entry.get('name')] = data
+                        unicode(entry.get('%s_%s' % ('current', pdisp[entry.tag]))),
+                        unicode(entry.get('%s_%s' % ('current', pdisp[entry.tag])))]
+                entries[entry.tag][entry.get('name')] = data
         for entry in xdata.find('.//Modified'):
-            print entry.tag, entry.get('name')
-            if entry.tag == 'Package':
-                if entry.get('name') in entries['Package']:
-                    entries['Package'][entry.get('name')][0] = True
+            if entry.tag in pdisp:
+                if entry.get('name') in entries[entry.tag]:
+                    entries[entry.tag][entry.get('name')][0] = True
                 else:
-                    data = [True, True, unicode(entry.get('type')),
-                            unicode(entry.get('current_version')),
-                            unicode(entry.get('version'))]
+                    data = [False, False, unicode(entry.get('type')),
+                            unicode(entry.get('%s_%s' % ('current', pdisp[entry.tag]))),
+                            unicode(entry.get(pdisp[entry.tag]))]
+                    entries[entry.tag][entry.get('name')] = data
+            else:
+                print entry.tag, entry.get('name')
         for entry in xdata.find('.//Extra'):
-            if entry.tag == 'Package':
-                edata = dict([('name', unicode(entry.get('name'))),
+            if entry.tag in pdisp:
+                tname = pdisp[entry.tag]
+                data = dict([('name', unicode(entry.get('name'))),
                               ('type', unicode(entry.get('type'))),
-                              ('version', unicode(entry.get('version')))]) 
-                extra['Package'].append(edata)
+                              (tname, unicode(entry.get(tname)))])
+            else:
+                print "extra", entry.tag, entry.get('name')
         t2 = time.time()
         snap = Snapshot.from_data(self.session, metadata, entries, extra)
         self.session.save(snap)