renamed from 'soltesz' to reflect it's function and content. Should be able

[monitor.git] / plc.py

diff --git a/plc.py b/plc.py
index 5bc5349..f609abb 100644 (file)
--- a/plc.py
+++ b/plc.py
@@ -21,6 +21,7 @@ except:
 import time
 try:
        from config import config
+       config = config()
        debug = config.debug
 except:
        debug = False
@@ -29,9 +30,6 @@ XMLRPC_SERVER="https://boot.planet-lab.org/PLCAPI/"
 
 logger = logging.getLogger("monitor")
 
-#XMLRPC_SERVER = config.XMLRPC_SERVER
-
-config = config()
 api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False, allow_none=True)
 
 def getAPI(url):
@@ -54,6 +52,10 @@ class PLC:
        def __repr__(self):
                return self.api.__repr__()
 
+def getAuthAPI():
+       import auth
+       return PLC(auth.auth, auth.plc)
+
 '''
 Returns list of nodes in dbg as reported by PLC
 '''
@@ -140,8 +142,11 @@ def getSites(filter=None, fields=None):
        sites = []
        anon = {'AuthMethod': "anonymous"}
        try:
-               sites = api.GetSites(anon, filter, fields)
+               #sites = api.GetSites(anon, filter, fields)
+               sites = api.GetSites(auth.auth, filter, fields)
        except Exception, exc:
+               import traceback
+               traceback.print_exc()
                print "getSites:  %s" % exc
                logger.info("getSites:  %s" % exc)
        return sites
@@ -257,6 +262,7 @@ def enableSliceCreation(nodename):
 Removes ability to create slices. Returns previous max_slices
 '''
 def removeSliceCreation(nodename):
+       print "removeSliceCreation(%s)" % nodename
        api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False)
        try:
                loginbase = siteId(nodename)
@@ -279,7 +285,7 @@ QED
 #      if len(siteid) == 1:
 #              logger.info("Enabling slice creation for site %s" % siteId(nodename))
 #              try:
-#                      if not config.debug:
+#                      if not debug:
 #                              api.AdmUpdateSite(auth.auth, siteid[0], {"max_slices" : maxslices})
 #              except Exception, exc:
 #                      logger.info("API:  %s" % exc)