DeleteSliver returns a boolean instead of an int

[sfa.git] / sfa / planetlab / pldriver.py

diff --git a/sfa/planetlab/pldriver.py b/sfa/planetlab/pldriver.py
index d72f2e6..b5e7771 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:
@@ -658,7 +662,7 @@ class PlDriver (Driver):
             persons = self.shell.GetPersons(slice['person_ids'], ['key_ids'])
             key_ids = [key_id for person in persons for key_id in person['key_ids']]
             person_keys = self.shell.GetKeys(key_ids)
-            keys = [key['key'] for key in keys]
+            keys = [key['key'] for key in person_keys]
 
             user.update({'urn': slice_urn,
                          'login': slice['name'],
@@ -768,7 +772,7 @@ class PlDriver (Driver):
         slicename = hrn_to_pl_slicename(slice_hrn)
         slices = self.shell.GetSlices({'name': slicename})
         if not slices:
-            return 1
+            return True
         slice = slices[0]
     
         # determine if this is a peer slice
@@ -783,7 +787,7 @@ class PlDriver (Driver):
         finally:
             if peer:
                 self.shell.BindObjectToPeer('slice', slice['slice_id'], peer, slice['peer_slice_id'])
-        return 1
+        return True
     
     def renew_sliver (self, slice_urn, slice_hrn, creds, expiration_time, options):
         slicename = hrn_to_pl_slicename(slice_hrn)