git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
avoid as much as possible accessing logger through class instances, whenever that...
[sfa.git]
/
sfa
/
iotlab
/
iotlabaggregate.py
diff --git
a/sfa/iotlab/iotlabaggregate.py
b/sfa/iotlab/iotlabaggregate.py
index
ee95299
..
3878da4
100644
(file)
--- a/
sfa/iotlab/iotlabaggregate.py
+++ b/
sfa/iotlab/iotlabaggregate.py
@@
-36,12
+36,12
@@
class IotLABAggregate(object):
rspec_lease = Lease()
rspec_lease['lease_id'] = lease['id']
iotlab_xrn = Xrn('.'.join([self.driver.root_auth,
rspec_lease = Lease()
rspec_lease['lease_id'] = lease['id']
iotlab_xrn = Xrn('.'.join([self.driver.root_auth,
- Xrn.escape(node)]),
+
Xrn.escape(node)]),
type='node')
rspec_lease['component_id'] = iotlab_xrn.urn
rspec_lease['start_time'] = str(lease['date'])
# duration in minutes
type='node')
rspec_lease['component_id'] = iotlab_xrn.urn
rspec_lease['start_time'] = str(lease['date'])
# duration in minutes
- duration = int(lease['duration'])
/
60
+ duration = int(lease['duration'])
/
60
rspec_lease['duration'] = duration
rspec_lease['slice_id'] = lease['slice_id']
rspec_leases.append(rspec_lease)
rspec_lease['duration'] = duration
rspec_lease['slice_id'] = lease['slice_id']
rspec_leases.append(rspec_lease)
@@
-52,13
+52,17
@@
class IotLABAggregate(object):
rspec_node = IotlabNode()
rspec_node['mobile'] = node['mobile']
rspec_node['archi'] = node['archi']
rspec_node = IotlabNode()
rspec_node['mobile'] = node['mobile']
rspec_node['archi'] = node['archi']
- rspec_node['radio'] = (node['archi'].split(':'))[1]
+ if ':' in node['archi']:
+ rspec_node['radio'] = (node['archi'].split(':'))[1]
+ else:
+ rspec_node['radio'] = node['archi']
iotlab_xrn = Xrn('.'.join([self.driver.root_auth,
iotlab_xrn = Xrn('.'.join([self.driver.root_auth,
- Xrn.escape(node['network_address'])]),
+
Xrn.escape(node['network_address'])]),
type='node')
# rspec_node['boot_state'] = 'true'
if node['state'] == 'Absent' or \
node['state'] == 'Suspected' or \
type='node')
# rspec_node['boot_state'] = 'true'
if node['state'] == 'Absent' or \
node['state'] == 'Suspected' or \
+ node['state'] == 'Dead' or \
node['state'] == 'Busy':
rspec_node['available'] = 'false'
else:
node['state'] == 'Busy':
rspec_node['available'] = 'false'
else:
@@
-182,7
+186,8
@@
class IotLABAggregate(object):
else:
reserved_nodes[lease_id]['slice_id'] = \
hrn_to_urn(self.driver.root_auth + '.' +
else:
reserved_nodes[lease_id]['slice_id'] = \
hrn_to_urn(self.driver.root_auth + '.' +
- reserved_nodes[lease_id]['owner']+"_slice",
+ reserved_nodes[lease_id][
+ 'owner'] + "_slice",
'slice')
leases.append(reserved_nodes[lease_id])
'slice')
leases.append(reserved_nodes[lease_id])