X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plc.py;h=5be15c8ea808d9584f036397a47be293a28e463a;hb=refs%2Fheads%2F1.0;hp=db14f503a76330e9470aa395224d7cd10c245d26;hpb=5ff2eaddf7644ac7ffddfe536ba9e50aa7529273;p=monitor.git

diff --git a/plc.py b/plc.py
index db14f50..5be15c8 100644
--- a/plc.py
+++ b/plc.py
@@ -45,6 +45,8 @@ except:
 
 api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
 
+global_error_count = 0
+
 class PLC:
 	def __init__(self, auth, url):
 		self.auth = auth
@@ -56,7 +58,17 @@ class PLC:
 		if method is None:
 			raise AssertionError("method does not exist")
 
-		return lambda *params : method(self.auth, *params)
+		try:
+			return lambda *params : method(self.auth, *params)
+		except ProtocolError:
+			traceback.print_exc()
+			global_error_count += 1
+			if global_error_count >= 10:
+				print "maximum error count exceeded; exiting..."
+				sys.exit(1)
+			else:
+				print "%s errors have occurred" % global_error_count
+			raise Exception("ProtocolError continuing")
 
 	def __repr__(self):
 		return self.api.__repr__()
@@ -76,7 +88,7 @@ def getTechEmails(loginbase):
 	# get site details.
 	s = api.GetSites(loginbase)[0]
 	# get people at site
-	p = api.GetPersons(s['person_ids'])[0]
+	p = api.GetPersons(s['person_ids'])
 	# pull out those with the right role.
 	emails = [ person['email'] for person in filter(lambda x: 'tech' in x['roles'], p) ]
 	return emails
@@ -89,7 +101,7 @@ def getPIEmails(loginbase):
 	# get site details.
 	s = api.GetSites(loginbase)[0]
 	# get people at site
-	p = api.GetPersons(s['person_ids'])[0]
+	p = api.GetPersons(s['person_ids'])
 	# pull out those with the right role.
 	emails = [ person['email'] for person in filter(lambda x: 'pi' in x['roles'], p) ]
 	return emails
@@ -98,7 +110,7 @@ def getSliceUserEmails(loginbase):
 	"""
 		For the given site, return all user email addresses that have the 'tech' role.
 	"""
-	#api = getAuthAPI()
+	api = getAuthAPI()
 	# get site details.
 	s = api.GetSites(loginbase)[0]
 	# get people at site
@@ -128,19 +140,20 @@ def nodesDbg():
 Returns loginbase for given nodename
 '''
 def siteId(nodename):
-	api = xmlrpclib.Server(auth.server, verbose=False)
-	anon = {'AuthMethod': "anonymous"}
-	site_id = api.GetNodes (anon, {"hostname": nodename}, ['site_id'])
+	api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
+	site_id = api.GetNodes (auth.auth, {"hostname": nodename}, ['site_id'])
 	if len(site_id) == 1:
-		loginbase = api.GetSites (anon, site_id[0], ["login_base"])
+		loginbase = api.GetSites (auth.auth, site_id[0], ["login_base"])
 		return loginbase[0]['login_base']
+	else:
+		print "Not nodes returned!!!!"
 
 '''
 Returns list of slices for a site.
 '''
 def slices(loginbase):
 	siteslices = []
-	api = xmlrpclib.Server(auth.server, verbose=False)
+	api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
 	sliceids = api.GetSites (auth.auth, {"login_base" : loginbase}, ["slice_ids"])[0]['slice_ids']
 	for slice in api.GetSlices(auth.auth, {"slice_id" : sliceids}, ["name"]):
 		siteslices.append(slice['name'])
@@ -150,7 +163,7 @@ def slices(loginbase):
 Returns dict of PCU info of a given node.
 '''
 def getpcu(nodename):
-	api = xmlrpclib.Server(auth.server, verbose=False)
+	api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
 	anon = {'AuthMethod': "anonymous"}
 	nodeinfo = api.GetNodes(auth.auth, {"hostname": nodename}, ["pcu_ids", "ports"])[0]
 	if nodeinfo['pcu_ids']:
@@ -219,14 +232,14 @@ def getSiteNodes2(loginbase):
 
 def getNodeNetworks(filter=None):
 	api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
-	nodenetworks = api.GetNodeNetworks(auth.auth, filter, None)
+	nodenetworks = api.GetInterfaces(auth.auth, filter, None)
 	return nodenetworks
 
 def getNodes(filter=None, fields=None):
 	api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True)
 	nodes = api.GetNodes(auth.auth, filter, fields) 
 			#['boot_state', 'hostname', 
-			#'site_id', 'date_created', 'node_id', 'version', 'nodenetwork_ids',
+			#'site_id', 'date_created', 'node_id', 'version', 'interface_ids',
 			#'last_updated', 'peer_node_id', 'ssh_rsa_key' ])
 	return nodes