X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=controller.py;h=826ca495bebb4c3a1e1c0da795b039897a455a53;hb=0b55e122a86da84ac10f54c3e990b166eb7139ab;hp=b754e6ac866436262cdff3a8d841e7100651dfc2;hpb=3224c1906c82596a86ae734181488ed14a0f0976;p=nodemanager.git diff --git a/controller.py b/controller.py index b754e6a..826ca49 100644 --- a/controller.py +++ b/controller.py @@ -1,14 +1,16 @@ # $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.""" -import accounts -import logger -import tools from pwd import getpwnam from grp import getgrnam +import logger +import tools +import accounts + class Controller(accounts.Account): SHELL = '/usr/bin/forward_api_calls' # tunneling shell TYPE = 'controller.Controller' @@ -17,15 +19,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 to /etc/shells if it's not already there."""