changes to work with latest rspec versions, try create at aggregates for protogeni...
[sface.git] / sface / screens / mainscreen.py
index c573aea..985e315 100644 (file)
@@ -1,12 +1,16 @@
 
+import datetime
 import os
+import urlparse
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from sfa.util.rspecHelper import RSpec
+#from sfa.util.rspecHelper import RSpec
 from sface.config import config
+from sface.sfirenew import RenewWindow
 from sface.sfiprocess import SfiProcess
 from sface.screens.sfascreen import SfaScreen
+from sface.sfidata import SfiData
 
 already_in_nodes = []
 
@@ -20,9 +24,21 @@ tag_status = { "in": "Already Set",
                 "add": "To be Added",
                 "remove": "To be Removed"}
 
+color_status = { "in": QColor.fromRgb(0, 250, 250),
+                 "add": QColor.fromRgb(0, 250, 0),
+                 "remove": QColor.fromRgb(250, 0, 0) }
+
 default_tags = "Default tags"
 settable_tags = ['delegations', 'initscript']
 
+NAME_COLUMN = 0
+NODE_STATUS_COLUMN = 1
+MEMBERSHIP_STATUS_COLUMN = 2
+KIND_COLUMN = 3
+
+# maximum length of a name to display before clipping
+NAME_MAX_LEN = 48
+
 def itemType(index):
     if index.parent().parent().isValid():
         return "tag"
@@ -43,12 +59,21 @@ class NodeView(QTreeView):
         self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
         self.setToolTip("Double click on a row to change its status.  Right click on a host to add a tag.")
 
+    def keyPressEvent(self, event):
+        if (event.key() == Qt.Key_Space):
+            self.toggleSelection()
+        else:
+            QTreeView.keyPressEvent(self, event)
+
     def mouseDoubleClickEvent(self, event):
+        self.toggleSelection()
+
+    def toggleSelection(self):
         index = self.currentIndex()
         model = index.model()
-        status_index = model.index(index.row(), 1, index.parent())
+        status_index = model.index(index.row(), MEMBERSHIP_STATUS_COLUMN, index.parent())
         status_data = status_index.data().toString()
-        node_index = model.index(index.row(), 0, index.parent())
+        node_index = model.index(index.row(), NAME_COLUMN, index.parent())
         node_data = node_index.data().toString()
 
         if itemType(node_index) == "tag":
@@ -116,7 +141,7 @@ class NodeView(QTreeView):
                         tagstring = QString("%s: %s" % (tagname, value))
                         tagItem = QStandardItem(tagstring)
                         status = QStandardItem(QString(tag_status['add']))
-                        nodeItem.appendRow([tagItem, status])
+                        nodeItem.appendRow([tagItem, QStandardItem(QString("")), status])
 
             elif status_data in (node_status['out'], node_status['remove']):
                 QMessageBox.warning(self, "Not selected", "Can only add tags to selected nodes")
@@ -136,15 +161,21 @@ class NodeNameDelegate(QStyledItemDelegate):
     def __init__(self, parent):
         QStyledItemDelegate.__init__(self, parent)
 
+    def displayText(self, value, locale):
+        data = str(QStyledItemDelegate.displayText(self, value, locale))
+        if (len(data)>NAME_MAX_LEN):
+            data = data[:(NAME_MAX_LEN-3)] + "..."
+        return QString(data)
+
     def paint(self, painter, option, index):
         model = index.model()
-        status_index = model.index(index.row(), 1, index.parent())
+        data = str(self.displayText(index.data(), QLocale()))
+        status_index = model.index(index.row(), MEMBERSHIP_STATUS_COLUMN, index.parent())
         status_data = status_index.data().toString()
 
         fm = QFontMetrics(option.font)
-        rect = option.rect
+        rect = QRect(option.rect)
 
-        data = index.data().toString()
         rect.setHeight(rect.height() - 2)
         rect.setWidth(fm.width(QString(data)) + 6)
         rect.setX(rect.x() + 5)
