geniclient isnt used anymore

[sfa.git] / sfa / plc / api.py

diff --git a/sfa/plc/api.py b/sfa/plc/api.py
index ffcacfb..ef3b9c3 100644 (file)
--- a/sfa/plc/api.py
+++ b/sfa/plc/api.py
@@ -17,7 +17,7 @@ from sfa.util.debug import *
 from sfa.trust.rights import *
 from sfa.trust.credential import *
 from sfa.trust.certificate import *
-from sfa.util.misc import *
+from sfa.util.namespace import *
 from sfa.util.api import *
 from sfa.util.nodemanager import NodeManager
 from sfa.util.sfalogging import *
@@ -92,15 +92,15 @@ class GeniAPI(BaseAPI):
             return '4.2'
             
 
-    def getCredential(self, origin_hrn=None):
+    def getCredential(self):
         if self.interface in ['registry']:
-            return self.getCredentialFromLocalRegistry(origin_hrn)
+            return self.getCredentialFromLocalRegistry()
         else:
-            return self.getCredentialFromRegistry(origin_hrn)
+            return self.getCredentialFromRegistry()
     
-    def getCredentialFromRegistry(self, origin_hrn=None):
+    def getCredentialFromRegistry(self):
         """ 
-        Get our credential from a remote registry using a geniclient connection
+        Get our credential from a remote registry 
         """
         type = 'authority'
         path = self.config.SFA_DATA_DIR
@@ -115,19 +115,15 @@ class GeniAPI(BaseAPI):
             registry = registries[self.hrn]
             cert_string=self.cert.save_to_string(save_parents=True)
             # get self credential
-            arg_list = [cert_string,type,self.hrn]
-            request_hash=self.key.compute_hash(arg_list)
-            self_cred = registry.get_self_credential(cert_string, type, self.hrn, request_hash)
+            self_cred = registry.get_self_credential(cert_string, type, self.hrn)
             # get credential
-            arg_list = [self_cred,type,self.hrn,origin_hrn]
-            request_hash=self.key.compute_hash(arg_list)
-            cred = registry.get_credential(self_cred, type, self.hrn, origin_hrn, request_hash)
+            cred = registry.get_credential(self_cred, type, self.hrn)
             
             # save cred to file
             Credential(string=cred).save_to_file(cred_filename, save_parents=True)
             return cred
 
-    def getCredentialFromLocalRegistry(self, origin_hrn=None):
+    def getCredentialFromLocalRegistry(self):
         """
         Get our current credential directly from the local registry.
         """
@@ -147,17 +143,6 @@ class GeniAPI(BaseAPI):
         record = records[0]
         type = record['type']
         object_gid = record.get_gid_object()
-        
-        # get the origin caller's gid (this is the caller's gid by default)
-        if origin_hrn:
-            orgin_records = table.find({'hrn': origin_hrn})
-            if not origin_records:
-                raise RecordNotFound(origin_hrn)
-            origin_record = origin_records[0]
-            origin_caller_gid_object = GID(string = record['gid'])
-        else:
-            origin_caller_gid_object = object_gid
-
         new_cred = Credential(subject = object_gid.get_subject())
         new_cred.set_gid_caller(object_gid)
         new_cred.set_gid_object(object_gid)