pl: set exclusive property in RSpec according to node type

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

diff --git a/sfa/planetlab/pldriver.py b/sfa/planetlab/pldriver.py
index 4bcb793..8b02d34 100644 (file)
--- a/sfa/planetlab/pldriver.py
+++ b/sfa/planetlab/pldriver.py
@@ -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
@@ -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.
@@ -737,7 +734,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 +746,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,7 +754,7 @@ 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