X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=getsshkeys.py;h=fb4c2a7a4c77b1a3e6958e4fd966fdbbb20ef17f;hb=7f16b4c8e96688b16152b62ec1012ab5bf29d95d;hp=0819abeeddb003f4e5df3406f90cc9b47fef58b4;hpb=77f84f1e8242cdc45eb091ab65eef940a23493a6;p=monitor.git

diff --git a/getsshkeys.py b/getsshkeys.py
index 0819abe..fb4c2a7 100755
--- a/getsshkeys.py
+++ b/getsshkeys.py
@@ -5,17 +5,30 @@ import sys
 import string
 import time
 import xml, xmlrpclib
+try:
+	from monitor import config
+	auth = {'Username'   : config.API_AUTH_USER,
+	        'AuthMethod' : "password",
+			'AuthString' : config.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['XMLRPC_SERVER'] = 'https://www.planet-lab.org/PLCAPI/'
+try:
+	from monitor import config
+	args['XMLRPC_SERVER'] = config.API_SERVER
+except:
+	args['XMLRPC_SERVER'] = 'https://boot.planet-lab.org/PLCAPI/'
+	print "Using default API server %s" %  args['XMLRPC_SERVER']
 
 class SSHKnownHosts:
 	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 = {}
 
@@ -142,7 +155,7 @@ class SSHKnownHosts:
 		nodenetworks = node['nodenetwork_ids']
 		if len(nodenetworks)==0: return (host, None, None, None)
 
-		# the [0] subscript to node['nodenetwork_ids'] means
+		# the [0] subscript to node['interface_ids'] means
 		# that this function wont work with multihomed nodes
 		l_nw = self.nodenetworks.get(nodenetworks[0],None)
 		if l_nw is None: return (host, None, None, None)