From 111193ef96adb711b1b1b4859291c77197eb8ea8 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 31 Jul 2012 09:12:01 -0400 Subject: unified Metadata/DBMetadata plugins made django optional --- src/lib/Bcfg2/Server/Plugins/Probes.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'src/lib/Bcfg2/Server/Plugins/Probes.py') diff --git a/src/lib/Bcfg2/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py index 3932c44d1..114a9bbd8 100644 --- a/src/lib/Bcfg2/Server/Plugins/Probes.py +++ b/src/lib/Bcfg2/Server/Plugins/Probes.py @@ -5,9 +5,14 @@ import time import operator import lxml.etree import Bcfg2.Server -from django.db import models import Bcfg2.Server.Plugin +try: + from django.db import models + has_django = True +except ImportError: + has_django = False + try: import json has_json = True @@ -32,18 +37,18 @@ except ImportError: import Bcfg2.Server.Plugin -class ProbesDataModel(models.Model, - Bcfg2.Server.Plugin.PluginDatabaseModel): - hostname = models.CharField(max_length=255) - probe = models.CharField(max_length=255) - timestamp = models.DateTimeField(auto_now=True) - data = models.TextField(null=True) +if has_django: + class ProbesDataModel(models.Model, + Bcfg2.Server.Plugin.PluginDatabaseModel): + hostname = models.CharField(max_length=255) + probe = models.CharField(max_length=255) + timestamp = models.DateTimeField(auto_now=True) + data = models.TextField(null=True) - -class ProbesGroupsModel(models.Model, - Bcfg2.Server.Plugin.PluginDatabaseModel): - hostname = models.CharField(max_length=255) - group = models.CharField(max_length=255) + class ProbesGroupsModel(models.Model, + Bcfg2.Server.Plugin.PluginDatabaseModel): + hostname = models.CharField(max_length=255) + group = models.CharField(max_length=255) class ClientProbeDataSet(dict): @@ -172,11 +177,6 @@ class Probes(Bcfg2.Server.Plugin.Plugin, self.cgroups = dict() self.load_data() - @property - def _use_db(self): - return self.core.setup.cfp.getboolean("probes", "use_database", - default=False) - def write_data(self, client): """Write probe data out for use with bcfg2-info.""" if self._use_db: -- cgit v1.2.3-1-g7c22