use new monitor.database for data model import

move config.py into monitor python module.

diff --git a/config.py b/config.py
deleted file mode 100644 (file)
index 0cde6f3..0000000
--- a/config.py
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/python
-
-# load defaults from /etc/monitor.conf
-# home/.monitor.conf
-# $PWD/.monitor.conf
-import os
-import ConfigParser
-
-class Options(object):
-       def __init__(self):
-               cp = ConfigParser.ConfigParser()
-               cp.optionxform = str
-               # load defaults from global, home dir, then $PWD
-               cp.read(['/etc/monitor.conf', os.path.expanduser('~/.monitor.conf'), 
-                                          '.monitor.conf', 'monitor.conf'])
-               self.cp = cp
-               self.section = "default"
-       def __getattr__(self, name):
-               if name in self.cp.sections():
-                       self.section = name
-                       return self
-               else:
-                       return self.cp.get(self.section, name)
-
-
-import config
-imported = False
-
-def updatemodule(module, cf):
-       module.__dict__.update(cf.__dict__)
-
-def update_section(options, section, bool=False):
-       # Place all default commandline values at the top level of this module
-       for key in options.cp.options(section):
-               if bool:
-                       config.__dict__.update({key : options.cp.getboolean(section, key)})
-               else:
-                       config.__dict__.update({key : options.cp.get(section, key)})
-
-def update(parseoptions):
-       update_commandline()
-       # now update the top-level module with all other args passed in here.
-       for key in parseoptions.__dict__.keys():
-               config.__dict__.update({key: parseoptions.__dict__[key]})
-
-if not config.imported:
-       imported = True
-
-       #from config import options as config
-       options = Options()
-       update_section(options, 'commandline', True)
-       update_section(options, 'monitorconfig')
-       update_section(options, 'monitordatabase')
-
-#for i in dir(config):
-#      if "__" not  in i:
-#              print i, "==", config.__dict__[i]
-#print "======================================"
-

diff --git a/monitor/config.py b/monitor/config.py
index b37e04a..0cde6f3 100644 (file)
--- a/monitor/config.py
+++ b/monitor/config.py
@@ -50,6 +50,7 @@ if not config.imported:
        options = Options()
        update_section(options, 'commandline', True)
        update_section(options, 'monitorconfig')
+       update_section(options, 'monitordatabase')
 
 #for i in dir(config):
 #      if "__" not  in i:

diff --git a/nodecommon.py b/nodecommon.py
index 624ee2c..f318949 100644 (file)
--- a/nodecommon.py
+++ b/nodecommon.py
@@ -2,7 +2,7 @@
 import struct
 import reboot
 import time
-import util.file
+from monitor import util
 import plc
 from datetime import datetime 
 from monitor import database

diff --git a/nodequery.py b/nodequery.py
index 691ead5..806fab0 100755 (executable)
--- a/nodequery.py
+++ b/nodequery.py
@@ -12,7 +12,7 @@ import glob
 import os
 from reboot import pcu_name
 import reboot
-import util.file
+from monitor import util
 import traceback
 
 import time
@@ -20,10 +20,11 @@ import re
 
 import config
 
-from sqlobject import connectionForURI,sqlhub
-connection = connectionForURI(config.sqlobjecturi)
-sqlhub.processConnection = connection
-from infovacuum.model.findbadrecord import *
+from monitor.database import FindbadNodeRecord, FindbadNodeRecordSync
+#from sqlobject import connectionForURI,sqlhub
+#connection = connectionForURI(config.sqlobjecturi)
+#sqlhub.processConnection = connection
+#from infovacuum.model.findbadrecord import *
 
 #fb = {}
 fb = None

diff --git a/unified_model.py b/unified_model.py
index e237bc9..844ae5b 100755 (executable)
--- a/unified_model.py
+++ b/unified_model.py
@@ -8,7 +8,7 @@ import time
 
 from model import *
 from const import *
-import util.file
+from monitor import util
 import config
 
 def gethostlist(hostlist_file):