fixed some typos and stuff like that
This commit is contained in:
parent
350f32244a
commit
3badd0f81c
|
@ -31,7 +31,7 @@ def loadcfg():
|
||||||
except EnvironmentError:
|
except EnvironmentError:
|
||||||
print("Error while trying to open xboard.cfg file")
|
print("Error while trying to open xboard.cfg file")
|
||||||
print("Check if file xboard.cfg exists!")
|
print("Check if file xboard.cfg exists!")
|
||||||
print("It should be set as a csv file with the following fields:")
|
print("It should be a csv file with the following fields:")
|
||||||
print("[server],[user],[password],[port]")
|
print("[server],[user],[password],[port]")
|
||||||
|
|
||||||
# Return the filled dictionary
|
# Return the filled dictionary
|
||||||
|
|
|
@ -12,6 +12,7 @@ stderr = stderr.decode('utf-8')
|
||||||
|
|
||||||
if "not found" in stderr:
|
if "not found" in stderr:
|
||||||
install = os.system("sudo apt install python3-pip")
|
install = os.system("sudo apt install python3-pip")
|
||||||
|
|
||||||
if install == 0:
|
if install == 0:
|
||||||
print("pip3 was successfully installed")
|
print("pip3 was successfully installed")
|
||||||
elif install != 0:
|
elif install != 0:
|
||||||
|
@ -32,6 +33,3 @@ if 'paramiko' not in sys.modules:
|
||||||
print("paramiko was successfully installed")
|
print("paramiko was successfully installed")
|
||||||
elif install != 0:
|
elif install != 0:
|
||||||
print("paramiko couldnot be installed")
|
print("paramiko couldnot be installed")
|
||||||
|
|
||||||
# I was testing for arch linux and saw it has not the nc tool
|
|
||||||
# Install furthermore nc
|
|
||||||
|
|
57
xboard.py
57
xboard.py
|
@ -5,7 +5,7 @@ import datetime
|
||||||
import traceback
|
import traceback
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
import sidefun
|
import utils
|
||||||
import readline
|
import readline
|
||||||
import loadcfg
|
import loadcfg
|
||||||
import subprocess
|
import subprocess
|
||||||
|
@ -139,7 +139,7 @@ class xBoard(Cmd):
|
||||||
print(stderr, end='')
|
print(stderr, end='')
|
||||||
|
|
||||||
# power status
|
# power status
|
||||||
checkPower = sidefun.powerstatus(self.servers['server'][i], \
|
checkPower = utils.powerstatus(self.servers['server'][i], \
|
||||||
self.servers['user'][i], self.servers['password'][i], \
|
self.servers['user'][i], self.servers['password'][i], \
|
||||||
self.servers['port'][i])
|
self.servers['port'][i])
|
||||||
|
|
||||||
|
@ -184,7 +184,7 @@ class xBoard(Cmd):
|
||||||
confirm = input("Y/n: ")
|
confirm = input("Y/n: ")
|
||||||
if confirm is 'Y' or confirm is 'y':
|
if confirm is 'Y' or confirm is 'y':
|
||||||
for i in range(len(self.off['server'])):
|
for i in range(len(self.off['server'])):
|
||||||
sidefun.poweron(self.off['server'][i], \
|
utils.poweron(self.off['server'][i], \
|
||||||
self.off['user'][i], self.off['password'][i], \
|
self.off['user'][i], self.off['password'][i], \
|
||||||
self.off['port'][i])
|
self.off['port'][i])
|
||||||
|
|
||||||
|
@ -343,13 +343,13 @@ class xBoard(Cmd):
|
||||||
self.do_checkup(None)
|
self.do_checkup(None)
|
||||||
|
|
||||||
# List of servers from do_conn function
|
# List of servers from do_conn function
|
||||||
ssh = sidefun.connect(self.servers)
|
ssh = utils.connect(self.servers)
|
||||||
|
|
||||||
argv = options.split(' ')
|
argv = options.split(' ')
|
||||||
|
|
||||||
# If -f option is passed write to xboard.log and return
|
# If -f option is passed write to xboard.log and return
|
||||||
if argv[0] == '-f':
|
if argv[0] == '-f':
|
||||||
sidefun.filewrite('fans', ssh, self.servers)
|
utils.filewrite('fans', ssh, self.servers)
|
||||||
return
|
return
|
||||||
|
|
||||||
# If an unknown option is passed display an error message and
|
# If an unknown option is passed display an error message and
|
||||||
|
@ -381,13 +381,13 @@ class xBoard(Cmd):
|
||||||
self.do_checkup(None)
|
self.do_checkup(None)
|
||||||
|
|
||||||
# List of servers from do_conn function
|
# List of servers from do_conn function
|
||||||
ssh = sidefun.connect(self.servers)
|
ssh = utils.connect(self.servers)
|
||||||
|
|
||||||
argv = options.split(' ')
|
argv = options.split(' ')
|
||||||
|
|
||||||
# If -f option is passed write to xboard.log and return
|
# If -f option is passed write to xboard.log and return
|
||||||
if argv[0] == '-f':
|
if argv[0] == '-f':
|
||||||
sidefun.filewrite('led', ssh, self.servers)
|
utils.filewrite('led', ssh, self.servers)
|
||||||
return
|
return
|
||||||
|
|
||||||
# If an unknown option is passed display an error message and
|
# If an unknown option is passed display an error message and
|
||||||
|
@ -417,13 +417,13 @@ class xBoard(Cmd):
|
||||||
self.do_checkup(None)
|
self.do_checkup(None)
|
||||||
|
|
||||||
# List of servers from do_conn function
|
# List of servers from do_conn function
|
||||||
ssh = sidefun.connect(self.servers)
|
ssh = utils.connect(self.servers)
|
||||||
|
|
||||||
argv = options.split(' ')
|
argv = options.split(' ')
|
||||||
|
|
||||||
# If -f option is passed write to xboard.log and return
|
# If -f option is passed write to xboard.log and return
|
||||||
if argv[0] == '-f':
|
if argv[0] == '-f':
|
||||||
sidefun.filewrite('volts', ssh, self.servers)
|
utils.filewrite('volts', ssh, self.servers)
|
||||||
return
|
return
|
||||||
|
|
||||||
# If an unknown option is passed display an error message and
|
# If an unknown option is passed display an error message and
|
||||||
|
@ -453,13 +453,13 @@ class xBoard(Cmd):
|
||||||
self.do_checkup(None)
|
self.do_checkup(None)
|
||||||
|
|
||||||
# List of servers from do_conn function
|
# List of servers from do_conn function
|
||||||
ssh = sidefun.connect(self.servers)
|
ssh = utils.connect(self.servers)
|
||||||
|
|
||||||
argv = options.split(' ')
|
argv = options.split(' ')
|
||||||
|
|
||||||
# If -f option is passed write to xboard.log and return
|
# If -f option is passed write to xboard.log and return
|
||||||
if argv[0] == '-f':
|
if argv[0] == '-f':
|
||||||
sidefun.filewrite('temps', ssh, self.servers)
|
utils.filewrite('temps', ssh, self.servers)
|
||||||
return
|
return
|
||||||
|
|
||||||
# If an unknown option is passed display an error message and
|
# If an unknown option is passed display an error message and
|
||||||
|
@ -488,13 +488,13 @@ class xBoard(Cmd):
|
||||||
self.do_checkup(None)
|
self.do_checkup(None)
|
||||||
|
|
||||||
# List of servers from do_conn function
|
# List of servers from do_conn function
|
||||||
ssh = sidefun.connect(self.servers)
|
ssh = utils.connect(self.servers)
|
||||||
|
|
||||||
argv = options.split(' ')
|
argv = options.split(' ')
|
||||||
|
|
||||||
# If -f option is passed write to xboard.log and return
|
# If -f option is passed write to xboard.log and return
|
||||||
if argv[0] == '-f':
|
if argv[0] == '-f':
|
||||||
sidefun.filewrite('adapter', ssh, self.servers)
|
utils.filewrite('adapter', ssh, self.servers)
|
||||||
return
|
return
|
||||||
|
|
||||||
# If an unknown option is passed display an error message and
|
# If an unknown option is passed display an error message and
|
||||||
|
@ -523,13 +523,13 @@ class xBoard(Cmd):
|
||||||
self.do_checkup(None)
|
self.do_checkup(None)
|
||||||
|
|
||||||
# List of servers from do_conn function
|
# List of servers from do_conn function
|
||||||
ssh = sidefun.connect(self.servers)
|
ssh = utils.connect(self.servers)
|
||||||
|
|
||||||
argv = options.split(' ')
|
argv = options.split(' ')
|
||||||
|
|
||||||
# If -f option is passed write to xboard.log and return
|
# If -f option is passed write to xboard.log and return
|
||||||
if argv[0] == '-f':
|
if argv[0] == '-f':
|
||||||
sidefun.filewrite('fw', ssh, self.servers)
|
utils.filewrite('fw', ssh, self.servers)
|
||||||
return
|
return
|
||||||
|
|
||||||
# If an unknown option is passed display an error message and
|
# If an unknown option is passed display an error message and
|
||||||
|
@ -558,13 +558,13 @@ class xBoard(Cmd):
|
||||||
self.do_checkup(None)
|
self.do_checkup(None)
|
||||||
|
|
||||||
# List of servers from do_conn function
|
# List of servers from do_conn function
|
||||||
ssh = sidefun.connect(self.servers)
|
ssh = utils.connect(self.servers)
|
||||||
|
|
||||||
argv = options.split(' ')
|
argv = options.split(' ')
|
||||||
|
|
||||||
# If -f option is passed write to xboard.log and return
|
# If -f option is passed write to xboard.log and return
|
||||||
if argv[0] == '-f':
|
if argv[0] == '-f':
|
||||||
sidefun.filewrite('imm', ssh, self.servers)
|
utils.filewrite('imm', ssh, self.servers)
|
||||||
return
|
return
|
||||||
|
|
||||||
# If an unknown option is passed display an error message and
|
# If an unknown option is passed display an error message and
|
||||||
|
@ -593,13 +593,13 @@ class xBoard(Cmd):
|
||||||
self.do_checkup(None)
|
self.do_checkup(None)
|
||||||
|
|
||||||
# List of servers from do_conn function
|
# List of servers from do_conn function
|
||||||
ssh = sidefun.connect(self.servers)
|
ssh = utils.connect(self.servers)
|
||||||
|
|
||||||
argv = options.split(' ')
|
argv = options.split(' ')
|
||||||
|
|
||||||
# If -f option is passed write to xboard.log and return
|
# If -f option is passed write to xboard.log and return
|
||||||
if argv[0] == '-f':
|
if argv[0] == '-f':
|
||||||
sidefun.filewrite('sys', ssh, self.servers)
|
utils.filewrite('sys', ssh, self.servers)
|
||||||
return
|
return
|
||||||
|
|
||||||
# If an unknown option is passed display an error message and
|
# If an unknown option is passed display an error message and
|
||||||
|
@ -628,13 +628,13 @@ class xBoard(Cmd):
|
||||||
self.do_checkup(None)
|
self.do_checkup(None)
|
||||||
|
|
||||||
# List of servers from do_conn function
|
# List of servers from do_conn function
|
||||||
ssh = sidefun.connect(self.servers)
|
ssh = utils.connect(self.servers)
|
||||||
|
|
||||||
argv = options.split(' ')
|
argv = options.split(' ')
|
||||||
|
|
||||||
# If -f option is passed write to xboard.log and return
|
# If -f option is passed write to xboard.log and return
|
||||||
if argv[0] == '-f':
|
if argv[0] == '-f':
|
||||||
sidefun.filewrite('dns', ssh, self.servers)
|
utils.filewrite('dns', ssh, self.servers)
|
||||||
return
|
return
|
||||||
|
|
||||||
# If an unknown option is passed display an error message and
|
# If an unknown option is passed display an error message and
|
||||||
|
@ -663,13 +663,13 @@ class xBoard(Cmd):
|
||||||
self.do_checkup(None)
|
self.do_checkup(None)
|
||||||
|
|
||||||
# List of servers from do_conn function
|
# List of servers from do_conn function
|
||||||
ssh = sidefun.connect(self.servers)
|
ssh = utils.connect(self.servers)
|
||||||
|
|
||||||
argv = options.split(' ')
|
argv = options.split(' ')
|
||||||
|
|
||||||
# If -f option is passed write to xboard.log and return
|
# If -f option is passed write to xboard.log and return
|
||||||
if argv[0] == '-f':
|
if argv[0] == '-f':
|
||||||
sidefun.filewrite('ls_release -a', ssh, self.servers)
|
utils.filewrite('ls_release -a', ssh, self.servers)
|
||||||
return
|
return
|
||||||
|
|
||||||
# If an unknown option is passed display an error message and
|
# If an unknown option is passed display an error message and
|
||||||
|
@ -701,7 +701,7 @@ class xBoard(Cmd):
|
||||||
def do_export(self, inp):
|
def do_export(self, inp):
|
||||||
"""Export all data to a csv file. Run checkup first!!!"""
|
"""Export all data to a csv file. Run checkup first!!!"""
|
||||||
|
|
||||||
ssh = sidefun.connect(self.servers)
|
ssh = utils.connect(self.servers)
|
||||||
sshLength = len(ssh)
|
sshLength = len(ssh)
|
||||||
|
|
||||||
if os.path.isfile('./exported.csv'):
|
if os.path.isfile('./exported.csv'):
|
||||||
|
@ -717,7 +717,7 @@ class xBoard(Cmd):
|
||||||
csvline.append(str(i+1))
|
csvline.append(str(i+1))
|
||||||
|
|
||||||
# type
|
# type
|
||||||
type_model = sidefun.sys(self.servers['server'][i], \
|
type_model = utils.sys(self.servers['server'][i], \
|
||||||
self.servers['user'][i], self.servers['password'][i], \
|
self.servers['user'][i], self.servers['password'][i], \
|
||||||
self.servers['port'][i])
|
self.servers['port'][i])
|
||||||
csvline.append(type_model)
|
csvline.append(type_model)
|
||||||
|
@ -726,13 +726,13 @@ class xBoard(Cmd):
|
||||||
csvline.append(self.servers['server'][i])
|
csvline.append(self.servers['server'][i])
|
||||||
|
|
||||||
# power state
|
# power state
|
||||||
power = sidefun.powerstatus(self.servers['server'][i], \
|
power = utils.powerstatus(self.servers['server'][i], \
|
||||||
self.servers['user'][i], self.servers['password'][i], \
|
self.servers['user'][i], self.servers['password'][i], \
|
||||||
self.servers['port'][i])
|
self.servers['port'][i])
|
||||||
csvline.append(power.split()[1])
|
csvline.append(power.split()[1])
|
||||||
|
|
||||||
# firmware info
|
# firmware info
|
||||||
csvline.extend(sidefun.fw(self.servers['server'][i], \
|
csvline.extend(utils.fw(self.servers['server'][i], \
|
||||||
self.servers['user'][i], self.servers['password'][i], \
|
self.servers['user'][i], self.servers['password'][i], \
|
||||||
self.servers['port'][i]))
|
self.servers['port'][i]))
|
||||||
|
|
||||||
|
@ -786,7 +786,7 @@ class xBoard(Cmd):
|
||||||
if '-u' == inp:
|
if '-u' == inp:
|
||||||
print('\n')
|
print('\n')
|
||||||
for i in range(len(self.off['server'])):
|
for i in range(len(self.off['server'])):
|
||||||
sidefun.poweron(self.off['server'][i], \
|
utils.poweron(self.off['server'][i], \
|
||||||
self.off['user'][i], self.off['password'][i], \
|
self.off['user'][i], self.off['password'][i], \
|
||||||
self.off['port'][i])
|
self.off['port'][i])
|
||||||
|
|
||||||
|
@ -817,4 +817,3 @@ try:
|
||||||
except KeyboardInterrupt:
|
except KeyboardInterrupt:
|
||||||
xBoard().postloop()
|
xBoard().postloop()
|
||||||
print("\nExit..")
|
print("\nExit..")
|
||||||
sys.exit(0)
|
|
||||||
|
|
Loading…
Reference in New Issue