@@ -158,48 +189,100 @@ class NodeNameDelegate(QStyledItemDelegate):
         painter.save()
         painter.setRenderHint(QPainter.Antialiasing)
 
+        if option.state & QStyle.State_Selected:
+            painter.fillRect(option.rect, option.palette.color(QPalette.Active, QPalette.Highlight))
+
         if itemType(index) == "node":
-            if status_data == node_status['in']: # already in the slice
-                painter.fillPath(path, QColor.fromRgb(0, 250, 250))
-                painter.setPen(QColor.fromRgb(0, 0, 0))
-                painter.drawText(option.rect, 0, QString(data))
+            for x in node_status.keys():
+                if (node_status[x] == status_data) and (x in color_status):
+                    painter.fillPath(path, color_status[x])
 
-            elif status_data == node_status['add']: # newly added to the slice
-                painter.fillPath(path, QColor.fromRgb(0, 250, 0))
-                painter.setPen(QColor.fromRgb(0, 0, 0))
-                painter.drawText(option.rect, 0, QString(data))
+            painter.setPen(QColor.fromRgb(0, 0, 0))
+            painter.drawText(rect, 0, QString(data))
 
-            elif status_data == node_status['remove']: # removed from the slice
-                painter.fillPath(path, QColor.fromRgb(250, 0, 0))
-                painter.setPen(QColor.fromRgb(0, 0, 0))
-                painter.drawText(option.rect, 0, QString(data))
+        else:
+            for x in tag_status.keys():
+                if (tag_status[x] == status_data) and (x in color_status):
+                    painter.fillPath(path, color_status[x])
 
-            else:
-                painter.setPen(QColor.fromRgb(0, 0, 0))
-                painter.drawText(option.rect, 0, QString(data))
+            painter.setPen(QColor.fromRgb(0, 0, 0))
+            painter.drawText(rect, 0, QString(data))
 
-        else:
-            if status_data == tag_status['in']: # already in the slice
-                painter.fillPath(path, QColor.fromRgb(0, 250, 250))
-                painter.setPen(QColor.fromRgb(0, 0, 0))
-                painter.drawText(option.rect, 0, QString(data))
+        painter.restore()
+
+class NodeStatusDelegate(QStyledItemDelegate):
+    def __init__(self, parent):
+        QStyledItemDelegate.__init__(self, parent)
 
-            elif status_data == tag_status['add']: # newly added to the slice
+    def paint(self, painter, option, index):
+        model = index.model()
+        nodestatus_index = model.index(index.row(), NODE_STATUS_COLUMN, index.parent())
+        nodestatus_data = nodestatus_index.data().toString()
+
+        fm = QFontMetrics(option.font)
+        rect = QRect(option.rect)
+
+        data = index.data().toString()
+        rect.setHeight(rect.height() - 2)
+        rect.setWidth(fm.width(QString(data)) + 6)
+        rect.setX(rect.x() + 5)
+        rect.setY(rect.y() - 1)
+
+        x, y, h, w = rect.x(), rect.y(), rect.height(), rect.width()
+
+        path = QPainterPath()
+        path.addRoundedRect(x - 1, y + 1, w, h, 4, 4)
+
+        painter.save()
+        painter.setRenderHint(QPainter.Antialiasing)
+
+        if option.state & QStyle.State_Selected:
+            painter.fillRect(option.rect, option.palette.color(QPalette.Active, QPalette.Highlight))
+
+        if (nodestatus_data == ""):
+                painter.setPen(QColor.fromRgb(0, 0, 0))
+                painter.drawText(rect, 0, QString(data))
+        elif (nodestatus_data == "boot"):
                 painter.fillPath(path, QColor.fromRgb(0, 250, 0))
                 painter.setPen(QColor.fromRgb(0, 0, 0))
-                painter.drawText(option.rect, 0, QString(data))
-
-            elif status_data == tag_status['remove']: # removed from the slice
+                painter.drawText(rect, 0, QString(data))
+        else:
                 painter.fillPath(path, QColor.fromRgb(250, 0, 0))
                 painter.setPen(QColor.fromRgb(0, 0, 0))
