support for hardware_type
authorsmbaker <smbaker@fc8clean.lan>
Tue, 3 Jan 2012 01:05:16 +0000 (17:05 -0800)
committersmbaker <smbaker@fc8clean.lan>
Tue, 3 Jan 2012 01:05:16 +0000 (17:05 -0800)
sface/screens/mainscreen.py

index c25403b..a435185 100644 (file)
@@ -626,10 +626,14 @@ class SliceWidget(QWidget):
                     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)
                 nodeItem = self.nodeView.appendRow(networkItem,
                                node["component_name"],
                                nodeStatus=node.get("boot_state", ""),
-                               #nodeType=node.get("rspec.get_node_sliver_type(node, network),
+                               nodeType=nodeType,
                                membership=node_status['in'],
                                kind="node")
 
@@ -643,10 +647,14 @@ class SliceWidget(QWidget):
                                             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)
                 self.nodeView.appendRow(networkItem,
                                node["component_name"],
                                nodeStatus = node.get("boot_state", ""),
-                               #nodeType= resources.get_node_sliver_type(node, network),
+                               nodeType=nodeType,
                                membership=node_status['out'],
                                kind="node")