tweaks

diff --git a/getsshkeys.py b/getsshkeys.py
index eee1fdc..95df2e6 100755 (executable)
--- a/getsshkeys.py
+++ b/getsshkeys.py
@@ -5,6 +5,15 @@ import sys
 import string
 import time
 import xml, xmlrpclib
 import string
 import time
 import xml, xmlrpclib

+try:
+       import monitorconfig
+       auth = {'Username'   : monitorconfig.API_AUTH_USER,
+               'AuthMethod' : "password",
+                       'AuthString' : monitorconfig.API_AUTH_PASSWORD}
+except:
+       import traceback
+       print traceback.print_exc()
+       auth = {'AuthMethod' : "anonymous"}

 
 args = {}
 args['known_hosts'] =  os.environ['HOME'] + os.sep + ".ssh" + os.sep + "known_hosts"
 
 args = {}
 args['known_hosts'] =  os.environ['HOME'] + os.sep + ".ssh" + os.sep + "known_hosts"


@@ -14,8 +23,7 @@ class SSHKnownHosts:
        def __init__(self, args = args):
                self.args = args
                self.read_knownhosts()
        def __init__(self, args = args):
                self.args = args
                self.read_knownhosts()

-               self.auth = {}
-               self.auth['AuthMethod'] = "anonymous"
+               self.auth = auth

                self.api = xmlrpclib.Server(args['XMLRPC_SERVER'], verbose=False, allow_none=True)
                self.nodenetworks = {}
 
                self.api = xmlrpclib.Server(args['XMLRPC_SERVER'], verbose=False, allow_none=True)
                self.nodenetworks = {}
 

diff --git a/nagios/plc2nagios.py b/nagios/plc2nagios.py
index b5023f2..d7da592 100755 (executable)
--- a/nagios/plc2nagios.py
+++ b/nagios/plc2nagios.py
@@ -1,7 +1,6 @@
 #!/usr/bin/python
 
 #!/usr/bin/python
 

-import soltesz
-import plc
+import database

 
 class NagiosObject(object):
        trans = {'d2_coords': '2d_coords'}
 
 class NagiosObject(object):
        trans = {'d2_coords': '2d_coords'}


@@ -69,9 +68,9 @@ globalhost = [Host(   name="planetlab-host",
 for obj in globalhost + globalservices:
        print obj.toString()
 
 for obj in globalhost + globalservices:
        print obj.toString()
 

-plcdb = soltesz.dbLoad("l_plcsites")
-netid2ip = soltesz.dbLoad("plcdb_netid2ip")
-lb2hn = soltesz.dbLoad("plcdb_lb2hn")
+plcdb = database.dbLoad("l_plcsites")
+netid2ip = database.dbLoad("plcdb_netid2ip")
+lb2hn = database.dbLoad("plcdb_lb2hn")

 
 for site in plcdb:
        shortname = site['abbreviated_name']
 
 for site in plcdb:
        shortname = site['abbreviated_name']


@@ -87,7 +86,7 @@ for site in plcdb:
                lat_y = int(180 - (lat + 90)) * scale
 
        if site['login_base'] in lb2hn:
                lat_y = int(180 - (lat + 90)) * scale
 
        if site['login_base'] in lb2hn:

-               nodes = lb2hn[site['login_base']] # plc.getSiteNodes2(site['login_base'])
+               nodes = lb2hn[site['login_base']]

        else:
                continue
 
        else:
                continue
 

diff --git a/siteleave.py b/siteleave.py
index f42e9ed..079ed8a 100755 (executable)
--- a/siteleave.py
+++ b/siteleave.py
@@ -29,4 +29,5 @@ for loginbase in sys.argv[1:]:
 
        date = time.strftime("%Y/%m/%d", time.gmtime(time.time()))
 
 
        date = time.strftime("%Y/%m/%d", time.gmtime(time.time()))
 

-       print "%s : %s : %s : %s" % (loginbase, date, name, site[0]['ext_consortium_id'])
+       print "loginbase :   date     : name                                            : ext_consortium_id"
+       print "%9s : %10s : %s : %s" % (loginbase, date, name, site[0]['ext_consortium_id'])