Reports: Fix InternalDatabaseVersion

You could not import a class, that is defined in a function. We need to
return the class, but we do not want to define it multiple times. So we
have to save the class in a global variable.

2 files changed, 23 insertions, 14 deletions

diff --git a/src/lib/Bcfg2/Server/Reports/updatefix.py b/src/lib/Bcfg2/Server/Reports/updatefix.py
index 91c370994..09b218464 100644
--- a/src/lib/Bcfg2/Server/Reports/updatefix.py
+++ b/src/lib/Bcfg2/Server/Reports/updatefix.py
@@ -4,7 +4,7 @@ import django.core.management
 import sys
 import logging
 import traceback
-from Bcfg2.Server.models import InternalDatabaseVersion
+from Bcfg2.Server.models import internal_database_version
 logger = logging.getLogger('Bcfg2.Server.Reports.UpdateFix')
 
 
@@ -138,7 +138,7 @@ def rollupdate(current_version):
                              exc_info=1)
             # since array start at 0 but version start at 1
             # we add 1 to the normal count
-            ret = InternalDatabaseVersion.objects.create(version=i + 1)
+            ret = internal_database_version().create(version=i + 1)
         return ret
     else:
         return None
@@ -149,10 +149,10 @@ def update_database():
     try:
         logger.debug("Running upgrade of models to the new one")
         django.core.management.call_command("syncdb", interactive=False, verbosity=0)
-        know_version = InternalDatabaseVersion.objects.order_by('-version')
+        know_version = internal_database_version().order_by('-version')
         if not know_version:
             logger.debug("No version, creating initial version")
-            know_version = InternalDatabaseVersion.objects.create(version=lastversion)
+            know_version = internal_database_version().create(version=lastversion)
         else:
             know_version = know_version[0]
         logger.debug("Presently at %s" % know_version)
diff --git a/src/lib/Bcfg2/Server/models.py b/src/lib/Bcfg2/Server/models.py
index 8d6642a25..9c0153c74 100644
--- a/src/lib/Bcfg2/Server/models.py
+++ b/src/lib/Bcfg2/Server/models.py
@@ -8,6 +8,7 @@ import Bcfg2.Server.Plugins
 LOGGER = logging.getLogger(__name__)
 
 MODELS = []
+INTERNAL_DATABASE_VERSION = None
 
 
 class _OptionContainer(object):
@@ -56,15 +57,23 @@ def load_models(plugins=None):
                 setattr(sys.modules[__name__], sym, obj)
                 MODELS.append(sym)
 
-    class InternalDatabaseVersion(models.Model):
-        """ Object that tell us to which version the database is """
-        version = models.IntegerField()
-        updated = models.DateTimeField(auto_now_add=True)
+def internal_database_version():
+    global INTERNAL_DATABASE_VERSION
 
-        def __str__(self):
-            return "version %d updated %s" % (self.version,
-                                              self.updated.isoformat())
+    if INTERNAL_DATABASE_VERSION is None:
+        from django.db import models
+        class InternalDatabaseVersion(models.Model):
+            """ Object that tell us to which version the database is """
+            version = models.IntegerField()
+            updated = models.DateTimeField(auto_now_add=True)
 
-        class Meta:  # pylint: disable=C0111,W0232
-            app_label = "reports"
-            get_latest_by = "version"
+            def __str__(self):
+                return "version %d updated %s" % (self.version,
+                                                  self.updated.isoformat())
+
+            class Meta:  # pylint: disable=C0111,W0232
+                app_label = "reports"
+                get_latest_by = "version"
+        INTERNAL_DATABASE_VERSION = InternalDatabaseVersion
+
+    return INTERNAL_DATABASE_VERSION.objects