fix how geni_available option is processed

diff --git a/sfa/planetlab/plaggregate.py b/sfa/planetlab/plaggregate.py
index d232cc5..46154e6 100644 (file)
--- a/sfa/planetlab/plaggregate.py
+++ b/sfa/planetlab/plaggregate.py
@@ -152,7 +152,7 @@ class PlAggregate:
             tags_filter=filter.copy()
 
         geni_available = options.get('geni_available')    
-        if geni_available:
+        if geni_available == True:
             filter['boot_state'] = 'boot'     
         
         filter.update({'peer_id': None})
@@ -298,7 +298,7 @@ class PlAggregate:
             rspec.xml.set('expires',  datetime_to_string(utcparse(slice['expires'])))
 
         if not options.get('list_leases') or options.get('list_leases') and options['list_leases'] != 'leases':
-           nodes, links = self.get_nodes_and_links(slice_xrn, slice, slivers)
+           nodes, links = self.get_nodes_and_links(slice_xrn, slice, slivers, options)
            rspec.version.add_nodes(nodes)
            rspec.version.add_links(links)
            # add sliver defaults

diff --git a/sfa/planetlab/pldriver.py b/sfa/planetlab/pldriver.py
index d72f2e6..31e37ec 100644 (file)
--- a/sfa/planetlab/pldriver.py
+++ b/sfa/planetlab/pldriver.py
@@ -615,6 +615,10 @@ class PlDriver (Driver):
         # Adding the list_leases option to the caching key
         if options.get('list_leases'):
             version_string = version_string + "_"+options.get('list_leases', 'default')
+
+        # Adding geni_available to caching key
+        if options.get('geni_available'):
+            version_string = version_string + "_" + str(options.get('geni_available'))
     
         # look in cache first
         if cached_requested and self.cache and not slice_hrn: