X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fwrapper%2Fplc.py;h=6dc5a286dfee30692415ec0575e5da00a3d63ab9;hb=c5e5127b4991493cd9cd9674664e957d8ffecad2;hp=2f0f19daa63efd4fee8a116aaee9d96738f387f0;hpb=c9d06f3b274ecbc092a0b3eb1f5ceb6c0f734aad;p=monitor.git

diff --git a/monitor/wrapper/plc.py b/monitor/wrapper/plc.py
index 2f0f19d..6dc5a28 100644
--- a/monitor/wrapper/plc.py
+++ b/monitor/wrapper/plc.py
@@ -146,6 +146,13 @@ def getAuthAPI():
 def getCachedAuthAPI():
 	return CachedPLC(auth.auth, auth.server)
 
+def getSessionAPI(session, server):
+	nodeauth = Auth(session=session)
+	return PLC(nodeauth.auth, server)
+def getUserAPI(username, password, server):
+	auth = Auth(username,password)
+	return PLC(auth.auth, server)
+
 def getTechEmails(loginbase):
 	"""
 		For the given site, return all user email addresses that have the 'tech' role.
@@ -301,14 +308,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