moving modpython stuff here

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

diff --git a/sfa/server/aggregate.py b/sfa/server/aggregate.py
index 89849c3..bc07b76 100644 (file)
--- a/sfa/server/aggregate.py
+++ b/sfa/server/aggregate.py
@@ -5,13 +5,14 @@ import os
 import sys
 import datetime
 import time
-import xmlrpclib
-from types import StringTypes, ListType
 
-from sfa.util.geniserver import GeniServer
-from sfa.util.geniclient import GeniClient
+from sfa.util.server import SfaServer
 from sfa.util.storage import *
 from sfa.util.faults import *
+from sfa.trust.gid import GID
+from sfa.util.table import SfaTable
+import sfa.util.xmlrpcprotocol as xmlrpcprotocol
+import sfa.util.soapprotocol as soapprotocol
 
 # GeniLight client support is optional
 try:
@@ -20,7 +21,7 @@ except ImportError:
     GeniClientLight = None
 
 
-class Aggregate(GeniServer):
+class Aggregate(SfaServer):
 
     ##
     # Create a new aggregate object.
@@ -30,49 +31,50 @@ 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):
-        GeniServer.__init__(self, ip, port, key_file, cert_file)
+        SfaServer.__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
+# Aggregates is a dictionary of aggregate connections keyed on the aggregate hrn
 
 class Aggregates(dict):
 
-    required_fields = ['hrn', 'addr', 'port']
-     
+    default_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]
+        aggregates_dict = {'aggregates': {'aggregate': [default_fields]}}
         
-        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)
+        # load config file
+        self.aggregate_info = XmlStorage(file, aggregates_dict)
         self.aggregate_info.load()
+        self.interfaces = self.registry_info['aggregates']['aggregate']
+        if not isinstance(self.interfaces, list):
+            self.interfaces = [self.interfaces]
+
+        # Attempt to get any missing peer gids
+        # There should be a gid file in /etc/sfa/trusted_roots for every
+        # peer registry found in in the aggregates.xml config file. If there
+        # are any missing gids, request a new one from the peer registry.
+        gids_current = self.api.auth.trusted_cert_list.get_list()
+        hrns_current = [gid.get_hrn() for gid in gids_found]
+        hrns_expected = [interface['hrn'] for interfaces in self.interfaces]
+        new_hrns = set(hrns_current).difference(hrns_expected)
+
+        self.get_peer_gids(new_hrns)
         self.connectAggregates()
 
     def connectAggregates(self):
         """
         Get connection details for the trusted peer aggregates from file and 
-        create an GeniClient connection to each. 
+        create an connection to each. 
         """
         aggregates = self.aggregate_info['aggregates']['aggregate']
         if isinstance(aggregates, dict):
@@ -87,8 +89,8 @@ class Aggregates(dict):
                     continue
                 self.interfaces.append(aggregate)
                 # check which client we should use
-                # geniclient is default
-                client_type = 'geniclient'
+                # sfa.util.xmlrpcprotocol is default
+                client_type = 'xmlrpcprotocol'
                 if aggregate.has_key('client') and aggregate['client'] in ['geniclientlight']:
                     client_type = 'geniclientlight'
                 
@@ -100,15 +102,14 @@ class Aggregates(dict):
                 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)
+                    self[hrn] = xmlrpcprotocol.get_server(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()
         local_aggregate = {'hrn': self.api.hrn, 'addr': address, 'port': port}
         self.interfaces.append(local_aggregate) 
-        self[self.api.hrn] = GeniClient(url, self.api.key_file, self.api.cert_file)
+        self[self.api.hrn] = xmlrpcprotocol.get_server(url, self.api.key_file, self.api.cert_file)