Fix leases allocation in pl

diff --git a/sfa/planetlab/pldriver.py b/sfa/planetlab/pldriver.py
index 1d0fedf..4e515ff 100644 (file)
--- a/sfa/planetlab/pldriver.py
+++ b/sfa/planetlab/pldriver.py
@@ -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.

diff --git a/sfa/planetlab/plslices.py b/sfa/planetlab/plslices.py
index 4c28040..3828e0b 100644 (file)
--- a/sfa/planetlab/plslices.py
+++ b/sfa/planetlab/plslices.py
@@ -1,3 +1,4 @@
+import time
 from types import StringTypes
 from collections import defaultdict
 
@@ -7,7 +8,7 @@ from sfa.util.xrn import Xrn, get_leaf, get_authority, urn_to_hrn
 from sfa.rspecs.rspec import RSpec
 from sfa.planetlab.vlink import VLink
 from sfa.planetlab.topology import Topology
-from sfa.planetlab.plxrn import PlXrn, hrn_to_pl_slicename
+from sfa.planetlab.plxrn import PlXrn, hrn_to_pl_slicename, xrn_to_hostname
 from sfa.storage.model import SliverAllocation
 from sfa.storage.alchemy import dbsession