-                painter.drawText(option.rect, 0, QString(data))
-
-            else:
-                painter.setPen(QColor.fromRgb(0, 0, 0))
-                painter.drawText(option.rect, 0, QString(data))
+                painter.drawText(rect, 0, QString(data))
 
         painter.restore()
 
+class NodeFilterProxyModel(QSortFilterProxyModel):
+    def __init__(self, parent=None):
+        QSortFilterProxyModel.__init__(self, parent)
+        self.hostname_filter_regex = None
+        self.nodestatus_filter = None
+
+    def setHostNameFilter(self, hostname):
+        self.hostname_filter_regex = QRegExp(hostname)
+        self.invalidateFilter()
+
+    def setNodeStatusFilter(self, status):
+        if (status == "all"):
+            self.nodestatus_filter = None
+        else:
+            self.nodestatus_filter = status
+        self.invalidateFilter()
+
+    def filterAcceptsRow(self, sourceRow, source_parent):
+        kind_data = self.sourceModel().index(sourceRow, KIND_COLUMN, source_parent).data().toString()
+        if (kind_data == "node"):
+            if self.hostname_filter_regex:
+                name_data = self.sourceModel().index(sourceRow, NAME_COLUMN, source_parent).data().toString()
+                if (self.hostname_filter_regex.indexIn(name_data) < 0):
+                    return False
+            if self.nodestatus_filter:
+                nodestatus_data = self.sourceModel().index(sourceRow, NODE_STATUS_COLUMN, source_parent).data().toString()
+                if (nodestatus_data != self.nodestatus_filter):
+                    return False
+        return True
+
 class SliceWidget(QWidget):
     def __init__(self, parent):
         QWidget.__init__(self, parent)
@@ -210,6 +293,9 @@ class SliceWidget(QWidget):
         self.slicename = QLabel("", self)
         self.updateSliceName()
         self.slicename.setScaledContents(False)
+        filterlabel = QLabel ("Filter: ", self)
+        filterbox = QComboBox(self)
+        filterbox.addItems(["all", "boot", "disabled", "reinstall", "safeboot"])
         searchlabel = QLabel ("Search: ", self)
         searchlabel.setScaledContents(False)
         searchbox = QLineEdit(self)
@@ -218,22 +304,28 @@ class SliceWidget(QWidget):
         toplayout = QHBoxLayout()
         toplayout.addWidget(self.slicename, 0, Qt.AlignLeft)
         toplayout.addStretch()
+        toplayout.addWidget(filterlabel, 0, Qt.AlignRight)
+        toplayout.addWidget(filterbox, 0, Qt.AlignRight)
         toplayout.addWidget(searchlabel, 0, Qt.AlignRight)
         toplayout.addWidget(searchbox, 0, Qt.AlignRight)
 
         self.nodeView = NodeView(self)
-        self.nodeModel = QStandardItemModel(0, 2, self)
-        self.filterModel = QSortFilterProxyModel(self) # enable filtering
+        self.nodeModel = QStandardItemModel(0, 4, self)
+        self.filterModel = NodeFilterProxyModel(self)
 
         self.nodeNameDelegate = NodeNameDelegate(self)
+        self.nodeStatusDelegate = NodeStatusDelegate(self)
 
-        refresh = QPushButton("Update Slice Data", self)
+        refresh = QPushButton("Refresh Slice Data", self)
         refresh.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
+        renew = QPushButton("Renew Slice", self)
+        renew.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
         submit = QPushButton("Submit", self)
         submit.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
 
         bottomlayout = QHBoxLayout()
         bottomlayout.addWidget(refresh, 0, Qt.AlignLeft)
+        bottomlayout.addWidget(renew, 0, Qt.AlignLeft)
         bottomlayout.addStretch()
         bottomlayout.addWidget(submit, 0, Qt.AlignRight)
 
@@ -245,28 +337,49 @@ class SliceWidget(QWidget):
         self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
 
         self.connect(refresh, SIGNAL('clicked()'), self.refresh)
