cosmetic

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

diff --git a/sfa/methods/CreateGid.py b/sfa/methods/CreateGid.py
index 7c1bf8a..0a2785f 100644 (file)
--- a/sfa/methods/CreateGid.py
+++ b/sfa/methods/CreateGid.py
@@ -1,20 +1,19 @@
-### $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.xrn import urn_to_hrn
 from sfa.util.method import Method

-from sfa.util.parameter import Parameter, Mixed
+
+from sfa.storage.parameter import Parameter, Mixed

 from sfa.trust.credential import Credential
 
 class CreateGid(Method):
     """
 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
     
     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 xrn urn or hrn of certificate owner
     @param cert caller's certificate

-    @param cred credential string

     
     @return gid string representation
     """
     
     @return gid string representation
     """


@@ -40,11 +39,6 @@ class CreateGid(Method):
 
         #log the call
         origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_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))
 
         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()
-
-        return manager.create_gid(self.api, xrn, cert)
+        return self.api.manager.CreateGid(self.api, xrn, cert)