From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Tue, 8 Nov 2011 02:06:09 +0000 (-0500)
Subject: fix GetVersion()
X-Git-Tag: sfa-1.1-3~93^2
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=a3996bfa45298c8d0abfd58916221abba737441c

fix GetVersion()
---

diff --git a/sfa/managers/aggregate_manager_eucalyptus.py b/sfa/managers/aggregate_manager_eucalyptus.py
index 4d73ab17..a94e0faf 100644
--- a/sfa/managers/aggregate_manager_eucalyptus.py
+++ b/sfa/managers/aggregate_manager_eucalyptus.py
@@ -22,13 +22,12 @@ from sfa.util.callids import Callids
 #comes with its own logging
 #from sfa.util.sfalogging import logger
 from sfa.util.version import version_core
-
 from sfa.trust.credential import Credential
-
 from sfa.server.sfaapi import SfaApi
-
 from sfa.plc.aggregate import Aggregate
 from sfa.plc.slices import Slice, Slices
+from sfa.rspecs.version_manager import VersionManager
+from sfa.rspecs.rspec import RSpec
 # not sure what this used to be nor where it is now defined
 #from sfa.rspecs.sfa_rspec import sfa_rspec_version
 
@@ -679,15 +678,22 @@ class AggregateManagerEucalyptus:
         f.close()
     
     def GetVersion(api):
+
+        version_manager = VersionManager()
+        ad_rspec_versions = []
+        request_rspec_versions = []
+        for rspec_version in version_manager.versions:
+            if rspec_version.content_type in ['*', 'ad']:
+                ad_rspec_versions.append(rspec_version.to_dict())
+            if rspec_version.content_type in ['*', 'request']:
+                request_rspec_versions.append(rspec_version.to_dict())
+        default_rspec_version = version_manager.get_version("sfa 1").to_dict()
         xrn=Xrn(api.hrn)
-        request_rspec_versions = [dict(sfa_rspec_version)]
-        ad_rspec_versions = [dict(sfa_rspec_version)]
         version_more = {'interface':'aggregate',
                         'testbed':'myplc',
                         'hrn':xrn.get_hrn(),
                         'request_rspec_versions': request_rspec_versions,
                         'ad_rspec_versions': ad_rspec_versions,
-                        'default_ad_rspec': dict(sfa_rspec_version)
+                        'default_ad_rspec': default_rspec_version
                         }
         return version_core(version_more)
-