-        self.connect(submit, SIGNAL('clicked()'), self.submit)
-        self.connect(searchbox, SIGNAL('textChanged(QString)'), self.filter)
+        self.connect(renew, SIGNAL('clicked()'), self.renew)
+        self.connect(submit, SIGNAL('clicked()'), self.submit_pg_compat)
+        self.connect(searchbox, SIGNAL('textChanged(QString)'), self.search)
+        self.connect(filterbox, SIGNAL('currentIndexChanged(QString)'), self.filter)
         self.connect(self.nodeView, SIGNAL('hostnameClicked(QString)'),
                      self.nodeSelectionChanged)
 
         self.updateView()
 
     def submitFinished(self):
-        self.setStatus("<font color='green'>Slice data submitted.</font>")
-        QTimer.singleShot(1000, self.refresh)
+        self.disconnect(self.process, SIGNAL('finished()'), self.submitFinished)
+
+        faultString = self.process.getFaultString()
+        if not faultString:
+            self.setStatus("<font color='green'>Slice data submitted.</font>")
+        else:
+            self.setStatus("<font color='red'>Slice submit failed: %s</font>" % (faultString))
 
-    def refreshFinished(self):
-        self.setStatus("<font color='green'>Slice data updated.</font>", 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 RSpec(xml)
-        return None
+    def refreshResourcesFinished(self):
+        self.disconnect(self.process, SIGNAL('finished()'), self.refreshResourcesFinished)
+
+        faultString = self.process.getFaultString()
+        if not faultString:
+            self.setStatus("Refreshing slice RSpec.")
+            self.connect(self.process, SIGNAL('finished()'), self.refreshRSpecFinished)
+            self.process.retrieveRspec()
+        else:
+            self.setStatus("<font color='red'>Resources refresh failed: %s</font>" % (faultString))
+
+    def refreshRSpecFinished(self):
+        self.disconnect(self.process, SIGNAL('finished()'), self.refreshRSpecFinished)
+
+        faultString = self.process.getFaultString()
+        if not faultString:
+            self.setStatus("<font color='green'>Slice data refreshed.</font>", timeout=5000)
+        else:
+            self.setStatus("<font color='red'>Slice refresh failed: %s</font>" % (faultString))
+
+        self.updateView()
+        self.parent().signalAll("rspecUpdated")
 
     def setStatus(self, msg, timeout=None):
         self.parent().setStatus(msg, timeout)
@@ -277,24 +390,21 @@ class SliceWidget(QWidget):
             return True
         return False
 
+    def search(self, search_string):
+        self.filterModel.setHostNameFilter(str(search_string))
+
     def filter(self, filter_string):
-        # for hierarchical models QSortFilterProxyModel applies the
-        # sort recursively. if the parent doesn't match the criteria
-        # we won't be able to match the children. so we need to match
-        # parent (by matching the network_names)
-        networks = ["^%s$" % n for n in self.network_names]
-        filters = networks + [str(filter_string)]
-        self.filterModel.setFilterRegExp(QRegExp('|'.join(filters)))
+        self.filterModel.setNodeStatusFilter(str(filter_string))
 
     def itemStatus(self, item):
-        statusItem = item.parent().child(item.row(), 1)
-        return statusItem.data(Qt.DisplayRole).toString()
+        statusItem = item.parent().child(item.row(), MEMBERSHIP_STATUS_COLUMN)
+        return str(statusItem.data(Qt.DisplayRole).toString())
 
     def itemText(self, item):
-        return item.data(Qt.DisplayRole).toString()
+        return str(item.data(Qt.DisplayRole).toString())
 
     # Recursively walk the tree, making changes to the RSpec
-    def process_subtree(self, rspec, item, depth = 0):
+    def process_subtree(self, rspec, resources, item, depth = 0):
         change = False
         model = self.nodeModel
 
@@ -306,11 +416,18 @@ class SliceWidget(QWidget):
             status = self.itemStatus(item)
             if status == node_status['add']:
                 print "Add hostname: %s" % hostname
-                rspec.add_sliver(hostname, testbed)
-                change = True
+
+                resource_node = resources.get_node_element(hostname)
+
+                if resource_node==None:
+                    print "Error: Failed to find %s in resources rspec" % hostname
+                else:
+                    rspec.merge_node(resource_node, testbed)
+                    rspec.add_slivers([{"hostname": str(hostname)}], testbed)
+                    change = True
             elif status == node_status['remove']:
                 print "Remove hostname: %s" % hostname
-                rspec.remove_sliver(hostname, testbed)
+                rspec.remove_slivers([{"hostname": str(hostname)}], testbed)
                 change = True
         elif depth == 3: # Tag
             tag, value = self.itemText(item).split(": ")
@@ -321,14 +438,14 @@ class SliceWidget(QWidget):
             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):
