remove sfa upcalls

[plcapi.git] / PLC / SFA.py

diff --git a/PLC/SFA.py b/PLC/SFA.py
index 853f238..edff676 100644 (file)
--- a/PLC/SFA.py
+++ b/PLC/SFA.py
@@ -2,12 +2,10 @@ import traceback
 from types import StringTypes
 from PLC.Sites import Sites
 try:
-    from sfa.plc.api import GeniAPI
     from sfa.util.geniclient import *
     from sfa.util.config import *
     from sfa.trust.credential import *         
     from sfa.plc.sfaImport import cleanup_string
-    from sfa.server.registry import Registries
     from sfa.util.record import *
     from sfa.trust.hierarchy import *
     from sfa.util.misc import *
@@ -51,11 +49,11 @@ class SFA:
         config = Config()
         self.authority = config.SFA_INTERFACE_HRN
         url = 'http://%s:%s/' %(config.SFA_REGISTRY_HOST, config.SFA_REGISTRY_PORT) 
-        self.registry = GeniCleint(url, key_file, cert_file)
-        self.sfa_api = GeniAPI(key_file = key_file, cert_file = cert_file)
-        self.credential = self.sfa_api.getCredential()
-        #cred_file = '/etc/sfa/slicemgr.plc.authority.cred'
-        #self.credential = Credential(filename = cred_file)   
+        self.registry = GeniClient(url, key_file, cert_file)
+        #self.sfa_api = GeniAPI(key_file = key_file, cert_file = cert_file)
+        #self.credential = self.sfa_api.getCredential() 
+        cred_file = '/etc/sfa/slicemgr.' + self.authority + '.authority.cred'
+        self.credential = Credential(filename = cred_file)   
 
     def get_login_base(self, site_id):
         sites = Sites(self.api, [site_id], ['login_base'])
@@ -112,7 +110,6 @@ class SFA:
         if not parent_hrn: parent_hrn = hrn
         #records = self.registry.list(self.credential, parent_hrn)
         records = self.registry.resolve(self.credential, hrn)
-        records = []
         for record in records: 
             if record['type'] == type and record['hrn'] == hrn:
                 exists = True