X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=be67787d178ab76f265dfa5dc20bce70e7f11161;hb=0f6d855d510b419a752cb8e5f67a5489c04d92e9;hp=160883b9f186feb19eee0e2bf95365b90a613e4f;hpb=ea028163f9ab1801b4b719a178184047531da5c1;p=sface.git
diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 160883b..be67787 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -9,6 +9,13 @@ from sface.config import config
from sface.sfiprocess import SfiProcess
from sface.screens.sfascreen import SfaScreen
+already_in_nodes = []
+
+node_status = { "in": "Already Selected",
+ "out": "Not Selected",
+ "add": "To be Added",
+ "remove": "To be Removed"}
+
class NodeView(QTreeView):
def __init__(self, parent):
QTreeView.__init__(self, parent)
@@ -20,21 +27,40 @@ class NodeView(QTreeView):
# 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")
-class SelectDelegate(QStyledItemDelegate):
- pass
+ def mouseDoubleClickEvent(self, event):
+ index = self.currentIndex()
+ 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']))
+ else: model.setData(status_index, QString(node_status['out']))
+
+ model.emit(SIGNAL("dataChanged(QModelIndex, QModelIndex)"), hostname_index, hostname_index)
+
+
class NodeNameDelegate(QStyledItemDelegate):
def __init__(self, parent):
- QStyledItemDelegate.__init__(self)
+ QStyledItemDelegate.__init__(self, parent)
def paint(self, painter, option, index):
- data = "%s" % index.data().toString()
model = index.model()
- select_index = model.index(index.row(), 2, index.parent())
- select_data = select_index.data().toString()
+ data = "%s" % index.data().toString()
+ status_index = model.index(index.row(), 2, index.parent())
+ status_data = status_index.data().toString()
- if select_data not in ("true", "add", "remove"): # default view
+ if status_data not in (node_status['in'], node_status['remove'], node_status['add']):
+ # default view
QStyledItemDelegate.paint(self, painter, option, index)
return
@@ -52,21 +78,23 @@ class NodeNameDelegate(QStyledItemDelegate):
painter.setRenderHint(QPainter.Antialiasing)
painter.drawRoundedRect(rect, 4, 4)
- if select_data == "true": # already in the slice
+ 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 select_data == "add": # newly added to the slice
+ 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 select_data == "remove": # removed from the slice
+ 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))
painter.restore()
@@ -84,6 +112,15 @@ class TreeItem:
del self.childItems
self.childItems = []
+ def allChildItems(self):
+ all = []
+ for c in self.childItems:
+ all.append(c)
+ if c.childItems:
+ for cc in c.childItems:
+ all.append(cc)
+ return all
+
def appendChild(self, child):
self.childItems.append(child)
@@ -138,7 +175,6 @@ class TreeItem:
return self.parentItem
-
class NodeModel(QAbstractItemModel):
def __init__(self, parent):
QAbstractItemModel.__init__(self, parent)
@@ -149,12 +185,13 @@ class NodeModel(QAbstractItemModel):
self.__initRoot()
def __initRoot(self):
- self.rootItem = TreeItem([QString("Testbed"), QString("Hostname"), QString("Selected")])
+ self.rootItem = TreeItem([QString("Testbed"), QString("Hostname"), QString("Status")])
def getItem(self, index):
if index.isValid():
item = index.internalPointer()
- if item: return item
+ if isinstance(item, TreeItem):
+ return item
return self.rootItem
def headerData(self, section, orientation, role):
@@ -217,7 +254,7 @@ class NodeModel(QAbstractItemModel):
def flags(self, index):
if not index.isValid():
return 0
- return Qt.ItemIsEnabled | Qt.ItemIsSelectable | Qt.ItemIsEditable
+ return Qt.ItemIsEnabled | Qt.ItemIsSelectable# | Qt.ItemIsEditable
def setData(self, index, value, role):
if role != Qt.EditRole:
@@ -235,6 +272,9 @@ class SliceWidget(QWidget):
def __init__(self, parent):
QWidget.__init__(self, parent)
+ self.network_names = []
+ self.process = SfiProcess(self)
+
slicename = QLabel ("Slice : %s"%(config.getSlice() or "None"),self)
slicename.setScaledContents(False)
searchlabel = QLabel ("Search: ", self)
@@ -251,14 +291,8 @@ class SliceWidget(QWidget):
self.nodeView = NodeView(self)
self.nodeModel = NodeModel(self)
self.filterModel = QSortFilterProxyModel(self) # enable filtering
- self.filterModel.setSourceModel(self.nodeModel)
- self.nodeView.setModel(self.filterModel)
- self.filterModel.setDynamicSortFilter(True)
-# self.nodeView.setModel(self.filterModel)
- self.nodeView.setModel(self.nodeModel)
self.nodeNameDelegate = NodeNameDelegate(self)
- self.selectDelegate = SelectDelegate(self)
refresh = QPushButton("Update Slice Data", self)
refresh.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
@@ -280,16 +314,22 @@ class SliceWidget(QWidget):
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.updateView()
- def filter(self, filter):
- print self.filterModel.rowCount(), self.nodeModel.rowCount()
- self.filterModel.setFilterRegExp(QRegExp(filter))
+ def processOutputReady(self):
+ self.parent().logWindow.setText(self.process.readOutput())
+
+ def submitFinished(self):
+ self.setStatus("Slice data submitted.")
+ QTimer.singleShot(1000, self.refresh)
+
+ def refreshFinished(self):
+ self.setStatus("Slice data updated.", timeout=5000)
+ self.updateView()
- def submit(self):
- self.parent().setStatus("TODO: Submit not implemented yet!", 3000)
-
def readSliceRSpec(self):
rspec_file = config.getSliceRSpecFile()
if os.path.exists(rspec_file):
@@ -297,51 +337,110 @@ class SliceWidget(QWidget):
return xml
return None
+ def setStatus(self, msg, timeout=None):
+ self.parent().setStatus(msg, timeout)
+
+ def checkRunningProcess(self):
+ if self.process.isRunning():
+ self.setStatus("There is already a process running. Please wait.")
+ return True
+ return False
+
+ 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 submit(self):
+ if self.checkRunningProcess():
+ return
+
+ rspec = RSpec(self.readSliceRSpec())
+
+ no_change = True
+ all_child = self.nodeModel.rootItem.allChildItems()
+ for c in all_child:
+ testbed, hostname, status = c.itemData
+ if isinstance(status, QVariant):
+ status = status.toString()
+
+ if status == node_status['add']:
+ rspec.add_sliver(hostname)
+ no_change = False
+ elif str(status) == node_status['remove']:
+ rspec.remove_sliver(hostname)
+ no_change = False
+
+ if no_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)
+ self.setStatus("Sending slice data (RSpec). This may take some time...")
+
+
def refresh(self):
if not config.getSlice():
- self.parent().setStatus("Slice not set yet!", timeout=None)
+ self.setStatus("Slice not set yet!")
return
- self.process = SfiProcess()
- outfile = self.process.getRSpecFromSM()
- self.parent().setStatus("Updating slice data. This may take some time...", timeout=None)
-
+ if self.process.isRunning():
+ 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.parent().rspecUpdated)
- def refreshFinished(self):
- del self.process
- self.parent().setStatus("Slice data updated.", timeout=5000)
- self.updateView()
+ self.process.getRSpecFromSM()
+ self.setStatus("Updating slice data. This may take some time...")
def updateView(self):
+ global already_in_nodes
+ already_in_nodes = []
+ self.network_names = []
self.nodeModel.clear()
+
rspec_string = self.readSliceRSpec()
if not rspec_string:
return None
networks = rspec_get_networks(rspec_string)
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)
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("true")], networkItem)
+ nodeItem = TreeItem([QString(""), QString("%s" % node), QString(node_status['in'])], networkItem)
networkItem.appendChild(nodeItem)
for node in available_nodes:
- nodeItem = TreeItem([QString(""), QString(node), QString("false")], networkItem)
+ nodeItem = TreeItem([QString(""), QString(node), QString(node_status['out'])], networkItem)
networkItem.appendChild(nodeItem)
self.nodeModel.rootItem.appendChild(networkItem)
+ self.filterModel.setSourceModel(self.nodeModel)
+ self.filterModel.setFilterKeyColumn(-1)
+ self.filterModel.setDynamicSortFilter(True)
+
+ self.nodeView.setItemDelegateForColumn(1, self.nodeNameDelegate)
+ self.nodeView.setModel(self.filterModel)
self.nodeView.expandAll()
self.nodeView.resizeColumnToContents(1)
- self.nodeView.setItemDelegateForColumn(1, self.nodeNameDelegate)
- self.nodeView.setItemDelegateForColumn(2, self.selectDelegate)
- self.filterModel.setFilterKeyColumn(1)
class MainScreen(SfaScreen):