X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=inline;f=sface%2Fscreens%2Fmainscreen.py;h=53e263ae4072ec11c0b338fe9e78e8311c5bb96c;hb=4d2afaf8faf213e4d55dd3b2188071a57dd74124;hp=d43bd62d426697170b8e7c62bca8e55fd77c03f0;hpb=0b8a8e633c3638ce75760f3445686e5b365bdd56;p=sface.git
diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index d43bd62..53e263a 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -112,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)
@@ -166,7 +175,6 @@ class TreeItem:
return self.parentItem
-
class NodeModel(QAbstractItemModel):
def __init__(self, parent):
QAbstractItemModel.__init__(self, parent)
@@ -182,7 +190,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):
@@ -264,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)
@@ -317,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.refreshFinished)
+ self.connect(self.process, SIGNAL('finished()'), self.refresh)
+
+ def submitFinished(self):
+ del self.process
+ self.process = None
+ self.parent().setStatus("Slice data submitted.", timeout=None)
+
def readSliceRSpec(self):
rspec_file = config.getSliceRSpecFile()
if os.path.exists(rspec_file):
@@ -331,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)
@@ -339,6 +387,7 @@ class SliceWidget(QWidget):
def refreshFinished(self):
del self.process
+ self.process = None
self.parent().setStatus("Slice data updated.", timeout=5000)
self.updateView()