a little nicer wrt pep8

[sfa.git] / sfa / server / registry.py

diff --git a/sfa/server/registry.py b/sfa/server/registry.py
index b55f9ac..edf0711 100644 (file)
--- a/sfa/server/registry.py
+++ b/sfa/server/registry.py
@@ -2,13 +2,15 @@
 # Registry is a SfaServer that implements the Registry interface
 #
 from sfa.server.sfaserver import SfaServer
-from sfa.util.faults import *
-from sfa.util.xrn import hrn_to_urn
 from sfa.server.interface import Interfaces, Interface
-from sfa.util.config import Config 
+from sfa.util.config import Config
 
-##
+#
 # Registry is a SfaServer that serves registry and slice operations at PLC.
+# this truly is a server-side object
+#
+
+
 class Registry(SfaServer):
     ##
     # Create a new registry object.
@@ -17,21 +19,28 @@ class Registry(SfaServer):
     # @param port the port to listen on
     # @param key_file private key filename of registry
     # @param cert_file certificate filename containing public key (could be a GID file)
-    
+
     def __init__(self, ip, port, key_file, cert_file):
-        SfaServer.__init__(self, ip, port, key_file, cert_file,'registry')
+        SfaServer.__init__(self, ip, port, key_file, cert_file, 'registry')
+        sfa_config = Config()
+        if Config().SFA_REGISTRY_ENABLED:
+            from sfa.storage.alchemy import engine
+            from sfa.storage.dbschema import DBSchema
+            DBSchema().init_or_upgrade()
+
+#
+# Registries is a dictionary of registry connections keyed on the registry hrn
+# as such it's more of a client-side thing for registry servers to reach their peers
+#
 
-##
-# Registries is a dictionary of registry connections keyed on the registry
-# hrn
 
 class Registries(Interfaces):
-    
+
     default_dict = {'registries': {'registry': [Interfaces.default_fields]}}
 
-    def __init__(self, conf_file = "/etc/sfa/registries.xml"):
-        Interfaces.__init__(self, conf_file) 
-        sfa_config = Config() 
+    def __init__(self, conf_file="/etc/sfa/registries.xml"):
+        Interfaces.__init__(self, conf_file)
+        sfa_config = Config()
         if sfa_config.SFA_REGISTRY_ENABLED:
             addr = sfa_config.SFA_REGISTRY_HOST
             port = sfa_config.SFA_REGISTRY_PORT