X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=0452161a5ba1ff2e34834835f2a286f5a3e62ad8;hp=c51ef7a96f3d18603c57cbf5c1fa65ed1a4ae21f;hb=a42adfb545b5810b301f43a6eede650c94ab5e9d;hpb=31f39d4d288e990328172ed778292ba801de8001 diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py index c51ef7a..0452161 100644 --- a/sface/screens/mainscreen.py +++ b/sface/screens/mainscreen.py @@ -7,9 +7,10 @@ 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 +from sface.sfidata import SfiData already_in_nodes = [] @@ -23,12 +24,20 @@ tag_status = { "in": "Already Set", "add": "To be Added", "remove": "To be Removed"} +color_status = { "in": QColor.fromRgb(0, 250, 250), + "add": QColor.fromRgb(0, 250, 0), + "remove": QColor.fromRgb(250, 0, 0) } + default_tags = "Default tags" 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(): @@ -50,7 +59,16 @@ class NodeView(QTreeView): self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) self.setToolTip("Double click on a row to change its status. Right click on a host to add a tag.") + def keyPressEvent(self, event): + if (event.key() == Qt.Key_Space): + self.toggleSelection() + else: + QTreeView.keyPressEvent(self, event) + def mouseDoubleClickEvent(self, event): + self.toggleSelection() + + def toggleSelection(self): index = self.currentIndex() model = index.model() status_index = model.index(index.row(), MEMBERSHIP_STATUS_COLUMN, index.parent()) @@ -123,7 +141,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 +161,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) @@ -169,44 +193,20 @@ class NodeNameDelegate(QStyledItemDelegate): painter.fillRect(option.rect, option.palette.color(QPalette.Active, QPalette.Highlight)) if itemType(index) == "node": - if status_data == node_status['in']: # already in the slice - painter.fillPath(path, QColor.fromRgb(0, 250, 250)) - painter.setPen(QColor.fromRgb(0, 0, 0)) - painter.drawText(rect, 0, QString(data)) + for x in node_status.keys(): + if (node_status[x] == status_data) and (x in color_status): + painter.fillPath(path, color_status[x]) - elif status_data == node_status['add']: # newly added to the slice - painter.fillPath(path, QColor.fromRgb(0, 250, 0)) - painter.setPen(QColor.fromRgb(0, 0, 0)) - painter.drawText(rect, 0, QString(data)) - - elif status_data == node_status['remove']: # removed from the slice - painter.fillPath(path, QColor.fromRgb(250, 0, 0)) - painter.setPen(QColor.fromRgb(0, 0, 0)) - painter.drawText(rect, 0, QString(data)) - - else: - painter.setPen(QColor.fromRgb(0, 0, 0)) - painter.drawText(rect, 0, QString(data)) + painter.setPen(QColor.fromRgb(0, 0, 0)) + painter.drawText(rect, 0, QString(data)) else: - if status_data == tag_status['in']: # already in the slice - painter.fillPath(path, QColor.fromRgb(0, 250, 250)) - painter.setPen(QColor.fromRgb(0, 0, 0)) - painter.drawText(rect, 0, QString(data)) - - elif status_data == tag_status['add']: # newly added to the slice - painter.fillPath(path, QColor.fromRgb(0, 250, 0)) - painter.setPen(QColor.fromRgb(0, 0, 0)) - painter.drawText(rect, 0, QString(data)) + for x in tag_status.keys(): + if (tag_status[x] == status_data) and (x in color_status): + painter.fillPath(path, color_status[x]) - elif status_data == tag_status['remove']: # removed from the slice - painter.fillPath(path, QColor.fromRgb(250, 0, 0)) - painter.setPen(QColor.fromRgb(0, 0, 0)) - painter.drawText(rect, 0, QString(data)) - - else: - painter.setPen(QColor.fromRgb(0, 0, 0)) - painter.drawText(rect, 0, QString(data)) + painter.setPen(QColor.fromRgb(0, 0, 0)) + painter.drawText(rect, 0, QString(data)) painter.restore() @@ -253,6 +253,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 +293,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 +304,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,27 +339,47 @@ 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) self.updateView() def submitFinished(self): - self.setStatus("Slice data submitted.") - QTimer.singleShot(1000, self.refresh) + self.disconnect(self.process, SIGNAL('finished()'), self.submitFinished) + + faultString = self.process.getFaultString() + if not faultString: + self.setStatus("Slice data submitted.") + else: + self.setStatus("Slice submit failed: %s" % (faultString)) - def refreshFinished(self): - self.setStatus("Slice data refreshed.", timeout=5000) self.updateView() self.parent().signalAll("rspecUpdated") - def readSliceRSpec(self): - rspec_file = config.getSliceRSpecFile() - if os.path.exists(rspec_file): - xml = open(rspec_file).read() - return parse_rspec(xml) - return None + def refreshResourcesFinished(self): + self.disconnect(self.process, SIGNAL('finished()'), self.refreshResourcesFinished) + + faultString = self.process.getFaultString() + if not faultString: + self.setStatus("Refreshing slice RSpec.") + self.connect(self.process, SIGNAL('finished()'), self.refreshRSpecFinished) + self.process.retrieveRspec() + else: + self.setStatus("Resources refresh failed: %s" % (faultString)) + + def refreshRSpecFinished(self): + self.disconnect(self.process, SIGNAL('finished()'), self.refreshRSpecFinished) + + faultString = self.process.getFaultString() + if not faultString: + self.setStatus("Slice data refreshed.", timeout=5000) + else: + self.setStatus("Slice refresh failed: %s" % (faultString)) + + self.updateView() + self.parent().signalAll("rspecUpdated") def setStatus(self, msg, timeout=None): self.parent().setStatus(msg, timeout) @@ -335,24 +390,21 @@ 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) - return statusItem.data(Qt.DisplayRole).toString() + statusItem = item.parent().child(item.row(), MEMBERSHIP_STATUS_COLUMN) + return str(statusItem.data(Qt.DisplayRole).toString()) def itemText(self, item): - return item.data(Qt.DisplayRole).toString() + return str(item.data(Qt.DisplayRole).toString()) # Recursively walk the tree, making changes to the RSpec - def process_subtree(self, rspec, item, depth = 0): + def process_subtree(self, rspec, resources, item, depth = 0): change = False model = self.nodeModel @@ -364,8 +416,15 @@ class SliceWidget(QWidget): status = self.itemStatus(item) if status == node_status['add']: print "Add hostname: %s" % hostname - rspec.add_slivers(str(hostname), testbed) - change = True + + resource_node = resources.get_node_element(hostname) + + if resource_node==None: + print "Error: Failed to find %s in resources rspec" % hostname + else: + rspec.merge_node(resource_node, testbed) + rspec.add_slivers(str(hostname), testbed) + change = True elif status == node_status['remove']: print "Remove hostname: %s" % hostname rspec.remove_slivers(str(hostname), testbed) @@ -394,7 +453,7 @@ class SliceWidget(QWidget): children = item.rowCount() for row in range(0, children): - status = self.process_subtree(rspec, item.child(row), depth + 1) + status = self.process_subtree(rspec, resources, item.child(row), depth + 1) change = change or status return change @@ -403,14 +462,14 @@ class SliceWidget(QWidget): if self.checkRunningProcess(): return - rspec = self.readSliceRSpec() - change = self.process_subtree(rspec, self.nodeModel.invisibleRootItem()) + rspec = SfiData().getSliceRSpec() + resources = SfiData().getResourcesRSpec() + change = self.process_subtree(rspec, resources, self.nodeModel.invisibleRootItem()) if not change: self.setStatus("No change in slice data. Not submitting!", timeout=3000) return - self.disconnect(self.process, SIGNAL('finished()'), self.refreshFinished) self.connect(self.process, SIGNAL('finished()'), self.submitFinished) self.process.applyRSpec(rspec) @@ -418,19 +477,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(): @@ -441,11 +488,10 @@ class SliceWidget(QWidget): self.setStatus("There is already a process running. Please wait.") return - self.disconnect(self.process, SIGNAL('finished()'), self.submitFinished) - self.connect(self.process, SIGNAL('finished()'), self.refreshFinished) + self.connect(self.process, SIGNAL('finished()'), self.refreshResourcesFinished) - self.process.getRSpecFromSM() - self.setStatus("Refreshing slice data. This will take some time...") + self.process.retrieveResources() + self.setStatus("Refreshing resources. This will take some time...") def updateView(self): global already_in_nodes @@ -453,45 +499,53 @@ class SliceWidget(QWidget): self.network_names = [] self.nodeModel.clear() - rspec = self.readSliceRSpec() + rspec = SfiData().getSliceRSpec() if not rspec: return None + resources = SfiData().getResourcesRSpec() + if not resources: + return None + rootItem = self.nodeModel.invisibleRootItem() - #networks = sorted(rspec.get_network_list()) networks = rspec.get_networks() + + for network in resources.get_networks(): + if not network in networks: + networks.append(network) + for network in networks: self.network_names.append(network) - #all_nodes = rspec.get_node_list(network) - #sliver_nodes = rspec.get_sliver_list(network) - all_nodes = rspec.get_nodes(network) + all_nodes = resources.get_nodes(network) sliver_nodes = rspec.get_nodes_with_slivers(network) + 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))]) + 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 +553,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]) + nodeStatus = QStandardItem(QString(resources.get_node_element(node, network).attrib.get("boot_state",""))) + 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 +581,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)