X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=inline;f=sface%2Fscreens%2Fmainscreen.py;h=90f8df119f4bd4ba21f98adb27e495380f052bd4;hb=312ec1d8972acfdd51b2bc6c26ba7f89b6096303;hp=c51ef7a96f3d18603c57cbf5c1fa65ed1a4ae21f;hpb=31f39d4d288e990328172ed778292ba801de8001;p=sface.git
diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index c51ef7a..90f8df1 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -7,7 +7,7 @@ from PyQt4.QtGui import *
#from sfa.util.rspecHelper import RSpec
from sfa.rspecs.rspec_parser import parse_rspec
from sface.config import config
-from sface.sfirenew import SfiRenewer
+from sface.sfirenew import RenewWindow
from sface.sfiprocess import SfiProcess
from sface.screens.sfascreen import SfaScreen
@@ -29,6 +29,10 @@ settable_tags = ['delegations', 'initscript']
NAME_COLUMN = 0
NODE_STATUS_COLUMN = 1
MEMBERSHIP_STATUS_COLUMN = 2
+KIND_COLUMN = 3
+
+# maximum length of a name to display before clipping
+NAME_MAX_LEN = 48
def itemType(index):
if index.parent().parent().isValid():
@@ -123,7 +127,7 @@ class NodeView(QTreeView):
tagstring = QString("%s: %s" % (tagname, value))
tagItem = QStandardItem(tagstring)
status = QStandardItem(QString(tag_status['add']))
- nodeItem.appendRow([tagItem, status])
+ nodeItem.appendRow([tagItem, QStandardItem(QString("")), status])
elif status_data in (node_status['out'], node_status['remove']):
QMessageBox.warning(self, "Not selected", "Can only add tags to selected nodes")
@@ -143,15 +147,21 @@ class NodeNameDelegate(QStyledItemDelegate):
def __init__(self, parent):
QStyledItemDelegate.__init__(self, parent)
+ def displayText(self, value, locale):
+ data = str(QStyledItemDelegate.displayText(self, value, locale))
+ if (len(data)>NAME_MAX_LEN):
+ data = data[:(NAME_MAX_LEN-3)] + "..."
+ return QString(data)
+
def paint(self, painter, option, index):
model = index.model()
+ data = str(self.displayText(index.data(), QLocale()))
status_index = model.index(index.row(), MEMBERSHIP_STATUS_COLUMN, index.parent())
status_data = status_index.data().toString()
fm = QFontMetrics(option.font)
rect = QRect(option.rect)
- data = index.data().toString()
rect.setHeight(rect.height() - 2)
rect.setWidth(fm.width(QString(data)) + 6)
rect.setX(rect.x() + 5)
@@ -253,6 +263,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 +303,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 +314,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 +349,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)
@@ -312,7 +358,10 @@ class SliceWidget(QWidget):
def submitFinished(self):
self.setStatus("Slice data submitted.")
- QTimer.singleShot(1000, self.refresh)
+ # no need to do that anymore
+ # QTimer.singleShot(1000, self.refresh)
+ self.updateView()
+ self.parent().signalAll("rspecUpdated")
def refreshFinished(self):
self.setStatus("Slice data refreshed.", timeout=5000)
@@ -335,17 +384,14 @@ 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)
+ statusItem = item.parent().child(item.row(), MEMBERSHIP_STATUS_COLUMN)
return statusItem.data(Qt.DisplayRole).toString()
def itemText(self, item):
@@ -418,19 +464,7 @@ class SliceWidget(QWidget):
def renew(self):
dlg = RenewWindow(parent=self)
- if (dlg.exec_() == QDialog.Accepted):
- self.setStatus("Renewing Slice.")
-
- self.renewProcess = SfiRenewer(config.getSlice(), dlg.get_new_expiration(), self)
- self.connect(self.renewProcess, SIGNAL('finished()'), self.renewFinished)
-
- def renewFinished(self):
- if self.renewProcess.statusMsg:
- self.setStatus("Renew " + self.renewProcess.status + ": " + self.renewProcess.statusMsg)
- else:
- self.setStatus("Renew " + self.renewProcess.status)
- self.disconnect(self.renewProcess, SIGNAL('finished()'), self.renewFinished)
- self.renewProcess = None
+ dlg.exec_()
def refresh(self):
if not config.getSlice():
@@ -444,7 +478,7 @@ class SliceWidget(QWidget):
self.disconnect(self.process, SIGNAL('finished()'), self.submitFinished)
self.connect(self.process, SIGNAL('finished()'), self.refreshFinished)
- self.process.getRSpecFromSM()
+ self.process.retrieveRspec()
self.setStatus("Refreshing slice data. This will take some time...")
def updateView(self):
@@ -471,27 +505,28 @@ 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
# Add default slice tags
nodeItem = QStandardItem(QString("%s for %s" % (default_tags, network)))
statusItem = QStandardItem(QString(""))
- networkItem.appendRow([nodeItem, statusItem])
+ nodeStatus = QStandardItem(QString(""))
+ networkItem.appendRow([nodeItem, nodeStatus, statusItem, QStandardItem(QString("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])
+ 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 +534,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()
@@ -527,44 +562,6 @@ class SliceWidget(QWidget):
def nodeSelectionChanged(self, hostname):
self.parent().nodeSelectionChanged(hostname)
-class RenewWindow(QDialog):
- def __init__(self, parent=None):
- super(RenewWindow, self).__init__(parent)
- self.setWindowTitle("Renew Slivers")
-
- self.duration = QComboBox()
-
- self.expirations = []
-
- durations = ( (1, "One Week"), (2, "Two Weeks"), (3, "Three Weeks"), (4, "One Month") )
-
- now = datetime.datetime.utcnow()
- for (weeks, desc) in durations:
- exp = now + datetime.timedelta(days = weeks * 7)
- desc = desc + " " + exp.strftime("%Y-%m-%d %H:%M:%S")
- self.expirations.append(exp)
- self.duration.addItem(desc)
-
- self.duration.setCurrentIndex(0)
-
- buttonBox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
- buttonBox.button(QDialogButtonBox.Ok).setDefault(True)
-
- layout = QVBoxLayout()
- layout.addWidget(self.duration)
- layout.addWidget(buttonBox)
- self.setLayout(layout)
-
- self.connect(buttonBox, SIGNAL("accepted()"), self, SLOT("accept()"))
- self.connect(buttonBox, SIGNAL("rejected()"), self, SLOT("reject()"))
-
- def accept(self):
- QDialog.accept(self)
-
- def get_new_expiration(self):
- index = self.duration.currentIndex()
- return self.expirations[index]
-
class MainScreen(SfaScreen):
def __init__(self, parent):
SfaScreen.__init__(self, parent)