X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=c9911eeff645b5394227ab5351d382a0ae790cf4;hp=6beaec24ecaaa5bc4db35c5612d10c4c0f83c30f;hb=9de90adda331169634bc46376edebef60ecd6978;hpb=c07803c550c122fac6a6537889faf1552f420580

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 6beaec2..c9911ee 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -75,6 +75,11 @@ class NodeView(QTreeView):
     def toggleSelection(self):
         index = self.currentIndex()
         model = index.model()
+
+        if (model == None):
+            # probably no rspec downloaded yet
+            return
+
         status_index = model.index(index.row(), MEMBERSHIP_STATUS_COLUMN, index.parent())
         status_data = status_index.data().toString()
         node_index = model.index(index.row(), NAME_COLUMN, index.parent())
@@ -125,6 +130,11 @@ class NodeView(QTreeView):
         # Right click
         index = self.currentIndex()
         model = index.model()
+
+        if (model == None):
+            # probably no rspec downloaded yet
+            return
+
         status_index = model.index(index.row(), 1, index.parent())
         status_data = status_index.data().toString()
         node_index = model.index(index.row(), 0, index.parent())
@@ -287,6 +297,20 @@ class NodeFilterProxyModel(QSortFilterProxyModel):
                     return False
         return True
 
+    def lessThan(self, left, right):
+        l_str = str(left.data().toString())
+        r_str = str(right.data().toString())
+
+        # make sure default_tags appears before everything else
+        if l_str.startswith(default_tags):
+            return True
+
+        if r_str.startswith(default_tags):
+            return False
+
+        return (l_str < r_str)
+
+
 class SliceWidget(QWidget):
     def __init__(self, parent):
         QWidget.__init__(self, parent)
@@ -362,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)
 
@@ -409,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]:
@@ -431,39 +468,48 @@ 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)
             tag = "%s" % tag     # Prevent weird error from lxml
             value = "%s" % value # Prevent weird error from lxml
-            node = self.itemText(item.parent())
+            hostname = self.itemText(item.parent())
             testbed = self.itemText(item.parent().parent())
             if status == tag_status['add']:
-                print "Add tag to (%s, %s): %s/%s " % (testbed, node, tag, value)
-                if node.startswith(default_tags):
-                    rspec.add_default_sliver_attribute(tag, value, testbed)
+                print "Add tag to (%s, %s): %s/%s " % (testbed, hostname, tag, value)
+                if hostname.startswith(default_tags):
+                    rspec.version.add_default_sliver_attribute(tag, value, testbed)
                 else:
-                    rspec.add_sliver_attribute(node, tag, value, testbed)
-                change = True
+                    node = rspec_node_names.get(hostname, None)
+                    if node:
+                        rspec.version.add_sliver_attribute(node['component_id'], tag, value, testbed)
+                changeAddTag += 1
             elif status == tag_status['remove']:
-                print "Remove tag from (%s, %s): %s/%s " % (testbed, node, tag, value)
-                if node.startswith(default_tags):
-                    rspec.remove_default_sliver_attribute(tag, value, testbed)
+                print "Remove tag from (%s, %s): %s/%s " % (testbed, hostname, tag, value)
+                if hostname.startswith(default_tags):
+                    rspec.version.remove_default_sliver_attribute(tag, value, testbed)
                 else:
-                    rspec.remove_sliver_attribute(node, tag, value, testbed)
-                change = True
+                    node = rspec_node_names.get(hostname, None)
+                    if node:
+                        rspec.version.remove_sliver_attribute(node['component_id'], tag, value, testbed)
+                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
+
+        change = changeAdd + changeRemove + changeAddTag + changeRemoveTag
 
-        return change
+        return (change, changeAdd, changeRemove, changeAddTag, changeRemoveTag)
 
     def submit(self):
         if self.checkRunningProcess():
@@ -475,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")
@@ -499,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
 
@@ -571,11 +626,11 @@ class SliceWidget(QWidget):
         rootItem = self.nodeModel.invisibleRootItem()
 
         networks = []
-        for network in rspec.get_networks():
+        for network in rspec.version.get_networks():
             network_name = network.get("name", None)
             if (network_name != None) and (not network_name in networks):
                 networks.append(network_name)
-        for network in resources.get_networks():
+        for network in resources.version.get_networks():
             network_name = network.get("name", None)
             if (network_name != None) and (not network_name in networks):
                 networks.append(network_name)
@@ -600,7 +655,7 @@ class SliceWidget(QWidget):
 
             # Add default slice tags
             nodeItem = self.nodeView.appendRow(networkItem, "%s for %s" % (default_tags, network), kind="defaults")
-            attrs = rspec.get_default_sliver_attributes(network)
+            attrs = rspec.version.get_default_sliver_attributes(network)
             for attr in attrs:
                     name = attr.get("name", None)
                     value = attr.get("value", None)
@@ -608,14 +663,21 @@ class SliceWidget(QWidget):
                     self.nodeView.appendRow(nodeItem, tagstring, membership=tag_status['in'], kind = "attribute")
 
             for node in sliver_nodes:
-                self.nodeView.appendRow(networkItem,
+                nodeType = None
+                if ("hardware_types" in node):
+                    hardware_types = [x["name"] for x in node["hardware_types"]]
+                    nodeType = ",".join(hardware_types)
+                nodeStatus = node.get("boot_state", "")
+                if nodeStatus == None:
+                    nodeStatus=""
+                nodeItem = self.nodeView.appendRow(networkItem,
                                node["component_name"],
-                               nodeStatus=node.get("boot_state", ""),
-                               #nodeType=node.get("rspec.get_node_sliver_type(node, network),
+                               nodeStatus=nodeStatus,
+                               nodeType=nodeType,
                                membership=node_status['in'],
                                kind="node")
 
-                attrs = rspec.get_sliver_attributes(node, network)
+                attrs = rspec.version.get_sliver_attributes(node['component_id'], network)
                 for attr in attrs:
                     name = attr.get("name", None)
                     value = attr.get("value", None)
@@ -625,10 +687,17 @@ class SliceWidget(QWidget):
                                             kind="attribute")
 
             for node in available_nodes:
+                nodeType = None
+                if ("hardware_types" in node):
+                    hardware_types = [x["name"] for x in node["hardware_types"]]
+                    nodeType = ",".join(hardware_types)
+                nodeStatus = node.get("boot_state", "")
+                if nodeStatus == None:
+                    nodeStatus=""
                 self.nodeView.appendRow(networkItem,
                                node["component_name"],
-                               nodeStatus = node.get("boot_state", ""),
-                               #nodeType= resources.get_node_sliver_type(node, network),
+                               nodeStatus=nodeStatus,
+                               nodeType=nodeType,
                                membership=node_status['out'],
                                kind="node")
 
@@ -657,8 +726,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()
@@ -670,3 +739,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)
+