X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2FRegister.py;h=8f57354600d6d998c9757f170e6b1dbefa3da379;hb=3e6097e2d50ff322b45f53fcb22d07fc16adbdb6;hp=92f230a144695025f602d2d597cbce2cf823964e;hpb=89d0fa4efde57cb62445af75c16bdc42bc03693a;p=sfa.git

diff --git a/sfa/methods/Register.py b/sfa/methods/Register.py
index 92f230a1..8f573546 100644
--- a/sfa/methods/Register.py
+++ b/sfa/methods/Register.py
@@ -1,39 +1,44 @@
 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 Register(Method):
     """
     Register an 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 record_dict dictionary containing record fields
-    
+
     @return gid string representation
     """
 
     interfaces = ['registry']
-    
+
     accepts = [
         Parameter(dict, "Record dictionary containing record fields"),
         Mixed(Parameter(str, "Credential string"),
               Parameter(type([str]), "List of credentials")),
-        ]
+    ]
 
     returns = Parameter(int, "String representation of gid object")
-    
+
     def call(self, record, creds):
-        # validate cred    
+        # validate cred
         valid_creds = self.api.auth.checkCredentials(creds, 'register')
-        
+
         # verify permissions
         hrn = record.get('hrn', '')
         self.api.auth.verify_object_permission(hrn)
 
-        #log the call
-        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, hrn, self.name))
-        
-        return self.api.manager.register(self.api, record)
+        # log the call
+        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, hrn, self.name))
+
+        return self.api.manager.Register(self.api, record)