From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Sat, 9 Feb 2013 00:21:15 +0000 (-0500)
Subject:  geni_api_versions should be a dict not a list
X-Git-Tag: sfa-3.0-0~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=961cad101fa9da7eaf15cea4cfbf706f621b1836;p=sfa.git

 geni_api_versions should be a dict not a list
---

diff --git a/sfa/managers/aggregate_manager.py b/sfa/managers/aggregate_manager.py
index 6893131b..0ba512e8 100644
--- a/sfa/managers/aggregate_manager.py
+++ b/sfa/managers/aggregate_manager.py
@@ -51,7 +51,7 @@ class AggregateManager:
         version = version_core()
         cred_types = [{'geni_type': 'geni_sfa', 'geni_version': str(i)} for i in range(4)[-2:]]
         geni_api_versions = ApiVersions().get_versions()
-        geni_api_versions.append({'3': 'http://%s:%s' % (socket.gethostname(), api.config.sfa_aggregate_port)})
+        geni_api_versions['3'] = 'http://%s:%s' % (api.config.sfa_aggregate_host, api.config.sfa_aggregate_port)
         version_generic = {
             'testbed': self.driver.testbed_name(),
             'interface':'aggregate',
diff --git a/sfa/server/api_versions.py b/sfa/server/api_versions.py
index 2f1ccf73..9b05dbe2 100644
--- a/sfa/server/api_versions.py
+++ b/sfa/server/api_versions.py
@@ -32,7 +32,7 @@ class ApiVersions:
         self.xml = XML(source)
 
     def get_versions(self):
-        versions = []
+        versions = {}
         for value in self.xml.todict().values():
             if not value:
                 continue
@@ -40,8 +40,7 @@ class ApiVersions:
                 for item in value:
                     if isinstance(item, dict) and \
                        set(ApiVersions.required_fields).issubset(item.keys()):
-                        api_version = {str(item['version']): item['url']}
-                        versions.append(api_version)
+                        versions[str(item['version'])] = item['url']
         return versions