X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=controller.py;h=c66ddff3576b48aa065353a56fcba230a3e7a20b;hb=ccc7b9c4b76a89faad66867b00d16ac45333b6de;hp=da5da1b99b6797259db23e1ac06734a56a67626d;hpb=2141ca4f3da5181c7a27ccc0a904d904ea9f90ba;p=nodemanager.git

diff --git a/controller.py b/controller.py
index da5da1b..c66ddff 100644
--- a/controller.py
+++ b/controller.py
@@ -1,21 +1,31 @@
-"""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."""
+#
+"""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
+import account
 
-
-class Controller(accounts.Account):
+class Controller(account.Account):
     SHELL = '/usr/bin/forward_api_calls'  # tunneling shell
-    TYPE = 'controller'
+    TYPE = 'controller.Controller'
 
     @staticmethod
     def create(name, vref = None):
-        add_shell(Delegate.SHELL)
-        logger.log_call('/usr/sbin/useradd', '-p', '*', '-s', Delegate.SHELL, name)
+        add_shell(Controller.SHELL)
+        group = getgrnam("slices")[2]
+        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("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."""