X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=inline;f=sface%2Fsfiprocess.py;h=108530cca8e10855881b3e9fb27c16c6a9687185;hb=312ec1d8972acfdd51b2bc6c26ba7f89b6096303;hp=227a35ba8c635f46c5f64262a447a0199fd2d20b;hpb=ab40b6e95de331b183c426db56fbe26cd3bdced8;p=sface.git
diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py
index 227a35b..108530c 100644
--- a/sface/sfiprocess.py
+++ b/sface/sfiprocess.py
@@ -2,14 +2,10 @@
import os
import sys
import time
-import re
from PyQt4.QtCore import *
-from PyQt4.QtXml import QDomDocument
from sface.config import config
-from sface.logwindow import LogIO
-from sface.rspecwindow import RSpecWindow, DomModel
-
+from sface.xmlrpcwindow import XmlrpcTracker, XmlrpcReader
def find_executable(exec_name):
"""find the given executable in $PATH"""
@@ -25,14 +21,35 @@ 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.xmltracker = XmlTracker()
+
+ 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)
+ 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)
@@ -43,6 +60,15 @@ class SfiProcess(QObject):
def isRunning(self):
return self.process.state() != QProcess.NotRunning
+ def processStandardOutput(self):
+ output = self.process.readAllStandardOutput()
+ self.output = self.output + output
+ if config.debug:
+ print output
+
+ def processStandardError(self):
+ print self.process.readAllStandardError()
+
def processFinished(self):
if self.process.exitStatus() == QProcess.CrashExit:
print self.readOutput()
@@ -60,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:
@@ -79,33 +120,82 @@ 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.args.prepend(QString('-D'))
+ self.respones = []
+ self.faults = []
+ self.output = ""
self.trace_command()
self.process.start(self.exe, self.args)
- print self.args
def readOutput(self):
if self.process.state() == QProcess.NotRunning:
@@ -115,83 +205,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
- #self.xmltracker.startTracking()
- #print "tracking"
+ print time.strftime('%H:%M:%S'),'Invoking',command
def trace_end (self):
if config.verbose:
- #print "stop tracking"
- #self.xmltracker.stopTracking()
- command = "%s %s" % (self.exe, self.args.join(" "))
- print time.strftime('%M:%S'),"[%.3f s]"%(time.time()-self._trace),command,'Done'
- self.xmltracker.getAndPrint(self.process.readAllStandardOutput())
-
-class XmlTracker():
- def __init__(self):
- self.xmlrpcwindow = XmlrpcWindow()
-
- def getAndPrint(self, rawOutput):
- self.store(rawOutput)
- self.extractXml()
- self.xmlrpcwindow.setData(self.xml)
- self.showXmlrpc()
- self.test()
-
- def showXmlrpc(self):
- # set all camel case
- self.xmlrpcwindow.show()
- self.xmlrpcwindow.resize(500, 640)
- self.xmlrpcwindow.raise_()
- self.xmlrpcwindow.activateWindow()
-
- def store(self, rawOutput):
- self.rawOutput = rawOutput
-
- def extractXml(self):
- pttrnAsk = '.*?'
- pttrnAns = '.*?'
- answers = re.compile(pttrnAsk, re.DOTALL).findall(self.rawOutput)
- replies = re.compile(pttrnAns, re.DOTALL).findall(self.rawOutput)
- # cleaning
- answers = map(lambda x: x.replace('\\n','\n'), answers)
- replies = map(lambda x: x.replace('\\n','\n').replace("'body: '", ''), replies)
- # A well-formed XML document must have one, and only one, top-level element
- self.xml = ''
- for ans in answers:
- self.xml += ans + replies.pop()
- self.xml += ''
-
- def test(self):
- print self.xml
-
- def stats(self):
- # statistics: round-trip time, size of the com
- pass
-
- def prettyPrint(self, XmlComs):
- # just for testing
- print XmlComs
-
-class XmlrpcWindow(RSpecWindow):
- def __init__(self, parent=None):
- # super __init__() calls updateView,
- # which assumes you have some data
- self.data = ''
- RSpecWindow.__init__(self, parent)
-
- def setData(self, XmlrpcCom):
- self.data = XmlrpcCom
-
- def updateView(self):
- del self.document
- del self.model
- self.document = None
- self.model = None
-
- self.document = QDomDocument("RSpec")
- self.document.setContent(self.data)
- self.model = DomModel(self.document, self)
-
- self.view.setModel(self.model)
- self.view.expand(self.model.index(0, 0)) #expand first level only
+# 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)
+