changed GENI_CONFIG_HOSTNAME to GENI_CONFIG_HOST

[sfa.git] / geni / aggregate.py

diff --git a/geni/aggregate.py b/geni/aggregate.py
index c1d74b5..3fb3566 100644 (file)
--- a/geni/aggregate.py
+++ b/geni/aggregate.py
@@ -7,6 +7,11 @@ 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 *
 
@@ -20,7 +25,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'
 
@@ -28,13 +33,35 @@ class Aggregate(GeniServer):
 # Aggregates is a dictionary of geniclient aggregate connections keyed on the aggregate hrn
 
 class Aggregates(dict):
-    
-    def __init__(self, api):
+
+    required_fields = ['hrn', 'addr', 'port']
+     
+    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'
-        connection_dict = {'hrn': '', 'addr': '', 'port': ''}
-        self.aggregate_info = XmlStorage(aggregates_file, {'aggregates': {'aggregate': [connection_dict]}})
+
+        # create default connection dict
+        connection_dict = {}
+        for field in self.required_fields:
+            connection_dict[field] = ''
+        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()
 
@@ -44,24 +71,36 @@ class Aggregates(dict):
         Get connection details for the trusted peer aggregates from file and 
         create an GeniClient connection to each. 
         """
-        required_fields = ['hrn', 'addr', 'port']
         aggregates = self.aggregate_info['aggregates']['aggregate']
         if isinstance(aggregates, dict):
             aggregates = [aggregates]
         if isinstance(aggregates, list):
             for aggregate in aggregates:
-                # create xmlrpc connection using GeniClient
-                if not set(required_fields).issubset(aggregate.keys()):
+                # make sure the required fields are present
+                if not set(self.required_fields).issubset(aggregate.keys()):
                     continue
                 hrn, address, port = aggregate['hrn'], aggregate['addr'], aggregate['port']
                 if not hrn or not address or not port:
                     continue
+                # check which client we should use
+                # geniclient is default
+                client_type = 'geniclient'
+                if aggregate.has_key('client') and aggregate['client'] in ['geniclientlight']:
+                    client_type = 'geniclientlight'
+                
+                # create url
                 url = 'http://%(address)s:%(port)s' % locals()
-                self[hrn] = GeniClient(url, self.api.key_file, self.api.cert_file)
+
+                # create the client connection
+                # make sure module exists before trying to instantiate it
+                if client_type in ['geniclientlight'] and GeniClientLight:
+                    self[hrn] = GeniClientLight(url, self.api.key_file, self.api.cert_file)
+                else:
+                    self[hrn] = GeniClient(url, self.api.key_file, self.api.cert_file)
 
         # 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)