X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plc.py;h=11d6e6edc2d611465c9215877f0e02efdf953089;hb=11af2608a703224fe72ff6596a36412f68f8f6d8;hp=6e94fdcff5e973e68275c8deaa62a0713d3419ee;hpb=ff9c23acba65509c70860d225393a04eeb27d6b1;p=monitor.git diff --git a/plc.py b/plc.py index 6e94fdc..11d6e6e 100644 --- a/plc.py +++ b/plc.py @@ -10,20 +10,41 @@ import xml, xmlrpclib import logging -import auth import time -from config import config,XMLRPC_SERVER - +import traceback +try: + from config import config + config = config() + debug = config.debug +except: + debug = False logger = logging.getLogger("monitor") + +class Auth: + def __init__(self): + self.auth = {'AuthMethod': "anonymous"} -#XMLRPC_SERVER = config.XMLRPC_SERVER +# NOTE: this host is used by default when there are no auth files. +XMLRPC_SERVER="https://boot.planet-lab.org/PLCAPI/" -config = config() -api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False, allow_none=True) +# NOTE: by default, use anonymous access, but if auth files are +# configured, use them, with their auth definitions. +auth = Auth() +try: + import monitorconfig + auth.auth = {'Username' : monitorconfig.API_AUTH_USER, + 'AuthMethod' : 'password', + 'AuthString' : monitorconfig.API_AUTH_PASSWORD} + auth.server = monitorconfig.API_SERVER +except: + try: + import auth + auth.server = auth.plc + except: + auth = Auth() + auth.server = XMLRPC_SERVER -def getAPI(url): - api = xmlrpclib.Server(url, verbose=False, allow_none=True) - return api +api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True) class PLC: def __init__(self, auth, url): @@ -41,12 +62,18 @@ class PLC: def __repr__(self): return self.api.__repr__() +def getAPI(url): + return xmlrpclib.Server(url, verbose=False, allow_none=True) + +def getAuthAPI(): + return PLC(auth.auth, auth.server) + ''' Returns list of nodes in dbg as reported by PLC ''' def nodesDbg(): dbgNodes = [] - api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False) + api = xmlrpclib.Server(auth.server, verbose=False) anon = {'AuthMethod': "anonymous"} for node in api.GetNodes(anon, {"boot_state":"dbg"},["hostname"]): dbgNodes.append(node['hostname']) @@ -58,7 +85,7 @@ def nodesDbg(): Returns loginbase for given nodename ''' def siteId(nodename): - api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False) + api = xmlrpclib.Server(auth.server, verbose=False) anon = {'AuthMethod': "anonymous"} site_id = api.GetNodes (anon, {"hostname": nodename}, ['site_id']) if len(site_id) == 1: @@ -70,7 +97,7 @@ Returns list of slices for a site. ''' def slices(loginbase): siteslices = [] - api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False) + api = xmlrpclib.Server(auth.server, verbose=False) 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']) @@ -80,7 +107,7 @@ def slices(loginbase): Returns dict of PCU info of a given node. ''' def getpcu(nodename): - api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False) + api = xmlrpclib.Server(auth.server, verbose=False) anon = {'AuthMethod': "anonymous"} nodeinfo = api.GetNodes(auth.auth, {"hostname": nodename}, ["pcu_ids", "ports"])[0] if nodeinfo['pcu_ids']: @@ -92,7 +119,7 @@ def getpcu(nodename): return False def GetPCUs(filter=None, fields=None): - api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False, allow_none=True) + api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True) pcu_list = api.GetPCUs(auth.auth, filter, fields) return pcu_list @@ -100,7 +127,7 @@ def GetPCUs(filter=None, fields=None): Returns all site nodes for site id (loginbase). ''' def getSiteNodes(loginbase, fields=None): - api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False) + api = xmlrpclib.Server(auth.server, verbose=False) nodelist = [] anon = {'AuthMethod': "anonymous"} try: @@ -113,7 +140,7 @@ def getSiteNodes(loginbase, fields=None): return nodelist def getPersons(filter=None, fields=None): - api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False, allow_none=True) + api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True) persons = [] try: persons = api.GetPersons(auth.auth, filter, fields) @@ -123,18 +150,20 @@ def getPersons(filter=None, fields=None): return persons def getSites(filter=None, fields=None): - api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False, allow_none=True) + api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True) 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: + traceback.print_exc() print "getSites: %s" % exc logger.info("getSites: %s" % exc) return sites def getSiteNodes2(loginbase): - api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False) + api = xmlrpclib.Server(auth.server, verbose=False) nodelist = [] anon = {'AuthMethod': "anonymous"} try: @@ -145,12 +174,12 @@ def getSiteNodes2(loginbase): return nodelist def getNodeNetworks(filter=None): - api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False, allow_none=True) + api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True) nodenetworks = api.GetNodeNetworks(auth.auth, filter, None) return nodenetworks def getNodes(filter=None, fields=None): - api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False, allow_none=True) + 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', @@ -161,14 +190,14 @@ def getNodes(filter=None, fields=None): Sets boot state of a node. ''' def nodeBootState(nodename, state): - api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False) + api = xmlrpclib.Server(auth.server, verbose=False) try: return api.UpdateNode(auth.auth, nodename, {'boot_state': state}) except Exception, exc: logger.info("nodeBootState: %s" % exc) def updateNodeKey(nodename, key): - api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False) + api = xmlrpclib.Server(auth.server, verbose=False) try: return api.UpdateNode(auth.auth, nodename, {'key': key}) except Exception, exc: @@ -178,10 +207,10 @@ def updateNodeKey(nodename, key): Sends Ping Of Death to node. ''' def nodePOD(nodename): - api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False) + api = xmlrpclib.Server(auth.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) @@ -190,21 +219,21 @@ def nodePOD(nodename): Freeze all site slices. ''' def suspendSlices(nodename): - api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False) + api = xmlrpclib.Server(auth.server, verbose=False) 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) def enableSlices(nodename): - api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False, allow_none=True) + api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True) 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 @@ -223,17 +252,17 @@ def enableSlices(nodename): #Enable suspended site slices. #''' #def enableSlices(nodename, slicelist): -# api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False) +# api = xmlrpclib.Server(auth.server, verbose=False) # for slice in slices(siteId(nodename)): # logger.info("Suspending slice %s" % slice) # api.SliceAttributeAdd(auth.auth, slice, "plc_slice_state", {"state" : "suspended"}) # def enableSliceCreation(nodename): - api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False, allow_none=True) + api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True) 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 +273,14 @@ def enableSliceCreation(nodename): Removes ability to create slices. Returns previous max_slices ''' def removeSliceCreation(nodename): - api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False) + print "removeSliceCreation(%s)" % nodename + api = xmlrpclib.Server(auth.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: @@ -260,13 +290,13 @@ def removeSliceCreation(nodename): QED ''' #def enableSliceCreation(nodename, maxslices): -# api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False) +# api = xmlrpclib.Server(auth.server, verbose=False) # anon = {'AuthMethod': "anonymous"} # siteid = api.AnonAdmQuerySite (anon, {"node_hostname": nodename}) # 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) @@ -294,5 +324,4 @@ def main(): #print slices("princeton") if __name__=="__main__": - import reboot main()