Merge branch 'ipv6'

[nodemanager.git] / controller.py

diff --git a/controller.py b/controller.py
index b754e6a..c66ddff 100644 (file)
--- a/controller.py
+++ b/controller.py
@@ -1,15 +1,15 @@
-# $Id$
-# $URL$
+#
+"""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."""
 
-"""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."""
+from pwd import getpwnam
+from grp import getgrnam
 
-import accounts
 import logger
 import tools
-from pwd import getpwnam
-from grp import getgrnam
+import account
 
-class Controller(accounts.Account):
+class Controller(account.Account):
     SHELL = '/usr/bin/forward_api_calls'  # tunneling shell
     TYPE = 'controller.Controller'
 
@@ -17,15 +17,15 @@ class Controller(accounts.Account):
     def create(name, vref = None):
         add_shell(Controller.SHELL)
         group = getgrnam("slices")[2]
-        logger.log_call('/usr/sbin/useradd', '-p', '*', '-g', str(group), '-s', Controller.SHELL, name)
+        logger.log_call(['/usr/sbin/useradd', '-p', '*', '-g', str(group), '-s', Controller.SHELL, name, ])
 
     @staticmethod
-    def destroy(name): logger.log_call('/usr/sbin/userdel', '-r', name)
+    def destroy(name): logger.log_call(['/usr/sbin/userdel', '-r', name, ])
 
     def is_running(self):
-        logger.verbose("Delegate:  %s" % self.name)
+        logger.verbose("controller: is_running:  %s" % self.name)
         return getpwnam(self.name)[6] == self.SHELL
-    
+
 
 def add_shell(shell):
     """Add <shell> to /etc/shells if it's not already there."""