From 09552022dd62e4b397e757a2104cac887ba7a0db Mon Sep 17 00:00:00 2001 From: Mohamed Larabi Date: Mon, 1 Oct 2012 09:08:07 +0200 Subject: [PATCH] Nitos: fot the manifest, use slice_xrn for the lease slice_id --- sfa/nitos/nitosaggregate.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/sfa/nitos/nitosaggregate.py b/sfa/nitos/nitosaggregate.py index b626e7c7..2a36fbf0 100644 --- a/sfa/nitos/nitosaggregate.py +++ b/sfa/nitos/nitosaggregate.py @@ -171,8 +171,13 @@ class NitosAggregate: slicename = slc['slice_name'] break - slice_hrn = slicename_to_hrn(self.driver.hrn, self.driver.testbedInfo['name'], slicename) - 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, self.driver.testbedInfo['name'], slicename) + slice_urn = hrn_to_urn(slice_hrn, 'slice') + rspec_channel['slice_id'] = slice_urn rspec_channels.append(rspec_channel) @@ -196,8 +201,13 @@ class NitosAggregate: slicename = slc['slice_name'] break - slice_hrn = slicename_to_hrn(self.driver.hrn, self.driver.testbedInfo['name'], slicename) - 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, self.driver.testbedInfo['name'], slicename) + slice_urn = hrn_to_urn(slice_hrn, 'slice') + rspec_lease['slice_id'] = slice_urn rspec_lease['start_time'] = lease['start_time'] rspec_lease['duration'] = (int(lease['end_time']) - int(lease['start_time'])) / int(grain) -- 2.43.0