X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sm.py;h=a050ded5b16765878be3e46e24ec7d948d09e172;hb=75eb060a541caa2fc9dabb82109e36e726128c1f;hp=df79c523507efa2c9f266ed3d8d140db45ddceb1;hpb=52433f91e71eefac5a36baefaf1ea395a7cb0905;p=nodemanager.git

diff --git a/sm.py b/sm.py
index df79c52..a050ded 100644
--- a/sm.py
+++ b/sm.py
@@ -13,6 +13,7 @@ try: from bwlimit import bwmin, bwmax
 except ImportError: bwmin, bwmax = 8, 1000*1000*1000
 import accounts
 import api
+import api_calls
 import database
 import delegate
 import logger
@@ -23,8 +24,8 @@ import string,re
 DEFAULT_ALLOCATION = {
     'enabled': 1,
     # CPU parameters
-    'cpu_min': 0, # ms/s
-    'cpu_share': 32, # proportional share
+    'cpu_pct': 0, # percent CPU reserved
+    'cpu_share': 1, # proportional share
     # bandwidth parameters
     'net_min_rate': bwmin / 1000, # kbps
     'net_max_rate': bwmax / 1000, # kbps
@@ -59,6 +60,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')
@@ -73,24 +78,14 @@ def GetSlivers(data, fullupdate=True):
             if network['is_primary'] and network['bwlimit'] is not None:
                 DEFAULT_ALLOCATION['net_max_rate'] = network['bwlimit'] / 1000
 
-### Emulab-specific hack begins here
-#    emulabdelegate = {
-#        'instantiation': 'plc-instantiated',
-#        'keys': '''ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA5Rimz6osRvlAUcaxe0YNfGsLL4XYBN6H30V3l/0alZOSXbGOgWNdEEdohwbh9E8oYgnpdEs41215UFHpj7EiRudu8Nm9mBI51ARHA6qF6RN+hQxMCB/Pxy08jDDBOGPefINq3VI2DRzxL1QyiTX0jESovrJzHGLxFTB3Zs+Y6CgmXcnI9i9t/zVq6XUAeUWeeXA9ADrKJdav0SxcWSg+B6F1uUcfUd5AHg7RoaccTldy146iF8xvnZw0CfGRCq2+95AU9rbMYS6Vid8Sm+NS+VLaAyJaslzfW+CAVBcywCOlQNbLuvNmL82exzgtl6fVzutRFYLlFDwEM2D2yvg4BQ== root@boss.emulab.net''',
- #       'name': 'utah_elab_delegate',
- #       'timestamp': data['timestamp'],
- #       'type': 'delegate',
- #       'vref': None
- #       }
- #   database.db.deliver_record(emulabdelegate)
-### 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['name'])] = is_rec['script']
 
     for sliver in data['slivers']:
+        logger.verbose("sm:GetSlivers in slivers loop")
         rec = sliver.copy()
         rec.setdefault('timestamp', data['timestamp'])
 
@@ -109,12 +104,17 @@ def GetSlivers(data, fullupdate=True):
         # instantiation here, but i suppose its the ssame thing when you think about it. -FA
             rec['type'] = 'delegate'
 
+        # set the vserver reference.  If none, set to default.
         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]
+
+        # set initscripts.  first check if exists, if not, leave empty.
+        is_name = attr_dict.get('initscript')
+        if is_name is not None and is_name in initscripts:
+            rec['initscript'] = initscripts[is_name]
         else:
             rec['initscript'] = ''
+
+        # set delegations, if none, set empty
         rec.setdefault('delegations', attr_dict.get("delegations", []))
 
         # extract the implied rspec
@@ -143,5 +143,5 @@ def start(options, config):
     accounts.register_class(delegate.Delegate)
     accounts.Startingup = options.startup
     database.start()
-    api.deliver_ticket = deliver_ticket
+    api_calls.deliver_ticket = deliver_ticket
     api.start()