Added ReCreate. Also added try catch to api eval of rpc method.

[nodemanager.git] / sm.py

diff --git a/sm.py b/sm.py
index 919b72a..4422e8b 100644 (file)
--- 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.12.2.5 2007/07/20 19:44:11 faiyaza 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,8 @@ DEFAULT_ALLOCATION = {
     'net_i2_thresh_kbyte': 13757316,
     # disk space limit
     'disk_max': 5000000, # bytes
+    # capabilities
+    'capabilities': '',
 
     # NOTE: this table is further populated with resource names and
     # default amounts via the start() function below.  This probably
@@ -47,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
@@ -127,10 +87,7 @@ def GetSlivers(data, fullupdate=True):
     initscripts_by_id = {}
     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,22 +113,21 @@ 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])
-            except (KeyError, ValueError): amt = default_amt
+            except KeyError: amt = default_amt
+            except ValueError:
+                if type(default_amt) is type('str'):
+                    amt = attr_dict[resname]
+                else:
+                    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()