add delete slice button

[sface.git] / sface / sfiprocess.py

diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py
index ee49eb7..872fa5a 100644 (file)
--- a/sface/sfiprocess.py
+++ b/sface/sfiprocess.py
@@ -3,9 +3,6 @@ import os
 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 +138,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,10 +200,19 @@ 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()