X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sm.py;h=399e3a8f98fddc95bd7eae53b93e98d989c53101;hb=c08013dc2fc32582e8636d84be3e2f68dafe11a0;hp=abbcaec9f484618c5109f3345714f93618e8d387;hpb=ef1c8f6a368f70e1b23bc1fc2c4f167efc63b0d9;p=nodemanager.git

diff --git a/sm.py b/sm.py
index abbcaec..399e3a8 100644
--- a/sm.py
+++ b/sm.py
@@ -7,14 +7,15 @@ 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 $
+# $Id$
 
 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 controller 
 import logger
 import sliver_vs
 import string,re
@@ -90,7 +91,7 @@ def GetSlivers(data, fullupdate=True):
 
         # convert attributes field to a proper dict
         attr_dict = {}
-        for attr in rec.pop('attributes'): attr_dict[attr['name']] = attr['value']
+        for attr in rec.pop('attributes'): attr_dict[attr['tagname']] = attr['value']
 
         # squash keys
         keys = rec.pop('keys')
@@ -100,8 +101,8 @@ def GetSlivers(data, fullupdate=True):
         rec.setdefault('type', attr_dict.get('type', 'sliver.VServer'))
         if rec['instantiation'] == 'nm-controller':
         # type isn't returned by GetSlivers() for whatever reason.  We're overloading
-        # instantiation here, but i suppose its the ssame thing when you think about it. -FA
-            rec['type'] = 'delegate'
+        # instantiation here, but i suppose its the same thing when you think about it. -FA
+            rec['type'] = 'controller'
 
         # set the vserver reference.  If none, set to default.
         rec.setdefault('vref', attr_dict.get('vref', 'default'))
@@ -139,8 +140,8 @@ def start(options, config):
         DEFAULT_ALLOCATION[resname]=default_amt
         
     accounts.register_class(sliver_vs.Sliver_VS)
-    accounts.register_class(delegate.Delegate)
+    accounts.register_class(controller.Controller)
     accounts.Startingup = options.startup
     database.start()
-    api.deliver_ticket = deliver_ticket
+    api_calls.deliver_ticket = deliver_ticket
     api.start()