moved this into pcucontrol and adjusted dependencies/imports accordingly.
import subprocess
import time
import subprocess
import time
-from monitor.util import command as moncommands
+from pcucontrol.util import command as moncommands
from sets import Set
from pcucontrol.transports.ssh import pxssh as pxssh
from sets import Set
from pcucontrol.transports.ssh import pxssh as pxssh
import threading
from monitor.util import file
import threading
from monitor.util import file
-from monitor.util import command
+from pcucontrol.util import command
from monitor import config
from monitor.database.info.model import FindbadNodeRecordSync, FindbadNodeRecord, session
from monitor import config
from monitor.database.info.model import FindbadNodeRecordSync, FindbadNodeRecord, session
import pcucontrol.transports.pyssh as pyssh
from monitor import config
import pcucontrol.transports.pyssh as pyssh
from monitor import config
-from monitor.util import command
from monitor.wrapper import plc
from monitor.wrapper import plc
+from pcucontrol.util import command
from pcucontrol.reboot import pcu_name, model_to_object, reboot_api, convert_oldmodelname_to_newmodelname, reboot_test_new
from pcucontrol.reboot import pcu_name, model_to_object, reboot_api, convert_oldmodelname_to_newmodelname, reboot_test_new
import socket
from pcucontrol import reboot
import socket
from pcucontrol import reboot
-from monitor import util
-from monitor.util import command
+from pcucontrol.util import command
from monitor import config
from monitor.database.info.model import *
from monitor import config
from monitor.database.info.model import *
def collectNMAP(self, nodename, cohash):
#### RUN NMAP ###############################
values = {}
def collectNMAP(self, nodename, cohash):
#### RUN NMAP ###############################
values = {}
- nmap = util.command.CMD()
print "nmap -oG - -P0 -p22,80,806 %s | grep Host:" % nodename
(oval,eval) = nmap.run_noexcept("nmap -oG - -P0 -p22,80,806 %s | grep Host:" % nodename)
# NOTE: an empty / error value for oval, will still work.
print "nmap -oG - -P0 -p22,80,806 %s | grep Host:" % nodename
(oval,eval) = nmap.run_noexcept("nmap -oG - -P0 -p22,80,806 %s | grep Host:" % nodename)
# NOTE: an empty / error value for oval, will still work.
#### RUN NMAP ###############################
if continue_probe:
#### RUN NMAP ###############################
if continue_probe:
- nmap = util.command.CMD()
print "nmap -oG - -P0 -p22,23,80,443,5869,9100,16992 %s | grep Host:" % reboot.pcu_name(values['plc_pcu_stats'])
(oval,eval) = nmap.run_noexcept("nmap -oG - -P0 -p22,23,80,443,5869,9100,16992 %s | grep Host:" % reboot.pcu_name(values['plc_pcu_stats']))
# NOTE: an empty / error value for oval, will still work.
print "nmap -oG - -P0 -p22,23,80,443,5869,9100,16992 %s | grep Host:" % reboot.pcu_name(values['plc_pcu_stats'])
(oval,eval) = nmap.run_noexcept("nmap -oG - -P0 -p22,23,80,443,5869,9100,16992 %s | grep Host:" % reboot.pcu_name(values['plc_pcu_stats']))
# NOTE: an empty / error value for oval, will still work.
print "RUNCMD: %s" % output
if verbose:
print "RUNCMD: %s" % output
if verbose:
return 0
except Exception, err:
return 0
except Exception, err:
- logger.debug("runcmd raised exception %s" % err)
- if verbose:
- logger.debug(err)
+ print "runcmd raised exception %s" % err
from pcucontrol.reboot import *
from pcucontrol.reboot import *
+from distutils.sysconfig import get_python_lib;
class HPiLO(PCUControl):
supported_ports = [22,443]
class HPiLO(PCUControl):
supported_ports = [22,443]
- cmd_str = config.MONITOR_SCRIPT_ROOT + "/pcucontrol/models/hpilo/"
+ cmd_str = get_python_lib(1) + "/pcucontrol/models/hpilo/"
cmd = cmd_str + "locfg.pl -s %s -f %s -u %s -p '%s' | grep 'MESSAGE' | grep -v 'No error'" % (
self.host, cmd_str+"iloxml/Get_Network.xml",
cmd = cmd_str + "locfg.pl -s %s -f %s -u %s -p '%s' | grep 'MESSAGE' | grep -v 'No error'" % (
self.host, cmd_str+"iloxml/Get_Network.xml",
email_exception(self.host)
raise Exception(err)
email_exception(self.host)
raise Exception(err)
+from pcucontrol.util import command
from pcucontrol.models import *
def pcu_name(pcu):
from pcucontrol.models import *
def pcu_name(pcu):
from distutils.core import setup
from distutils.core import setup
-packages=['monitor', 'monitor.database', 'monitor.database.zabbixapi',
- 'monitor.database.info', 'monitor.sources',
- 'monitor.util', 'monitor.wrapper' ]
+packages=[ 'monitor',
+ 'monitor.database',
+ 'monitor.database.zabbixapi',
+ 'monitor.database.info',
+ 'monitor.sources',
+ 'monitor.util',
+ 'monitor.wrapper' ]
print packages
setup(name='MonitorModule',
print packages
setup(name='MonitorModule',
description='Monitor Utility Module',
author='Stephen Soltesz',
author_email='soltesz@cs.princeton.edu',
description='Monitor Utility Module',
author='Stephen Soltesz',
author_email='soltesz@cs.princeton.edu',
)
packages=['pcucontrol',
)
packages=['pcucontrol',
'pcucontrol.transports',
'pcucontrol.transports.ssh',
'pcucontrol.transports.pyssh',
'pcucontrol.transports',
'pcucontrol.transports.ssh',
'pcucontrol.transports.pyssh',
# TODO: add data dir for intelamt and hpilo stuff
print packages
setup(name='PCUControlModule',
# TODO: add data dir for intelamt and hpilo stuff
print packages
setup(name='PCUControlModule',
description='PCU Control Module',
author='Stephen Soltesz',
author_email='soltesz@cs.princeton.edu',
description='PCU Control Module',
author='Stephen Soltesz',
author_email='soltesz@cs.princeton.edu',