X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fsfiprocess.py;h=108530cca8e10855881b3e9fb27c16c6a9687185;hp=cd98a314f8f1a94634977129610dd6afc58a0713;hb=312ec1d8972acfdd51b2bc6c26ba7f89b6096303;hpb=5d9d4374df91f919e5c744906186b2769b6d09ae diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py index cd98a31..108530c 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 XmlrpcTracker, XmlrpcReader def find_executable(exec_name): """find the given executable in $PATH""" @@ -27,11 +27,13 @@ class SfiProcess(QObject): 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 + self.xmlrpctracker = XmlrpcTracker() # this one is for the debug window + + # holds aggregate output from processStandardOutput(); used by xmlrpc + # tracker. + self.output = "" self.connect(self.process, SIGNAL("readyReadStandardOutput()"), self.processStandardOutput) @@ -40,9 +42,14 @@ class SfiProcess(QObject): def __init_command(self, args): self.args = QStringList() - 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) @@ -55,6 +62,7 @@ class SfiProcess(QObject): def processStandardOutput(self): output = self.process.readAllStandardOutput() + self.output = self.output + output if config.debug: print output @@ -78,13 +86,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: @@ -97,29 +120,80 @@ class SfiProcess(QObject): self.start() return filename - def getRSpecFromSM(self): - return self.__getRSpec(config.getSlicemgr()) -# 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", hrn] - def getRecord(self, hrn): - args = ["-u", config.getUser(), "-a", config.getAuthority(), + if filename: + # 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): + args = ["-u", config.getUser(), "-a", config.getAuthority(), + "-r", config.getRegistry(), "-s", config.getSlicemgr(), "renew", + config.getSlice(), 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)