+                if node.startswith(default_tags):
                     rspec.add_default_sliver_attribute(tag, value, testbed)
                 else:
                     rspec.add_sliver_attribute(node, tag, value, testbed)
                 change = True
             elif status == tag_status['remove']:
                 print "Remove tag from (%s, %s): %s/%s " % (testbed, node, tag, value)
-                if node.startsWith(default_tags):
+                if node.startswith(default_tags):
                     rspec.remove_default_sliver_attribute(tag, value, testbed)
                 else:
                     rspec.remove_sliver_attribute(node, tag, value, testbed)
@@ -336,7 +453,7 @@ class SliceWidget(QWidget):
 
         children = item.rowCount()
         for row in range(0, children):
-            status = self.process_subtree(rspec, item.child(row), depth + 1)
+            status = self.process_subtree(rspec, resources, item.child(row), depth + 1)
             change = change or status
 
         return change
@@ -345,19 +462,102 @@ class SliceWidget(QWidget):
         if self.checkRunningProcess():
             return
 
-        rspec = self.readSliceRSpec()
-        change = self.process_subtree(rspec, self.nodeModel.invisibleRootItem())
+        rspec = SfiData().getSliceRSpec()
+        resources = SfiData().getResourcesRSpec()
+        change = self.process_subtree(rspec, resources, self.nodeModel.invisibleRootItem())
 
         if not change:
             self.setStatus("<font color=red>No change in slice data. Not submitting!</font>", timeout=3000)
             return
 
-        self.disconnect(self.process, SIGNAL('finished()'), self.refreshFinished)
-        self.connect(self.process, SIGNAL('finished()'), self.submitFinished)
+        # Several aggregates have issues with the <statistics> section in the
+        # rspec, so make sure it's not there.
+        stats_elems = rspec.xml.xpath("//statistics")
+        if len(stats_elems)>0:
+            stats_elem = stats_elems[0]
+            parent = stats_elem.xpath("..")[0]
+            parent.remove(stats_elem)
 
+        self.connect(self.process, SIGNAL('finished()'), self.submitFinished)
         self.process.applyRSpec(rspec)
         self.setStatus("Sending slice data (RSpec). This will take some time...")
