X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fsfiprocess.py;h=bef0902c93b3432bf149ed1077df8a21a0b335ad;hp=227a35ba8c635f46c5f64262a447a0199fd2d20b;hb=3439851d679809141ed08e5e486531cd2cbd4f9a;hpb=ab40b6e95de331b183c426db56fbe26cd3bdced8

diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py
index 227a35b..bef0902 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
 
 def find_executable(exec_name):
     """find the given executable in $PATH"""
@@ -25,14 +21,28 @@ 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.xmlrpctracker = XmlrpcTracker()
+        # in case self.output is read by the XmlrpcTracker 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)
 
@@ -43,6 +53,14 @@ class SfiProcess(QObject):
     def isRunning(self):
         return self.process.state() != QProcess.NotRunning
 
+    def processStandardOutput(self):
+        output = self.process.readAllStandardOutput()
+        if config.debug:
+            print output
+
+    def processStandardError(self):
+        print self.process.readAllStandardError()
+
     def processFinished(self):
         if self.process.exitStatus() == QProcess.CrashExit:
             print self.readOutput()
@@ -82,30 +100,44 @@ class SfiProcess(QObject):
     def getRSpecFromSM(self):
         return self.__getRSpec(config.getSlicemgr())
 
-    def getRSpecFromAM(self):
-        return self.__getRSpec(config.getAggmgr())
+#    def getRSpecFromAM(self):
+#        return self.__getRSpec(config.getAggmgr())
 
-    def getRecord(self, hrn):
-        args = ["-u", config.getUser(), "-a", config.getAuthority(), 
+    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 applyRSpec(self, rspec):
         filename = config.getSliceRSpecFile() + "_new"
         rspec.save(filename)
-        args = ["-u", config.getUser(), "-a", config.getAuthority(), 
-                "-r", config.getRegistry(), "-s", config.getSlicemgr(), "create", 
+        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 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 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()
+
     def start(self):
-        self.args.prepend(QString('-D'))
         self.trace_command()
         self.process.start(self.exe, self.args)
-        print self.args
 
     def readOutput(self):
         if self.process.state() == QProcess.NotRunning:
@@ -115,83 +147,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 = '<methodCall>.*?</methodCall>'
-        pttrnAns = '<methodResponse>.*?</methodResponse>'
-        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 = '<debug>'
-        for ans in answers:
-            self.xml += ans + replies.pop()
-        self.xml += '</debug>'
-
-    def test(self):
-        print self.xml
-        
-    def stats(self):
-        # statistics: round-trip time, size of the com
-        pass
+#            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)
 
-    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 = '<debug/>'
-        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