From cda6681faefef0c128af45ff325ca671e9bd369c Mon Sep 17 00:00:00 2001 From: Mohamed Larabi Date: Mon, 1 Oct 2012 09:25:44 +0200 Subject: [PATCH] PL: for the manifest, use slice_xrn for the lease slice_id --- sfa/planetlab/plaggregate.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sfa/planetlab/plaggregate.py b/sfa/planetlab/plaggregate.py index 00e62072..b3ae4596 100644 --- a/sfa/planetlab/plaggregate.py +++ b/sfa/planetlab/plaggregate.py @@ -257,7 +257,7 @@ class PlAggregate: return (rspec_nodes, links) - def get_leases(self, slice=None, options={}): + def get_leases(self, slice_xrn=None, slice=None, options={}): now = int(time.time()) filter={} @@ -286,8 +286,12 @@ class PlAggregate: #rspec_lease['lease_id'] = lease['lease_id'] rspec_lease['component_id'] = hostname_to_urn(self.driver.hrn, site['login_base'], lease['hostname']) - slice_hrn = slicename_to_hrn(self.driver.hrn, lease['name']) - slice_urn = hrn_to_urn(slice_hrn, 'slice') + if slice_xrn: + slice_urn = slice_xrn + slice_hrn = urn_to_hrn(slice_urn) + else: + slice_hrn = slicename_to_hrn(self.driver.hrn, lease['name']) + slice_urn = hrn_to_urn(slice_hrn, 'slice') rspec_lease['slice_id'] = slice_urn rspec_lease['start_time'] = lease['t_from'] rspec_lease['duration'] = (lease['t_until'] - lease['t_from']) / grain @@ -325,7 +329,7 @@ class PlAggregate: rspec.version.add_default_sliver_attribute(attrib['tagname'], attrib['value']) if not options.get('list_leases') or options.get('list_leases') and options['list_leases'] != 'resources': - leases = self.get_leases(slice) + leases = self.get_leases(slice_xrn, slice) rspec.version.add_leases(leases) return rspec.toxml() -- 2.47.0