-        
+
+    # ProtoGENI-compatible submit. Contact each aggregate individually rather
+    # than using the slice manager.
+    # This code will be removed when ProtoGENI slicemanager is patched.
+    def submit_pg_compat(self):
+        if self.checkRunningProcess():
+            return
+
+        rspec = SfiData().getSliceRSpec()
+        resources = SfiData().getResourcesRSpec()
+        change = self.process_subtree(rspec, resources, self.nodeModel.invisibleRootItem())
+
+        if not change:
+            self.setStatus("<font color=red>No change in slice data. Not submitting!</font>", timeout=3000)
+            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")
+        if len(stats_elems)>0:
+            stats_elem = stats_elems[0]
+            parent = stats_elem.xpath("..")[0]
+            parent.remove(stats_elem)
+
+        self.submit_aggSuccessCount = 0
+        self.submit_aggFailCount = 0
+        self.submit_rspec = rspec
+        self.connect(self.process, SIGNAL('finished()'), self.getVersionFinished)
+        self.process.getSliceMgrVersion()
+        self.setStatus("Getting aggregate directory...")
+
+    def getVersionFinished(self):
+        self.disconnect(self.process, SIGNAL('finished()'), self.getVersionFinished)
+
+        faultString = self.process.getFaultString()
+        if not faultString:
+            peers = SfiData().getSliceMgrVersion()["peers"]
+            self.submit_aggs = [(key, peers[key]) for key in peers.keys()]
+            str = "<font color='green'>Successfully retrieved agg list.</font> "
+            self.submitNextAgg(str)
+        else:
+            self.setStatus("<font color='red'>getSliceMgrVersion failed: %s</font>" % (faultString))
+
+    def submitNextAgg(self, statusStr=""):
+        if (self.submit_aggs == []):
+            self.setStatus(statusStr + "<font color='green'>Finished submitting. %d/%d aggs succeeded.</font>" %
+                           (self.submit_aggSuccessCount,self.submit_aggSuccessCount+self.submit_aggFailCount))
+            QTimer.singleShot(2500, self.refresh)
+            return
+
+        self.submit_agg = self.submit_aggs.pop()
+
+        urlParts = urlparse.urlsplit(self.submit_agg[1])
+        amPort = urlParts.port
+        amAddr = urlParts.hostname+urlParts.path
+
+        self.setStatus(statusStr + "Submitting to %s..." % (self.submit_agg[0]))
+
+        self.connect(self.process, SIGNAL('finished()'), self.submitNextAggFinished)
+        self.process.applyRSpec(self.submit_rspec, aggAddr = amAddr, aggPort = amPort, saveObtained=False)
+
+    def submitNextAggFinished(self):
+        self.disconnect(self.process, SIGNAL('finished()'), self.submitNextAggFinished)
+
+        faultString = self.process.getFaultString()
+        if not faultString:
+            self.submit_aggSuccessCount+=1
+            str = "<font color='green'>Succeeded on %s.</font> " % (self.submit_agg[0])
+        else:
+            self.submit_aggFailCount+=1
+            str = "<font color='red'>Failed on %s.</font> " % (self.submit_agg[0])  # , faultString)
+
+        self.submitNextAgg(str)
+
+    def renew(self):
+        dlg = RenewWindow(parent=self)
+        dlg.exec_()
 
     def refresh(self):
         if not config.getSlice():
@@ -368,11 +568,10 @@ class SliceWidget(QWidget):
             self.setStatus("<font color='red'>There is already a process running. Please wait.</font>")
             return
 
-        self.disconnect(self.process, SIGNAL('finished()'), self.submitFinished)
-        self.connect(self.process, SIGNAL('finished()'), self.refreshFinished)
+        self.connect(self.process, SIGNAL('finished()'), self.refreshResourcesFinished)
 
-        self.process.getRSpecFromSM()
-        self.setStatus("Updating slice data. This will take some time...")
+        self.process.retrieveResources()
+        self.setStatus("Refreshing resources. This will take some time...")
 
     def updateView(self):
         global already_in_nodes
@@ -380,62 +579,78 @@ class SliceWidget(QWidget):
         self.network_names = []
         self.nodeModel.clear()
 
-        rspec = self.readSliceRSpec()
+        rspec = SfiData().getSliceRSpec()
         if not rspec:
             return None
 
+        resources = SfiData().getResourcesRSpec()
+        if not resources:
+            return None
+
         rootItem = self.nodeModel.invisibleRootItem()
-        networks = sorted(rspec.get_network_list())
+        networks = rspec.get_networks()
+
+        for network in resources.get_networks():
+            if not network in networks:
+                networks.append(network)
+
         for network in networks:
             self.network_names.append(network)
 
-            all_nodes = rspec.get_node_list(network)
-            sliver_nodes = rspec.get_sliver_list(network)
+            all_nodes = resources.get_nodes(network)
+            sliver_nodes = rspec.get_nodes_with_slivers(network)
+
             available_nodes = [ node for node in all_nodes if node not in sliver_nodes ]
 
             networkItem = QStandardItem(QString(network))
             msg = "%s Nodes\t%s Selected" % (len(all_nodes), len(sliver_nodes))
