X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fsfiprocess.py;h=bef0902c93b3432bf149ed1077df8a21a0b335ad;hp=61018895a1daa8253aeeb65910900ba737d3803d;hb=ce4c16bdd5c07f69c612b7c9db8bbc182ee28f74;hpb=154bcc2afda6ff1d2889f8d6b120becbedb3b707

diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py
index 6101889..bef0902 100644
--- a/sface/sfiprocess.py
+++ b/sface/sfiprocess.py
@@ -5,6 +5,7 @@ import time
 
 from PyQt4.QtCore import *
 from sface.config import config
+from sface.xmlrpcwindow import XmlrpcTracker
 
 def find_executable(exec_name):
     """find the given executable in $PATH"""
@@ -20,12 +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.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)
 
@@ -36,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()
@@ -75,25 +100,41 @@ 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.trace_command()
         self.process.start(self.exe, self.args)
@@ -106,9 +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
+            print time.strftime('%H:%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'
+#            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)
+