rename /etc/geni into /etc/sfa

[sfa.git] / geni / alt_aggregate.py

diff --git a/geni/alt_aggregate.py b/geni/alt_aggregate.py
index ebf7495..8d5a400 100644 (file)
--- a/geni/alt_aggregate.py
+++ b/geni/alt_aggregate.py
@@ -1,3 +1,6 @@
+### $Id$
+### $URL$
+
 import os
 import sys
 import datetime
@@ -6,10 +9,10 @@ import xmlrpclib
 
 from geni.util.geniserver import GeniServer
 from geni.util.geniclient import *
-from geni.util.cert import Keypair, Certificate
+from geni.util.certificate import Keypair, Certificate
 from geni.util.credential import Credential
 from geni.util.trustedroot import TrustedRootList
-from geni.util.excep import *
+from geni.util.faults import *
 from geni.util.misc import *
 from geni.util.config import Config
 from geni.util.rspec import Rspec
@@ -39,7 +42,7 @@ class AltAggregate(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, config = "/etc/sfa/sfa_config"):
         GeniServer.__init__(self, ip, port, key_file, cert_file)
         self.key_file = key_file
         self.cert_file = cert_file
@@ -73,7 +76,7 @@ class AltAggregate(GeniServer):
         Connect to the registry
         """
         # connect to registry using GeniClient
-        address = self.config.GENI_REGISTRY_HOSTNAME
+        address = self.config.GENI_REGISTRY_HOST
         port = self.config.GENI_REGISTRY_PORT
         url = 'https://%(address)s:%(port)s' % locals()
         self.registry = GeniClient(url, self.key_file, self.cert_file)