From d428ca60fd1eb7283291b8f47cdd86dce4986925 Mon Sep 17 00:00:00 2001 From: Stephen Soltesz Date: Tue, 13 Jan 2009 17:41:26 +0000 Subject: [PATCH] updated module import statements. not sure how I missed these before. --- bootman.py | 18 +++++++++--------- grouprins.py | 2 +- mailmonitor.py | 11 +++++------ monitor/policy.py | 8 ++++---- emailTxt.py => monitor/wrapper/emailTxt.py | 0 monitor/wrapper/rt.py | 5 +++-- nodeconfig.py | 3 +-- nodegroups.py | 2 +- plctool.py | 2 +- template.py | 2 +- zabbix/zabbixsync.py | 2 +- 11 files changed, 27 insertions(+), 28 deletions(-) rename emailTxt.py => monitor/wrapper/emailTxt.py (100%) diff --git a/bootman.py b/bootman.py index 981a911..92f4ffe 100755 --- a/bootman.py +++ b/bootman.py @@ -2,29 +2,29 @@ # Attempt to reboot a node in debug state. -import plc +from monitor import const +from monitor.database.info.model import * +from monitor.wrapper import plc api = plc.getAuthAPI() import sys import os -import const from getsshkeys import SSHKnownHosts import subprocess import time -import database -import moncommands +from monitor.util import command as moncommands from sets import Set -import ssh.pxssh as pxssh -import ssh.fdpexpect as fdpexpect -import ssh.pexpect as pexpect +from pcucontrol.transports.ssh import pxssh as pxssh +from pcucontrol.transports.ssh import fdpexpect as fdpexpect +from pcucontrol.transports.ssh import pexpect as pexpect from monitor.model import * -from emailTxt import mailtxt +from monitor.wrapper.emailTxt import mailtxt from nodeconfig import network_config_to_str import traceback -import config +from monitor import config import signal class Sopen(subprocess.Popen): diff --git a/grouprins.py b/grouprins.py index c30e85d..ed6149d 100755 --- a/grouprins.py +++ b/grouprins.py @@ -33,7 +33,7 @@ import time import bootman # debug nodes import mailmonitor # down nodes without pcu -from emailTxt import mailtxt +from monitor.wrapper.emailTxt import mailtxt import sys class Reboot(object): diff --git a/mailmonitor.py b/mailmonitor.py index 8481966..8af368a 100644 --- a/mailmonitor.py +++ b/mailmonitor.py @@ -6,16 +6,15 @@ # # $Id: monitor.py,v 1.7 2007/07/03 19:59:02 soltesz Exp $ -import database - -import rt import sys -import plc -api = plc.getAuthAPI() - +from monitor import database +from monitor.wrapper import rt +from monitor.wrapper import plc from monitor.policy import * +api = plc.getAuthAPI() + def reboot(hostname): print "CALLING: mailmonitor.reboot(%s)" % hostname diff --git a/monitor/policy.py b/monitor/policy.py index a8f3cd7..c23e7de 100644 --- a/monitor/policy.py +++ b/monitor/policy.py @@ -1,15 +1,15 @@ import config import database import time -import mailer import sys -import emailTxt import string +from monitor.wrapper import mailer +from monitor.wrapper import emailTxt from monitor.wrapper import plccache from datetime import datetime -from rt import is_host_in_rt_tickets -import plc +from monitor.wrapper.rt import is_host_in_rt_tickets +from monitor.wrapper import plc # Time to enforce policy POLSLEEP = 7200 diff --git a/emailTxt.py b/monitor/wrapper/emailTxt.py similarity index 100% rename from emailTxt.py rename to monitor/wrapper/emailTxt.py diff --git a/monitor/wrapper/rt.py b/monitor/wrapper/rt.py index 8194036..2051019 100644 --- a/monitor/wrapper/rt.py +++ b/monitor/wrapper/rt.py @@ -7,9 +7,10 @@ import logging import Queue import time import re -import database from threading import * -import config + +from monitor import config +from monitor import database # TODO: merge the RT mailer from mailer.py into this file. diff --git a/nodeconfig.py b/nodeconfig.py index 401ff83..788d7f8 100755 --- a/nodeconfig.py +++ b/nodeconfig.py @@ -8,8 +8,7 @@ from monitor import parser as parsermodule from sets import Set from monitor.common import * -from monitor import database -from monitor.database import FindbadNodeRecord +from monitor.database.info.model import FindbadNodeRecord def network_config_to_str(net): diff --git a/nodegroups.py b/nodegroups.py index 8302404..d6beb54 100755 --- a/nodegroups.py +++ b/nodegroups.py @@ -14,7 +14,7 @@ # * from monitor import database -from monitor.database import FindbadNodeRecord +from monitor.database.info.model import FindbadNodeRecord from monitor import util from monitor.wrapper import plc from monitor import parser as parsermodule diff --git a/plctool.py b/plctool.py index f40c436..9be8462 100644 --- a/plctool.py +++ b/plctool.py @@ -8,7 +8,7 @@ # $Id: plctool.py,v 1.2 2007/04/19 20:43:00 mef Exp $ # -from emailTxt import * +from monitor.wrapper.emailTxt import * import xml, xmlrpclib import logging import time diff --git a/template.py b/template.py index 2e9150b..430d7cf 100644 --- a/template.py +++ b/template.py @@ -1,7 +1,7 @@ #!/usr/bin/python -import emailTxt +from monitor.wrapper import emailTxt class Type: def __init__(self, value): self.value = value diff --git a/zabbix/zabbixsync.py b/zabbix/zabbixsync.py index ffef361..5cc2cd3 100755 --- a/zabbix/zabbixsync.py +++ b/zabbix/zabbixsync.py @@ -78,7 +78,7 @@ if __name__=="__main__": # ADD SITES sites = api.GetSites(query, ['login_base']) site_api_list = [ site['login_base'] for site in sites ] - for site in sites[:20]: + for site in sites: # [:20]: add_loginbase(site['login_base']) session.flush() -- 2.43.0