git://git.onelab.eu
/
monitor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
just commit everything...
[monitor.git]
/
siteinfo.py
diff --git
a/siteinfo.py
b/siteinfo.py
index
d248b99
..
e9dc9d5
100755
(executable)
--- a/
siteinfo.py
+++ b/
siteinfo.py
@@
-1,8
+1,7
@@
#!/usr/bin/python
import plc
#!/usr/bin/python
import plc
-import auth
-api = plc.PLC(auth.auth, auth.plc)
+api = plc.getAuthAPI()
import database
import reboot
import database
import reboot
@@
-11,12
+10,12
@@
import time
from model import *
from nodecommon import *
from model import *
from nodecommon import *
-import
config as configmodu
le
+import
util.fi
le
-from config import config as cfg
-from optparse import OptionParser
+import parser as parsermodule
-parser = OptionParser()
+
+parser = parsermodule.getParser()
parser.set_defaults(site=None,
findbad=False,
enable=False,
parser.set_defaults(site=None,
findbad=False,
enable=False,
@@
-30,8
+29,7
@@
parser.add_option("", "--enable", dest="enable", action="store_true",
help="")
parser.add_option("", "--disable", dest="disable", action="store_true",
help="")
help="")
parser.add_option("", "--disable", dest="disable", action="store_true",
help="")
-config = cfg(parser)
-config.parse_args()
+config = parsermodule.parse_args(parser)
from unified_model import *
def color_sitestatus(status):
from unified_model import *
def color_sitestatus(status):
@@
-95,7
+93,7
@@
for site in config.args:
file = "findbad.txt"
nodes = api.GetNodes(plc_siteinfo['node_ids'], ['hostname'])
nodes = [ n['hostname'] for n in nodes ]
file = "findbad.txt"
nodes = api.GetNodes(plc_siteinfo['node_ids'], ['hostname'])
nodes = [ n['hostname'] for n in nodes ]
-
configmodu
le.setFileFromList(file, nodes)
+
util.fi
le.setFileFromList(file, nodes)
os.system("./findbad.py --cachenodes --debug=0 --dbname=findbad --increment --nodelist %s" % file)
print "%(login_base)s %(url)s" % plc_siteinfo
os.system("./findbad.py --cachenodes --debug=0 --dbname=findbad --increment --nodelist %s" % file)
print "%(login_base)s %(url)s" % plc_siteinfo