git://git.onelab.eu
/
sface.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix NONE displayed for protogeni boot state
[sface.git]
/
sface
/
screens
/
mainscreen.py
diff --git
a/sface/screens/mainscreen.py
b/sface/screens/mainscreen.py
index
c25403b
..
988d608
100644
(file)
--- a/
sface/screens/mainscreen.py
+++ b/
sface/screens/mainscreen.py
@@
-626,10
+626,17
@@
class SliceWidget(QWidget):
self.nodeView.appendRow(nodeItem, tagstring, membership=tag_status['in'], kind = "attribute")
for node in sliver_nodes:
self.nodeView.appendRow(nodeItem, tagstring, membership=tag_status['in'], kind = "attribute")
for node in sliver_nodes:
+ nodeType = None
+ if ("hardware_types" in node):
+ hardware_types = [x["name"] for x in node["hardware_types"]]
+ nodeType = ",".join(hardware_types)
+ nodeStatus = node.get("boot_state", "")
+ if nodeStatus == None:
+ nodeStatus=""
nodeItem = self.nodeView.appendRow(networkItem,
node["component_name"],
nodeItem = self.nodeView.appendRow(networkItem,
node["component_name"],
- nodeStatus=node
.get("boot_state", "")
,
-
#nodeType=node.get("rspec.get_node_sliver_type(node, network)
,
+ nodeStatus=node
Status
,
+
nodeType=nodeType
,
membership=node_status['in'],
kind="node")
membership=node_status['in'],
kind="node")
@@
-643,10
+650,17
@@
class SliceWidget(QWidget):
kind="attribute")
for node in available_nodes:
kind="attribute")
for node in available_nodes:
+ nodeType = None
+ if ("hardware_types" in node):
+ hardware_types = [x["name"] for x in node["hardware_types"]]
+ nodeType = ",".join(hardware_types)
+ nodeStatus = node.get("boot_state", "")
+ if nodeStatus == None:
+ nodeStatus=""
self.nodeView.appendRow(networkItem,
node["component_name"],
self.nodeView.appendRow(networkItem,
node["component_name"],
- nodeStatus
= node.get("boot_state", "")
,
-
#nodeType= resources.get_node_sliver_type(node, network)
,
+ nodeStatus
=nodeStatus
,
+
nodeType=nodeType
,
membership=node_status['out'],
kind="node")
membership=node_status['out'],
kind="node")