From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 18 Nov 2011 08:55:44 +0000 (+0100)
Subject: Merge branches 'master' and 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-1.1-4~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2f1f135574b837d17507d69b901a72e1fcdcdce6;hp=3647d2a2888d6ee1c7614a32d3564dfe47ceb9c2;p=sfa.git

Merge branches 'master' and 'master' of ssh://git.onelab.eu/git/sfa
---

diff --git a/sfa/managers/managerwrapper.py b/sfa/managers/managerwrapper.py
index b0326d67..86907e79 100644
--- a/sfa/managers/managerwrapper.py
+++ b/sfa/managers/managerwrapper.py
@@ -29,6 +29,6 @@ class ManagerWrapper:
         
     def __getattr__(self, method):
         if not hasattr(self.manager, method):
-            raise SfaNotImplemented(method, self.interface)
+            raise SfaNotImplemented(self.interface, method)
         return getattr(self.manager, method)
         
diff --git a/sfa/methods/GetGids.py b/sfa/methods/GetGids.py
index 601db6f6..5c1470b7 100644
--- a/sfa/methods/GetGids.py
+++ b/sfa/methods/GetGids.py
@@ -31,7 +31,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, full = False)
         if not records:
             raise RecordNotFound(xrns)
 
diff --git a/sfa/methods/GetSelfCredential.py b/sfa/methods/GetSelfCredential.py
index 7076e924..efad1804 100644
--- a/sfa/methods/GetSelfCredential.py
+++ b/sfa/methods/GetSelfCredential.py
@@ -54,7 +54,7 @@ class GetSelfCredential(Method):
         
  
         # authenticate the gid
-        records = self.api.manager.resolve(self.api, xrn, type)
+        records = self.api.manager.Resolve(self.api, xrn, type)
         if not records:
             raise RecordNotFound(hrn)
         record = SfaRecord(dict=records[0])