Options: migrated reporting to new parser

3 files changed, 22 insertions, 51 deletions

diff --git a/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py b/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
index aea5e9d4b..9505682a7 100644
--- a/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
+++ b/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
@@ -11,6 +11,7 @@ from time import strptime
 os.environ['DJANGO_SETTINGS_MODULE'] = 'Bcfg2.settings'
 from Bcfg2 import settings
 
+import Bcfg2.Options
 from Bcfg2.Compat import md5
 from Bcfg2.Reporting.Storage.base import StorageBase, StorageError
 from Bcfg2.Server.Plugin.exceptions import PluginExecutionError
@@ -27,9 +28,13 @@ from Bcfg2.Reporting.models import *
 
 
 class DjangoORM(StorageBase):
-    def __init__(self, setup):
-        super(DjangoORM, self).__init__(setup)
-        self.size_limit = setup.get('reporting_file_limit')
+    options = StorageBase.options + [
+        Bcfg2.Options.Common.repository,
+        Bcfg2.Options.Option(
+            cf=('reporting', 'file_limit'),
+            type=Bcfg2.Options.Types.size,
+            help='Reporting file size limit',
+            default=1024 * 1024)]
 
     def _import_default(self, entry, state, entrytype=None, defaults=None,
                         mapping=None, boolean=None, xforms=None):
@@ -184,7 +189,7 @@ class DjangoORM(StorageBase):
                 act_dict['detail_type'] = PathEntry.DETAIL_DIFF
                 cdata = entry.get('current_bdiff')
             if cdata:
-                if len(cdata) > self.size_limit:
+                if len(cdata) > Bcfg2.Options.setup.file_limit:
                     act_dict['detail_type'] = PathEntry.DETAIL_SIZE_LIMIT
                     act_dict['details'] = md5(cdata).hexdigest()
                 else:
@@ -364,31 +369,31 @@ class DjangoORM(StorageBase):
 
     def import_interaction(self, interaction):
         """Import the data into the backend"""
-
         try:
             self._import_interaction(interaction)
         except:
             self.logger.error("Failed to import interaction: %s" %
-                    traceback.format_exc().splitlines()[-1])
+                              sys.exc_info()[1])
 
     def validate(self):
         """Validate backend storage.  Should be called once when loaded"""
 
-        settings.read_config(repo=self.setup['repo'])
+        settings.read_config(repo=Bcfg2.Options.setup.repository)
 
         # verify our database schema
         try:
-            if self.setup['debug']:
+            if Bcfg2.Options.setup.debug:
                 vrb = 2
-            elif self.setup['verbose']:
+            elif Bcfg2.Options.setup.verbose:
                 vrb = 1
             else:
                 vrb = 0
             management.call_command("syncdb", verbosity=vrb, interactive=False)
-            management.call_command("migrate", verbosity=vrb, interactive=False)
+            management.call_command("migrate", verbosity=vrb,
+                                    interactive=False)
         except:
-            self.logger.error("Failed to update database schema: %s" % \
-                traceback.format_exc().splitlines()[-1])
+            self.logger.error("Failed to update database schema: %s" %
+                              sys.exc_info()[1])
             raise StorageError
 
     def GetExtra(self, client):
@@ -451,4 +456,3 @@ class DjangoORM(StorageBase):
             else:
                 ret.append(None)
         return ret
-
diff --git a/src/lib/Bcfg2/Reporting/Storage/__init__.py b/src/lib/Bcfg2/Reporting/Storage/__init__.py
index 85356fcfe..953104d4b 100644
--- a/src/lib/Bcfg2/Reporting/Storage/__init__.py
+++ b/src/lib/Bcfg2/Reporting/Storage/__init__.py
@@ -1,32 +1,3 @@
 """
 Public storage routines
 """
-
-import traceback
-
-from Bcfg2.Reporting.Storage.base import StorageError, \
-    StorageImportError
-
-def load_storage(storage_name, setup):
-    """
-    Try to load the storage.  Raise StorageImportError on failure
-    """
-    try:
-        mod_name = "%s.%s" % (__name__, storage_name)
-        mod = getattr(__import__(mod_name).Reporting.Storage, storage_name)
-    except ImportError:
-        try:
-            mod = __import__(storage_name)
-        except:
-            raise StorageImportError("Unavailable")
-    try:
-        cls = getattr(mod, storage_name)
-        return cls(setup)
-    except:
-        raise StorageImportError("Storage unavailable: %s" %
-            traceback.format_exc().splitlines()[-1])
-
-def load_storage_from_config(setup):
-    """Load the storage in the config... eventually"""
-    return load_storage('DjangoORM', setup)
-
diff --git a/src/lib/Bcfg2/Reporting/Storage/base.py b/src/lib/Bcfg2/Reporting/Storage/base.py
index 92cc3a68b..771f755a1 100644
--- a/src/lib/Bcfg2/Reporting/Storage/base.py
+++ b/src/lib/Bcfg2/Reporting/Storage/base.py
@@ -2,28 +2,25 @@
 The base for all Storage backends
 """
 
-import logging 
+import logging
+
 
 class StorageError(Exception):
     """Generic StorageError"""
     pass
 
-class StorageImportError(StorageError):
-    """Raised when a storage module fails to import"""
-    pass
-
 class StorageBase(object):
     """The base for all storages"""
 
+    options = []
+
     __rmi__ = ['Ping', 'GetExtra', 'GetCurrentEntry']
 
-    def __init__(self, setup):
+    def __init__(self):
         """Do something here"""
         clsname = self.__class__.__name__
         self.logger = logging.getLogger(clsname)
         self.logger.debug("Loading %s storage" % clsname)
-        self.setup = setup
-        self.encoding = setup['encoding']
 
     def import_interaction(self, interaction):
         """Import the data into the backend"""
@@ -48,4 +45,3 @@ class StorageBase(object):
     def GetCurrentEntry(self, client, e_type, e_name):
         """Get the current status of an entry on the client"""
         raise NotImplementedError
-