From: smbaker <smbaker@fc8clean.lan>
Date: Tue, 3 Jan 2012 01:05:16 +0000 (-0800)
Subject: support for hardware_type
X-Git-Tag: sface-0.9-1~2
X-Git-Url: http://git.onelab.eu/?p=sface.git;a=commitdiff_plain;h=ce5e4c9baaac18e6e3afe3de2316c71990c20cca;hp=3df82fab7b2e027b83d21b16529083fbdcf461b7

support for hardware_type
---

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index c25403b..a435185 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -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")