X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sm.py;h=d3812fc2abbd11e34c0c70180abdb4f7f2e12254;hb=e9bcfa27a1da64878f80b8b010d3f8ae71194992;hp=2d1f288472dcb69fa618e261e37718e26e726ec6;hpb=1b64fd5ba728875d918f80a79406ea7851de464d;p=nodemanager.git diff --git a/sm.py b/sm.py index 2d1f288..d3812fc 100644 --- a/sm.py +++ b/sm.py @@ -7,7 +7,7 @@ also to make inter-sliver resource loans. The sliver manager is also responsible for handling delegation accounts. """ -# $Id$ +# $Id: sm.py,v 1.25 2007/07/20 19:35:29 faiyaza Exp $ try: from bwlimit import bwmin, bwmax except ImportError: bwmin, bwmax = 8, 1000*1000*1000 @@ -22,7 +22,6 @@ import string,re DEFAULT_ALLOCATION = { 'enabled': 1, - 'whitelist': 1, # CPU parameters 'cpu_min': 0, # ms/s 'cpu_share': 32, # proportional share @@ -51,49 +50,6 @@ DEFAULT_ALLOCATION = { start_requested = False # set to True in order to request that all slivers be started - -def whitelistfilter(): - """creates a regex (re) object based on the slice definitions - in /etc/planetlab/whitelist""" - - whitelist = [] - whitelist_re = re.compile("([a-zA-Z0-9\*]+)_([a-zA-Z0-9\*]+)") - linecount = 0 - try: - f = open('/etc/planetlab/whitelist') - for line in f.readlines(): - linecount = linecount+1 - line = line.strip() - # skip comments - if len(line)>0 and line[0]=='#': - continue - m = whitelist_re.search(line) - if m == None: - logger.log("skipping line #%d in /etc/planetlab/whitelist" % linecount) - continue - else: - whitelist.append(m.group()) - f.close() - except IOError,e: - logger.log("IOError -> %s" % e) - logger.log("No whitelist file found; setting slice white list to *_*") - whitelist = ["*_*"] - - white_re_list = None - for w in whitelist: - w = string.replace(w,'*','([a-zA-Z0-9]+)') - if white_re_list == None: - white_re_list = w - else: - white_re_list = "(%s)|(%s)" % (white_re_list,w) - - if white_re_list == None: - white_re_list = "([a-zA-Z0-9]+)_([a-zA-Z0-9]+)" - - logger.log("whitelist regex = %s" % white_re_list) - whitelist_re = re.compile(white_re_list) - return whitelist_re - @database.synchronized def GetSlivers(data, fullupdate=True): """This function has two purposes. One, convert GetSlivers() data @@ -132,9 +88,6 @@ def GetSlivers(data, fullupdate=True): for is_rec in data['initscripts']: initscripts_by_id[str(is_rec['initscript_id'])] = is_rec['script'] - # remove slivers not on the whitelist - whitelist_regex = whitelistfilter() - for sliver in data['slivers']: rec = sliver.copy() rec.setdefault('timestamp', data['timestamp']) @@ -175,12 +128,6 @@ def GetSlivers(data, fullupdate=True): amt = default_amt rspec[resname] = amt - # disable sliver - m = whitelist_regex.search(sliver['name']) - if m == None: - rspec['whitelist'] = 0 - rspec['enabled'] = 0 - database.db.deliver_record(rec) if fullupdate: database.db.set_min_timestamp(data['timestamp']) database.db.sync()