X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=getsshkeys.py;h=eae58835aeb5098fa46ef4f2329e34682504ee86;hb=refs%2Fheads%2F1.0;hp=fc306e4f829e3c109d0078ebff9296c20bee2f87;hpb=f38420ff4bc9fb114db5f62b01cc8990dc0a0af2;p=monitor.git

diff --git a/getsshkeys.py b/getsshkeys.py
index fc306e4..eae5883 100755
--- a/getsshkeys.py
+++ b/getsshkeys.py
@@ -5,17 +5,30 @@ import sys
 import string
 import time
 import xml, xmlrpclib
+try:
+	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:
+	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 = {}
 
@@ -122,27 +135,27 @@ class SSHKnownHosts:
 		if type(host) == type(""): host = [host]
 
 		# get the node(s) info
-		nodes = self.api.GetNodes(self.auth,host,["hostname","ssh_rsa_key","nodenetwork_ids"])
+		nodes = self.api.GetNodes(self.auth,host,["hostname","ssh_rsa_key","interface_ids"])
 
 		# for each node's node network, update the self.nodenetworks cache
 		nodenetworks = []
 		for node in nodes:
-			for net in node["nodenetwork_ids"]:
+			for net in node["interface_ids"]:
 				nodenetworks.append(net)
 
-		plcnodenetworks = self.api.GetNodeNetworks(self.auth,nodenetworks,["nodenetwork_id","ip"])
+		plcnodenetworks = self.api.GetInterfaces(self.auth,nodenetworks,["interface_id","ip"])
 		for n in plcnodenetworks:
-			self.nodenetworks[n["nodenetwork_id"]]=n
+			self.nodenetworks[n["interface_id"]]=n
 		return nodes
 
 	def _record_from_node(self, node, nokey_list=None):
 		host = node['hostname']
 		key = node['ssh_rsa_key']
 
-		nodenetworks = node['nodenetwork_ids']
+		nodenetworks = node['interface_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)
@@ -154,7 +167,7 @@ class SSHKnownHosts:
 
 		key = key.strip()
 		# TODO: check for '==' at end of key.
-		if key[-1] != '=':
+		if len(key) > 0 and key[-1] != '=':
 			print "Host with corrupt key! for %s %s" % (node['boot_state'], node['hostname'])
 
 		s_date = time.strftime("%Y/%m/%d_%H:%M:%S",time.gmtime(time.time()))