X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fsfiprocess.py;h=8eb0408a091ae8d8764848d7504096939e8423ec;hp=655fcb6beece995493c8d39ebf139afb340a9e90;hb=7deacd09712ea9d96f3dcef6195f3e207efb55f4;hpb=fe5c9420a6778d5e1d069ab12db4de3a96ab010d

diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py
index 655fcb6..8eb0408 100644
--- a/sface/sfiprocess.py
+++ b/sface/sfiprocess.py
@@ -1,9 +1,11 @@
 
 import os
+import sys
 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"""
@@ -19,8 +21,29 @@ 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()
+
+        # 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()
+        if config.debug:
+            # this shows xmlrpc conversation, see sfi.py docs.
+            self.args << QString('-D')
         for arg in args:
             self.args << QString(arg)
 
@@ -28,10 +51,17 @@ class SfiProcess(QObject):
         if not self.exe:
             print "FATAL.. Could not locate binary sfi.py - not much we can do without that"
 
-        self.process = QProcess()
+    def isRunning(self):
+        return self.process.state() != QProcess.NotRunning
 
-        self.connect(self.process, SIGNAL("finished(int, QProcess::ExitStatus)"),
-                     self.processFinished)
+    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:
@@ -72,26 +102,76 @@ 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 listRecords(self, hrn, rectype=None, filename=None):
+        args = ["-u", config.getUser(), "-a", config.getAuthority(),
+                "-r", config.getRegistry(), "-s", config.getSlicemgr(), "list", 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 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", 
+        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 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()
+
     def start(self):
+        self.output = ""
         self.trace_command()
         self.process.start(self.exe, self.args)
 
@@ -103,9 +183,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)
+