git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
acd5b9c
)
Nitos: for the manifest, use slice_xrn for the lease slice_id
author
Mohamed Larabi
<mohamed.larabi@inria.fr>
Mon, 1 Oct 2012 07:08:07 +0000
(09:08 +0200)
committer
Mohamed Larabi
<mohamed.larabi@inria.fr>
Mon, 1 Oct 2012 07:09:47 +0000
(09:09 +0200)
sfa/nitos/nitosaggregate.py
patch
|
blob
|
history
diff --git
a/sfa/nitos/nitosaggregate.py
b/sfa/nitos/nitosaggregate.py
index
b626e7c
..
2a36fbf
100644
(file)
--- a/
sfa/nitos/nitosaggregate.py
+++ b/
sfa/nitos/nitosaggregate.py
@@
-171,8
+171,13
@@
class NitosAggregate:
slicename = slc['slice_name']
break
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)
rspec_channel['slice_id'] = slice_urn
rspec_channels.append(rspec_channel)
@@
-196,8
+201,13
@@
class NitosAggregate:
slicename = slc['slice_name']
break
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)
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)