X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=monitor%2Fwrapper%2Fplc.py;h=76db7d8699dd6052d43930d2b8f621d2550fa8fb;hb=0fabfc8dbe8f1f2c0d12397e1bc8c6ed686fb5ed;hp=63f17a4e6fe42c852ab7c3871088efc2fa51c164;hpb=6f2351e4b44590221425fa9b4bfa77c92db49b6a;p=monitor.git

diff --git a/monitor/wrapper/plc.py b/monitor/wrapper/plc.py
index 63f17a4..76db7d8 100644
--- a/monitor/wrapper/plc.py
+++ b/monitor/wrapper/plc.py
@@ -122,7 +122,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
@@ -135,7 +135,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
@@ -174,19 +174,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'])
@@ -196,7 +197,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']: