X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FCreateGid.py;h=fe5aacb8b23e1247cd36b89ce837e74aeb215d9d;hb=fd395e1944dcd49f10a4d5b27ce4983ad389fb96;hp=7c1bf8ace4244986d4551081f802bfe52bf2b6a2;hpb=db88e8be755e4a4c17fcd65eec98ca420eff91a4;p=sfa.git

diff --git a/sfa/methods/CreateGid.py b/sfa/methods/CreateGid.py
index 7c1bf8ac..fe5aacb8 100644
--- a/sfa/methods/CreateGid.py
+++ b/sfa/methods/CreateGid.py
@@ -1,50 +1,48 @@
-### $Id: register.py 16477 2010-01-05 16:31:37Z thierry $
-### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/methods/register.py $
 
 from sfa.util.xrn import urn_to_hrn
 from sfa.util.method import Method
-from sfa.util.parameter import Parameter, Mixed
+from sfa.util.sfalogging import logger
+
+from sfa.storage.parameter import Parameter, Mixed
 from sfa.trust.credential import Credential
 
+
 class CreateGid(Method):
     """
-    Create a signed credential for the s object with the registry. In addition to being stored in the
+    Create a signed credential for the object with the registry. In addition to being stored in the
     SFA database, the appropriate records will also be created in the
     PLC databases
-    
+
+    @param cred credential string
     @param xrn urn or hrn of certificate owner
     @param cert caller's certificate
-    @param cred credential string
-    
+
     @return gid string representation
     """
 
     interfaces = ['registry']
-    
+
     accepts = [
         Mixed(Parameter(str, "Credential string"),
               Parameter(type([str]), "List of credentials")),
         Parameter(str, "URN or HRN of certificate owner"),
         Parameter(str, "Certificate string"),
-        ]
+    ]
 
     returns = Parameter(int, "String representation of gid object")
-    
+
     def call(self, creds, xrn, cert=None):
-        # TODO: is there a better right to check for or is 'update good enough? 
+        # TODO: is there a better right to check for or is 'update good enough?
         valid_creds = self.api.auth.checkCredentials(creds, 'update')
 
         # verify permissions
         hrn, type = urn_to_hrn(xrn)
         self.api.auth.verify_object_permission(hrn)
 
-        #log the call
-        origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_hrn()
-
-        # log
-        origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_hrn()
-        self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, xrn, self.name))
-
-        manager = self.api.get_interface_manager()
+        # log the call
+        origin_hrn = Credential(
+            string=valid_creds[0]).get_gid_caller().get_hrn()
+        logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s" %
+                    (self.api.interface, origin_hrn, xrn, self.name))
 
-        return manager.create_gid(self.api, xrn, cert)
+        return self.api.manager.CreateGid(self.api, xrn, cert)