X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fsfiprocess.py;h=cfa11093f6fb2929bfae463bd12df5f57a1a43fc;hp=1d8815516cb728848b0e4f85468709137d802555;hb=7bc9576fe11f712b7ff8b5565bf5ad8d59ff06ab;hpb=cb346e87aaf444b1142e80a8cec1e64df6a122cf diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py index 1d88155..cfa1109 100644 --- a/sface/sfiprocess.py +++ b/sface/sfiprocess.py @@ -5,7 +5,7 @@ import time from PyQt4.QtCore import * from sface.config import config -from sface.xmlrpcwindow import XmlrpcTracker +from sface.xmlrpcwindow import get_tracker, XmlrpcReader def find_executable(exec_name): """find the given executable in $PATH""" @@ -21,14 +21,18 @@ class SfiProcess(QObject): 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 = '' + + self.xmlrpcreader = XmlrpcReader() # this one is for parsing XMLRPC responses + + # holds aggregate output from processStandardOutput(); used by xmlrpc + # tracker. + self.output = "" self.connect(self.process, SIGNAL("readyReadStandardOutput()"), self.processStandardOutput) @@ -37,10 +41,14 @@ class SfiProcess(QObject): def __init_command(self, args): self.args = QStringList() - print "DEBUG FLAG:", config.debug - if config.debug: - # this shows xmlrpc conversation, see sfi.py docs. - self.args << QString('-D') + self.args << "-d" + self.args << config.get_dirname() + + # this shows xmlrpc conversation, see sfi.py docs. + # always do this, so we can parse the XML result for faults and show + # then to the users. + self.args << QString('-D') + for arg in args: self.args << QString(arg) @@ -52,16 +60,10 @@ class SfiProcess(QObject): 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() - print "STDOUT READY" + 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() @@ -83,13 +85,28 @@ class SfiProcess(QObject): print "ReadError" elif err == QProcess.UnknownError: print "UnknownError" + + # extract any faults from the XMLRPC response(s) + self.xmlrpcreader.responses = [] + self.xmlrpcreader.store(self.output) + self.xmlrpcreader.extractXml() + self.responses = self.xmlrpcreader.responses + self.faults = [x for x in self.responses if (x["kind"]=="fault")] + self.trace_end() self.emit(SIGNAL("finished()")) - def __getRSpec(self, mgr): + def getFaultString(self): + if self.faults == []: + return None + + return self.faults[0].get("faultString","") + " (" + self.faults[0].get("faultCode","") + ")" + + def retrieveRspec(self): slice = config.getSlice() - # Write RSpec to file for testing. - filename = os.path.expanduser("~/.sfi/" + slice + ".rspec") + mgr = config.getSlicemgr() + # Write RSpec to file + filename = config.fullpath ("%s.rspec"%slice) try: os.remove(filename) except: @@ -102,29 +119,101 @@ class SfiProcess(QObject): self.start() return filename - def getRSpecFromSM(self): - return self.__getRSpec(config.getSlicemgr()) + def retrieveResources(self): + mgr = config.getSlicemgr() + # Write RSpec to file + filename = config.getResourcesRSpecFile() + try: + os.remove(filename) + except: + pass + args = ["-u", config.getUser(), "-a", config.getAuthority(), + "-r", config.getRegistry(), "-s", mgr, "resources", + "-o", filename] + + self.__init_command(args) + self.start() + return filename - def getRSpecFromAM(self): - return self.__getRSpec(config.getAggmgr()) - def getRecord(self, hrn): - args = ["-u", config.getUser(), "-a", config.getAuthority(), + def listRecords(self, hrn, rectype=None, filename=None): + args = ["-u", config.getUser(), "-a", config.getAuthority(), + "-r", config.getRegistry(), "-s", config.getSlicemgr(), "list", "-F", "xmllist", hrn] + + if not filename: + filename = config.getAuthorityListFile() + + # we can't tell whether SFI will create one file or many, so delete + # leftovers from last time, then we'll know what we got, after we get it. + if os.path.exists(filename): + os.remove(filename) + if os.path.exists(filename + ".1"): + os.remove(filename + ".1") + args.append("-o") + args.append(filename) + + if rectype: + args.append("-t") + args.append(rectype) + + self.__init_command(args) + self.start() + + 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 getSliceRecord(self): + self.getRecord(config.getSlice(), config.getSliceRecordFile()) + + def getAuthorityRecord(self): + self.getRecord(config.getAuthority(), config.getAuthorityRecordFile()) + 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", - config.getSlice(), filename] + # that's what we pass, like in what we'd like to get + requested = config.getSliceRSpecFile() + "_new" + # that's what we actually receive + # just overwrite the slice file as if we'd used 'resources' + obtained = config.getSliceRSpecFile() + rspec.save(requested) + args = ["-u", config.getUser(), "-a", config.getAuthority(), + "-r", config.getRegistry(), "-s", config.getSlicemgr(), "create", + "-o", obtained, + config.getSlice(), requested] + self.__init_command(args) + self.start() + + 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 addRecord(self, filename): + args = ["-u", config.getUser(), "-a", config.getAuthority(), + "-r", config.getRegistry(), "-s", config.getSlicemgr(), "add", filename] + self.__init_command(args) + self.start() + + def renewSlivers(self, expiration, slice=None): + if not slice: + slice = config.getSlice() + + args = ["-u", config.getUser(), "-a", config.getAuthority(), + "-r", config.getRegistry(), "-s", config.getSlicemgr(), "renew", + slice, expiration] self.__init_command(args) self.start() - return filename def start(self): + self.respones = [] + self.faults = [] + self.output = "" self.trace_command() self.process.start(self.exe, self.args) @@ -136,11 +225,12 @@ class SfiProcess(QObject): 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' - self.xmlrpctracker.getAndPrint(self.output) +# command = "%s %s" % (self.exe, self.args.join(" ")) + print time.strftime('%H:%M:%S'),"Done [%.3f s]"%(time.time()-self._trace) + if config.debug: + get_tracker().getAndPrint(self.output)