fix problem with adding networks to RSpecs (QString was not automatically type converted)
[sface.git] / sface / screens / mainscreen.py
index f566b99..22c321f 100644 (file)
 
-from PyQt4.QtCore import Qt, QString, SIGNAL
-from PyQt4.QtGui import QWidget, QLabel, QTreeView, QStandardItemModel, QVBoxLayout, QSizePolicy
+import datetime
+import os
+from PyQt4.QtCore import *
+from PyQt4.QtGui import *
 
-from sfa.util.rspecHelper import RSpec
-
-from sface.sficonfig import config
+#from sfa.util.rspecHelper import RSpec
+from sfa.rspecs.rspec_parser import parse_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 = []
 
-class SliceWidget(QWidget):
+node_status = { "in": "Already Selected",
+                "out": "Not Selected",
+                "add": "To be Added",
+                "remove": "To be Removed"}
+
+tag_status = { "in": "Already Set",
+                "out": "Not Set",
+                "add": "To be Added",
+                "remove": "To be Removed"}
+
+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"
+    else:
+        return "node"
+
+
+class NodeView(QTreeView):
+    def __init__(self, parent):
+        QTreeView.__init__(self, parent)
+
+        self.setAnimated(True)
+        self.setItemsExpandable(True)
+        self.setRootIsDecorated(True)
+        self.setAlternatingRowColors(True)
+#        self.setSelectionMode(self.MultiSelection)
+        self.setAttribute(Qt.WA_MacShowFocusRect, 0)
+        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(), MEMBERSHIP_STATUS_COLUMN, index.parent())
+        status_data = status_index.data().toString()
+        node_index = model.index(index.row(), NAME_COLUMN, index.parent())
+        node_data = node_index.data().toString()
+
+        if itemType(node_index) == "tag":
+            data = node_index.data().toString()
+            tagname, value = data.split(": ")
+            if tagname not in settable_tags:
+                # Pop up error msg
+                QMessageBox.warning(self, "Not settable", "Insufficient permission to change '%s' tag" % tagname)
+                return
+            if status_data == tag_status['in']:
+                model.setData(status_index, QString(tag_status['remove']))
+            elif status_data == tag_status['add']:
+                model.setData(status_index, QString(tag_status['out']))
+            elif status_data == tag_status['remove']:
+                model.setData(status_index, QString(tag_status['in']))
+            else: model.setData(status_index, QString(node_status['out']))
+        else:
+            # This is a hostname
+            if status_data == node_status['in']:
+                model.setData(status_index, QString(node_status['remove']))
+            elif status_data == node_status['out']:
+                model.setData(status_index, QString(node_status['add']))
+            elif status_data in (node_status['add'], node_status['remove']):
+                if node_data in already_in_nodes: model.setData(status_index, QString(node_status['in']))
+                else: model.setData(status_index, QString(node_status['out']))
+
+        model.emit(SIGNAL("dataChanged(QModelIndex, QModelIndex)"), node_index, node_index)
+
+    def mousePressEvent(self, event):
+        QTreeView.mousePressEvent(self, event)
+        if event.button() == Qt.LeftButton:
+            return
+
+        # Right click
+        index = self.currentIndex()
+        model = index.model()
+        status_index = model.index(index.row(), 1, index.parent())
+        status_data = status_index.data().toString()
+        node_index = model.index(index.row(), 0, index.parent())
+        node_data = node_index.data().toString()
+
+        if itemType(node_index) == "node":
+            # This is a hostname
+            if status_data in (node_status['in'], node_status['add'], ""):
+                # Pop up a dialog box for adding a new attribute
+                tagname, ok = QInputDialog.getItem(self, "Add tag",
+                                                   "Tag name:", settable_tags)
+                if ok:
+                    value, ok = QInputDialog.getText(self, "Add tag",
+                                                     "Value for tag '%s'" % tagname)
+                    if ok:
+                        # Add a new row to the model for the tag
+
+                        # For testing with the QStandardItemModel
+                        #nodeItem = model.itemFromIndex(index)
+                        #tagstring = QString("%s: %s" % (tagname, value))
+                        #tagItem = QStandardItem(tagstring)
+                        #status = QStandardItem(QString(tag_status['add']))
+                        #nodeItem.appendRow([tagItem, status])
+
+                        # We're using the QSortFilterProxyModel here
+                        src_index = model.mapToSource(index)
+                        src_model = src_index.model()
+                        nodeItem = src_model.itemFromIndex(src_index)
+                        tagstring = QString("%s: %s" % (tagname, value))
+                        tagItem = QStandardItem(tagstring)
+                        status = QStandardItem(QString(tag_status['add']))
+                        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")
+                return
+
+        model.emit(SIGNAL("dataChanged(QModelIndex, QModelIndex)"), node_index, node_index)
+
+    def currentChanged(self, current, previous):
+        model = current.model()
+        node_index = model.index(current.row(), 0, current.parent())
+        node_data = node_index.data().toString()
+        self.emit(SIGNAL('hostnameClicked(QString)'), node_data)
+        
+                
+
+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()
+        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 = QRect(option.rect)
+
+        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 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(rect, 0, QString(data))
+
+            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(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(rect, 0, QString(data))
+
+            else:
+                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(rect, 0, QString(data))
+
+            elif status_data == tag_status['add']: # newly added to the slice
+                painter.fillPath(path, QColor.fromRgb(0, 250, 0))
+                painter.setPen(QColor.fromRgb(0, 0, 0))
+                painter.drawText(rect, 0, QString(data))
+
+            elif status_data == tag_status['remove']: # removed from the slice
+                painter.fillPath(path, QColor.fromRgb(250, 0, 0))
+                painter.setPen(QColor.fromRgb(0, 0, 0))
+                painter.drawText(rect, 0, QString(data))
+
+            else:
+                painter.setPen(QColor.fromRgb(0, 0, 0))
+                painter.drawText(rect, 0, QString(data))
+
+        painter.restore()
+
+class NodeStatusDelegate(QStyledItemDelegate):
+    def __init__(self, parent):
+        QStyledItemDelegate.__init__(self, parent)
+
+    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(rect, 0, QString(data))
+        else:
+                painter.fillPath(path, QColor.fromRgb(250, 0, 0))
+                painter.setPen(QColor.fromRgb(0, 0, 0))
+                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)
 
