from PyQt4.QtGui import *
from sfa.util.rspecHelper import RSpec
-from sface.sfahelper import *
from sface.config import config
from sface.sfiprocess import SfiProcess
from sface.screens.sfascreen import SfaScreen
"add": "To be Added",
"remove": "To be Removed"}
+tag_status = { "in": "Already Set",
+ "out": "Not Set",
+ "add": "To be Added",
+ "remove": "To be Removed"}
+
+def itemType(index):
+ if index.parent().parent().isValid():
+ return "tag"
+ else:
+ return "node"
+
+
class NodeView(QTreeView):
def __init__(self, parent):
QTreeView.__init__(self, parent)
model = index.model()
status_index = model.index(index.row(), 2, index.parent())
status_data = status_index.data().toString()
- hostname_index = model.index(index.row(), 1, index.parent())
- hostname_data = hostname_index.data().toString()
-
- if status_data == node_status['in']:
- model.setData(status_index, QString(node_status['remove']))
- elif status_data == node_status['out']:
- model.setData(status_index, QString(node_status['add']))
- elif status_data in (node_status['add'], node_status['remove']):
- if hostname_data in already_in_nodes: model.setData(status_index, QString(node_status['in']))
+ node_index = model.index(index.row(), 1, index.parent())
+ node_data = node_index.data().toString()
+
+ if itemType(node_index) == "tag":
+ if status_data == tag_status['in']:
+ model.setData(status_index, QString(tag_status['remove']))
+ elif status_data == tag_status['add']:
+ model.setData(status_index, QString(tag_status['out']))
+ elif status_data == tag_status['remove']:
+ model.setData(status_index, QString(tag_status['in']))
else: model.setData(status_index, QString(node_status['out']))
-
- model.emit(SIGNAL("dataChanged(QModelIndex, QModelIndex)"), hostname_index, hostname_index)
+ else:
+ # This is a hostname
+ if status_data == node_status['in']:
+ model.setData(status_index, QString(node_status['remove']))
+ elif status_data == node_status['out']:
+ model.setData(status_index, QString(node_status['add']))
+ elif status_data in (node_status['add'], node_status['remove']):
+ if node_data in already_in_nodes: model.setData(status_index, QString(node_status['in']))
+ else: model.setData(status_index, QString(node_status['out']))
+
+ 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_data = node_index.data().toString()
+ self.emit(SIGNAL('hostnameClicked(QString)'), node_data)
+
class NodeNameDelegate(QStyledItemDelegate):
def paint(self, painter, option, index):
model = index.model()
- data = "%s" % index.data().toString()
status_index = model.index(index.row(), 2, index.parent())
status_data = status_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
-
fm = QFontMetrics(option.font)
rect = option.rect
- rect.setWidth(fm.width(QString(data)) + 8)
- rect.setHeight(rect.height() - 2)
- rect.setX(rect.x() + 4)
- x, y, h, w = rect.x(), rect.y(), rect.height(), rect.width()
-
- path = QPainterPath()
- path.addRoundedRect(x, y, w, h, 4, 4)
-
- painter.save()
- painter.setRenderHint(QPainter.Antialiasing)
- painter.drawRoundedRect(rect, 4, 4)
-
- if status_data == node_status['in']: # already in 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 == 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))
- painter.drawRect(x + w + 10, y + 3, 10, 10)
- painter.fillRect(x + w + 10, y + 3, 10, 10, QColor.fromRgb(0, 250, 0))
-
- 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))
- painter.drawRect(x + w + 10, y + 3, 10, 10)
- painter.fillRect(x + w + 10, y + 3, 10, 10, QColor.fromRgb(250, 0, 0))
+
+ 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))
+
+ 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))
+
+ 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))
+
+ else:
+ painter.setPen(QColor.fromRgb(0, 0, 0))
+ painter.drawText(option.rect, 0, QString(data))
+
+ 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()
+
+ path = QPainterPath()
+ path.addRoundedRect(x - 1, y + 1, w, h, 4, 4)
+
+ painter.save()
+ painter.setRenderHint(QPainter.Antialiasing)
+
+ 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:
+ painter.setPen(QColor.fromRgb(0, 0, 0))
+ painter.drawText(option.rect, 0, QString(data))
painter.restore()
item = self.getItem(index)
return item.data(index.column())
+ def nodestatus(self, index):
+ if not index.isValid():
+ return QVariant()
+
+ item = self.getItem(index)
+ return item.nodestatus(index.column())
+
def flags(self, index):
if not index.isValid():
return 0
self.connect(refresh, SIGNAL('clicked()'), self.refresh)
self.connect(submit, SIGNAL('clicked()'), self.submit)
self.connect(searchbox, SIGNAL('textChanged(QString)'), self.filter)
- self.connect(self.process, SIGNAL('readyReadStandardOutput()'), self.processOutputReady)
- self.connect(self.process, SIGNAL('readyReadStandardError()'), self.processOutputReady)
+ self.connect(self.nodeView, SIGNAL('hostnameClicked(QString)'),
+ self.nodeSelectionChanged)
self.updateView()
- def processOutputReady(self):
- self.parent().logWindow.setText(self.process.readOutput())
-
def submitFinished(self):
self.setStatus("<font color='green'>Slice data submitted.</font>")
QTimer.singleShot(1000, self.refresh)
rspec_file = config.getSliceRSpecFile()
if os.path.exists(rspec_file):
xml = open(rspec_file).read()
- return xml
+ return RSpec(xml)
return None
def setStatus(self, msg, timeout=None):
if self.checkRunningProcess():
return
- rspec = RSpec(self.readSliceRSpec())
+ rspec = self.readSliceRSpec()
no_change = True
all_child = self.nodeModel.rootItem.allChildItems()
self.network_names = []
self.nodeModel.clear()
- rspec_string = self.readSliceRSpec()
- if not rspec_string:
+ rspec = self.readSliceRSpec()
+ if not rspec:
return None
- networks = rspec_get_networks(rspec_string)
+ networks = rspec.get_network_list()
for network in networks:
self.network_names.append(network)
- networkItem = TreeItem([QString(network), QString(""), QString("")], self.nodeModel.rootItem)
-
- all_nodes = rspec_get_nodes_from_network(rspec_string, network)
- sliver_nodes = rspec_get_sliver_nodes_from_network(rspec_string, network)
+ data = [QString(network), QString(""), QString("")]
+ #taglist = QStringList()
+ #attrs = rspec.get_default_sliver_attributes(network)
+ #for (name, value) in attrs:
+ # taglist.append(QString("%s/%s" % (name, value)))
+ # taglist.append(QString("in"))
+ #data.append(taglist)
+ 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)
already_in_nodes += sliver_nodes
for node in sliver_nodes:
- nodeItem = TreeItem([QString(""), QString("%s" % node), QString(node_status['in'])], networkItem)
+ data = [QString(""), QString(node), QString(node_status['in'])]
+ nodeItem = TreeItem(data, networkItem)
networkItem.appendChild(nodeItem)
+ 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)
+
for node in available_nodes:
- nodeItem = TreeItem([QString(""), QString(node), QString(node_status['out'])], networkItem)
+ nodeItem = TreeItem([QString(""), QString(node), QString(node_status['out']), QString("")], networkItem)
networkItem.appendChild(nodeItem)
self.nodeModel.rootItem.appendChild(networkItem)
def updateSliceName(self):
self.slicename.setText("Slice : %s" % (config.getSlice() or "None"))
+ def nodeSelectionChanged(self, hostname):
+ self.parent().nodeSelectionChanged(hostname)
class MainScreen(SfaScreen):
def __init__(self, parent):
slice = SliceWidget(self)
self.init(slice, "Main Window", "OneLab Federation GUI")
+ def rspecUpdated(self):
+ self.mainwin.rspecWindow.updateView()
+
def configurationChanged(self):
self.widget.updateSliceName()
self.widget.updateView()
+ self.mainwin.rspecWindow.updateView()
+ def nodeSelectionChanged(self, hostname):
+ self.mainwin.nodeSelectionChanged(hostname)
git://git.onelab.eu / sface.git / blobdiff