Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi into observer3.0

[plstackapi.git] / planetstack / observer / syncstep.py

diff --git a/planetstack/observer/syncstep.py b/planetstack/observer/syncstep.py
index a52302d..fc0cb0b 100644 (file)
--- a/planetstack/observer/syncstep.py
+++ b/planetstack/observer/syncstep.py
@@ -43,26 +43,31 @@ class SyncStep:
 
         return
 
-    def fetch_pending(self):
+    def fetch_pending(self, deletion=False):
         return []
         #return Sliver.objects.filter(ip=None)
     
     def check_dependencies(self, obj, failed):
         for dep in self.dependencies:
-            peer_object = getattr(obj, dep.lower())
+            peer_name = dep[0].lower() + dep[1:]    # django names are camelCased with the first letter lower
+            peer_object = getattr(obj, peer_name)
             if (peer_object.pk==failed.pk):
                 raise FailedDependency
 
-    def call(self, failed=[]):
-        pending = self.fetch_pending()
+    def call(self, failed=[], deletion=False):
+        pending = self.fetch_pending(deletion)
         for o in pending:
             try:
                 for f in failed:
                     self.check_dependencies(o,f) # Raises exception if failed
-                self.sync_record(o)
-                o.enacted = datetime.now() # Is this the same timezone? XXX
-                o.backend_status = "OK"
-                o.save(update_fields=['enacted'])
+                if (deletion):
+                    self.delete_record(o)
+                    o.delete(purge=True)
+                else:
+                    self.sync_record(o)
+                    o.enacted = datetime.now() # Is this the same timezone? XXX
+                    o.backend_status = "OK"
+                    o.save(update_fields=['enacted'])
             except Exception,e:
                 try:
                     o.backend_status = self.error_map.map(str(e))