X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fsfirenew.py;h=8d15ba57bb98190491410fc6db2c31adb42cb87b;hp=a4dd1b352106f53d586cd8d06ba46bf6f24c3ec4;hb=5a487f5551aff6228d7615a85ff4c84a54d98e85;hpb=1123a48de43e859c145f1489257b92ad79323e14

diff --git a/sface/sfirenew.py b/sface/sfirenew.py
index a4dd1b3..8d15ba5 100644
--- a/sface/sfirenew.py
+++ b/sface/sfirenew.py
@@ -21,7 +21,7 @@ class SfiRenewer(QObject):
 
         self.renewProcess = SfiProcess(self)
         self.connect(self.renewProcess, SIGNAL('finished()'), self.finishedGetRecord)
-        self.renewProcess.getRecord(hrn=hrn, filename="/tmp/slicerecord")
+        self.renewProcess.getRecord(hrn=hrn, type="slice", filename="/tmp/slicerecord")
 
     def finishedGetRecord(self):
         self.faultString = self.renewProcess.getFaultString()
@@ -63,12 +63,17 @@ class SfiRenewer(QObject):
         if os.path.exists(sliceCredName):
             os.remove(sliceCredName)
 
+        # newer SFA has a slightly different slice credential name
+        sliceCredName = config.fullpath(self.hrn + ".slice.cred")
+        if os.path.exists(sliceCredName):
+            os.remove(sliceCredName)
+
         open("/tmp/expiration", "w").write(self.newExpiration.strftime("%Y-%m-%dT%H:%M:%SZ"))
 
         # call renewSlivers on the aggregate
         self.disconnect(self.renewProcess, SIGNAL('finished()'), self.finishedUpdateRecord)
         self.connect(self.renewProcess, SIGNAL('finished()'), self.finishedRenewSlivers)
-        self.renewProcess.renewSlivers(self.newExpiration.strftime("%Y-%m-%dT%H:%M:%SZ"))
+        self.renewProcess.renewSlivers(self.newExpiration.strftime("%Y-%m-%dT%H:%M:%SZ"), slice = self.hrn)
 
     def finishedRenewSlivers(self):
         self.faultString = self.renewProcess.getFaultString()
@@ -200,7 +205,7 @@ class RenewWindow(QDialog):
         self.process = SfiProcess(self)
         self.connect(self.process, SIGNAL('finished()'), self.getAuthorityRecordFinished)
 
-        self.process.listRecords(config.getAuthority(), None, config.getAuthorityListFile())
+        self.process.listRecords(config.getAuthority(), None)
         self.setStatus("Refreshing slice list. This will take a moment...")
 
     def getAuthorityRecordFinished(self):