X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=41deacd767c7ef2250f84274448e8e2eed44a9be;hp=3ac5520c7b265565b8d93c3cf36f43039d6ea8e7;hb=be3bd7fd5181f7f98a891dab4211d0d94a64cb28;hpb=7c3b04b5d6a6674a197fa6bf28bfd7ae5e15170d
diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 3ac5520..41deacd 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):
model = index.model()
data = "%s" % index.data().toString()
- select_index = model.index(index.row(), 2, index.parent())
- select_data = select_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,19 +78,19 @@ 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))
@@ -86,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)
@@ -140,7 +175,6 @@ class TreeItem:
return self.parentItem
-
class NodeModel(QAbstractItemModel):
def __init__(self, parent):
QAbstractItemModel.__init__(self, parent)
@@ -151,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):
@@ -219,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:
@@ -238,6 +273,7 @@ class SliceWidget(QWidget):
QWidget.__init__(self, parent)
self.network_names = []
+ self.process = None
slicename = QLabel ("Slice : %s"%(config.getSlice() or "None"),self)
slicename.setScaledContents(False)
@@ -257,7 +293,6 @@ class SliceWidget(QWidget):
self.filterModel = QSortFilterProxyModel(self) # enable filtering
self.nodeNameDelegate = NodeNameDelegate(self)
- self.selectDelegate = SelectDelegate(self)
refresh = QPushButton("Update Slice Data", self)
refresh.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
@@ -292,8 +327,41 @@ class SliceWidget(QWidget):
self.filterModel.setFilterRegExp(QRegExp('|'.join(filters)))
def submit(self):
- self.parent().setStatus("TODO: Submit not implemented yet!", 3000)
+ xml = self.readSliceRSpec()
+ rspec = RSpec(xml)
+
+ if self.process:
+ self.parent().setStatus("There is already a process running. Please wait.",
+ timeout=None)
+ return
+ 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
+
+
+ self.process = SfiProcess()
+ outfile = self.process.applyRSpec(rspec)
+ self.parent().setStatus("Sending slice data (RSpec). This may take some time...", timeout=None)
+
+ self.connect(self.process, SIGNAL('finished()'), self.submitFinished)
+
+ def submitFinished(self):
+ del self.process
+ self.process = None
+ self.parent().setStatus("Slice data submitted.", timeout=None)
+ QTimer.singleShot(1000, self.refresh)
+
def readSliceRSpec(self):
rspec_file = config.getSliceRSpecFile()
if os.path.exists(rspec_file):
@@ -306,6 +374,11 @@ class SliceWidget(QWidget):
self.parent().setStatus("Slice not set yet!", timeout=None)
return
+ if self.process:
+ self.parent().setStatus("There is already a process running. Please wait.",
+ timeout=None)
+ return
+
self.process = SfiProcess()
outfile = self.process.getRSpecFromSM()
self.parent().setStatus("Updating slice data. This may take some time...", timeout=None)
@@ -314,12 +387,16 @@ class SliceWidget(QWidget):
def refreshFinished(self):
del self.process
+ self.process = None
self.parent().setStatus("Slice data updated.", timeout=5000)
self.updateView()
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
@@ -333,12 +410,14 @@ class SliceWidget(QWidget):
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)
@@ -348,7 +427,6 @@ class SliceWidget(QWidget):
self.filterModel.setDynamicSortFilter(True)
self.nodeView.setItemDelegateForColumn(1, self.nodeNameDelegate)
- self.nodeView.setItemDelegateForColumn(2, self.selectDelegate)
self.nodeView.setModel(self.filterModel)
self.nodeView.expandAll()
self.nodeView.resizeColumnToContents(1)