X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sm.py;h=3acce630787c07419641f4a0d6c4161160acd5d3;hb=a526d7fa0e3359e63b70f6a0a5bc35e210f6a4f6;hp=e159213e8fc8d6dc463bda79af7e037c0a43344b;hpb=7cea44a7c00223a0fe229e34f58a79db9b4ccbec;p=nodemanager.git

diff --git a/sm.py b/sm.py
index e159213..3acce63 100644
--- a/sm.py
+++ b/sm.py
@@ -7,6 +7,8 @@ also to make inter-sliver resource loans.  The sliver manager is also
 responsible for handling delegation accounts.
 """
 
+# $Id: sm.py,v 1.27 2007/07/24 15:59:04 dhozac Exp $
+
 try: from bwlimit import bwmin, bwmax
 except ImportError: bwmin, bwmax = 8, 1000*1000*1000
 import accounts
@@ -20,7 +22,6 @@ import string,re
 
 DEFAULT_ALLOCATION = {
     'enabled': 1,
-    'whitelist': 1,
     # CPU parameters
     'cpu_min': 0, # ms/s
     'cpu_share': 32, # proportional share
@@ -38,6 +39,10 @@ DEFAULT_ALLOCATION = {
     'net_i2_thresh_kbyte': 13757316,
     # disk space limit
     'disk_max': 5000000, # bytes
+    # capabilities
+    'capabilities': '',
+    # IP-addresses'
+    'ip_addresses': '',
 
     # NOTE: this table is further populated with resource names and
     # default amounts via the start() function below.  This probably
@@ -47,49 +52,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
@@ -128,9 +90,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'])
@@ -156,34 +115,22 @@ def GetSlivers(data, fullupdate=True):
             rec['initscript'] = initscripts_by_id[is_id]
         else:
             rec['initscript'] = ''
-        rec.setdefault('delegations', [])
+        rec.setdefault('delegations', attr_dict.get("delegations", []))
 
         # extract the implied rspec
         rspec = {}
         rec['rspec'] = rspec
         for resname, default_amt in DEFAULT_ALLOCATION.iteritems():
-            try: amt = int(attr_dict[resname])
+            try:
+                t = type(default_amt)
+                amt = t.__new__(t, attr_dict[resname])
             except (KeyError, ValueError): 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()
-
-    # handle requested startup
-    global start_requested
-    if start_requested:
-        start_requested = False
-        cumulative_delay = 0
-        for name in database.db.iterkeys():
-            accounts.get(name).start(delay=cumulative_delay)
-            cumulative_delay += 3
+    accounts.Startingup = False
 
 def deliver_ticket(data): return GetSlivers(data, fullupdate=False)
 
@@ -194,8 +141,7 @@ def start(options, config):
         
     accounts.register_class(sliver_vs.Sliver_VS)
     accounts.register_class(delegate.Delegate)
-    global start_requested
-    start_requested = options.startup
+    accounts.Startingup = options.startup
     database.start()
     api.deliver_ticket = deliver_ticket
     api.start()