fix Status

[sfa.git] / sfa / managers / aggregate_manager.py

diff --git a/sfa/managers/aggregate_manager.py b/sfa/managers/aggregate_manager.py
index bd26a45..0b97c63 100644 (file)
--- a/sfa/managers/aggregate_manager.py
+++ b/sfa/managers/aggregate_manager.py
@@ -44,8 +44,9 @@ class AggregateManager:
         return version_string
 
     def GetVersion(self, api, options):
-        xrn=Xrn(api.hrn)
+        xrn=Xrn(api.hrn, type='authority')
         version = version_core()
+        cred_types = [{'geni_type': 'geni_sfa', 'geni_version': str(i)} for i in range(4)[-2:]]
         version_generic = {
             'testbed': self.driver.testbed_name(),
             'interface':'aggregate',
@@ -56,10 +57,7 @@ class AggregateManager:
             'geni_single_allocation': 0, # Accept operations that act on as subset of slivers in a given state.
             'geni_allocate': 'geni_many',# Multiple slivers can exist and be incrementally added, including those which connect or overlap in some way.
             'geni_best_effort': 'true',
-            'geni_credential_types': [{
-                'geni_type': 'geni_sfa',
-                'geni_version': 3,
-            }],
+            'geni_credential_types': cred_types,
         }
         version.update(version_generic)
         version.update(self.rspec_versions())
@@ -78,13 +76,13 @@ class AggregateManager:
 
         # look in cache first
         cached_requested = options.get('cached', True)
-        if cached_requested and self.driver.cache and not slice_hrn:
+        if cached_requested and self.driver.cache:
             rspec = self.driver.cache.get(version_string)
             if rspec:
                 logger.debug("%s.ListResources returning cached advertisement" % (self.driver.__module__))
                 return rspec
        
-        rspec = self.driver.list_resources (version, options) 
+        rspec = self.driver.list_resources (rspec_version, options) 
         if self.driver.cache:
             logger.debug("%s.ListResources stores advertisement in cache" % (self.driver.__module__))
             self.driver.cache.add(version_string, rspec)