add sliver_type column, sorting in mainscreen

[sface.git] / sface / screens / mainscreen.py

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 3c1be13..f7171cb 100644 (file)
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -32,9 +32,10 @@ default_tags = "Default tags"
 settable_tags = ['delegations', 'initscript']
 
 NAME_COLUMN = 0
-NODE_STATUS_COLUMN = 1
-MEMBERSHIP_STATUS_COLUMN = 2
-KIND_COLUMN = 3
+NODE_TYPE_COLUMN = 1
+NODE_STATUS_COLUMN = 2
+MEMBERSHIP_STATUS_COLUMN = 3
+KIND_COLUMN = 4
 
 # maximum length of a name to display before clipping
 NAME_MAX_LEN = 48
@@ -102,6 +103,17 @@ class NodeView(QTreeView):
 
         model.emit(SIGNAL("dataChanged(QModelIndex, QModelIndex)"), node_index, node_index)
 
+    def appendRow(self, parent, name, nodeStatus="", nodeType="", membership="", kind = ""):
+        # row: name nodeStatus nodeType membership kind
+        item = QStandardItem(QString(str(name)))
+        row = [item,
+                QStandardItem(QString(str(nodeType))),
+                QStandardItem(QString(str(nodeStatus))),
+                QStandardItem(QString(str(membership))),
+                QStandardItem(QString(str(kind)))]
+        parent.appendRow(row)
+        return item
+
     def mousePressEvent(self, event):
         QTreeView.mousePressEvent(self, event)
         if event.button() == Qt.LeftButton:
@@ -125,23 +137,12 @@ class NodeView(QTreeView):
                     value, ok = QInputDialog.getText(self, "Add tag",
                                                      "Value for tag '%s'" % tagname)
                     if ok:
-                        # Add a new row to the model for the tag
-
-                        # For testing with the QStandardItemModel
-                        #nodeItem = model.itemFromIndex(index)
-                        #tagstring = QString("%s: %s" % (tagname, value))
-                        #tagItem = QStandardItem(tagstring)
-                        #status = QStandardItem(QString(tag_status['add']))
-                        #nodeItem.appendRow([tagItem, status])
-
                         # We're using the QSortFilterProxyModel here
                         src_index = model.mapToSource(index)
                         src_model = src_index.model()
                         nodeItem = src_model.itemFromIndex(src_index)
-                        tagstring = QString("%s: %s" % (tagname, value))
-                        tagItem = QStandardItem(tagstring)
-                        status = QStandardItem(QString(tag_status['add']))
-                        nodeItem.appendRow([tagItem, QStandardItem(QString("")), status])
+
+                        self.appendRow(nodeItem, "%s: %s" % (tagname, value), membership=tag_status['add'], kind="attribute")
 
             elif status_data in (node_status['out'], node_status['remove']):
                 QMessageBox.warning(self, "Not selected", "Can only add tags to selected nodes")
@@ -631,53 +632,55 @@ class SliceWidget(QWidget):
 
             available_nodes = [ node for node in all_nodes if node not in sliver_nodes ]
 
-            networkItem = QStandardItem(QString(network))
             msg = "%s Nodes\t%s Selected" % (len(all_nodes), len(sliver_nodes))
-            rootItem.appendRow([networkItem, QStandardItem(QString("")), QStandardItem(QString(msg)), QStandardItem(QString("network"))])
+            networkItem = self.nodeView.appendRow(rootItem, network, membership=msg, kind="network")
 
             already_in_nodes += sliver_nodes
 
             # Add default slice tags
-            nodeItem = QStandardItem(QString("%s for %s" % (default_tags, network)))
-            statusItem = QStandardItem(QString(""))
-            nodeStatus = QStandardItem(QString(""))
-            networkItem.appendRow([nodeItem, nodeStatus, statusItem, QStandardItem(QString("defaults"))])
+            self.nodeView.appendRow(networkItem, "%s for %s" % (default_tags, network), kind="defaults")
             attrs = rspec.get_default_sliver_attributes(network)
             for (name, value) in attrs:
                     tagstring = QString("%s: %s" % (name, value))
