X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sface%2Fsfiprocess.py;h=3c14718575c8026e32de1b987761abab18ae177e;hb=96ec1c38a62466c4d69a57835d470fee98a39edc;hp=ee49eb73cf85b6963d0e92e956639cbb8e2a2f28;hpb=dc5a4a16b0819bc27efd1f77d632a76463db82c0;p=sface.git

diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py
index ee49eb7..3c14718 100644
--- a/sface/sfiprocess.py
+++ b/sface/sfiprocess.py
@@ -1,11 +1,9 @@
 
 import os
+import pickle
 import sys
 import time
 
-from distutils.version import LooseVersion
-from sfa.util.version import version_core
-
 from PyQt4.QtCore import *
 from sface.config import config
 from sface.xmlrpcwindow import get_tracker, XmlrpcReader
@@ -141,14 +139,10 @@ class SfiProcess(QObject):
 
     def listRecords(self, hrn, rectype=None, filename=None):
         args = ["-u", config.getUser(), "-a", config.getAuthority(),
-                "-r", config.getRegistry(), "-s", config.getSlicemgr(), "list", hrn]
+                "-r", config.getRegistry(), "-s", config.getSlicemgr(), "list", "-F", "xmllist", hrn]
 
         if not filename:
-            if LooseVersion(version_core()['code_tag']) <= LooseVersion("1.0-35"):
-                # DEPRECATED
-                filename = config.getAuthorityListRecordFile()
-            else:
-                filename = config.getAuthorityListFile()
+            filename = config.getAuthorityListFile()
 
         # 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.
@@ -207,13 +201,36 @@ class SfiProcess(QObject):
         self.__init_command(args)
         self.start()
 
-    def renewSlivers(self, expiration):
+    def removeRecord(self, hrn):
+        args = ["-u", config.getUser(), "-a", config.getAuthority(),
+                "-r", config.getRegistry(), "-s", config.getSlicemgr(), "remove", hrn]
+        self.__init_command(args)
+        self.start()
+
+    def renewSlivers(self, expiration, slice=None):
+        if not slice:
+            slice = config.getSlice()
+
         args = ["-u", config.getUser(), "-a", config.getAuthority(),
                 "-r", config.getRegistry(), "-s", config.getSlicemgr(), "renew",
-                config.getSlice(), expiration]
+                slice, expiration]
+        self.__init_command(args)
+        self.start()
+
+    def sliverStatus(self, slice=None, filename=None):
+        if not slice:
+            slice = config.getSlice()
+
+        if not filename:
+            filename = config.fullpath(slice+".sliverstatus")
+
+        args = ["-u", config.getUser(), "-a", config.getAuthority(),
+                "-r", config.getRegistry(), "-s", config.getSlicemgr(), "status",
+                "-o", filename, "-F", "pickled", slice]
         self.__init_command(args)
         self.start()
 
+
     def start(self):
         self.respones = []
         self.faults = []