X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=controller.py;h=0732ee59bd57e2da998373e65b4505da10c24d43;hb=48a73b18fd7daed13c645c1adeddb57b560e7a2d;hp=264b3bb6c3a9f24316df5302972b2aa5b8317dd0;hpb=441aa514e076df6818711447594be7793a3e2a2d;p=nodemanager.git

diff --git a/controller.py b/controller.py
index 264b3bb..0732ee5 100644
--- a/controller.py
+++ b/controller.py
@@ -1,21 +1,31 @@
-"""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
+import account
 
-
-class Controller(accounts.Account):
+class Controller(account.Account):
     SHELL = '/usr/bin/forward_api_calls'  # tunneling shell
     TYPE = 'controller.Controller'
 
     @staticmethod
     def create(name, vref = None):
         add_shell(Controller.SHELL)
-        logger.log_call('/usr/sbin/useradd', '-p', '*', '-s', Controller.SHELL, name)
+        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."""
@@ -24,5 +34,5 @@ def add_shell(shell):
     etc_shells.close()
     if shell not in valid_shells:
         etc_shells = open('/etc/shells', 'a')
-        print >>etc_shells, shell
+        print(shell, file=etc_shells)
         etc_shells.close()