X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Faggregate.py;h=a8f0a0a48146ad7afb0333a24641feaa04099756;hb=HEAD;hp=45eff40b90c9ad5d24398273a34fabddc5aa753c;hpb=6bf71c2dd1f5e530f86479c65161e4ca41c5d8d3;p=sfa.git

diff --git a/sfa/server/aggregate.py b/sfa/server/aggregate.py
index 45eff40b..a8f0a0a4 100644
--- a/sfa/server/aggregate.py
+++ b/sfa/server/aggregate.py
@@ -1,26 +1,12 @@
-### $Id$
-### $URL$
+from sfa.server.sfaserver import SfaServer
+from sfa.util.xrn import hrn_to_urn
+from sfa.server.interface import Interfaces, Interface
+from sfa.util.config import Config
 
-import os
-import sys
-import datetime
-import time
-import xmlrpclib
-from types import StringTypes, ListType
+# this truly is a server-side object
 
-from sfa.util.geniserver import GeniServer
-from sfa.util.geniclient import GeniClient
-from sfa.util.storage import *
-from sfa.util.faults import *
 
-# GeniLight client support is optional
-try:
-    from egeni.geniLight_client import *
-except ImportError:
-    GeniClientLight = None
-
-
-class Aggregate(GeniServer):
+class Aggregate(SfaServer):
 
     ##
     # Create a new aggregate object.
@@ -28,85 +14,27 @@ class Aggregate(GeniServer):
     # @param ip the ip address to listen on
     # @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)     
+    # @param cert_file certificate filename containing public key (could be a GID file)
     def __init__(self, ip, port, key_file, cert_file):
-        GeniServer.__init__(self, ip, port, key_file, cert_file)
-        self.server.interface = 'aggregate'
-
-##
-# Aggregates is a dictionary of geniclient aggregate connections keyed on the aggregate hrn
-
-class Aggregates(dict):
-
-    required_fields = ['hrn', 'addr', 'port']
-     
-    def __init__(self, api, file = "/etc/sfa/aggregates.xml"):
-        dict.__init__(self, {})
-        self.api = api
-        self.interfaces = []
-        # 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()
+        SfaServer.__init__(self, ip, port, key_file, cert_file, 'aggregate')
 
-    def connectAggregates(self):
-        """
-        Get connection details for the trusted peer aggregates from file and 
-        create an GeniClient connection to each. 
-        """
-        aggregates = self.aggregate_info['aggregates']['aggregate']
-        if isinstance(aggregates, dict):
-            aggregates = [aggregates]
-        if isinstance(aggregates, list):
-            for aggregate in aggregates:
-                # 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
-                self.interfaces.append(aggregate)
-                # 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()
+#
+# Aggregates is a dictionary of aggregate connections keyed on the aggregate hrn
+# as such it's more of a client-side thing for aggregate servers to reach their peers
+#
 
-                # 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.SFA_AGGREGATE_HOST
-        port = self.api.config.SFA_AGGREGATE_PORT
-        url = 'http://%(address)s:%(port)s' % locals()
-        self[self.api.hrn] = GeniClient(url, self.api.key_file, self.api.cert_file)
+class Aggregates(Interfaces):
 
+    default_dict = {'aggregates': {'aggregate': [Interfaces.default_fields]}}
 
+    def __init__(self, conf_file="/etc/sfa/aggregates.xml"):
+        Interfaces.__init__(self, conf_file)
+        sfa_config = Config()
+        # set up a connection to the local aggregate
+        if sfa_config.SFA_AGGREGATE_ENABLED:
+            addr = sfa_config.SFA_AGGREGATE_HOST
+            port = sfa_config.SFA_AGGREGATE_PORT
+            hrn = sfa_config.SFA_INTERFACE_HRN
+            interface = Interface(hrn, addr, port)
+            self[hrn] = interface