X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fsfiprocess.py;h=35f0ca9d8650f7a8df42ffd12390bf6e1641e221;hp=cd24f9a9d870c7e3a1844d96ef422f724aff9e61;hb=d7a2606ffd441335cd25b0185cb077c6cb91e795;hpb=a66b375ceca1b5c2567659a5b2da806e9b9598ea diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py index cd24f9a..35f0ca9 100644 --- a/sface/sfiprocess.py +++ b/sface/sfiprocess.py @@ -1,9 +1,12 @@ import os +import pickle +import sys import time from PyQt4.QtCore import * from sface.config import config +from sface.xmlrpcwindow import get_tracker, XmlrpcReader def find_executable(exec_name): """find the given executable in $PATH""" @@ -19,8 +22,34 @@ 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.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) + self.connect(self.process, SIGNAL("readyReadStandardError()"), + self.processStandardError) + def __init_command(self, args): self.args = QStringList() + 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) @@ -28,19 +57,65 @@ class SfiProcess(QObject): if not self.exe: print "FATAL.. Could not locate binary sfi.py - not much we can do without that" - self.process = QProcess() + def isRunning(self): + return self.process.state() != QProcess.NotRunning + + def processStandardOutput(self): + output = self.process.readAllStandardOutput() + self.output = self.output + output + if config.debug: + try: + print output + except IOError, e: + if (e.errno == 4): + # XXX why is this happening?? + print "*** caught EINTR" + else: + raise - self.connect(self.process, SIGNAL("finished(int, QProcess::ExitStatus)"), - self.processFinished) + + def processStandardError(self): + print self.process.readAllStandardError() def processFinished(self): + if self.process.exitStatus() == QProcess.CrashExit: + print self.readOutput() + print "Process exited with errors:", + err = self.process.error() + if err == QProcess.FailedToStart: + print "FailedToStart" + elif err == QProcess.Crashed: + print "Crashed" + elif err == QProcess.Timedout: + print "Timedout" + elif err == QProcess.WriteError: + print "WriteError" + elif err == QProcess.ReadError: + 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: @@ -53,19 +128,152 @@ 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 listRecords(self, hrn, rectype=None, filename=None): + args = ["-u", config.getUser(), "-a", config.getAuthority(), + "-r", config.getRegistry(), "-s", config.getSlicemgr(), "list", "-F", "xmllist", hrn] - def getRecord(self, hrn): - args = ["-u", config.getUser(), "-a", config.getAuthority(), + 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, aggAddr=None, aggPort=None, saveObtained=True): + # 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"] + + if saveObtained: + args = args + ["-o", obtained] + + if aggAddr: + args = args + ["-a", aggAddr, "-p", str(aggPort)] + + args = args + [config.getSlice(), requested] + + self.__init_command(args) + self.start() + + def deleteSlivers(self, slice=None, aggAddr=None, aggPort=None): + if not slice: + slice = config.getSlice() + + args = ["-u", config.getUser(), "-a", config.getAuthority(), + "-r", config.getRegistry(), "-s", config.getSlicemgr(), "delete"] + + if aggAddr: + args = args + ["-a", aggAddr, "-p", str(aggPort)] + + args = args + [slice] + + 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 removeRecord(self, hrn): + args = ["-u", config.getUser(), "-a", config.getAuthority(), + "-r", config.getRegistry(), "-s", config.getSlicemgr(), "remove", hrn] + 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() + + def sliverStatus(self, slice=None, filename=None): + if not slice: + slice = config.getSlice() + + if not filename: + filename = config.fullpath(slice+".sliverstatus") + + args = ["-u", config.getUser(), "-a", config.getAuthority(), + "-r", config.getRegistry(), "-s", config.getSlicemgr(), "status", + "-o", filename, "-F", "pickled", slice] + self.__init_command(args) + self.start() + + def getSliceMgrVersion(self, filename=None): + if not filename: + filename = config.fullpath("slicemgr.version") + + args = ["-u", config.getUser(), "-a", config.getAuthority(), + "-r", config.getRegistry(), "-s", config.getSlicemgr(), "version", + "-o", filename, "-F", "pickled",] self.__init_command(args) self.start() def start(self): + self.respones = [] + self.faults = [] + self.output = "" self.trace_command() self.process.start(self.exe, self.args) @@ -77,9 +285,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' +# 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) +