PEP8 changes
Change-Id: Ie5e4cdff7b46c783ba7071813ecd7c0d1c491931
diff --git a/lavapdu/__init__.py b/lavapdu/__init__.py
index 6c6aaf6..9b73b54 100644
--- a/lavapdu/__init__.py
+++ b/lavapdu/__init__.py
@@ -19,4 +19,4 @@
# MA 02110-1301, USA.
import pdurunner
-import socketserver
\ No newline at end of file
+import socketserver
diff --git a/lavapdu/apcdrivers.py b/lavapdu/apcdrivers.py
index 72d0d54..0dad9b6 100644
--- a/lavapdu/apcdrivers.py
+++ b/lavapdu/apcdrivers.py
@@ -32,11 +32,11 @@
def _back_to_main(self):
logging.debug("Returning to main menu")
self.connection.expect('>')
- for i in range(1,20):
+ for i in range(1, 20):
#print("Sending escape character")
self.connection.send("\x1B")
self.connection.send("\r")
- res = self.connection.expect(["4- Logout","> "])
+ res = self.connection.expect(["4- Logout", "> "])
if res == 0:
logging.debug("Back at main menu")
break
@@ -66,7 +66,7 @@
self.connection.expect("> ")
logging.debug("Entering Device Manager")
self.connection.send("1\r")
- res = self.connection.expect(["3- Outlet Control/Configuration","2- Outlet Control","2- Outlet Management","------- Device Manager"])
+ res = self.connection.expect(["3- Outlet Control/Configuration", "2- Outlet Control", "2- Outlet Management", "------- Device Manager"])
logging.debug("Matched pattern %s", res)
if res == 0:
self.connection.send("3\r")
@@ -82,12 +82,12 @@
res = self.connection.expect(["1- Control Outlet", "1- Outlet Control/Configuration"])
self.connection.expect("> ")
self.connection.send("1\r")
- res = self.connection.expect(["> ","Press <ENTER> to continue..."])
+ res = self.connection.expect(["> ", "Press <ENTER> to continue..."])
if res == 1:
logging.debug("Stupid paging thingmy detected, pressing enter")
self.connection.send("\r")
self.connection.send("\r")
- res = self.connection.expect(["Control Outlet %s" % port_number,"Control Outlet"])
+ res = self.connection.expect(["Control Outlet %s" % port_number, "Control Outlet"])
if res == 0:
logging.debug("Already at the right port")
else:
@@ -132,9 +132,10 @@
def port_reboot(self, port_number):
self._port_interaction("reboot", port_number)
+
class apc8959(PDUDriver):
connection = None
- pdu_commands = {"off":"olOff","on":"olOn","reboot":"olReboot","delayed":"olDlyReboot"}
+ pdu_commands = {"off": "olOff", "on": "olOn", "reboot": "olReboot", "delayed": "olDlyReboot"}
def _pdu_logout(self):
logging.debug("logging out")
@@ -145,7 +146,7 @@
def _pdu_get_to_prompt(self):
self.connection.send("\r")
- self.connection.expect ('apc>')
+ self.connection.expect('apc>')
def _port_interaction(self, command, port_number):
logging.debug("Attempting %s on port %i" % (command, port_number))
diff --git a/lavapdu/driver.py b/lavapdu/driver.py
index 44e0adc..bd36c18 100644
--- a/lavapdu/driver.py
+++ b/lavapdu/driver.py
@@ -18,10 +18,10 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301, USA.
+
class PDUDriver():
connection = None
- pdu_commands = {"off":"olOff","on":"olOn","reboot":"olReboot","delayed":"olDlyReboot"}
+ pdu_commands = {"off": "olOff", "on": "olOn", "reboot": "olReboot", "delayed": "olDlyReboot"}
def __init__(self, connection):
self.connection = connection
-
diff --git a/lavapdu/engine.py b/lavapdu/engine.py
index e8ab9ca..beb954f 100644
--- a/lavapdu/engine.py
+++ b/lavapdu/engine.py
@@ -32,11 +32,11 @@
prompt = 0
driver = None
- def __init__(self, pdu_hostname, pdu_telnetport = 23):
+ def __init__(self, pdu_hostname, pdu_telnetport=23):
self.exec_string = "/usr/bin/telnet %s %d" % (pdu_hostname, pdu_telnetport)
logging.debug("Created new PDUEngine: %s" % self.exec_string)
#self.connection.logfile_read = sys.stdout
- prompt = self._pdu_login("apc","apc")
+ prompt = self._pdu_login("apc", "apc")
if prompt == 0:
logging.debug("Found a v5 prompt")
self.driver = apc8959(self.connection)
@@ -71,10 +71,10 @@
self.connection.close(True)
def _pdu_login(self, username, password):
- logging.debug("attempting login with username %s, password %s" % (username,password))
+ logging.debug("attempting login with username %s, password %s" % (username, password))
self.pduconnect()
self.connection.send("\r")
- self.connection.expect ("User Name :")
+ self.connection.expect("User Name :")
self.connection.send("apc\r")
self.connection.expect("Password :")
self.connection.send("apc\r")
@@ -109,4 +109,3 @@
#pe4.driver.port_off(8)
#pe4.driver.port_on(8)
pe4.close()
-
diff --git a/lavapdu/pdurunner.py b/lavapdu/pdurunner.py
index 3c1ed29..cc2b19d 100644
--- a/lavapdu/pdurunner.py
+++ b/lavapdu/pdurunner.py
@@ -23,6 +23,7 @@
from engine import PDUEngine
from socketserver import DBHandler
+
class PDURunner():
def __init__(self, config):
@@ -34,10 +35,10 @@
def get_one(self, db):
job = db.get_next_job()
if job:
- job_id,hostname,port,request = job
+ job_id, hostname, port, request = job
logging.info("Processing queue item: (%s %s) on hostname: %s" % (request, port, hostname))
#logging.debug(id, hostname, request, port)
- res = self.do_job(hostname,port,request)
+ res = self.do_job(hostname, port, request)
db.delete_row(job_id)
else:
logging.debug("Found nothing to do in database")
@@ -60,12 +61,11 @@
pe.pduclose()
retries = 0
except:
- logging.warn("Failed to execute job: %s %s %s (attempts left %i)" % (hostname,port,request,retries))
+ logging.warn("Failed to execute job: %s %s %s (attempts left %i)" % (hostname, port, request, retries))
#logging.warn(e)
time.sleep(5)
retries -= 1
-
def run_me(self):
logging.info("Starting up the PDURunner")
while 1:
@@ -76,10 +76,10 @@
time.sleep(2)
if __name__ == "__main__":
- starter = {"dbhost":"127.0.0.1",
- "dbuser":"pdudaemon",
- "dbpass":"pdudaemon",
- "dbname":"lavapdu",
+ starter = {"dbhost": "127.0.0.1",
+ "dbuser": "pdudaemon",
+ "dbpass": "pdudaemon",
+ "dbname": "lavapdu",
"logging_level": logging.DEBUG}
p = PDURunner(starter)
- p.run_me()
\ No newline at end of file
+ p.run_me()
diff --git a/lavapdu/socketserver.py b/lavapdu/socketserver.py
index b00bbf1..5a6011c 100644
--- a/lavapdu/socketserver.py
+++ b/lavapdu/socketserver.py
@@ -23,6 +23,7 @@
import logging
import socket
+
class DBHandler(object):
def __init__(self, config):
logging.debug("Creating new DBHandler: %s" % config["dbhost"])
@@ -93,11 +94,11 @@
hostname = array[0]
port = int(array[1])
request = array[2]
- if not (request in ["reboot","on","off","delayed"]):
+ if not (request in ["reboot", "on", "off", "delayed"]):
logging.info("Unknown request: %s" % request)
raise Exception("Unknown request: %s" % request)
db = DBHandler(self.server.config)
- sql = "insert into pdu_queue (hostname,port,request) values ('%s',%i,'%s')" % (hostname,port,request)
+ sql = "insert into pdu_queue (hostname,port,request) values ('%s',%i,'%s')" % (hostname, port, request)
db.do_sql(sql)
db.close()
del(db)
@@ -111,7 +112,7 @@
try:
request_host = socket.gethostbyaddr(ip)[0]
except socket.herror as e:
- logging.debug("Unable to resolve: %s error: %s" % (ip,e))
+ logging.debug("Unable to resolve: %s error: %s" % (ip, e))
request_host = ip
logging.info("Received a request from %s: '%s'" % (request_host, data))
self.insert_request(data)
@@ -121,6 +122,7 @@
self.request.sendall("nack\n")
self.request.close()
+
class TCPServer(SocketServer.ThreadingMixIn, SocketServer.TCPServer):
allow_reuse_address = True
daemon_threads = True
@@ -131,11 +133,11 @@
logging.getLogger().setLevel(logging.DEBUG)
logging.debug("Executing from __main__")
starter = {"hostname": "0.0.0.0",
- "port":16421,
- "dbhost":"127.0.0.1",
- "dbuser":"pdudaemon",
- "dbpass":"pdudaemon",
- "dbname":"lavapdu",
+ "port": 16421,
+ "dbhost": "127.0.0.1",
+ "dbuser": "pdudaemon",
+ "dbpass": "pdudaemon",
+ "dbname": "lavapdu",
"logging_level": logging.DEBUG}
ss = ListenerServer(starter)
- ss.start()
\ No newline at end of file
+ ss.start()
diff --git a/pduclient b/pduclient
index 15b04d5..fdcdcb3 100755
--- a/pduclient
+++ b/pduclient
@@ -6,12 +6,12 @@
if __name__ == '__main__':
usage = "Usage: %prog [-d] deamonhostname [-h] pduhostname -[p] pduportnum [-c] pducommand"
description = "LAVA PDU daemon client"
- commands = ["reboot","on","off","delayed"]
+ commands = ["reboot", "on", "off", "delayed"]
parser = optparse.OptionParser(usage=usage, description=description)
- parser.add_option("--daemon", dest="pdudaemonhostname", action="store",type="string", help="LAVAPDU Daemon (ex: control)")
- parser.add_option("--hostname", dest="pduhostname", action="store",type="string", help="PDU Hostname (ex: pdu05)")
- parser.add_option("--port", dest="pduportnum", action="store",type="string", help="PDU Portnumber (ex: 04)")
- parser.add_option("--command", dest="pducommand", action="store",type="string", help="PDU command (ex: reboot|on|off|delayed)")
+ parser.add_option("--daemon", dest="pdudaemonhostname", action="store", type="string", help="LAVAPDU Daemon (ex: control)")
+ parser.add_option("--hostname", dest="pduhostname", action="store", type="string", help="PDU Hostname (ex: pdu05)")
+ parser.add_option("--port", dest="pduportnum", action="store", type="string", help="PDU Portnumber (ex: 04)")
+ parser.add_option("--command", dest="pducommand", action="store", type="string", help="PDU command (ex: reboot|on|off|delayed)")
(options, args) = parser.parse_args()
if (not (options.pdudaemonhostname) or not(options.pduhostname) or not (options.pduportnum) or not (options.pducommand)):
print("Missing option, try -h for help")
@@ -38,4 +38,3 @@
else:
print("Unknown error sending command! %s replied: %s" % (options.pdudaemonhostname, reply))
exit(127)
-