X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sface%2Fsfiprocess.py;h=ca2c023f03d88507b43c37a7ce79007e88f7ba1a;hb=b7b7f439707e66f748e6658758f17f8bcb682c17;hp=ba9a5c832636ae9073fc47f02fcdf022ac70bf31;hpb=e095c7423002644d129cef273f3a63646903b788;p=sface.git
diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py
index ba9a5c8..ca2c023 100644
--- a/sface/sfiprocess.py
+++ b/sface/sfiprocess.py
@@ -1,6 +1,15 @@
+import os
+import sys
+import time
+import re
+
from PyQt4.QtCore import *
-from sface.sficonfig import config
+from PyQt4.QtXml import QDomDocument
+from sface.config import config
+from sface.logwindow import LogIO
+from sface.rspecwindow import RSpecWindow, DomModel
+
def find_executable(exec_name):
"""find the given executable in $PATH"""
@@ -16,17 +25,70 @@ class SfiProcess(QObject):
def __init__(self, parent=None):
QObject.__init__(self, parent)
- def __init_command(self, args)
+ self.process = QProcess()
+ self.connect(self.process, SIGNAL("finished(int, QProcess::ExitStatus)"),
+ self.processFinished)
+
+ self.xmltracker = XmlTracker()
+ # in case self.output is read by the XmlTracker before any
+ # readyReadStandardOutput signal
+ 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()
+ if config.debug:
+ # this shows xmlrpc conversation, see sfi.py docs.
+ self.args << QString('-D')
for arg in args:
self.args << QString(arg)
self.exe = find_executable("sfi.py")
- self.process = QProcess()
+ if not self.exe:
+ print "FATAL.. Could not locate binary sfi.py - not much we can do without that"
- finished = pyqtSignal()
- self.connect(self.process, SIGNAL("finished(int, QProcess::ExitStatus)"),
- self.finished)
+ def isRunning(self):
+ return self.process.state() != QProcess.NotRunning
+
+ def processStandardOutput(self):
+ # NOTE: The signal readyReadStandardOutput is emitted when
+ # the process has made new data available through its standard output channel.
+ # But the process is not necessarily finished.
+ # It's cool to have this method wo we print the stdOut live,
+ # but we must be carefull with self.output, used by xmlTracker too.
+ print "SETTING SELF.OUTPUT"
+ tmpOut = self.process.readAllStandardOutput()
+ if config.debug:
+ print tmpOut
+ self.output += tmpOut
+
+
+ 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"
+ self.trace_end()
+ self.emit(SIGNAL("finished()"))
def __getRSpec(self, mgr):
slice = config.getSlice()
@@ -37,7 +99,7 @@ class SfiProcess(QObject):
except:
pass
args = ["-u", config.getUser(), "-a", config.getAuthority(),
- "-r", config.registry(), "-s", mgr, "resources",
+ "-r", config.getRegistry(), "-s", mgr, "resources",
"-o", filename, slice]
self.__init_command(args)
@@ -45,21 +107,108 @@ class SfiProcess(QObject):
return filename
def getRSpecFromSM(self):
- return self.__getRSpec(config.slicemgr())
+ return self.__getRSpec(config.getSlicemgr())
def getRSpecFromAM(self):
- return self.__getRSpec(config.aggmgr())
+ return self.__getRSpec(config.getAggmgr())
def getRecord(self, hrn):
args = ["-u", config.getUser(), "-a", config.getAuthority(),
- "-r", config.registry(), "-s", config.slicemgr(), "show", hrn]
+ "-r", config.getRegistry(), "-s", config.getSlicemgr(), "show", hrn]
self.__init_command(args)
self.start()
+ 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]
+ self.__init_command(args)
+ self.start()
+ return filename
+
def start(self):
- self.process(self.exe, self.args)
+ self.trace_command()
+ self.process.start(self.exe, self.args)
def readOutput(self):
if self.process.state() == QProcess.NotRunning:
return self.process.readAll()
+ def trace_command (self):
+ if config.verbose:
+ self._trace=time.time()
+ command = "%s %s" % (self.exe, self.args.join(" "))
+ print time.strftime('%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'
+ self.xmltracker.getAndPrint(self.output)
+
+class XmlTracker():
+ def __init__(self):
+ self.xmlrpcWindow = XmlrpcWindow()
+
+ def getAndPrint(self, rawOutput):
+ self.store(rawOutput)
+ self.extractXml()
+ self.xmlrpcWindow.setData(self.xml)
+ self.showXmlrpc()
+
+ def showXmlrpc(self):
+ 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("'\nbody: '", ''), replies)
+ replies.reverse() # so that I use pop() as popleft
+ # 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 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