changed GENI_CONFIG_HOSTNAME to GENI_CONFIG_HOST

[sfa.git] / geni / aggregate.py

diff --git a/geni/aggregate.py b/geni/aggregate.py
index 33fd3ab..3fb3566 100644 (file)
--- a/geni/aggregate.py
+++ b/geni/aggregate.py
@@ -44,7 +44,7 @@ class Aggregates(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__))
@@ -55,13 +55,13 @@ class Aggregates(dict):
         for f in files:
             try:
                 if os.path.isfile(f):
-                    self.aggregate_info = XmlStorage(f, {'aggregates': {'aggregate': [connection_dict]}})
+                    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': {'aggregate': [connection_dict]}})
+            self.aggregate_info = XmlStorage(file, aggregates_dict)
         self.aggregate_info.load()
         self.connectAggregates()
 
@@ -100,7 +100,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)