X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fnitos%2Fnitosaggregate.py;h=2a36fbf08a9865c818a6459c76630bf81a4b2852;hb=9f8aa84278e1fde6dad11db720537c4fe7e355d3;hp=b626e7c73c32b43fa15908f331becb744a7f9a0a;hpb=acd5b9c144cce5838af5478ef5d363e25e49b391;p=sfa.git 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)