X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=monitor%2Fwrapper%2Fplc.py;h=7d9af2db90d80e53be55a15f082d7afa9d52ef2c;hb=4cb4cb9e9231a1a0b6d837098f83086d6aabf547;hp=2f0f19daa63efd4fee8a116aaee9d96738f387f0;hpb=c9d06f3b274ecbc092a0b3eb1f5ceb6c0f734aad;p=monitor.git diff --git a/monitor/wrapper/plc.py b/monitor/wrapper/plc.py index 2f0f19d..7d9af2d 100644 --- a/monitor/wrapper/plc.py +++ b/monitor/wrapper/plc.py @@ -14,6 +14,9 @@ import time import traceback from monitor import database +PENDING_CONSORTIUM_ID = 0 +APPROVED_CONSORTIUM_ID = 999999 + try: from monitor import config debug = config.debug @@ -71,7 +74,7 @@ class PLC: try: return lambda *params : method(self.auth, *params) - except ProtocolError: + except xmlrpclib.ProtocolError: traceback.print_exc() global_error_count += 1 if global_error_count >= 10: @@ -84,7 +87,6 @@ class PLC: def __repr__(self): return self.api.__repr__() -api = PLC(auth.auth, auth.server) class CachedPLC(PLC): @@ -117,12 +119,12 @@ class CachedPLC(PLC): except: print "Call %s FAILED: Using old cached data" % cachename load_old_cache = True - + if load_old_cache: values = database.dbLoad(cachename) else: database.dbDump(cachename, values) - + return values else: values = database.dbLoad(cachename) @@ -132,6 +134,9 @@ class CachedPLC(PLC): return run_or_returncached +api = PLC(auth.auth, auth.server) +cacheapi = CachedPLC(auth.auth, auth.server) + def getAPI(url): return xmlrpclib.Server(url, verbose=False, allow_none=True) @@ -140,12 +145,22 @@ def getNodeAPI(session): nodeauth = Auth(session=session) return PLC(nodeauth.auth, auth.server) -def getAuthAPI(): - return PLC(auth.auth, auth.server) +def getAuthAPI(url=None): + if url: + return PLC(auth.auth, url) + else: + return PLC(auth.auth, auth.server) 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,17 +316,33 @@ 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 + +# Check if the site is a pending site that needs to be approved. +def isPendingSite(loginbase): + api = xmlrpclib.Server(auth.server, verbose=False) + try: + site = api.GetSites(auth.auth, loginbase)[0] + except Exception, exc: + login.info("ERROR: No site %s" % loginbase) + return False + + if not site['enabled'] and site['ext_consortium_id'] == PENDING_CONSORTIUM_ID: + return True + + return False + + ''' Sets boot state of a node. ''' @@ -388,6 +419,7 @@ def enableSiteSlices(loginbase): def enableSlices(nodename): api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True) + for slice in slices(siteId(nodename)): logger.info("Enabling slices %s" % slice) try: @@ -405,6 +437,7 @@ def enableSlices(nodename): logger.info("enableSlices: %s" % exc) print "exception: %s" % exc + #I'm commenting this because this really should be a manual process. #''' #Enable suspended site slices. @@ -416,6 +449,12 @@ def enableSlices(nodename): # api.SliceAttributeAdd(auth.auth, slice, "plc_slice_state", {"state" : "suspended"}) # def enableSiteSliceCreation(loginbase): + if isPendingSite(loginbase): + msg = "INFO: enableSiteSliceCreation: Pending Site (%s)" % loginbase + print msg + logger.info(msg) + return + api = xmlrpclib.Server(auth.server, verbose=False, allow_none=True) try: logger.info("Enabling slice creation for site %s" % loginbase) @@ -430,10 +469,7 @@ def enableSliceCreation(nodename): 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 debug: - logger.info("\tcalling UpdateSite(%s, enabled=True)" % loginbase) - api.UpdateSite(auth.auth, loginbase, {'enabled': True}) + enableSiteSliceCreation(loginbase) except Exception, exc: print "ERROR: enableSliceCreation: %s" % exc logger.info("ERROR: enableSliceCreation: %s" % exc) @@ -441,13 +477,20 @@ def enableSliceCreation(nodename): ''' Removes site's ability to create slices. Returns previous max_slices ''' -def removeSiteSliceCreation(sitename): - print "removeSiteSliceCreation(%s)" % sitename +def removeSiteSliceCreation(loginbase): + print "removeSiteSliceCreation(%s)" % loginbase + + if isPendingSite(loginbase): + msg = "INFO: removeSiteSliceCreation: Pending Site (%s)" % loginbase + print msg + logger.info(msg) + return + api = xmlrpclib.Server(auth.server, verbose=False) try: - logger.info("Removing slice creation for site %s" % sitename) + logger.info("Removing slice creation for site %s" % loginbase) if not debug: - api.UpdateSite(auth.auth, sitename, {'enabled': False}) + api.UpdateSite(auth.auth, loginbase, {'enabled': False}) except Exception, exc: logger.info("removeSiteSliceCreation: %s" % exc) @@ -459,12 +502,7 @@ def removeSliceCreation(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 debug: - #api.UpdateSite(auth.auth, loginbase, {'max_slices': 0}) - api.UpdateSite(auth.auth, loginbase, {'enabled': False}) + removeSiteSliceCreation(loginbase) except Exception, exc: logger.info("removeSliceCreation: %s" % exc)