From e05a4f6ac4c3e6d0e8a88ad31ec8516440cdd2b3 Mon Sep 17 00:00:00 2001 From: smbaker Date: Tue, 23 Aug 2011 16:18:40 -0700 Subject: [PATCH] add filtering for node status, add custom filtering class --- sface/screens/mainscreen.py | 68 +++++++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 17 deletions(-) diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py index c51ef7a..2963754 100644 --- a/sface/screens/mainscreen.py +++ b/sface/screens/mainscreen.py @@ -29,6 +29,7 @@ settable_tags = ['delegations', 'initscript'] NAME_COLUMN = 0 NODE_STATUS_COLUMN = 1 MEMBERSHIP_STATUS_COLUMN = 2 +KIND_COLUMN = 3 def itemType(index): if index.parent().parent().isValid(): @@ -253,6 +254,36 @@ class NodeStatusDelegate(QStyledItemDelegate): painter.restore() +class NodeFilterProxyModel(QSortFilterProxyModel): + def __init__(self, parent=None): + QSortFilterProxyModel.__init__(self, parent) + self.hostname_filter_regex = None + self.nodestatus_filter = None + + def setHostNameFilter(self, hostname): + self.hostname_filter_regex = QRegExp(hostname) + self.invalidateFilter() + + def setNodeStatusFilter(self, status): + if (status == "all"): + self.nodestatus_filter = None + else: + self.nodestatus_filter = status + self.invalidateFilter() + + def filterAcceptsRow(self, sourceRow, source_parent): + kind_data = self.sourceModel().index(sourceRow, KIND_COLUMN, source_parent).data().toString() + if (kind_data == "node"): + if self.hostname_filter_regex: + name_data = self.sourceModel().index(sourceRow, NAME_COLUMN, source_parent).data().toString() + if (self.hostname_filter_regex.indexIn(name_data) < 0): + return False + if self.nodestatus_filter: + nodestatus_data = self.sourceModel().index(sourceRow, NODE_STATUS_COLUMN, source_parent).data().toString() + if (nodestatus_data != self.nodestatus_filter): + return False + return True + class SliceWidget(QWidget): def __init__(self, parent): QWidget.__init__(self, parent) @@ -263,6 +294,9 @@ class SliceWidget(QWidget): self.slicename = QLabel("", self) self.updateSliceName() self.slicename.setScaledContents(False) + filterlabel = QLabel ("Filter: ", self) + filterbox = QComboBox(self) + filterbox.addItems(["all", "boot", "disabled", "reinstall", "safeboot"]) searchlabel = QLabel ("Search: ", self) searchlabel.setScaledContents(False) searchbox = QLineEdit(self) @@ -271,12 +305,14 @@ class SliceWidget(QWidget): toplayout = QHBoxLayout() toplayout.addWidget(self.slicename, 0, Qt.AlignLeft) toplayout.addStretch() + toplayout.addWidget(filterlabel, 0, Qt.AlignRight) + toplayout.addWidget(filterbox, 0, Qt.AlignRight) toplayout.addWidget(searchlabel, 0, Qt.AlignRight) toplayout.addWidget(searchbox, 0, Qt.AlignRight) self.nodeView = NodeView(self) - self.nodeModel = QStandardItemModel(0, 2, self) - self.filterModel = QSortFilterProxyModel(self) # enable filtering + self.nodeModel = QStandardItemModel(0, 4, self) + self.filterModel = NodeFilterProxyModel(self) self.nodeNameDelegate = NodeNameDelegate(self) self.nodeStatusDelegate = NodeStatusDelegate(self) @@ -304,7 +340,8 @@ class SliceWidget(QWidget): self.connect(refresh, SIGNAL('clicked()'), self.refresh) self.connect(renew, SIGNAL('clicked()'), self.renew) self.connect(submit, SIGNAL('clicked()'), self.submit) - self.connect(searchbox, SIGNAL('textChanged(QString)'), self.filter) + self.connect(searchbox, SIGNAL('textChanged(QString)'), self.search) + self.connect(filterbox, SIGNAL('currentIndexChanged(QString)'), self.filter) self.connect(self.nodeView, SIGNAL('hostnameClicked(QString)'), self.nodeSelectionChanged) @@ -335,14 +372,11 @@ class SliceWidget(QWidget): return True return False + def search(self, search_string): + self.filterModel.setHostNameFilter(str(search_string)) + def filter(self, filter_string): - # for hierarchical models QSortFilterProxyModel applies the - # sort recursively. if the parent doesn't match the criteria - # we won't be able to match the children. so we need to match - # parent (by matching the network_names) - networks = ["^%s$" % n for n in self.network_names] - filters = networks + [str(filter_string)] - self.filterModel.setFilterRegExp(QRegExp('|'.join(filters))) + self.filterModel.setNodeStatusFilter(str(filter_string)) def itemStatus(self, item): statusItem = item.parent().child(item.row(), 1) @@ -471,7 +505,7 @@ class SliceWidget(QWidget): networkItem = QStandardItem(QString(network)) msg = "%s Nodes\t%s Selected" % (len(all_nodes), len(sliver_nodes)) - rootItem.appendRow([networkItem, QStandardItem(QString("")), QStandardItem(QString(msg))]) + rootItem.appendRow([networkItem, QStandardItem(QString("")), QStandardItem(QString(msg)), QStandardItem(QString("network"))]) already_in_nodes += sliver_nodes @@ -485,13 +519,13 @@ class SliceWidget(QWidget): tagItem = QStandardItem(tagstring) status = QStandardItem(QString(tag_status['in'])) nodeStatus = QStandardItem(QString("")) - nodeItem.appendRow([tagItem, nodeStatus, status]) + nodeItem.appendRow([tagItem, nodeStatus, status, QStandardItem(QString("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]) + networkItem.appendRow([nodeItem, nodeStatus, statusItem, QStandardItem(QString("node"))]) attrs = rspec.get_sliver_attributes(node, network) for (name, value) in attrs: @@ -499,24 +533,24 @@ class SliceWidget(QWidget): tagItem = QStandardItem(tagstring) statusItem = QStandardItem(QString(tag_status['in'])) nodeStatus = QStandardItem(QString("")) - nodeItem.appendRow([tagItem, nodeStatus, statusItem]) + nodeItem.appendRow([tagItem, nodeStatus, statusItem, QStandardItem(QString("attribute"))]) for node in available_nodes: nodeItem = QStandardItem(QString(node)) statusItem = QStandardItem(QString(node_status['out'])) nodeStatus = QStandardItem(QString(rspec.get_node_element(node, network).attrib.get("boot_state",""))) - networkItem.appendRow([nodeItem, nodeStatus, statusItem]) + networkItem.appendRow([nodeItem, nodeStatus, statusItem, QStandardItem(QString("node"))]) self.filterModel.setSourceModel(self.nodeModel) - self.filterModel.setFilterKeyColumn(-1) self.filterModel.setDynamicSortFilter(True) - headers = QStringList() << "Hostname or Tag" << "Node Status" << "Membership Status" + headers = QStringList() << "Hostname or Tag" << "Node Status" << "Membership Status" << "Kind" self.nodeModel.setHorizontalHeaderLabels(headers) self.nodeView.setItemDelegateForColumn(0, self.nodeNameDelegate) self.nodeView.setItemDelegateForColumn(1, self.nodeStatusDelegate) self.nodeView.setModel(self.filterModel) + self.nodeView.hideColumn(KIND_COLUMN) self.nodeView.expandAll() self.nodeView.resizeColumnToContents(0) self.nodeView.collapseAll() -- 2.43.0