more helpful log line for Renew

[sfa.git] / sfa / methods / Renew.py

diff --git a/sfa/methods/Renew.py b/sfa/methods/Renew.py
index ee951c0..c75c781 100644 (file)
--- a/sfa/methods/Renew.py
+++ b/sfa/methods/Renew.py
@@ -21,7 +21,7 @@ class Renew(Method):
     """
     interfaces = ['aggregate', 'slicemgr']
     accepts = [
-        Parameter(str, "Slice URN"),
+        Parameter(type([str]), "Slice URN"),
         Parameter(type([str]), "List of credentials"),
         Parameter(str, "Expiration time in RFC 3339 format"),
         Parameter(dict, "Options"),
@@ -30,17 +30,23 @@ class Renew(Method):
 
     def call(self, urns, creds, expiration_time, options):
 
-        self.api.logger.info("interface: %s\ttarget-hrn: %s\tcaller-creds: %s\tmethod-name: %s"%(self.api.interface, urns, creds, self.name))
 
         # Find the valid credentials
-        valid_creds = self.api.auth.checkCredentials(creds, 'renewsliver', urns)
+        valid_creds = self.api.auth.checkCredentialsSpeaksFor(creds, 'renewsliver', urns,
+                                                              check_sliver_callback = self.api.driver.check_sliver_credentials,
+                                                              options=options)
+        the_credential = Credential(cred=valid_creds[0])
+        actual_caller_hrn = the_credential.actual_caller_hrn()
+        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-urns: %s\texp:%s\tmethod-name: %s"%\
+                             (self.api.interface, actual_caller_hrn, urns, expiration_time,self.name))
+
 
         # Validate that the time does not go beyond the credential's expiration time
         requested_time = utcparse(expiration_time)
         max_renew_days = int(self.api.config.SFA_MAX_SLICE_RENEW)
-        if requested_time > Credential(string=valid_creds[0]).get_expiration():
+        if requested_time > Credential(cred=valid_creds[0]).get_expiration():
             raise InsufficientRights('Renewsliver: Credential expires before requested expiration time')
         if requested_time > datetime.datetime.utcnow() + datetime.timedelta(days=max_renew_days):
             raise Exception('Cannot renew > %s days from now' % max_renew_days)
-        return self.api.manager.Renew(self.api, urns, expiration_time, options)
+        return self.api.manager.Renew(self.api, urns, creds, expiration_time, options)