Tagging module geniwrapper - geniwrapper-0.2-3

[sfa.git] / geni / registry.py

diff --git a/geni/registry.py b/geni/registry.py
index c03e481..7844cfe 100644 (file)
--- a/geni/registry.py
+++ b/geni/registry.py
@@ -33,7 +33,7 @@ class Registry(GeniServer):
     # @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, config = '/usr/share/geniwrapper/geni/util/geni_config'):
+    def __init__(self, ip, port, key_file, cert_file):
         GeniServer.__init__(self, ip, port, key_file, cert_file)
         self.server.interface = 'registry' 
 
@@ -46,14 +46,33 @@ class Registries(dict):
 
     required_fields = ['hrn', 'addr', 'port']
 
-    def __init__(self, api):
+    def __init__(self, api, file = "/etc/geni/registries.xml"):
         dict.__init__(self, {})
         self.api = api
-        registries_file = self.api.server_basedir + os.sep + 'registries.xml'
+    
+        # create default connection dict
         connection_dict = {}
         for field in self.required_fields:
-            connection_dict[field] = ''  
-        self.registry_info = XmlStorage(registries_file, {'registries': {'registry': [connection_dict]}})
+            connection_dict[field] = ''
+        registries_dict = {'registries': {'registry': [connection_dict]}}
+
+        # get possible config file locations
+        loaded = False
+        path = os.path.dirname(os.path.abspath(__file__))
+        filename = file.split(os.sep)[-1]
+        alt_file = path + os.sep + filename
+        files = [file, alt_file]
+    
+        for f in files:
+            try:
+                if os.path.isfile(f):
+                    self.registry_info = XmlStorage(f, registries_dict)
+                    loaded = True
+            except: pass
+
+        # if file is missing, just recreate it in the right place
+        if not loaded:
+            self.registry_info = XmlStorage(file, registries_dict)
         self.registry_info.load()
         self.connectRegistries()
         
@@ -92,7 +111,7 @@ class Registries(dict):
 
         # set up a connection to the local registry
         # connect to registry using GeniClient
-        address = self.api.config.GENI_REGISTRY_HOSTNAME
+        address = self.api.config.GENI_REGISTRY_HOST
         port = self.api.config.GENI_REGISTRY_PORT
         url = 'http://%(address)s:%(port)s' % locals()
         self[self.api.hrn] = GeniClient(url, self.api.key_file, self.api.cert_file)