+import datetime
import os
from PyQt4.QtCore import *
from PyQt4.QtGui import *
-from sfa.util.rspecHelper import RSpec
+#from sfa.util.rspecHelper import RSpec
+from sfa.rspecs.rspec_parser import parse_rspec
from sface.config import config
+from sface.sfirenew import RenewWindow
from sface.sfiprocess import SfiProcess
from sface.screens.sfascreen import SfaScreen
+from sface.sfidata import SfiData
already_in_nodes = []
"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():
return "tag"
# self.setSelectionMode(self.MultiSelection)
self.setAttribute(Qt.WA_MacShowFocusRect, 0)
self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
- self.setToolTip("Double click on a row to change its status")
+ 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(), 2, index.parent())
+ status_index = model.index(index.row(), MEMBERSHIP_STATUS_COLUMN, index.parent())
status_data = status_index.data().toString()
- node_index = model.index(index.row(), 1, index.parent())
+ node_index = model.index(index.row(), NAME_COLUMN, index.parent())
node_data = node_index.data().toString()
if itemType(node_index) == "tag":
- tagname, value = node_index.data().toStringList()
+ data = node_index.data().toString()
+ tagname, value = data.split(": ")
if tagname not in settable_tags:
# Pop up error msg
QMessageBox.warning(self, "Not settable", "Insufficient permission to change '%s' tag" % tagname)
model.emit(SIGNAL("dataChanged(QModelIndex, QModelIndex)"), node_index, node_index)
+ def mousePressEvent(self, event):
+ QTreeView.mousePressEvent(self, event)
+ if event.button() == Qt.LeftButton:
+ return
+
+ # Right click
+ index = self.currentIndex()
+ model = index.model()
+ status_index = model.index(index.row(), 1, index.parent())
+ status_data = status_index.data().toString()
+ node_index = model.index(index.row(), 0, index.parent())
+ node_data = node_index.data().toString()
+
+ if itemType(node_index) == "node":
+ # This is a hostname
+ if status_data in (node_status['in'], node_status['add'], ""):
+ # Pop up a dialog box for adding a new attribute
+ tagname, ok = QInputDialog.getItem(self, "Add tag",
+ "Tag name:", settable_tags)
+ if ok:
+ 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])
+
+ elif status_data in (node_status['out'], node_status['remove']):
+ QMessageBox.warning(self, "Not selected", "Can only add tags to selected nodes")
+ return
+
+ model.emit(SIGNAL("dataChanged(QModelIndex, QModelIndex)"), node_index, node_index)
+
def currentChanged(self, current, previous):
model = current.model()
- node_index = model.index(current.row(), 1, current.parent())
+ node_index = model.index(current.row(), 0, current.parent())
node_data = node_index.data().toString()
self.emit(SIGNAL('hostnameClicked(QString)'), node_data)
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()
- status_index = model.index(index.row(), 2, index.parent())
+ 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 = option.rect
+ rect = QRect(option.rect)
- if itemType(index) == "node":
- data = "%s" % index.data().toString()
- #if status_data not in (node_status['in'], node_status['remove'], node_status['add']):
- # default view
- # QStyledItemDelegate.paint(self, painter, option, index)
- # return
-
- rect.setHeight(rect.height() - 2)
- rect.setWidth(fm.width(QString(data)) + 6)
- rect.setX(rect.x() + 5)
- rect.setY(rect.y() - 1)
- x, y, h, w = rect.x(), rect.y(), rect.height(), rect.width()
-
- path = QPainterPath()
- path.addRoundedRect(x - 1, y + 1, w, h, 4, 4)
-
- painter.save()
- painter.setRenderHint(QPainter.Antialiasing)
-
- if status_data == node_status['in']: # already in the slice
- painter.fillPath(path, QColor("cyan"))
- painter.setPen(QColor.fromRgb(0, 0, 0))
- painter.drawText(option.rect, 0, QString(data))
+ rect.setHeight(rect.height() - 2)
+ rect.setWidth(fm.width(QString(data)) + 6)
+ rect.setX(rect.x() + 5)
+ rect.setY(rect.y() - 1)
- 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(option.rect, 0, QString(data))
+ x, y, h, w = rect.x(), rect.y(), rect.height(), rect.width()
- 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(option.rect, 0, QString(data))
+ path = QPainterPath()
+ path.addRoundedRect(x - 1, y + 1, w, h, 4, 4)
- else:
- painter.setPen(QColor.fromRgb(0, 0, 0))
- painter.drawText(option.rect, 0, QString(data))
+ painter.save()
+ painter.setRenderHint(QPainter.Antialiasing)
- else:
- indent = 16
- tag = index.data().toStringList()
- data = "%s: %s" % (tag[0], tag[1])
- rect.setHeight(rect.height() - 2)
- rect.setWidth(fm.width(QString(data)) + 6 + indent)
- rect.setX(rect.x() + 4 + indent)
- rect.setY(rect.y() - 1)
-
- x, y, h, w = rect.x(), rect.y(), rect.height(), rect.width()
+ if option.state & QStyle.State_Selected:
+ painter.fillRect(option.rect, option.palette.color(QPalette.Active, QPalette.Highlight))
- path = QPainterPath()
- path.addRoundedRect(x - 1, y + 1, w, h, 4, 4)
+ if itemType(index) == "node":
+ for x in node_status.keys():
+ if (node_status[x] == status_data) and (x in color_status):
+ painter.fillPath(path, color_status[x])
- painter.save()
- painter.setRenderHint(QPainter.Antialiasing)
+ painter.setPen(QColor.fromRgb(0, 0, 0))
+ painter.drawText(rect, 0, QString(data))
- if status_data == tag_status['in']: # already in the slice
- painter.fillPath(path, QColor("cyan"))
- painter.setPen(QColor.fromRgb(0, 0, 0))
- painter.drawText(option.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(option.rect, 0, QString(data))
-
- 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(option.rect, 0, QString(data))
+ else:
+ for x in tag_status.keys():
+ if (tag_status[x] == status_data) and (x in color_status):
+ painter.fillPath(path, color_status[x])
- else:
- painter.setPen(QColor.fromRgb(0, 0, 0))
- painter.drawText(option.rect, 0, QString(data))
+ painter.setPen(QColor.fromRgb(0, 0, 0))
+ painter.drawText(rect, 0, QString(data))
painter.restore()
-
-class TreeItem:
- def __init__(self, data, parent=None):
- self.parentItem = parent
- self.itemData = data
- self.childItems = []
-
- def clear(self):
- for child in self.childItems:
- child.clear()
- del child
- del self.childItems
- self.childItems = []
-
- def allChildItems(self):
- all = []
- for c in self.childItems:
- all.append(c)
- if c.childItems:
- all.extend(c.allChildItems())
- return all
-
- def appendChild(self, child):
- self.childItems.append(child)
-
- def child(self, row):
- return self.childItems[row]
-
- def childCount(self):
- return len(self.childItems)
-
- def childNumber(self):
- if self.parentItem:
- return self.parentItem.childItems.index(self)
- return 0
-
- def columnCount(self):
- return len(self.itemData)
-
- def data(self, column):
- return self.itemData[column]
-
- def insertChildren(self, position, count, columns):
- if position < 0 or position > len(self.childItems):
- return False
-
- for row in range(count):
- data = self.data(columns)
- item = TreeItem(data, self)
- self.childItems.insert(position, item)
-
- return True
-
- def insertColumns(self, position, columns):
- if position < 0 or position > len(self.itemData):
- return False
-
- for column in range(columns):
- self.itemData.insert(position, QVariant())
-
- for child in self.childItems:
- child.insertColumns(position, columns)
-
- return True
-
- def setData(self, column, value):
- if column < 0 or column >= len(self.itemData):
- return False
-
- self.itemData[column] = value
- return True
-
- def parent(self):
- return self.parentItem
-
-
-class NodeModel(QAbstractItemModel):
+class NodeStatusDelegate(QStyledItemDelegate):
def __init__(self, parent):
- QAbstractItemModel.__init__(self, parent)
- self.__initRoot()
-
- def clear(self):
- self.rootItem.clear()
- self.__initRoot()
-
- def __initRoot(self):
- self.rootItem = TreeItem([QString("Testbed"), QString("Hostname"), QString("Status")])
-
- def getItem(self, index):
- if index.isValid():
- item = index.internalPointer()
- if isinstance(item, TreeItem):
- return item
- return self.rootItem
-
- def headerData(self, section, orientation, role):
- if orientation == Qt.Horizontal and role in (Qt.DisplayRole, Qt.EditRole):
- return self.rootItem.data(section)
- return QVariant()
-
- def index(self, row, column, parent):
- if not self.hasIndex(row, column, parent):
- return QModelIndex()
-
- parentItem = self.getItem(parent)
- childItem = parentItem.child(row)
- if childItem:
- return self.createIndex(row, column, childItem)
- else:
- return QModelIndex()
-
- def insertColumns(self, position, columns, parent):
- self.beginInsertColumns(parent, position, position + columns -1)
- ret = self.rootItem.insertColumns(position, columns)
- self.endInsertColumns()
- return ret
-
- def insertRows(self, position, rows, parent):
- parentItem = self.getItem(parent)
- self.beginInsertRows(parent, position, position + rows -1)
- ret = parentItem.insertChildren(position, rows, self.rootItem.columnCount())
- self.endInsertRows()
- return ret
-
- def parent(self, index):
- if not index.isValid():
- return QModelIndex()
-
- childItem = self.getItem(index)
- parentItem = childItem.parent()
- if parentItem is self.rootItem:
- return QModelIndex()
+ QStyledItemDelegate.__init__(self, parent)
- return self.createIndex(parentItem.childNumber(), 0, parentItem)
+ def paint(self, painter, option, index):
+ model = index.model()
+ nodestatus_index = model.index(index.row(), NODE_STATUS_COLUMN, index.parent())
+ nodestatus_data = nodestatus_index.data().toString()
- def rowCount(self, parent=QModelIndex()):
- parentItem = self.getItem(parent)
- return parentItem.childCount()
+ fm = QFontMetrics(option.font)
+ rect = QRect(option.rect)
- def columnCount(self, parent=None):
- return self.rootItem.columnCount()
+ data = index.data().toString()
+ rect.setHeight(rect.height() - 2)
+ rect.setWidth(fm.width(QString(data)) + 6)
+ rect.setX(rect.x() + 5)
+ rect.setY(rect.y() - 1)
- def data(self, index, role):
- if not index.isValid():
- return QVariant()
+ x, y, h, w = rect.x(), rect.y(), rect.height(), rect.width()
- if role != Qt.DisplayRole and role != Qt.EditRole:
- return QVariant()
+ path = QPainterPath()
+ path.addRoundedRect(x - 1, y + 1, w, h, 4, 4)
- item = self.getItem(index)
- return item.data(index.column())
+ painter.save()
+ painter.setRenderHint(QPainter.Antialiasing)
- def nodestatus(self, index):
- if not index.isValid():
- return QVariant()
+ if option.state & QStyle.State_Selected:
+ painter.fillRect(option.rect, option.palette.color(QPalette.Active, QPalette.Highlight))
- item = self.getItem(index)
- return item.nodestatus(index.column())
+ if (nodestatus_data == ""):
+ painter.setPen(QColor.fromRgb(0, 0, 0))
+ painter.drawText(rect, 0, QString(data))
+ elif (nodestatus_data == "boot"):
+ painter.fillPath(path, QColor.fromRgb(0, 250, 0))
+ painter.setPen(QColor.fromRgb(0, 0, 0))
+ painter.drawText(rect, 0, QString(data))
+ else:
+ painter.fillPath(path, QColor.fromRgb(250, 0, 0))
+ painter.setPen(QColor.fromRgb(0, 0, 0))
+ painter.drawText(rect, 0, QString(data))
- def flags(self, index):
- if not index.isValid():
- return 0
- return Qt.ItemIsEnabled | Qt.ItemIsSelectable# | Qt.ItemIsEditable
+ painter.restore()
- def setData(self, index, value, role):
- if role != Qt.EditRole:
- return False
+class NodeFilterProxyModel(QSortFilterProxyModel):
+ def __init__(self, parent=None):
+ QSortFilterProxyModel.__init__(self, parent)
+ self.hostname_filter_regex = None
+ self.nodestatus_filter = None
- item = self.getItem(index)
- ret = item.setData(index.column(), value)
- if ret:
- self.emit(SIGNAL("dataChanged(QModelIndex, QModelIndex)"), index, index)
- return ret
+ 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):
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)
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 = NodeModel(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)
- refresh = QPushButton("Update Slice Data", self)
+ refresh = QPushButton("Refresh Slice Data", self)
refresh.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
+ renew = QPushButton("Renew Slice", self)
+ renew.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
submit = QPushButton("Submit", self)
submit.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
bottomlayout = QHBoxLayout()
bottomlayout.addWidget(refresh, 0, Qt.AlignLeft)
+ bottomlayout.addWidget(renew, 0, Qt.AlignLeft)
bottomlayout.addStretch()
bottomlayout.addWidget(submit, 0, Qt.AlignRight)
self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
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("<font color='green'>Slice data submitted.</font>")
- QTimer.singleShot(1000, self.refresh)
+ self.disconnect(self.process, SIGNAL('finished()'), self.submitFinished)
+
+ faultString = self.process.getFaultString()
+ if not faultString:
+ self.setStatus("<font color='green'>Slice data submitted.</font>")
+ else:
+ self.setStatus("<font color='red'>Slice submit failed: %s</font>" % (faultString))
- def refreshFinished(self):
- self.setStatus("<font color='green'>Slice data updated.</font>", 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 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("<font color='red'>Resources refresh failed: %s</font>" % (faultString))
+
+ def refreshRSpecFinished(self):
+ self.disconnect(self.process, SIGNAL('finished()'), self.refreshRSpecFinished)
+
+ faultString = self.process.getFaultString()
+ if not faultString:
+ self.setStatus("<font color='green'>Slice data refreshed.</font>", timeout=5000)
+ else:
+ self.setStatus("<font color='red'>Slice refresh failed: %s</font>" % (faultString))
+
+ self.updateView()
+ self.parent().signalAll("rspecUpdated")
def setStatus(self, msg, timeout=None):
self.parent().setStatus(msg, timeout)
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)))
-
- def levels_down(self, item):
- if item == self.nodeModel.rootItem:
- return 0
- else:
- return self.levels_down(item.parent()) + 1
+ self.filterModel.setNodeStatusFilter(str(filter_string))
+
+ def itemStatus(self, item):
+ statusItem = item.parent().child(item.row(), MEMBERSHIP_STATUS_COLUMN)
+ return str(statusItem.data(Qt.DisplayRole).toString())
+
+ def itemText(self, item):
+ return str(item.data(Qt.DisplayRole).toString())
+
+ # Recursively walk the tree, making changes to the RSpec
+ def process_subtree(self, rspec, resources, item, depth = 0):
+ change = False
+ model = self.nodeModel
+
+ if depth in [0, 1]:
+ pass
+ elif depth == 2: # Hostname
+ hostname = self.itemText(item)
+ testbed = self.itemText(item.parent())
+ status = self.itemStatus(item)
+ if status == node_status['add']:
+ print "Add hostname: %s" % hostname
+
+ 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)
+ change = True
+ elif depth == 3: # Tag
+ tag, value = self.itemText(item).split(": ")
+ status = self.itemStatus(item)
+ tag = "%s" % tag # Prevent weird error from lxml
+ value = "%s" % value # Prevent weird error from lxml
+ node = self.itemText(item.parent())
+ testbed = self.itemText(item.parent().parent())
+ if status == tag_status['add']:
+ print "Add tag to (%s, %s): %s/%s " % (testbed, node, tag, value)
+ if node.startsWith(default_tags):
+ rspec.add_default_sliver_attribute(tag, value, testbed)
+ else:
+ rspec.add_sliver_attribute(node, tag, value, testbed)
+ change = True
+ elif status == tag_status['remove']:
+ print "Remove tag from (%s, %s): %s/%s " % (testbed, node, tag, value)
+ if node.startsWith(default_tags):
+ rspec.remove_default_sliver_attribute(tag, value, testbed)
+ else:
+ rspec.remove_sliver_attribute(node, tag, value, testbed)
+ change = True
+
+ children = item.rowCount()
+ for row in range(0, children):
+ status = self.process_subtree(rspec, resources, item.child(row), depth + 1)
+ change = change or status
+
+ return change
def submit(self):
if self.checkRunningProcess():
return
- rspec = self.readSliceRSpec()
-
- no_change = True
- all_child = self.nodeModel.rootItem.allChildItems()
- for c in all_child:
- testbed, name, status = c.itemData
-
- if isinstance(status, QVariant):
- status = status.toString()
-
- treelevel = self.levels_down(c)
-
- if treelevel == 2:
- testbed = c.parent().itemData[0]
- if status == node_status['add']:
- #print "Add hostname: %s" % name
- rspec.add_sliver(name, testbed)
- no_change = False
- elif status == node_status['remove']:
- #print "Remove hostname: %s" % name
- rspec.remove_sliver(name, testbed)
- no_change = False
- elif treelevel == 3:
- # A tag entry
- tag, value = name
- tag = "%s" % tag # Prevent weird error from lxml
- node = c.parent().itemData[1]
- testbed = c.parent().parent().itemData[0]
- if status == tag_status['add']:
- #print "Add tag: %s/%s " % (tag, value)
- if node.startswith(default_tags):
- rspec.add_default_sliver.attribute(tag, value, testbed)
- else:
- rspec.add_sliver_attribute(tag, value, node, testbed)
- no_change = False
- elif status == node_status['remove']:
- #print "Remove tag: %s/%s" % (tag, value)
- if node.startsWith(default_tags):
- rspec.remove_default_sliver_attribute(tag, value, testbed)
- else:
- rspec.remove_sliver_attribute(node, tag, value, testbed)
- no_change = False
-
- if no_change:
+ rspec = SfiData().getSliceRSpec()
+ resources = SfiData().getResourcesRSpec()
+ change = self.process_subtree(rspec, resources, self.nodeModel.invisibleRootItem())
+
+ if not change:
self.setStatus("<font color=red>No change in slice data. Not submitting!</font>", timeout=3000)
return
- self.disconnect(self.process, SIGNAL('finished()'), self.refreshFinished)
self.connect(self.process, SIGNAL('finished()'), self.submitFinished)
self.process.applyRSpec(rspec)
self.setStatus("Sending slice data (RSpec). This will take some time...")
-
+
+ def renew(self):
+ dlg = RenewWindow(parent=self)
+ dlg.exec_()
def refresh(self):
if not config.getSlice():
self.setStatus("<font color='red'>There is already a process running. Please wait.</font>")
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("Updating 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
already_in_nodes = []
self.network_names = []
self.nodeModel.clear()
-
- rspec = self.readSliceRSpec()
+
+ rspec = SfiData().getSliceRSpec()
if not rspec:
return None
- networks = rspec.get_network_list()
+ resources = SfiData().getResourcesRSpec()
+ if not resources:
+ return None
+
+ rootItem = self.nodeModel.invisibleRootItem()
+ 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)
- data = [QString(network), QString(""), QString("")]
- networkItem = TreeItem(data, self.nodeModel.rootItem)
- all_nodes = rspec.get_node_list(network)
- sliver_nodes = rspec.get_sliver_list(network)
- available_nodes = filter(lambda x:x not in sliver_nodes, all_nodes)
+
+ 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)), QStandardItem(QString("network"))])
already_in_nodes += sliver_nodes
# Add default slice tags
- data = [QString(""), QString("%s for %s" % (default_tags, network)),
- QString("")]
- nodeItem = TreeItem(data, networkItem)
- networkItem.appendChild(nodeItem)
+ nodeItem = QStandardItem(QString("%s for %s" % (default_tags, network)))
+ statusItem = QStandardItem(QString(""))
+ nodeStatus = QStandardItem(QString(""))
+ networkItem.appendRow([nodeItem, nodeStatus, statusItem, QStandardItem(QString("defaults"))])
attrs = rspec.get_default_sliver_attributes(network)
for (name, value) in attrs:
- tagstring = QStringList([name, value])
- data = [QString(""), tagstring, QString(tag_status['in'])]
- tagItem = TreeItem(data, nodeItem)
- nodeItem.appendChild(tagItem)
+ 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"))])
for node in sliver_nodes:
- data = [QString(""), QString(node), QString(node_status['in'])]
- nodeItem = TreeItem(data, networkItem)
- networkItem.appendChild(nodeItem)
+ 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"))])
attrs = rspec.get_sliver_attributes(node, network)
for (name, value) in attrs:
- tagstring = QStringList([name, value])
- data = [QString(""), tagstring, QString(tag_status['in'])]
- tagItem = TreeItem(data, nodeItem)
- nodeItem.appendChild(tagItem)
+ 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"))])
for node in available_nodes:
- nodeItem = TreeItem([QString(""), QString(node), QString(node_status['out'])], networkItem)
- networkItem.appendChild(nodeItem)
-
- self.nodeModel.rootItem.appendChild(networkItem)
+ 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.filterModel.setSourceModel(self.nodeModel)
- self.filterModel.setFilterKeyColumn(-1)
self.filterModel.setDynamicSortFilter(True)
- self.nodeView.setItemDelegateForColumn(1, self.nodeNameDelegate)
+ 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(1)
+ self.nodeView.resizeColumnToContents(0)
+ self.nodeView.collapseAll()
def updateSliceName(self):
self.slicename.setText("Slice : %s" % (config.getSlice() or "None"))
SfaScreen.__init__(self, parent)
slice = SliceWidget(self)
- self.init(slice, "Main Window", "OneLab Federation GUI")
+ self.init(slice, "Nodes", "OneLab SFA crawler")
def rspecUpdated(self):
self.mainwin.rspecWindow.updateView()
-
+
def configurationChanged(self):
self.widget.updateSliceName()
self.widget.updateView()
git://git.onelab.eu / sface.git / blobdiff