-            rootItem.appendRow([networkItem, QStandardItem(QString(msg))])
+            rootItem.appendRow([networkItem, QStandardItem(QString("")), QStandardItem(QString(msg)), QStandardItem(QString("network"))])
 
             already_in_nodes += sliver_nodes
 
             # Add default slice tags
             nodeItem = QStandardItem(QString("%s for %s" % (default_tags, network)))
             statusItem = QStandardItem(QString(""))
-            networkItem.appendRow([nodeItem, statusItem])
+            nodeStatus = QStandardItem(QString(""))
+            networkItem.appendRow([nodeItem, nodeStatus, statusItem, QStandardItem(QString("defaults"))])
             attrs = rspec.get_default_sliver_attributes(network)
             for (name, value) in attrs:
                     tagstring = QString("%s: %s" % (name, value))
                     tagItem = QStandardItem(tagstring)
                     status = QStandardItem(QString(tag_status['in']))
-                    nodeItem.appendRow([tagItem, status])
+                    nodeStatus = QStandardItem(QString(""))
+                    nodeItem.appendRow([tagItem, nodeStatus, status, QStandardItem(QString("attribute"))])
 
             for node in sliver_nodes:
                 nodeItem = QStandardItem(QString(node))
                 statusItem = QStandardItem(QString(node_status['in']))
-                networkItem.appendRow([nodeItem, statusItem])
+                nodeStatus = QStandardItem(QString(rspec.get_node_element(node, network).attrib.get("boot_state","")))
+                networkItem.appendRow([nodeItem, nodeStatus, statusItem, QStandardItem(QString("node"))])
 
                 attrs = rspec.get_sliver_attributes(node, network)
                 for (name, value) in attrs:
                     tagstring = QString("%s: %s" % (name, value))
                     tagItem = QStandardItem(tagstring)
                     statusItem = QStandardItem(QString(tag_status['in']))
-                    nodeItem.appendRow([tagItem, statusItem])
+                    nodeStatus = QStandardItem(QString(""))
+                    nodeItem.appendRow([tagItem, nodeStatus, statusItem, QStandardItem(QString("attribute"))])
 
             for node in available_nodes:
                 nodeItem = QStandardItem(QString(node))
                 statusItem = QStandardItem(QString(node_status['out']))
-                networkItem.appendRow([nodeItem, statusItem])
+                nodeStatus = QStandardItem(QString(resources.get_node_element(node, network).attrib.get("boot_state","")))
+                networkItem.appendRow([nodeItem, nodeStatus, statusItem, QStandardItem(QString("node"))])
 
         self.filterModel.setSourceModel(self.nodeModel)
-        self.filterModel.setFilterKeyColumn(-1)
         self.filterModel.setDynamicSortFilter(True)
 
-        headers = QStringList() << "Hostname or Tag" << "Status"
+        headers = QStringList() << "Hostname or Tag" << "Node Status" << "Membership Status" << "Kind"
         self.nodeModel.setHorizontalHeaderLabels(headers)
 
         self.nodeView.setItemDelegateForColumn(0, self.nodeNameDelegate)
+        self.nodeView.setItemDelegateForColumn(1, self.nodeStatusDelegate)
         self.nodeView.setModel(self.filterModel)
+        self.nodeView.hideColumn(KIND_COLUMN)
         self.nodeView.expandAll()
         self.nodeView.resizeColumnToContents(0)
         self.nodeView.collapseAll()
@@ -451,11 +666,11 @@ class MainScreen(SfaScreen):
         SfaScreen.__init__(self, parent)
 
         slice = SliceWidget(self)
-        self.init(slice, "Main Window", "OneLab SFA crawler")
+        self.init(slice, "Nodes", "OneLab SFA crawler")
 
     def rspecUpdated(self):
         self.mainwin.rspecWindow.updateView()
-        
+
     def configurationChanged(self):
         self.widget.updateSliceName()
         self.widget.updateView()