-        self.nodeView = QTreeView(self)
-        self.nodeView.setRootIsDecorated(False)
-        self.nodeView.setAlternatingRowColors(True)
-        self.nodeView.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+        self.network_names = []
+        self.process = SfiProcess(self)
 
-        self.nodeModel = QStandardItemModel(0, 3, self)
-        self.nodeModel.setHeaderData(0, Qt.Horizontal, QString("Testbed"))
-        self.nodeModel.setHeaderData(1, Qt.Horizontal, QString("Hostname"))
-        self.nodeModel.setHeaderData(2, Qt.Horizontal, QString("IsIn"))
+        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)
+        searchbox.setAttribute(Qt.WA_MacShowFocusRect, 0)
 
-        self.nodeView.setModel(self.nodeModel)
+        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)
 
-        label = QLabel("<a href='refresh'>Refresh</a>", self)
-        label.setScaledContents(False)
-        self.connect(label, SIGNAL('linkActivated(QString)'), self.refresh)
+        self.nodeView = NodeView(self)
+        self.nodeModel = QStandardItemModel(0, 4, self)
+        self.filterModel = NodeFilterProxyModel(self)
 
-        slicename = QLabel ("Slice : %s"%(config.getSlice() or "None"),self)
+        self.nodeNameDelegate = NodeNameDelegate(self)
+        self.nodeStatusDelegate = NodeStatusDelegate(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)
 
         layout = QVBoxLayout()
-        layout.addWidget(label)
-        layout.addWidget(slicename)
+        layout.addLayout(toplayout)
         layout.addWidget(self.nodeView)
+        layout.addLayout(bottomlayout)
         self.setLayout(layout)
         self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
