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 (parent:
847b902
)
further changes in sliver_status
author
Sandrine Avakian
<sandrine.avakian@inria.fr>
Thu, 6 Jun 2013 12:50:15 +0000
(14:50 +0200)
committer
Sandrine Avakian
<sandrine.avakian@inria.fr>
Thu, 6 Jun 2013 12:50:15 +0000
(14:50 +0200)
sfa/senslab/slabdriver.py
patch
|
blob
|
history
diff --git
a/sfa/senslab/slabdriver.py
b/sfa/senslab/slabdriver.py
index
776eb86
..
c80f762
100644
(file)
--- a/
sfa/senslab/slabdriver.py
+++ b/
sfa/senslab/slabdriver.py
@@
-220,7
+220,7
@@
class SlabDriver(Driver):
#slice_nodes_list.append(node['hostname'])
#for node in one_slice:
#slice_nodes_list.append(node['hostname'])
#slice_nodes_list.append(node['hostname'])
#for node in one_slice:
#slice_nodes_list.append(node['hostname'])
- slice_nodes_list = one_slice['
list_node_ids']['hostname']
+ slice_nodes_list = one_slice['
node_ids']
#Get all the corresponding nodes details
nodes_all = self.slab_api.GetNodes({'hostname':slice_nodes_list},
['node_id', 'hostname','site','boot_state'])
#Get all the corresponding nodes details
nodes_all = self.slab_api.GetNodes({'hostname':slice_nodes_list},
['node_id', 'hostname','site','boot_state'])
@@
-235,8
+235,8
@@
class SlabDriver(Driver):
top_level_status = 'empty'
result = {}
result.fromkeys(\
top_level_status = 'empty'
result = {}
result.fromkeys(\
- ['geni_urn','pl_login','geni_status','geni_resources'], None)
- result['pl_login'] = one_slice['reg_researchers'][
'hrn']
+ ['geni_urn','
geni_error', '
pl_login','geni_status','geni_resources'], None)
+ result['pl_login'] = one_slice['reg_researchers'][
0].hrn
logger.debug("Slabdriver - sliver_status Sliver status \
urn %s hrn %s single_slice %s \r\n " \
%(slice_urn, slice_hrn, single_slice))
logger.debug("Slabdriver - sliver_status Sliver status \
urn %s hrn %s single_slice %s \r\n " \
%(slice_urn, slice_hrn, single_slice))
@@
-255,23
+255,23
@@
class SlabDriver(Driver):
result['geni_urn'] = slice_urn
resources = []
result['geni_urn'] = slice_urn
resources = []
- for node in single_slice['node_ids']:
+ for node
_hostname
in single_slice['node_ids']:
res = {}
res = {}
- #res['slab_hostname'] = node['hostname']
-
#res['slab_boot_state'] = node
['boot_state']
+ res['slab_hostname'] = node_hostname
+
res['slab_boot_state'] = nodeall_byhostname[node_hostname]
['boot_state']
- res['pl_hostname'] = node['hostname']
- res['pl_boot_state'] = \
- nodeall_byhostname[node['hostname']]['boot_state']
+
#
res['pl_hostname'] = node['hostname']
+
#
res['pl_boot_state'] = \
+
#
nodeall_byhostname[node['hostname']]['boot_state']
#res['pl_last_contact'] = strftime(self.time_format, \
#gmtime(float(timestamp)))
sliver_id = Xrn(slice_urn, type='slice', \
#res['pl_last_contact'] = strftime(self.time_format, \
#gmtime(float(timestamp)))
sliver_id = Xrn(slice_urn, type='slice', \
- id=nodeall_byhostname[node
['hostname']
]['node_id'], \
+ id=nodeall_byhostname[node
_hostname
]['node_id'], \
authority=self.hrn).urn
res['geni_urn'] = sliver_id
authority=self.hrn).urn
res['geni_urn'] = sliver_id
- node_name = node['hostname']
- if nodeall_byhostname[node_name]['boot_state'] == 'Alive':
+
#
node_name = node['hostname']
+ if nodeall_byhostname[node_
host
name]['boot_state'] == 'Alive':
res['geni_status'] = 'ready'
else:
res['geni_status'] = 'ready'
else: