def __init__(self, parent=None):
QObject.__init__(self, parent)
+ env = QProcess.systemEnvironment()
+ env << "PYTHONPATH=%s" % ":".join(sys.path)
self.process = QProcess()
+ self.process.setEnvironment(env)
self.connect(self.process, SIGNAL("finished(int, QProcess::ExitStatus)"),
self.processFinished)
-
+
self.xmlrpctracker = XmlrpcTracker()
- # in case self.output is read by the XmlrpcTracker before any
- # readyReadStandardOutput signal
- self.output = ''
+
+ # holds aggregate output from processStandardOutput(); used by xmlrpc
+ # tracker.
+ self.output = ""
self.connect(self.process, SIGNAL("readyReadStandardOutput()"),
self.processStandardOutput)
return self.process.state() != QProcess.NotRunning
def processStandardOutput(self):
- # NOTE: The signal readyReadStandardOutput is emitted when
- # the process has made new data available through its standard output channel.
- # But the process is not necessarily finished.
- # It's cool to have this method wo we print the stdOut live,
- # but we must be carefull with self.output, used by XmlrpcTracker too.
- tmpOut = self.process.readAllStandardOutput()
+ output = self.process.readAllStandardOutput()
+ self.output = self.output + output
if config.debug:
- print tmpOut
- self.output += tmpOut
+ print output
def processStandardError(self):
print self.process.readAllStandardError()
def getRSpecFromSM(self):
return self.__getRSpec(config.getSlicemgr())
- def getRSpecFromAM(self):
- return self.__getRSpec(config.getAggmgr())
+# def getRSpecFromAM(self):
+# return self.__getRSpec(config.getAggmgr())
- def getRecord(self, hrn):
- args = ["-u", config.getUser(), "-a", config.getAuthority(),
+ def getRecord(self, hrn, filename=None):
+ args = ["-u", config.getUser(), "-a", config.getAuthority(),
"-r", config.getRegistry(), "-s", config.getSlicemgr(), "show", hrn]
+ if filename:
+ args.append("-o")
+ args.append(filename)
self.__init_command(args)
self.start()
def applyRSpec(self, rspec):
filename = config.getSliceRSpecFile() + "_new"
rspec.save(filename)
- args = ["-u", config.getUser(), "-a", config.getAuthority(),
- "-r", config.getRegistry(), "-s", config.getSlicemgr(), "create",
+ args = ["-u", config.getUser(), "-a", config.getAuthority(),
+ "-r", config.getRegistry(), "-s", config.getSlicemgr(), "create",
config.getSlice(), filename]
self.__init_command(args)
self.start()
return filename
+ def updateRecord(self, filename):
+ args = ["-u", config.getUser(), "-a", config.getAuthority(),
+ "-r", config.getRegistry(), "-s", config.getSlicemgr(), "update", filename]
+ self.__init_command(args)
+ self.start()
+
+ def renewSlivers(self, expiration):
+ args = ["-u", config.getUser(), "-a", config.getAuthority(),
+ "-r", config.getRegistry(), "-s", config.getSlicemgr(), "renew",
+ config.getSlice(), expiration]
+ self.__init_command(args)
+ self.start()
+
def start(self):
+ self.output = ""
self.trace_command()
self.process.start(self.exe, self.args)
if config.verbose:
self._trace=time.time()
command = "%s %s" % (self.exe, self.args.join(" "))
- print time.strftime('%M:%S'),'Invoking',command
+ print time.strftime('%H:%M:%S'),'Invoking',command
def trace_end (self):
if config.verbose:
- command = "%s %s" % (self.exe, self.args.join(" "))
- print time.strftime('%M:%S'),"[%.3f s]"%(time.time()-self._trace),command,'Done'
+# command = "%s %s" % (self.exe, self.args.join(" "))
+ print time.strftime('%H:%M:%S'),"Done [%.3f s]"%(time.time()-self._trace)
+ if config.debug:
self.xmlrpctracker.getAndPrint(self.output)