X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=4fc6288629f02daf7b5b1d0e7141d250de075c88;hp=df110c64a95554feb25642445b8340626464a466;hb=93fafc17c71f94d625e79990a89380317e64a70b;hpb=bc9cce47260c4847c2c613548ca3b2e0eaa6b510

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index df110c6..4fc6288 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -386,6 +386,16 @@ class SliceWidget(QWidget):
         self.updateView()
         self.parent().signalAll("rspecUpdated")
 
+    def deleteSliversFinished(self):
+        self.disconnect(self.process, SIGNAL('finished()'), self.deleteSliversFinished)
+
+        faultString = self.process.getFaultString()
+        if not faultString:
+            self.setStatus("<font color='green'>Slice data submitted.</font>")
+            QTimer.singleShot(2500, self.refresh)
+        else:
+            self.setStatus("<font color='red'>Slice submit failed: %s</font>" % (faultString))
+
     def refreshResourcesFinished(self):
         self.disconnect(self.process, SIGNAL('finished()'), self.refreshResourcesFinished)
 
@@ -433,7 +443,10 @@ class SliceWidget(QWidget):
 
     # Recursively walk the tree, making changes to the RSpec
     def process_subtree(self, rspec, rspec_node_names, resource_node_names, item, depth = 0):
-        change = False
+        changeAdd = 0
+        changeRemove = 0
+        changeAddTag = 0
+        changeRemoveTag = 0
         model = self.nodeModel
 
         if depth in [0, 1]:
@@ -455,11 +468,11 @@ class SliceWidget(QWidget):
                         rspec.version.add_network(network_name)
                         rspec.version.add_nodes([resource_node])
                     rspec.version.add_slivers([str(hostname)])
-                    change = True
+                    changeAdd += 1
             elif status == node_status['remove']:
                 print "Remove hostname: %s" % hostname
                 rspec.version.remove_slivers([str(hostname)])
-                change = True
+                changeRemove += 1
         elif depth == 3: # Tag
             tag, value = self.itemText(item).split(": ")
             status = self.itemStatus(item)
@@ -475,7 +488,7 @@ class SliceWidget(QWidget):
                     node = rspec_node_names.get(hostname, None)
                     if node:
                         rspec.version.add_sliver_attribute(node['component_id'], tag, value, testbed)
-                change = True
+                changeAddTag += 1
             elif status == tag_status['remove']:
                 print "Remove tag from (%s, %s): %s/%s " % (testbed, hostname, tag, value)
                 if hostname.startswith(default_tags):
@@ -484,14 +497,19 @@ class SliceWidget(QWidget):
                     node = rspec_node_names.get(hostname, None)
                     if node:
                         rspec.version.remove_sliver_attribute(node['component_id'], tag, value, testbed)
-                change = True
+                changeRemoveTag += 1
 
         children = item.rowCount()
         for row in range(0, children):
-            status = self.process_subtree(rspec, rspec_node_names, resource_node_names, item.child(row), depth + 1)
-            change = change or status
+            (c, ca, cr, cat, crt) = self.process_subtree(rspec, rspec_node_names, resource_node_names, item.child(row), depth + 1)
+            changeAdd = changeAdd + ca
+            changeRemove = changeRemove + cr
+            changeAddTag = changeAddTag + cat
+            changeRemoveTag = changeRemoveTag + crt
 
-        return change
+        change = changeAdd + changeRemove + changeAddTag + changeRemoveTag
+
+        return (change, changeAdd, changeRemove, changeAddTag, changeRemoveTag)
 
     def submit(self):
         if self.checkRunningProcess():
@@ -503,12 +521,19 @@ class SliceWidget(QWidget):
         resource_node_names = self.nodesByName(resources.version.get_nodes())
         rspec_node_names = self.nodesByName(rspec.version.get_nodes_with_slivers())
 
-        change = self.process_subtree(rspec, rspec_node_names, resource_node_names, self.nodeModel.invisibleRootItem())
+        (change, changeAdd, changeRemove, changeAddTag, changeRemoveTag) = \
+            self.process_subtree(rspec, rspec_node_names, resource_node_names, self.nodeModel.invisibleRootItem())
 
-        if not change:
+        if (change <= 0):
             self.setStatus("<font color=red>No change in slice data. Not submitting!</font>", timeout=3000)
             return
 
+        if (changeRemove > 0) and (rspec.version.get_nodes_with_slivers() == []):
+            # removing the last sliver in a slice requires us to call deleteSlivers
+            self.connect(self.process, SIGNAL('finished()'), self.deleteSliversFinished)
+            self.process.deleteSlivers()
+            return
+
         # Several aggregates have issues with the <statistics> section in the
         # rspec, so make sure it's not there.
         stats_elems = rspec.xml.xpath("//statistics")
@@ -527,9 +552,11 @@ class SliceWidget(QWidget):
 
         rspec = SfiData().getSliceRSpec()
         resources = SfiData().getResourcesRSpec()
-        change = self.process_subtree(rspec, resources, self.nodeModel.invisibleRootItem())
 
-        if not change:
+        (change, changeAdd, changeRemove, changeAddTag, changeRemoveTag) = \
+            self.process_subtree(rspec, rspec, resources, self.nodeModel.invisibleRootItem())
+
+        if (change <= 0):
             self.setStatus("<font color=red>No change in slice data. Not submitting!</font>", timeout=3000)
             return
 
@@ -658,7 +685,13 @@ class SliceWidget(QWidget):
                                             "%s: %s" % (name, value),
                                             membership=tag_status['in'],
                                             kind="attribute")
-
+                disk_images = node.get("disk_image", [])
+                for disk_image in disk_images:
+                    name = disk_image.get("name", None)
+                    self.noveView.appendRow(nodeItem, name, 
+                                            membership=node_status['in'],
+                                            kind="attribute")  							 		
+		
             for node in available_nodes:
                 nodeType = None
                 if ("hardware_types" in node):
@@ -699,8 +732,8 @@ class MainScreen(SfaScreen):
     def __init__(self, parent):
         SfaScreen.__init__(self, parent)
 
-        slice = SliceWidget(self)
-        self.init(slice, "Nodes", "OneLab SFA crawler")
+        self.sliceWidget = SliceWidget(self)
+        self.init(self.sliceWidget, "Nodes", "OneLab SFA crawler")
 
     def rspecUpdated(self):
         self.mainwin.rspecWindow.updateView()
@@ -712,3 +745,9 @@ class MainScreen(SfaScreen):
 
     def nodeSelectionChanged(self, hostname):
         self.mainwin.nodeSelectionChanged(hostname)
+
+    def remoteSliceChanged(self):
+        # we're being notified the slice was changed remotely. Download a new
+        # rspec.
+        QTimer.singleShot(2500, self.sliceWidget.refresh)
+