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

diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py
index eee34bb..6f2140b 100644
--- a/sface/sfiprocess.py
+++ b/sface/sfiprocess.py
@@ -27,11 +27,12 @@ class SfiProcess(QObject):
         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 = ''
+
+        # holds aggregate output from processStandardOutput(); used by xmlrpc
+        # tracker.
+        self.output = ""
 
         self.connect(self.process, SIGNAL("readyReadStandardOutput()"),
                      self.processStandardOutput)
@@ -55,6 +56,7 @@ class SfiProcess(QObject):
 
     def processStandardOutput(self):
         output = self.process.readAllStandardOutput()
+        self.output = self.output + output
         if config.debug:
             print output
 
@@ -103,23 +105,40 @@ class SfiProcess(QObject):
 #    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.output = ""
         self.trace_command()
         self.process.start(self.exe, self.args)
 
@@ -131,11 +150,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)