-        
-    
-    # TODO: use the methods from sfa-trunk
-    def rspec_get_networks(self, rspec_string):
-        rspec = RSpec (rspec_string)
-        return rspec.rspec.xpath("./network[@name]/@name")
-    def rspec_get_xml_nodes_from_network(self, rspec_string, network):
-        rspec = RSpec (rspec_string)
-        return rspec.rspec.xpath("./network[@name='%s']/site/node" % network)
-    def rspec_get_sliver_nodes_from_network(self, rspec_string, network):
-        rspec = RSpec (rspec_string)
-        return rspec.rspec.xpath("./network[@name='%s']/site/node[sliver]/hostname/text()" % network)
-    def rspec_get_other_nodes_from_network(self, rspec_string, network):
-        rspec = RSpec (rspec_string)
-        # xxx todo - could not find the xpath syntax for 'does not have the sliver attribute'
-        return rspec.rspec.xpath("./network[@name='%s']/site/node[~sliver]/hostname/text()" % network)
-
-    def refresh(self, link=None):
-        data = SfaData()
-        if not data.getSlice(): 
-            print 'slice not set yet'
-            return
-        if not data.SFACE_DEBUG:
-            rspec_string = data.getRSpecFromSM()
+
+        self.connect(refresh, SIGNAL('clicked()'), self.refresh)
+        self.connect(renew, SIGNAL('clicked()'), self.renew)
+        self.connect(submit, SIGNAL('clicked()'), self.submit)
+        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.disconnect(self.process, SIGNAL('finished()'), self.submitFinished)
+
+        faultString = self.process.getFaultString()
+        if not faultString:
+            self.setStatus("<font color='green'>Slice data submitted.</font>")
         else:
-            print 'SFACE_DEBUG : using local file'
-            import os
-            rspec_string = open(os.path.expanduser("~/.sfi/%s.rspec"%data.getSlice())).read()
+            self.setStatus("<font color='red'>Slice submit failed: %s</font>" % (faultString))
+
+        # no need to do that anymore
+        # QTimer.singleShot(1000, self.refresh)
+        self.updateView()
+        self.parent().signalAll("rspecUpdated")
+
+    def refreshResourcesFinished(self):
+        self.disconnect(self.process, SIGNAL('finished()'), self.refreshResourcesFinished)
+
+        self.setStatus("Refreshing slice RSpec.")
+        self.connect(self.process, SIGNAL('finished()'), self.refreshRSpecFinished)
+        self.process.retrieveRspec()
+
+    def refreshRSpecFinished(self):
+        self.disconnect(self.process, SIGNAL('finished()'), self.refreshRSpecFinished)
+        self.setStatus("<font color='green'>Slice data refreshed.</font>", timeout=5000)
+        self.updateView()
+        self.parent().signalAll("rspecUpdated")
 
