Merge branch 'master' of ssh://git.onelab.eu/git/sfa

diff --git a/config/default_config.xml b/config/default_config.xml
index 10471bc..5427283 100644 (file)
--- a/config/default_config.xml
+++ b/config/default_config.xml
@@ -33,7 +33,7 @@ Thierry Parmentelat
           <description>The human readable name for this interface.</description>
         </variable>
 
-        <variable id="aggregate_api_version" type="string">
+        <variable id="aggregate_api_version" type="int">
           <name>Aggregate Manager API Version</name>
           <value>1</value>
           <description>The Aggregate API version</description>

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index ae4d97a..6299ce2 100755 (executable)
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -423,7 +423,7 @@ class Sfi:
 
         if cache:
             version = cache.get(cache_key)
-            
+
         if not version: 
             result = server.GetVersion()
             version= ReturnValue.get_value(result)

diff --git a/sfa/managers/aggregate_manager.py b/sfa/managers/aggregate_manager.py
index 56d6008..5fe1d6f 100644 (file)
--- a/sfa/managers/aggregate_manager.py
+++ b/sfa/managers/aggregate_manager.py
@@ -25,8 +25,8 @@ class AggregateManager:
 
     def __init__ (self):
         # xxx Thierry : caching at the aggregate level sounds wrong...
-        #self.caching=True
-        self.caching=False
+        self.caching=True
+        #self.caching=False
     
     def GetVersion(self, api, options={}):
     
@@ -40,7 +40,7 @@ class AggregateManager:
                 request_rspec_versions.append(rspec_version.to_dict()) 
         xrn=Xrn(api.hrn)
         version_more = {'interface':'aggregate',
-                        'sfa': 1,
+                        'sfa': 2,
                         'geni_api': api.config.SFA_AGGREGATE_API_VERSION,
                         'testbed':'myplc',
                         'hrn':xrn.get_hrn(),