-                    tagItem = QStandardItem(tagstring)
-                    status = QStandardItem(QString(tag_status['in']))
-                    nodeStatus = QStandardItem(QString(""))
-                    nodeItem.appendRow([tagItem, nodeStatus, status, QStandardItem(QString("attribute"))])
+                    self.nodeView.appendRow(nodeItem, tagstring, membership=tag_status['in'], kind = "attribute")
 
             for node in sliver_nodes:
-                nodeItem = QStandardItem(QString(node))
-                statusItem = QStandardItem(QString(node_status['in']))
-                nodeStatus = QStandardItem(QString(rspec.get_node_element(node, network).attrib.get("boot_state","")))
-                networkItem.appendRow([nodeItem, nodeStatus, statusItem, QStandardItem(QString("node"))])
+                self.nodeView.appendRow(networkItem,
+                               node,
+                               nodeStatus=rspec.get_node_boot_state(node, network),
+                               nodeType=rspec.get_node_sliver_type(node, network),
+
+                               #get_node_element(node, network).attrib.get("boot_state",""),
+                               #nodeType=rspec.get_node_element(node, network).attrib.get("sliver_type",""),
+
+                               membership=node_status['in'],
+                               kind="node")
 
                 attrs = rspec.get_sliver_attributes(node, network)
                 for (name, value) in attrs:
-                    tagstring = QString("%s: %s" % (name, value))
-                    tagItem = QStandardItem(tagstring)
-                    statusItem = QStandardItem(QString(tag_status['in']))
-                    nodeStatus = QStandardItem(QString(""))
-                    nodeItem.appendRow([tagItem, nodeStatus, statusItem, QStandardItem(QString("attribute"))])
+                    self.nodeView.appendRow(nodeItem,
+                                            "%s: %s" % (name, value),
+                                            membership=tag_status['in'],
+                                            kind="attribute")
 
             for node in available_nodes:
-                nodeItem = QStandardItem(QString(node))
-                statusItem = QStandardItem(QString(node_status['out']))
-                nodeStatus = QStandardItem(QString(resources.get_node_element(node, network).attrib.get("boot_state","")))
-                networkItem.appendRow([nodeItem, nodeStatus, statusItem, QStandardItem(QString("node"))])
+                self.nodeView.appendRow(networkItem,
+                               node,
+                               #nodeStatus=resources.get_node_element(node, network).attrib.get("boot_state",""),
+                               nodeStatus = resources.get_node_boot_state(node, network),
+                               nodeType= resources.get_node_sliver_type(node, network),
+                               membership=node_status['out'],
+                               kind="node")
 
         self.filterModel.setSourceModel(self.nodeModel)
         self.filterModel.setDynamicSortFilter(True)
+        self.filterModel.sort(NAME_COLUMN)
 
-        headers = QStringList() << "Hostname or Tag" << "Node Status" << "Membership Status" << "Kind"
+        headers = QStringList() << "Hostname or Tag" << "Node Type" << "Node Status" << "Membership Status" << "Kind"
         self.nodeModel.setHorizontalHeaderLabels(headers)
 
-        self.nodeView.setItemDelegateForColumn(0, self.nodeNameDelegate)
-        self.nodeView.setItemDelegateForColumn(1, self.nodeStatusDelegate)
+        self.nodeView.setItemDelegateForColumn(NAME_COLUMN, self.nodeNameDelegate)
+        self.nodeView.setItemDelegateForColumn(NODE_STATUS_COLUMN, self.nodeStatusDelegate)
         self.nodeView.setModel(self.filterModel)
         self.nodeView.hideColumn(KIND_COLUMN)
         self.nodeView.expandAll()