Merge Master in geni-v3 conflict resolution

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

diff --git a/sfa/methods/GetGids.py b/sfa/methods/GetGids.py
index 601db6f..623fbe9 100644 (file)
--- a/sfa/methods/GetGids.py
+++ b/sfa/methods/GetGids.py
@@ -1,8 +1,10 @@
 from sfa.util.faults import RecordNotFound
 from sfa.util.method import Method
-from sfa.util.parameter import Parameter, Mixed
+
 from sfa.trust.credential import Credential
 
+from sfa.storage.parameter import Parameter, Mixed
+
 class GetGids(Method):
     """
     Get a list of record information (hrn, gid and type) for 
@@ -31,7 +33,7 @@ class GetGids(Method):
         origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_hrn()
         
         # resolve the record
-        records = self.api.manager.resolve(self.api, xrns, full = False)
+        records = self.api.manager.Resolve(self.api, xrns, details = False)
         if not records:
             raise RecordNotFound(xrns)