add clarifying error messages that offer a solution.

[sfa.git] / geni / aggregate.py

diff --git a/geni/aggregate.py b/geni/aggregate.py
index fe1a5e8..4f95ee8 100644 (file)
--- a/geni/aggregate.py
+++ b/geni/aggregate.py
@@ -1,19 +1,24 @@
+### $Id$
+### $URL$
+
 import os
 import sys
 import datetime
 import time
 import xmlrpclib
-
 from types import StringTypes, ListType
+
 from geni.util.geniserver import GeniServer
 from geni.util.geniclient import GeniClient
+
 # GeniLight client support is optional
 try:
     from egeni.geniLight_client import *
 except ImportError:
     GeniClientLight = None
 from geni.util.storage import *
-from geni.util.excep import *
+from geni.util.faults import *
+
 
 class Aggregate(GeniServer):
 
@@ -25,7 +30,7 @@ class Aggregate(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 = 'aggregate'
 
@@ -36,14 +41,32 @@ class Aggregates(dict):
 
     required_fields = ['hrn', 'addr', 'port']
      
-    def __init__(self, api):
+    def __init__(self, api, file = "/etc/geni/aggregates.xml"):
         dict.__init__(self, {})
         self.api = api
-        aggregates_file = self.api.server_basedir + os.sep + 'aggregates.xml'
+
+        # create default connection dict
         connection_dict = {}
         for field in self.required_fields:
             connection_dict[field] = ''
-        self.aggregate_info = XmlStorage(aggregates_file, {'aggregates': {'aggregate': [connection_dict]}})
+        aggregates_dict = {'aggregates': {'aggregate': [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.aggregate_info = XmlStorage(f, aggregates_dict)
+                    loaded = True
+            except: pass
+
+        # if file is missing, just recreate it in the right place
+        if not loaded:
+            self.aggregate_info = XmlStorage(file, aggregates_dict)
         self.aggregate_info.load()
         self.connectAggregates()
 
@@ -82,7 +105,7 @@ class Aggregates(dict):
 
         # set up a connection to the local registry
         # connect to registry using GeniClient
-        address = self.api.config.GENI_AGGREGATE_HOSTNAME
+        address = self.api.config.GENI_AGGREGATE_HOST
         port = self.api.config.GENI_AGGREGATE_PORT
         url = 'http://%(address)s:%(port)s' % locals()
         self[self.api.hrn] = GeniClient(url, self.api.key_file, self.api.cert_file)