avoid as much as possible accessing logger through class instances, whenever that...

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

diff --git a/sfa/methods/CreateGid.py b/sfa/methods/CreateGid.py
index 74ce9de..fe5aacb 100644 (file)
--- a/sfa/methods/CreateGid.py
+++ b/sfa/methods/CreateGid.py
@@ -1,46 +1,48 @@
 
 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.util.sfalogging import logger
+
+from sfa.storage.parameter import Parameter, Mixed

 from sfa.trust.credential import Credential
 
 from sfa.trust.credential import Credential
 

+

 class CreateGid(Method):
     """
 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
     """
 
     interfaces = ['registry']
     @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"),
     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")
 
     returns = Parameter(int, "String representation of gid object")

-    
+

     def call(self, creds, xrn, cert=None):
     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)
 
         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))
+        # 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 self.api.manager.create_gid(self.api, xrn, cert)
+        return self.api.manager.CreateGid(self.api, xrn, cert)