renamed class TrustedRootList into TrustedRoots

diff --git a/sfa/plc/sfaImport.py b/sfa/plc/sfaImport.py
index 1bc28f0..cadefd7 100644 (file)
--- a/sfa/plc/sfaImport.py
+++ b/sfa/plc/sfaImport.py
@@ -20,7 +20,7 @@ from sfa.util.xrn import get_authority, hrn_to_urn
 from sfa.util.plxrn import email_to_hrn
 from sfa.util.config import Config
 from sfa.trust.certificate import convert_public_key, Keypair
-from sfa.trust.trustedroots import *
+from sfa.trust.trustedroots import TrustedRoots
 from sfa.trust.hierarchy import *
 from sfa.trust.gid import create_uuid
 
@@ -55,7 +55,7 @@ class sfaImport:
        self.logger = _SfaLogger(logfile='/var/log/sfa_import.log', loggername='importlog')
        self.AuthHierarchy = Hierarchy()
        self.config = Config()
-       self.TrustedRoots = TrustedRootList(Config.get_trustedroots_dir(self.config))
+       self.TrustedRoots = TrustedRoots(Config.get_trustedroots_dir(self.config))
        self.plc_auth = self.config.get_plc_auth()
        self.root_auth = self.config.SFA_REGISTRY_ROOT_AUTH
         

diff --git a/sfa/server/sfa-server.py b/sfa/server/sfa-server.py
index 6477ffa..5a1cbca 100755 (executable)
--- a/sfa/server/sfa-server.py
+++ b/sfa/server/sfa-server.py
@@ -39,7 +39,6 @@ import sfa.util.xmlrpcprotocol as xmlrpcprotocol
 from optparse import OptionParser
 
 from sfa.util.sfalogging import logger
-from sfa.trust.trustedroots import TrustedRootList
 from sfa.trust.certificate import Keypair, Certificate
 from sfa.trust.hierarchy import Hierarchy
 from sfa.trust.gid import GID

diff --git a/sfa/trust/auth.py b/sfa/trust/auth.py
index 657dd34..1b8a182 100644 (file)
--- a/sfa/trust/auth.py
+++ b/sfa/trust/auth.py
@@ -5,7 +5,7 @@ import sys
 
 from sfa.trust.certificate import Keypair, Certificate
 from sfa.trust.credential import Credential
-from sfa.trust.trustedroots import TrustedRootList
+from sfa.trust.trustedroots import TrustedRoots
 from sfa.util.faults import *
 from sfa.trust.hierarchy import Hierarchy
 from sfa.util.config import *
@@ -27,8 +27,8 @@ class Auth:
         self.load_trusted_certs()
 
     def load_trusted_certs(self):
-        self.trusted_cert_list = TrustedRootList(self.config.get_trustedroots_dir()).get_list()
-        self.trusted_cert_file_list = TrustedRootList(self.config.get_trustedroots_dir()).get_file_list()
+        self.trusted_cert_list = TrustedRoots(self.config.get_trustedroots_dir()).get_list()
+        self.trusted_cert_file_list = TrustedRoots(self.config.get_trustedroots_dir()).get_file_list()
 
         
         

diff --git a/sfa/trust/trustedroots.py b/sfa/trust/trustedroots.py
index 65b97fa..e81b9c1 100644 (file)
--- a/sfa/trust/trustedroots.py
+++ b/sfa/trust/trustedroots.py
@@ -3,7 +3,7 @@ import glob
 
 from sfa.trust.gid import GID
 
-class TrustedRootList:
+class TrustedRoots:
     def __init__(self, dir):
         self.basedir = dir
         # create the directory to hold the files, if not existing

diff --git a/sfa/util/server.py b/sfa/util/server.py
index fadd4ca..c3ae718 100644 (file)
--- a/sfa/util/server.py
+++ b/sfa/util/server.py
@@ -18,7 +18,7 @@ import SimpleXMLRPCServer
 from OpenSSL import SSL
 
 from sfa.trust.certificate import Keypair, Certificate
-from sfa.trust.trustedroot import TrustedRootList
+from sfa.trust.trustedroots import TrustedRoots
 from sfa.util.config import Config
 from sfa.trust.credential import *
 from sfa.util.faults import *
@@ -154,7 +154,7 @@ class SecureXMLRPCServer(BaseHTTPServer.HTTPServer,SimpleXMLRPCServer.SimpleXMLR
         # If you wanted to verify certs against known CAs.. this is how you would do it
         #ctx.load_verify_locations('/etc/sfa/trusted_roots/plc.gpo.gid')
         config = Config()
-        trusted_cert_files = TrustedRootList(config.get_trustedroots_dir()).get_file_list()
+        trusted_cert_files = TrustedRoots(config.get_trustedroots_dir()).get_file_list()
         for cert_file in trusted_cert_files:
             ctx.load_verify_locations(cert_file)
         ctx.set_verify(SSL.VERIFY_PEER | SSL.VERIFY_FAIL_IF_NO_PEER_CERT, verify_callback)