fix wrong slice renewed when doing batch renew
authorsmbaker <smbaker@fc8clean.lan>
Tue, 4 Oct 2011 02:19:48 +0000 (19:19 -0700)
committersmbaker <smbaker@fc8clean.lan>
Tue, 4 Oct 2011 02:19:48 +0000 (19:19 -0700)
sface/sfiprocess.py
sface/sfirenew.py

index c5a056b..cfa1109 100644 (file)
@@ -200,10 +200,13 @@ class SfiProcess(QObject):
         self.__init_command(args)
         self.start()
 
-    def renewSlivers(self, expiration):
+    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()
 
index dda2652..abbeb57 100644 (file)
@@ -68,7 +68,7 @@ class SfiRenewer(QObject):
         # 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()