X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fsfiprocess.py;h=cfa11093f6fb2929bfae463bd12df5f57a1a43fc;hp=e06bf9a8bd8a6afd57b0aeec949f0509d52a1097;hb=7bc9576fe11f712b7ff8b5565bf5ad8d59ff06ab;hpb=ab5bd9742a2d1b306e1a65b7f37c46f602c3fdd3 diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py index e06bf9a..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""" @@ -28,7 +28,7 @@ class SfiProcess(QObject): self.connect(self.process, SIGNAL("finished(int, QProcess::ExitStatus)"), self.processFinished) - self.xmlrpctracker = XmlrpcTracker() + self.xmlrpcreader = XmlrpcReader() # this one is for parsing XMLRPC responses # holds aggregate output from processStandardOutput(); used by xmlrpc # tracker. @@ -44,9 +44,11 @@ class SfiProcess(QObject): self.args << "-d" self.args << config.get_dirname() - if config.debug: - # this shows xmlrpc conversation, see sfi.py docs. - self.args << QString('-D') + # 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) @@ -83,12 +85,27 @@ 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. + mgr = config.getSlicemgr() + # Write RSpec to file filename = config.fullpath ("%s.rspec"%slice) try: os.remove(filename) @@ -102,25 +119,38 @@ 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", hrn] + "-r", config.getRegistry(), "-s", config.getSlicemgr(), "list", "-F", "xmllist", hrn] - 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 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") @@ -145,14 +175,18 @@ class SfiProcess(QObject): self.getRecord(config.getAuthority(), config.getAuthorityRecordFile()) def applyRSpec(self, rspec): - filename = config.getSliceRSpecFile() + "_new" - rspec.save(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", - config.getSlice(), filename] + "-o", obtained, + config.getSlice(), requested] self.__init_command(args) self.start() - return filename def updateRecord(self, filename): args = ["-u", config.getUser(), "-a", config.getAuthority(), @@ -166,14 +200,19 @@ class SfiProcess(QObject): self.__init_command(args) self.start() - def renewSlivers(self, expiration): + 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", - config.getSlice(), expiration] + slice, expiration] 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) @@ -193,5 +232,5 @@ class SfiProcess(QObject): # 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) + get_tracker().getAndPrint(self.output)