X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=6ffd7e0bb0b2164ef3e667e0082208b2aa32856c;hp=fa29ec665b2332dfe60f58803010ce6815212019;hb=76b7956ab05ec9a16b460115928d16b5d12f0a2a;hpb=6918ef20652170b47750757550e49358bf6ec1dc
diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index fa29ec6..6ffd7e0 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -27,6 +27,7 @@ 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")
def mouseDoubleClickEvent(self, event):
index = self.currentIndex()
@@ -45,8 +46,14 @@ class NodeView(QTreeView):
else: model.setData(status_index, QString(node_status['out']))
model.emit(SIGNAL("dataChanged(QModelIndex, QModelIndex)"), hostname_index, hostname_index)
-
+
+ def currentChanged(self, current, previous):
+ model = current.model()
+ hostname_index = model.index(current.row(), 1, current.parent())
+ hostname_data = hostname_index.data().toString()
+ self.emit(SIGNAL('hostnameClicked(QString)'), hostname_data)
+
class NodeNameDelegate(QStyledItemDelegate):
def __init__(self, parent):
@@ -98,6 +105,7 @@ class NodeNameDelegate(QStyledItemDelegate):
painter.restore()
+
class TreeItem:
def __init__(self, data, parent=None):
self.parentItem = parent
@@ -111,6 +119,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)
@@ -165,7 +182,6 @@ class TreeItem:
return self.parentItem
-
class NodeModel(QAbstractItemModel):
def __init__(self, parent):
QAbstractItemModel.__init__(self, parent)
@@ -181,7 +197,8 @@ class NodeModel(QAbstractItemModel):
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):
@@ -257,22 +274,23 @@ class NodeModel(QAbstractItemModel):
return ret
-
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)
+ self.slicename = QLabel("", self)
+ self.updateSliceName()
+ self.slicename.setScaledContents(False)
searchlabel = QLabel ("Search: ", self)
searchlabel.setScaledContents(False)
searchbox = QLineEdit(self)
searchbox.setAttribute(Qt.WA_MacShowFocusRect, 0)
toplayout = QHBoxLayout()
- toplayout.addWidget(slicename, 0, Qt.AlignLeft)
+ toplayout.addWidget(self.slicename, 0, Qt.AlignLeft)
toplayout.addStretch()
toplayout.addWidget(searchlabel, 0, Qt.AlignRight)
toplayout.addWidget(searchbox, 0, Qt.AlignRight)
@@ -303,9 +321,36 @@ 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.nodeView, SIGNAL('hostnameClicked(QString)'),
+ self.nodeSelectionChanged)
self.updateView()
+ 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()
+ self.parent().signalAll("rspecUpdated")
+
+ def readSliceRSpec(self):
+ rspec_file = config.getSliceRSpecFile()
+ if os.path.exists(rspec_file):
+ xml = open(rspec_file).read()
+ 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
@@ -316,30 +361,50 @@ class SliceWidget(QWidget):
self.filterModel.setFilterRegExp(QRegExp('|'.join(filters)))
def submit(self):
- self.parent().setStatus("TODO: Submit not implemented yet!", 3000)
+ 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 will take some time...")
- def readSliceRSpec(self):
- rspec_file = config.getSliceRSpecFile()
- if os.path.exists(rspec_file):
- xml = open(rspec_file).read()
- return xml
- return None
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)
- 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 will take some time...")
def updateView(self):
global already_in_nodes
@@ -381,6 +446,11 @@ class SliceWidget(QWidget):
self.nodeView.expandAll()
self.nodeView.resizeColumnToContents(1)
+ 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):
@@ -388,3 +458,14 @@ class MainScreen(SfaScreen):
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)