X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2Fget_trusted_certs.py;h=53a687f36cd1efa8e20a8fe9d5045614b2b9d814;hb=3e6097e2d50ff322b45f53fcb22d07fc16adbdb6;hp=41563a2102a3beb2967318e28b7816dc3d7a41ab;hpb=9615a622441952c1e477178ce8619b3681336a9c;p=sfa.git

diff --git a/sfa/methods/get_trusted_certs.py b/sfa/methods/get_trusted_certs.py
index 41563a21..53a687f3 100644
--- a/sfa/methods/get_trusted_certs.py
+++ b/sfa/methods/get_trusted_certs.py
@@ -1,12 +1,11 @@
-
-### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/reset_slices.py $
-
-from sfa.util.faults import *
 from sfa.util.method import Method
-from sfa.util.parameter import Parameter, Mixed
+
 from sfa.trust.auth import Auth
 from sfa.trust.credential import Credential
 
+from sfa.storage.parameter import Parameter, Mixed
+
+
 class get_trusted_certs(Method):
     """
     @param cred credential string specifying the rights of the caller
@@ -14,28 +13,29 @@ class get_trusted_certs(Method):
     """
 
     interfaces = ['registry', 'aggregate', 'slicemgr']
-    
+
     accepts = [
         Mixed(Parameter(str, "Credential string"),
               Parameter(None, "Credential not specified"))
-        ]
+    ]
 
-    returns = Parameter([str], "List of GID strings")
-    
-    def call(self, cred = None):
+    returns = Parameter(type([str]), "List of GID strings")
+
+    def call(self, cred=None):
         # If cred is not specified just return the gid for this interface.
         # This is true when when a peer is attempting to initiate federation
-        # with this interface 
+        # with this interface
+        self.api.logger.debug("get_trusted_certs: %r" % cred)
         if not cred:
             gid_strings = []
             for gid in self.api.auth.trusted_cert_list:
                 if gid.get_hrn() == self.api.config.SFA_INTERFACE_HRN:
-                    gid_strings.append[gid.save_to_string(save_parents=True)]   
+                    gid_strings.append(gid.save_to_string(save_parents=True))
             return gid_strings
 
         # authenticate the cred
         self.api.auth.check(cred, 'gettrustedcerts')
-        gid_strings = [gid.save_to_string(save_parents=True) for \
-                                gid in self.api.auth.trusted_cert_list] 
-        
-        return gid_strings 
+        gid_strings = [gid.save_to_string(save_parents=True) for
+                       gid in self.api.auth.trusted_cert_list]
+
+        return gid_strings