git://git.onelab.eu
/
sface.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ce5e4c9
)
fix NONE displayed for protogeni boot state
author
smbaker
<smbaker@fc8clean.lan>
Tue, 3 Jan 2012 01:09:22 +0000
(17:09 -0800)
committer
smbaker
<smbaker@fc8clean.lan>
Tue, 3 Jan 2012 01:09:22 +0000
(17:09 -0800)
sface/screens/mainscreen.py
patch
|
blob
|
history
diff --git
a/sface/screens/mainscreen.py
b/sface/screens/mainscreen.py
index
a435185
..
988d608
100644
(file)
--- a/
sface/screens/mainscreen.py
+++ b/
sface/screens/mainscreen.py
@@
-630,9
+630,12
@@
class SliceWidget(QWidget):
if ("hardware_types" in node):
hardware_types = [x["name"] for x in node["hardware_types"]]
nodeType = ",".join(hardware_types)
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", "")
,
+ nodeStatus=node
Status
,
nodeType=nodeType,
membership=node_status['in'],
kind="node")
nodeType=nodeType,
membership=node_status['in'],
kind="node")
@@
-651,9
+654,12
@@
class SliceWidget(QWidget):
if ("hardware_types" in node):
hardware_types = [x["name"] for x in node["hardware_types"]]
nodeType = ",".join(hardware_types)
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", "")
,
+ nodeStatus
=nodeStatus
,
nodeType=nodeType,
membership=node_status['out'],
kind="node")
nodeType=nodeType,
membership=node_status['out'],
kind="node")