X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplanetlab%2Fpldriver.py;h=6c88a14fff9d5ff0ae14b6b4161af273c6e3b4ab;hb=8753f49d0f07c3419b387d798625ad1830c0ba9a;hp=1d0a59ec19778d0a9eeb234f70d4a4a78a8c29d9;hpb=f5e5e378c79269e9366d2df0a60328060c0ccf77;p=sfa.git diff --git a/sfa/planetlab/pldriver.py b/sfa/planetlab/pldriver.py index 1d0a59ec..6c88a14f 100644 --- a/sfa/planetlab/pldriver.py +++ b/sfa/planetlab/pldriver.py @@ -778,7 +778,10 @@ class PlDriver (Driver): if not slices: return True slice = slices[0] - + + # leases + leases = self.shell.GetLeases({'name': slicename}) + leases_ids = [lease['lease_id'] for lease in leases ] # determine if this is a peer slice # xxx I wonder if this would not need to use PlSlices.get_peer instead # in which case plc.peers could be deprecated as this here @@ -788,6 +791,8 @@ class PlDriver (Driver): if peer: self.shell.UnBindObjectFromPeer('slice', slice['slice_id'], peer) self.shell.DeleteSliceFromNodes(slicename, slice['node_ids']) + if len(leases_ids) > 0: + self.shell.DeleteLeases(leases_ids) finally: if peer: self.shell.BindObjectToPeer('slice', slice['slice_id'], peer, slice['peer_slice_id'])