X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fsfiprocess.py;h=00f9df374e1e5c4d3c150d3b28dca48a83a494d6;hp=34608de1cb8aa14541c1256d45f295933155af3d;hb=44743e4122a7a015518988f8b5ef07aca9a5f01e;hpb=1a0bb6c8cf51c8abcffdc94da1ba4d9c9bb452e0 diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py index 34608de..00f9df3 100644 --- a/sface/sfiprocess.py +++ b/sface/sfiprocess.py @@ -1,18 +1,21 @@ import os +import json +import pickle import sys +import tempfile import time from PyQt4.QtCore import * from sface.config import config -from sface.xmlrpcwindow import XmlrpcTracker, XmlrpcReader +from sface.xmlrpcwindow import get_tracker, XmlrpcReader def find_executable(exec_name): """find the given executable in $PATH""" paths = os.getenv("PATH").split(':') for p in paths: exec_path = os.path.join(p, exec_name) - if os.path.exists(exec_path): + if os.path.exists(exec_path) and os.access(exec_path,os.X_OK): return exec_path return None @@ -29,12 +32,13 @@ class SfiProcess(QObject): self.processFinished) 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.do_raw = True # xxx should check version of sfa + self.connect(self.process, SIGNAL("readyReadStandardOutput()"), self.processStandardOutput) self.connect(self.process, SIGNAL("readyReadStandardError()"), @@ -50,6 +54,15 @@ class SfiProcess(QObject): # then to the users. self.args << QString('-D') + if self.do_raw: + self.raw_filename = tempfile.mktemp(suffix=".raw") + self.args << QString('-R') + self.args << QString(self.raw_filename) + self.args << QString('--rawformat') + self.args << QString('json') + else: + self.raw_filename = None + for arg in args: self.args << QString(arg) @@ -64,7 +77,15 @@ class SfiProcess(QObject): output = self.process.readAllStandardOutput() self.output = self.output + output if config.debug: - print output + try: + print output + except IOError, e: + if (e.errno == 4): + # XXX why is this happening?? + print "*** caught EINTR" + else: + raise + def processStandardError(self): print self.process.readAllStandardError() @@ -87,6 +108,22 @@ class SfiProcess(QObject): elif err == QProcess.UnknownError: print "UnknownError" + self.raw_data = None + if (self.raw_filename != None) and os.path.exists(self.raw_filename): + if hasattr(json, "loads"): + self.raw_data = json.loads(open(self.raw_filename,"r").read()) + else: + self.raw_data = json.read(open(self.raw_filename,"r").read()) + + os.remove(self.raw_filename) + + self.geni_code=None + self.geni_output=None + if (self.raw_data!=None) and (type(self.raw_data)==dict): + code = self.raw_data.get("code",{}) + self.geni_code = code.get("geni_code",None) + self.geni_output = self.raw_data.get("output","") + # extract any faults from the XMLRPC response(s) self.xmlrpcreader.responses = [] self.xmlrpcreader.store(self.output) @@ -94,6 +131,16 @@ class SfiProcess(QObject): self.responses = self.xmlrpcreader.responses self.faults = [x for x in self.responses if (x["kind"]=="fault")] + # if we got a nonzero + if (self.geni_code!=None) and (self.geni_code!=0): + x = {"kind": "bad_geni_code"} + x["faultCode"] = str(self.geni_code) + faultString = "Nonzero geni_code: " + str(self.geni_code) + if self.geni_output: + faultString = faultString + " output: " + str(self.geni_output) + x["faultString"] = faultString + self.faults.append(x) + self.trace_end() self.emit(SIGNAL("finished()")) @@ -103,9 +150,10 @@ class SfiProcess(QObject): return self.faults[0].get("faultString","") + " (" + self.faults[0].get("faultCode","") + ")" - def __getRSpec(self, mgr): + 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) @@ -119,25 +167,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") @@ -161,15 +222,41 @@ class SfiProcess(QObject): def getAuthorityRecord(self): self.getRecord(config.getAuthority(), config.getAuthorityRecordFile()) - def applyRSpec(self, rspec): - filename = config.getSliceRSpecFile() + "_new" - rspec.save(filename) + 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(), "create", - config.getSlice(), filename] + "-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() - return filename def updateRecord(self, filename): args = ["-u", config.getUser(), "-a", config.getAuthority(), @@ -183,10 +270,42 @@ class SfiProcess(QObject): self.__init_command(args) self.start() - def renewSlivers(self, expiration): + 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", - config.getSlice(), expiration] + 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() @@ -212,5 +331,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)