a key for the monitor user.

[monitor.git] / plc.py

diff --git a/plc.py b/plc.py
index b804364..ae0ddac 100644 (file)
--- a/plc.py
+++ b/plc.py
@@ -5,10 +5,9 @@
 # 
 # Faiyaz Ahmed <faiyaza@cs.princeton.edu
 #
-# $Id: plc.py,v 1.17 2007/08/08 13:28:55 soltesz Exp $
+# $Id: plc.py,v 1.18 2007/08/29 17:26:50 soltesz Exp $
 #
 
-from emailTxt import *
 import xml, xmlrpclib
 import logging
 import auth
@@ -73,8 +72,8 @@ def getpcu(nodename):
 
 def GetPCUs(filter=None, fields=None):
        api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False, allow_none=True)
-       sitepcu = api.GetPCUs(auth.auth, filter, fields)
-       return sitepcu
+       pcu_list = api.GetPCUs(auth.auth, filter, fields)
+       return pcu_list 
 
 '''
 Returns all site nodes for site id (loginbase).
@@ -91,6 +90,16 @@ def getSiteNodes(loginbase, fields=None):
                logger.info("getSiteNodes:  %s" % exc)
        return nodelist
 
+def getPersons(filter=None, fields=None):
+       api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False, allow_none=True)
+       persons = []
+       try:
+               persons = api.GetPersons(auth.auth, filter, fields)
+       except Exception, exc:
+               print "getPersons:  %s" % exc
+               logger.info("getPersons:  %s" % exc)
+       return persons
+
 def getSites(filter=None, fields=None):
        api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False, allow_none=True)
        sites = []