Deleters are no longer used

diff --git a/planetstack/syndicate_observer/deleters/volume_deleter.py b/planetstack/syndicate_observer/deleters/volume_deleter.py
deleted file mode 100644 (file)
index 5b7c49b..0000000
--- a/planetstack/syndicate_observer/deleters/volume_deleter.py
+++ /dev/null
@@ -1,63 +0,0 @@
-import os\r
-import sys\r
-import traceback\r
-\r
-if __name__ == "__main__":\r
-    # for testing \r
-    if os.getenv("OPENCLOUD_PYTHONPATH"):\r
-        sys.path.append( os.getenv("OPENCLOUD_PYTHONPATH") )\r
-    else:\r
-        print >> sys.stderr, "No OPENCLOUD_PYTHONPATH variable set.  Assuming that OpenCloud is in PYTHONPATH"\r
-\r
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "planetstack.settings")\r
-\r
-\r
-import logging\r
-from logging import Logger\r
-logging.basicConfig( format='[%(levelname)s] [%(module)s:%(lineno)d] %(message)s' )\r
-logger = logging.getLogger()\r
-logger.setLevel( logging.INFO )\r
-\r
-# point to planetstack \r
-if __name__ != "__main__":\r
-    if os.getenv("OPENCLOUD_PYTHONPATH") is not None:\r
-        sys.path.insert(0, os.getenv("OPENCLOUD_PYTHONPATH"))\r
-    else:\r
-        logger.warning("No OPENCLOUD_PYTHONPATH set; assuming your PYTHONPATH works") \r
-\r
-\r
-from syndicate_storage.models import Volume\r
-from observer.deleter import Deleter\r
-\r
-from django.forms.models import model_to_dict\r
-\r
-\r
-# syndicatelib will be in steps/..\r
-parentdir = os.path.join(os.path.dirname(__file__),"..")\r
-sys.path.insert(0,parentdir)\r
-\r
-import syndicatelib\r
-\r
-class VolumeDeleter(Deleter):\r
-        model='Volume'\r
-\r
-        def __init__(self, **args):\r
-            Deleter.__init__(self, **args)\r
-\r
-        def call(self, pk, model_dict):\r
-            try:\r
-                volume_name = model_dict['name']\r
-                syndicatelib.ensure_volume_absent( volume_name )\r
-                return True\r
-            except Exception, e:\r
-                traceback.print_exc()\r
-                logger.exception("Failed to erase volume '%s'" % volume_name)\r
-                return False\r
-            \r
-\r
-if __name__ == "__main__":\r
-   vd = VolumeDeleter()\r
-   \r
-   all_volumes = Volume.objects.all()\r
-   for vol in all_volumes:\r
-      vd( vol.pk, model_to_dict( vol ) )\r

diff --git a/planetstack/syndicate_observer/deleters/volumeaccessright_deleter.py b/planetstack/syndicate_observer/deleters/volumeaccessright_deleter.py
deleted file mode 100644 (file)
index 74b405d..0000000
--- a/planetstack/syndicate_observer/deleters/volumeaccessright_deleter.py
+++ /dev/null
@@ -1,56 +0,0 @@
-import os\r
-import sys\r
-import traceback\r
-\r
-if __name__ == "__main__":\r
-    # for testing \r
-    if os.getenv("OPENCLOUD_PYTHONPATH"):\r
-        sys.path.append( os.getenv("OPENCLOUD_PYTHONPATH") )\r
-    else:\r
-        print >> sys.stderr, "No OPENCLOUD_PYTHONPATH variable set.  Assuming that OpenCloud is in PYTHONPATH"\r
-\r
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "planetstack.settings")\r
-\r
-\r
-import logging\r
-from logging import Logger\r
-logging.basicConfig( format='[%(levelname)s] [%(module)s:%(lineno)d] %(message)s' )\r
-logger = logging.getLogger()\r
-logger.setLevel( logging.INFO )\r
-\r
-# point to planetstack \r
-if __name__ != "__main__":\r
-    if os.getenv("OPENCLOUD_PYTHONPATH") is not None:\r
-        sys.path.insert(0, os.getenv("OPENCLOUD_PYTHONPATH"))\r
-    else:\r
-        logger.warning("No OPENCLOUD_PYTHONPATH set; assuming your PYTHONPATH works") \r
-        \r
-\r
-from syndicate_storage.models import VolumeAccessRight\r
-from observer.deleter import Deleter\r
-\r
-from django.forms.models import model_to_dict\r
-\r
-\r
-# find syndicatelib\r
-parentdir = os.path.join(os.path.dirname(__file__),"..")\r
-sys.path.insert(0,parentdir)\r
-\r
-import syndicatelib\r
-\r
-class VolumeAccessRightDeleter(Deleter):\r
-   model='VolumeAccessRight'\r
-\r
-   def __init__(self, **args):\r
-      Deleter.__init__(self, **args)\r
-\r
-   def call(self, pk, model_dict):\r
-      print "XXX delete volume access right", model_dict\r
-\r
-\r
-if __name__ == "__main__":\r
-   vard = VolumeAccessRightDeleter()\r
-\r
-   all_vars = VolumeAccessRight.objects.all()\r
-   for var in all_vars:\r
-      vard( var.pk, model_to_dict( var ) )
\ No newline at end of file