Submit button works.

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index d43bd62..53e263a 100644 (file)
--- 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("<font color='red'>There is already a process running. Please wait.</font>", 
+                                    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("<font color='green'>Slice data submitted.</font>", 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("<font color='red'>Slice not set yet!</font>", timeout=None)
             return
 
+        if self.process:
+            self.parent().setStatus("<font color='red'>There is already a process running. Please wait.</font>", 
+                                    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("<font color='green'>Slice data updated.</font>", timeout=5000)
         self.updateView()
 

diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py
index 9dce273..d2e806d 100644 (file)
--- a/sface/sfiprocess.py
+++ b/sface/sfiprocess.py
@@ -70,7 +70,7 @@ class SfiProcess(QObject):
         rspec.save(filename)
         args = ["-u", config.getUser(), "-a", config.getAuthority(), 
                 "-r", config.getRegistry(), "-s", config.getSlicemgr(), "create", 
-                config.getSlice, filename]
+                config.getSlice(), filename]
         self.__init_command(args)
         self.start()
         return filename