-        networks = self.rspec_get_networks(rspec_string)
-        networks.reverse()
+    def setStatus(self, msg, timeout=None):
+        self.parent().setStatus(msg, timeout)
+
+    def checkRunningProcess(self):
+        if self.process.isRunning():
+            self.setStatus("<font color='red'>There is already a process running. Please wait.</font>")
+            return True
+        return False
+
+    def search(self, search_string):
+        self.filterModel.setHostNameFilter(str(search_string))
+
+    def filter(self, filter_string):
+        self.filterModel.setNodeStatusFilter(str(filter_string))
+
+    def itemStatus(self, item):
+        statusItem = item.parent().child(item.row(), MEMBERSHIP_STATUS_COLUMN)
+        return str(statusItem.data(Qt.DisplayRole).toString())
+
+    def itemText(self, item):
+        return str(item.data(Qt.DisplayRole).toString())
+
+    # Recursively walk the tree, making changes to the RSpec
+    def process_subtree(self, rspec, resources, item, depth = 0):
+        change = False
+        model = self.nodeModel
+
+        if depth in [0, 1]:
+            pass
+        elif depth == 2: # Hostname
+            hostname = self.itemText(item)
+            testbed = self.itemText(item.parent())
+            status = self.itemStatus(item)
+            if status == node_status['add']:
+                print "Add hostname: %s" % hostname
+
+                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(str(hostname), testbed)
+                    change = True
+            elif status == node_status['remove']:
+                print "Remove hostname: %s" % hostname
+                rspec.remove_slivers(str(hostname), testbed)
+                change = True
+        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())
+            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)
+                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):
+                    rspec.remove_default_sliver_attribute(tag, value, testbed)
+                else:
+                    rspec.remove_sliver_attribute(node, tag, value, testbed)
+                change = True
+
+        children = item.rowCount()
+        for row in range(0, children):
+            status = self.process_subtree(rspec, resources, item.child(row), depth + 1)
+            change = change or status
+
+        return change
+
+    def submit(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
+
+        self.connect(self.process, SIGNAL('finished()'), self.submitFinished)
+
+        self.process.applyRSpec(rspec)
+        self.setStatus("Sending slice data (RSpec). This will take some time...")
+
+    def renew(self):
+        dlg = RenewWindow(parent=self)
+        dlg.exec_()
+
+    def refresh(self):
+        if not config.getSlice():
+            self.setStatus("<font color='red'>Slice not set yet!</font>")
+            return
+
+        if self.process.isRunning():
+            self.setStatus("<font color='red'>There is already a process running. Please wait.</font>")
+            return
+
+        self.connect(self.process, SIGNAL('finished()'), self.refreshResourcesFinished)
+
+        self.process.retrieveResources()
+        self.setStatus("Refreshing resources. This will take some time...")
+
+    def updateView(self):
+        global already_in_nodes
+        already_in_nodes = []
+        self.network_names = []
+        self.nodeModel.clear()
+
+        rspec = SfiData().getSliceRSpec()
+        if not rspec:
+            return None
+
+        resources = SfiData().getResourcesRSpec()
+        if not resources:
+            return None
+
+        rootItem = self.nodeModel.invisibleRootItem()
+        networks = rspec.get_networks()
+
+        for network in resources.get_networks():
+            if not network in networks:
+                networks.append(network)
 
         for network in networks:
-#            nodes = self.rspec_get_sliver_nodes_from_network(rspec_string, network)
-#            for node in nodes: self.addNode(network, node, True)
-#            nodes = self.rspec_get_other_nodes_from_network(rspec_string, network)
-#            for node in nodes: self.addNode(network, node, False)
-            # hacky - i'm just gettin used to this xml navigation stuff
-            xml_nodes = self.rspec_get_xml_nodes_from_network(rspec_string, network)
-            from lxml import etree
-            # addNode inserts before, so let's start with the ones that are not in
-            for xml_node in xml_nodes:
-                if not xml_node.xpath('sliver'): 
-                    self.addNode(network,xml_node.xpath('hostname/text()')[0],False)
-            for xml_node in xml_nodes:
-                if xml_node.xpath('sliver'): 
-                    self.addNode(network,xml_node.xpath('hostname/text()')[0],True)
-                
+            self.network_names.append(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("")), 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(""))
+            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']))
+                    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']))
+                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']))
+                    nodeStatus = QStandardItem(QString(""))
+                    nodeItem.appendRow([tagItem, nodeStatus, statusItem, QStandardItem(QString("attribute"))])
 
-    def addNode(self, testbed, hostname, mark):
-        self.nodeModel.insertRow(0)
-        self.nodeModel.setData(self.nodeModel.index(0,0), QString(testbed))
-        self.nodeModel.setData(self.nodeModel.index(0,1), QString(hostname))
-        if mark:msg="x"
-        else:   msg="-"
-        self.nodeModel.setData(self.nodeModel.index(0,2), QString(msg))
+            for node in available_nodes:
+                nodeItem = QStandardItem(QString(node))
+                statusItem = QStandardItem(QString(node_status['out']))
+                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.setDynamicSortFilter(True)
 
+        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()
+
+    def updateSliceName(self):
+        self.slicename.setText("Slice : %s" % (config.getSlice() or "None"))
+
+    def nodeSelectionChanged(self, hostname):
+        self.parent().nodeSelectionChanged(hostname)
 
 class MainScreen(SfaScreen):
-    def __init__(self, parent=None):
+    def __init__(self, parent):
         SfaScreen.__init__(self, parent)
 
         slice = SliceWidget(self)
-        self.init(slice, "Main Window", "PlanetLab Federation GUI")
-#        slice.refresh()
+        self.init(slice, "Nodes", "OneLab SFA crawler")
+
+    def rspecUpdated(self):
+        self.mainwin.rspecWindow.updateView()
+
+    def configurationChanged(self):
+        self.widget.updateSliceName()
+        self.widget.updateView()
+        self.mainwin.rspecWindow.updateView()
+
+    def nodeSelectionChanged(self, hostname):
+        self.mainwin.nodeSelectionChanged(hostname)