X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fsfiprocess.py;h=b6c5f046676ee2c952f5bcd1ac490ff43fb65dc4;hp=6f2140be5149a09142ec930ab8196105563433d1;hb=9e7839877d1fe013161b0bbe7d76792a13dc8c62;hpb=ee759096e835ee81c1a66759396cd2ad9c3c4001

diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py
index 6f2140b..b6c5f04 100644
--- a/sface/sfiprocess.py
+++ b/sface/sfiprocess.py
@@ -5,7 +5,7 @@ import time
 
 from PyQt4.QtCore import *
 from sface.config import config
-from sface.xmlrpcwindow import XmlrpcTracker
+from sface.xmlrpcwindow import XmlrpcTracker, XmlrpcReader
 
 def find_executable(exec_name):
     """find the given executable in $PATH"""
@@ -28,7 +28,8 @@ class SfiProcess(QObject):
         self.connect(self.process, SIGNAL("finished(int, QProcess::ExitStatus)"),
                      self.processFinished)
 
-        self.xmlrpctracker = XmlrpcTracker()
+        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.
@@ -41,9 +42,14 @@ class SfiProcess(QObject):
 
     def __init_command(self, args):
         self.args = QStringList()
-        if config.debug:
-            # this shows xmlrpc conversation, see sfi.py docs.
-            self.args << QString('-D')
+        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)
 
@@ -80,6 +86,14 @@ 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()"))
 
@@ -105,6 +119,27 @@ class SfiProcess(QObject):
 #    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]
+
+        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]
@@ -114,6 +149,12 @@ class SfiProcess(QObject):
         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)
@@ -130,6 +171,12 @@ class SfiProcess(QObject):
         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",
@@ -138,6 +185,8 @@ class SfiProcess(QObject):
         self.start()
 
     def start(self):
+        self.respones = []
+        self.faults = []
         self.output = ""
         self.trace_command()
         self.process.start(self.exe, self.args)