a little nicer wrt pep8

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

diff --git a/sfa/methods/GetGids.py b/sfa/methods/GetGids.py
index b497670..1e2349f 100644 (file)
--- a/sfa/methods/GetGids.py
+++ b/sfa/methods/GetGids.py
@@ -1,12 +1,12 @@
-from sfa.util.faults import *
+from sfa.util.faults import RecordNotFound
 from sfa.util.method import Method
-from sfa.util.parameter import Parameter, Mixed
-from sfa.trust.auth import Auth
-from sfa.trust.gid import GID
-from sfa.trust.certificate import Certificate
+
 from sfa.trust.credential import Credential
 
-class get_gids(Method):
+from sfa.storage.parameter import Parameter, Mixed
+
+
+class GetGids(Method):
     """
     Get a list of record information (hrn, gid and type) for 
     the specified hrns.
@@ -17,34 +17,31 @@ class get_gids(Method):
     """
 
     interfaces = ['registry']
-    
+
     accepts = [
-        Parameter(str, "Certificate string"),
-        Mixed(Parameter(str, "Human readable name (hrn or xrn)"), 
-              Parameter(type([str]), "List of Human readable names (hrn or xrn)")) 
-        ]
+        Mixed(Parameter(str, "Human readable name (hrn or xrn)"),
+              Parameter(type([str]), "List of Human readable names (hrn or xrn)")),
+        Mixed(Parameter(str, "Credential string"),
+              Parameter(type([str]), "List of credentials")),
+    ]
 
     returns = [Parameter(dict, "Dictionary of gids keyed on hrn")]
-    
-    def call(self, cred, xrns):
+
+    def call(self, xrns, creds):
         # validate the credential
-        self.api.auth.check(cred, 'getgids')
-        user_cred = Credential(string=cred)
-        origin_hrn = user_cred.get_gid_caller().get_hrn()
+        valid_creds = self.api.auth.checkCredentials(creds, 'getgids')
+        # xxxpylintxxx origin_hrn is unused..
+        origin_hrn = Credential(
+            string=valid_creds[0]).get_gid_caller().get_hrn()
 
         # resolve the record
-        manager_base = 'sfa.managers'
-        mgr_type = self.api.config.SFA_REGISTRY_TYPE
-        manager_module = manager_base + ".registry_manager_%s" % mgr_type
-        manager = __import__(manager_module, fromlist=[manager_base])
-        records = manager.resolve(self.api, xrns, None, origin_hrn=origin_hrn, full = False)
+        records = self.api.manager.Resolve(self.api, xrns, details=False)
         if not records:
-            raise RecordNotFound(hrns)
+            raise RecordNotFound(xrns)
 
-        gids = []
-        allowed_fields =  ['hrn', 'type', 'gid']
+        allowed_fields = ['hrn', 'type', 'gid']
         for record in records:
-            for key in record.keys():
+            for key in list(record.keys()):
                 if key not in allowed_fields:
                     del(record[key])
-        return records    
+        return records