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 6e94fdc..f609abb 100644 (file)
--- a/plc.py
+++ b/plc.py
@@ -10,15 +10,26 @@
 
 import xml, xmlrpclib
 import logging
-import auth
+try:
+    import auth
+except:
+       class Anon:
+               def __init__(self):
+                       self.auth = {'AuthMethod': "anonymous"}
+       auth = Anon()
+
 import time
-from config import config,XMLRPC_SERVER
+try:
+       from config import config
+       config = config()
+       debug = config.debug
+except:
+       debug = False
+       
+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):
@@ -41,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
 '''
@@ -127,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
@@ -181,7 +199,7 @@ def nodePOD(nodename):
        api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False)
        logger.info("Sending POD to %s" % nodename)
        try:
-               if not config.debug:
+               if not debug:
                        return api.RebootNode(auth.auth, nodename)
        except Exception, exc:
                        logger.info("nodePOD:  %s" % exc)
@@ -194,7 +212,7 @@ def suspendSlices(nodename):
        for slice in slices(siteId(nodename)):
                logger.info("Suspending slice %s" % slice)
                try:
-                       if not config.debug:
+                       if not debug:
                                api.AddSliceAttribute(auth.auth, slice, "enabled", "0")
                except Exception, exc:
                        logger.info("suspendSlices:  %s" % exc)
@@ -204,7 +222,7 @@ def enableSlices(nodename):
        for slice in slices(siteId(nodename)):
                logger.info("Enabling slices %s" % slice)
                try:
-                       if not config.debug:
+                       if not debug:
                                slice_list = api.GetSlices(auth.auth, {'name': slice}, None)
                                if len(slice_list) == 0:
                                        return
@@ -233,7 +251,7 @@ def enableSliceCreation(nodename):
        try:
                loginbase = siteId(nodename)
                logger.info("Enabling slice creation for site %s" % loginbase)
-               if not config.debug:
+               if not debug:
                        logger.info("\tcalling UpdateSite(%s, enabled=True)" % loginbase)
                        api.UpdateSite(auth.auth, loginbase, {'enabled': True})
        except Exception, exc:
@@ -244,13 +262,14 @@ 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)
                #numslices = api.GetSites(auth.auth, {"login_base": loginbase}, 
                #               ["max_slices"])[0]['max_slices']
                logger.info("Removing slice creation for site %s" % loginbase)
-               if not config.debug:
+               if not debug:
                        #api.UpdateSite(auth.auth, loginbase, {'max_slices': 0})
                        api.UpdateSite(auth.auth, loginbase, {'enabled': False})
        except Exception, exc:
@@ -266,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)