slices.verify_slice_links(slice, rspec.version.get_link_requests(), nodes)
# add/remove leases
- rspec_requested_leases = rspec.version.get_leases()
- leases = slices.verify_slice_leases(slice, rspec_requested_leases, peer)
+ try:
+ rspec_requested_leases = rspec.version.get_leases()
+ leases = slices.verify_slice_leases(slice, rspec_requested_leases, peer)
+ except:
+ pass
#requested_leases = []
#kept_leases = []
#for lease in rspec.version.get_leases():
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
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'])