From a979334e9bb65b34f67d1bc0ca2003c184de9924 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Sat, 9 Feb 2013 16:46:05 -0500 Subject: [PATCH] geni_api_versions should be a dict not a list --- sfa/managers/aggregate_manager.py | 2 +- sfa/server/api_versions.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sfa/managers/aggregate_manager.py b/sfa/managers/aggregate_manager.py index 4d773fc3..fe6b07b4 100644 --- a/sfa/managers/aggregate_manager.py +++ b/sfa/managers/aggregate_manager.py @@ -14,7 +14,7 @@ class AggregateManager: xrn=Xrn(api.hrn) version = version_core() geni_api_versions = ApiVersions().get_versions() - geni_api_versions.append({'2': 'http://%s:%s' % (api.config.SFA_AGGREGATE_HOST, api.config.SFA_AGGREGATE_PORT)}) + geni_api_versions['2'] = 'http://%s:%s' % (api.config.SFA_AGGREGATE_HOST, api.config.SFA_AGGREGATE_PORT) version_generic = { 'interface':'aggregate', 'sfa': 2, 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 -- 2.47.0