X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplanetlab%2Fnodemanager.py;h=2e755d9e78d1ffd11792eae2ffb1484d2548d1e1;hb=4a9e6751f9f396f463932133b9d62fc925a99ef6;hp=eb00fdcf34f215726ca1e65a13a0b6e0435e1911;hpb=04a3f20dc71bf8b3f96b1e3172623aa346a638a7;p=sfa.git diff --git a/sfa/planetlab/nodemanager.py b/sfa/planetlab/nodemanager.py index eb00fdcf..2e755d9e 100644 --- a/sfa/planetlab/nodemanager.py +++ b/sfa/planetlab/nodemanager.py @@ -1,5 +1,5 @@ import tempfile -import commands +import subprocess import os @@ -18,7 +18,7 @@ class NodeManager: method = self.method sfa_slice_prefix = self.config.SFA_CM_SLICE_PREFIX sfa_slice = sfa_slice_prefix + "_sfacm" - python = "/usr/bin/python" + python = "/usr/bin/python2" vserver_path = "/vservers/%s" % (sfa_slice) script_path = "/tmp/" path = "%(vserver_path)s/%(script_path)s" % locals() @@ -40,11 +40,11 @@ print s.%(method)s%(args)s""" % locals() f.close() # make the file executeable chmod_cmd = "/bin/chmod 775 %(filename)s" % locals() - (status, output) = commands.getstatusoutput(chmod_cmd) + (status, output) = subprocess.getstatusoutput(chmod_cmd) # execute the commad as a slice with root NM privs cmd = 'su - %(sfa_slice)s -c "%(python)s %(scriptname)s"' % locals() - (status, output) = commands.getstatusoutput(cmd) + (status, output) = subprocess.getstatusoutput(cmd) return (status, output) finally: os.unlink(filename)