X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sm.py;h=a936a66b2f48f42ea4b432a3cef6d46a81d9771f;hb=a8fffafb5ccbdb71ef4ef7914ba342d2d62ad54f;hp=eb45362d78df791c302a23881e8ad5bc4c7e41e3;hpb=93371f5ea539ff6205f0b9f96056a484268f110c;p=nodemanager.git

diff --git a/sm.py b/sm.py
index eb45362..a936a66 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.28 2007/07/27 18:02:36 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
@@ -40,6 +41,8 @@ DEFAULT_ALLOCATION = {
     'disk_max': 5000000, # bytes
     # capabilities
     'capabilities': '',
+    # IP addresses
+    'ip_addresses': '0.0.0.0',
 
     # NOTE: this table is further populated with resource names and
     # default amounts via the start() function below.  This probably
@@ -49,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
@@ -99,6 +59,10 @@ def GetSlivers(data, fullupdate=True):
     in, use the GetSlivers() heartbeat as a cue to scan for expired
     slivers."""
 
+    logger.verbose("Entering sm:GetSlivers with fullupdate=%r"%fullupdate)
+    for key in data.keys():
+        logger.verbose('GetSlivers key : ' + key)
+
     node_id = None
     try:
         f = open('/etc/planetlab/node_id')
@@ -126,14 +90,14 @@ def GetSlivers(data, fullupdate=True):
 ### Emulab-specific hack ends here
 
 
-    initscripts_by_id = {}
+    # Take intscripts (global) returned by API, make dict
+    initscripts = {}
     for is_rec in data['initscripts']:
-        initscripts_by_id[str(is_rec['initscript_id'])] = is_rec['script']
+        logger.verbose("initscript: %s" % is_rec['name'])
+        initscripts[str(is_rec['initscript_id'])] = is_rec['script']
 
-    # remove slivers not on the whitelist
-    whitelist_regex = whitelistfilter()
-    
     for sliver in data['slivers']:
+        logger.verbose("sm:GetSlivers in slivers loop")
         rec = sliver.copy()
         rec.setdefault('timestamp', data['timestamp'])
 
@@ -153,9 +117,9 @@ def GetSlivers(data, fullupdate=True):
             rec['type'] = 'delegate'
 
         rec.setdefault('vref', attr_dict.get('vref', 'default'))
-        is_id = attr_dict.get('plc_initscript_id')
-        if is_id is not None and is_id in initscripts_by_id:
-            rec['initscript'] = initscripts_by_id[is_id]
+        is_id = attr_dict.get('initscript')
+        if is_id is not None and is_id in initscripts:
+            rec['initscript'] = initscripts[is_id]
         else:
             rec['initscript'] = ''
         rec.setdefault('delegations', attr_dict.get("delegations", []))
@@ -164,21 +128,12 @@ def GetSlivers(data, fullupdate=True):
         rspec = {}
         rec['rspec'] = rspec
         for resname, default_amt in DEFAULT_ALLOCATION.iteritems():
-            try: amt = int(attr_dict[resname])
-            except KeyError: amt = default_amt
-            except ValueError:
-                if type(default_amt) is type('str'):
-                    amt = attr_dict[resname]
-                else:
-                    amt = default_amt
+            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()