Better mgt of external slices/users/sites + fixes

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

diff --git a/sfa/planetlab/pldriver.py b/sfa/planetlab/pldriver.py
index 4bcb793..79c61f0 100644 (file)
--- 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):
@@ -621,7 +621,7 @@ class PlDriver (Driver):
     
     def status (self, urns, options={}):
         aggregate = PlAggregate(self)
-        desc =  aggregate.describe(urns)
+        desc =  aggregate.describe(urns, version='GENI 3')
         status = {'geni_urn': desc['geni_urn'],
                   'geni_slivers': desc['geni_slivers']}
         return status
@@ -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)
        
@@ -658,11 +658,8 @@ class PlDriver (Driver):
         slices.verify_slice_links(slice, rspec.version.get_link_requests(), nodes)
 
         # add/remove leases
-        try:
-           rspec_requested_leases = rspec.version.get_leases()
-           leases = slices.verify_slice_leases(slice, rspec_requested_leases, peer)
-        except:
-           pass
+        rspec_requested_leases = rspec.version.get_leases()
+        leases = slices.verify_slice_leases(slice, rspec_requested_leases, peer)
 
         # handle MyPLC peer association.
         # only used by plc and ple.
@@ -679,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]
@@ -695,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)
@@ -737,7 +742,7 @@ class PlDriver (Driver):
         requested_time = utcparse(expiration_time)
         record = {'expires': int(datetime_to_epoch(requested_time))}
         self.shell.UpdateSlice(slice['slice_id'], record)
-        description = self.describe(urns, None, options)
+        description = self.describe(urns, 'GENI 3', options)
         return description['geni_slivers']
             
 
@@ -749,7 +754,7 @@ class PlDriver (Driver):
             raise UnsupportedOperation(action)
 
         # fault if sliver is not full allocated (operational status is geni_pending_allocation)
-        description = self.describe(urns, None, options)
+        description = self.describe(urns, 'GENI 3', options)
         for sliver in description['geni_slivers']:
             if sliver['geni_operational_status'] == 'geni_pending_allocation':
                 raise UnsupportedOperation(action, "Sliver must be fully allocated (operational status is not geni_pending_allocation)")
@@ -757,13 +762,17 @@ class PlDriver (Driver):
         # Perform Operational Action Here
         #
 
-        geni_slivers = self.describe(urns, None, options)['geni_slivers']
+        geni_slivers = self.describe(urns, 'GENI 3', options)['geni_slivers']
         return geni_slivers
 
     # 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)