X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplanetlab%2Fpldriver.py;h=79c61f0a9f41e596b82ad9bdc90ec004a42fc9ac;hb=f41d4566c5db5ac9b36a5a86ded828197fe3b1fd;hp=8b02d34938833e373198112ec1916246a4f60123;hpb=9a54f17887543b8a3b79975136ce1be556782e53;p=sfa.git

diff --git a/sfa/planetlab/pldriver.py b/sfa/planetlab/pldriver.py
index 8b02d349..79c61f0a 100644
--- a/sfa/planetlab/pldriver.py
+++ b/sfa/planetlab/pldriver.py
@@ -25,7 +25,7 @@ from sfa.planetlab.plshell import PlShell
 import sfa.planetlab.peers as peers
 from sfa.planetlab.plaggregate import PlAggregate
 from sfa.planetlab.plslices import PlSlices
-from sfa.planetlab.plxrn import PlXrn, slicename_to_hrn, hostname_to_hrn, hrn_to_pl_slicename, xrn_to_hostname
+from sfa.planetlab.plxrn import PlXrn, slicename_to_hrn, hostname_to_hrn, hrn_to_pl_slicename, xrn_to_hostname, xrn_to_ext_slicename, top_auth
 
 
 def list_to_dict(recs, key):
@@ -646,7 +646,7 @@ class PlDriver (Driver):
         # ensure slice record exists
         slice = slices.verify_slice(xrn.hrn, slice_record, peer, sfa_peer, expiration=expiration, options=options)
         # ensure person records exists
-        #persons = slices.verify_persons(xrn.hrn, slice, users, peer, sfa_peer, options=options)
+        persons = slices.verify_persons(xrn.hrn, slice, users, peer, sfa_peer, options=options)
         # ensure slice attributes exists
         slices.verify_slice_attributes(slice, requested_attributes, options=options)
        
@@ -676,7 +676,7 @@ class PlDriver (Driver):
         peer = slices.get_peer(slice['hrn'])
         sfa_peer = slices.get_sfa_peer(slice['hrn'])
         users = options.get('geni_users', [])
-        persons = slices.verify_persons(None, slice, users, peer, sfa_peer, options=options)
+        persons = slices.verify_persons(slice['hrn'], slice, users, peer, sfa_peer, options=options)
         slices.handle_peer(None, None, persons, peer)
         # update sliver allocation states and set them to geni_provisioned
         sliver_ids = [sliver['sliver_id'] for sliver in slivers]
@@ -692,23 +692,31 @@ class PlDriver (Driver):
         slivers = aggregate.get_slivers(urns)
         if slivers:
             slice_id = slivers[0]['slice_id'] 
+            slice_name = slivers[0]['name']
             node_ids = []
             sliver_ids = []
             for sliver in slivers:
                 node_ids.append(sliver['node_id'])
                 sliver_ids.append(sliver['sliver_id']) 
 
+            # leases
+            leases = self.shell.GetLeases({'name': slice_name})
+            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
             # is the only/last call to this last method in plc.peers
-            slice_hrn = PlXrn(auth=self.hrn, slicename=slivers[0]['name']).get_hrn()     
+            #slice_hrn = PlXrn(auth=self.hrn, slice_name).get_hrn()     
+            slice_hrn = self.shell.GetSliceHrn(int(slice_id))
             peer = peers.get_peer(self, slice_hrn)
             try:
                 if peer:
                     self.shell.UnBindObjectFromPeer('slice', slice_id, peer)
      
                 self.shell.DeleteSliceFromNodes(slice_id, node_ids)
+                if len(leases_ids) > 0:
+                    self.shell.DeleteLeases(leases_ids)
      
                 # delete sliver allocation states
                 SliverAllocation.delete_allocations(sliver_ids)
@@ -759,8 +767,12 @@ class PlDriver (Driver):
 
     # set the 'enabled' tag to 0
     def shutdown (self, xrn, options={}):
-        xrn = PlXrn(xrn=xrn, type='slice')
-        slicename = xrn.pl_slicename()
+        hrn = urn_to_hrn(xrn)
+        top_auth_hrn = top_auth(hrn)
+        if top_auth_hrn == self.hrn:
+            slicename = hrn_to_pl_slicename(hrn)
+        else:
+            slicename = xrn_to_ext_slicename(hrn)
         slices = self.shell.GetSlices({'name': slicename}, ['slice_id'])
         if not slices:
             raise RecordNotFound(slice_hrn)