From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Mon, 20 Sep 2010 19:00:53 +0000 (-0400)
Subject: update get_rspec() to accept creds, and options params
X-Git-Tag: sfa-1.0-2~27
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5ff950d29277c37e531a17b37b13d8e0ac2e8f1e;p=sfa.git

update get_rspec() to accept creds, and options params
---

diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py
index 6a6a03b6..da5c3376 100644
--- a/sfa/managers/aggregate_manager_pl.py
+++ b/sfa/managers/aggregate_manager_pl.py
@@ -270,13 +270,11 @@ def get_rspec(api, creds, options):
     xrn = options.get('geni_slice_urn', None)
     hrn, type = urn_to_hrn(xrn)
 
-    """
     # look in cache first
     if api.cache and not xrn:
         rspec = api.cache.get('nodes')
         if rspec:
             return rspec 
-    """
 
     registry = api.registries[api.hrn]
     credential = api.getCredential()
@@ -291,11 +289,10 @@ def get_rspec(api, creds, options):
 
     rspec = network.toxml()
 
-    """
     # cache the result
     if api.cache and not xrn:
         api.cache.add('nodes', rspec)
-    """
+    
     return rspec