From: Faiyaz Ahmed <faiyaza@cs.princeton.edu>
Date: Fri, 14 Nov 2008 21:16:05 +0000 (+0000)
Subject: NM-controller accounts != delegate accounts.  Nomenclature change.  purely cosmetic.
X-Git-Tag: NodeManager-1.8-1~21
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=2141ca4f3da5181c7a27ccc0a904d904ea9f90ba

NM-controller accounts != delegate accounts.  Nomenclature change.  purely cosmetic.
---

diff --git a/delegate.py b/controller.py
similarity index 75%
rename from delegate.py
rename to controller.py
index 73a0743..da5da1b 100644
--- a/delegate.py
+++ b/controller.py
@@ -1,13 +1,13 @@
-"""Delegate accounts are used to provide secure access to the XMLRPC API.  They are normal Unix accounts with a shell that tunnels XMLRPC requests to the API server."""
+"""NM-Controller accounts are used to provide secure access to the XMLRPC API.  They are normal Unix accounts with a shell that tunnels XMLRPC requests to the API server."""
 
 import accounts
 import logger
 import tools
 
 
-class Delegate(accounts.Account):
+class Controller(accounts.Account):
     SHELL = '/usr/bin/forward_api_calls'  # tunneling shell
-    TYPE = 'delegate'
+    TYPE = 'controller'
 
     @staticmethod
     def create(name, vref = None):
diff --git a/setup.py b/setup.py
index 63c6c80..375f0bb 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ setup(
     'config',
     'curlwrapper',
     'database',
-    'delegate',
+    'controller',
     'logger',
     'net',
     'nm',
diff --git a/sm.py b/sm.py
index 9ba2c38..399e3a8 100644
--- a/sm.py
+++ b/sm.py
@@ -15,7 +15,7 @@ import accounts
 import api
 import api_calls
 import database
-import delegate
+import controller 
 import logger
 import sliver_vs
 import string,re
@@ -101,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'))
@@ -140,7 +140,7 @@ 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_calls.deliver_ticket = deliver_ticket