display disk images
[sface.git] / sface / screens / mainscreen.py
index 8cbe3d0..4fc6288 100644 (file)
@@ -1,15 +1,19 @@
 
 import datetime
 import os
+import urlparse
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
 #from sfa.util.rspecHelper import RSpec
-from sfa.rspecs.rspec_parser import parse_rspec
+from sfa.util.xrn import Xrn
 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
+
+from sface.clislicemgr import ClientSliceManager
 
 already_in_nodes = []
 
@@ -23,13 +27,18 @@ 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
+NODE_TYPE_COLUMN = 1
+NODE_STATUS_COLUMN = 2
+MEMBERSHIP_STATUS_COLUMN = 3
+KIND_COLUMN = 4
 
 # maximum length of a name to display before clipping
 NAME_MAX_LEN = 48
@@ -57,6 +66,8 @@ class NodeView(QTreeView):
     def keyPressEvent(self, event):
         if (event.key() == Qt.Key_Space):
             self.toggleSelection()
+        else:
+            QTreeView.keyPressEvent(self, event)
 
     def mouseDoubleClickEvent(self, event):
         self.toggleSelection()
@@ -64,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())
@@ -95,6 +111,17 @@ class NodeView(QTreeView):
 
         model.emit(SIGNAL("dataChanged(QModelIndex, QModelIndex)"), node_index, node_index)
 
+    def appendRow(self, parent, name, nodeStatus="", nodeType="", membership="", kind = ""):
+        # row: name nodeStatus nodeType membership kind
+        item = QStandardItem(QString(str(name)))
+        row = [item,
+                QStandardItem(QString(str(nodeType))),
+                QStandardItem(QString(str(nodeStatus))),
+                QStandardItem(QString(str(membership))),
+                QStandardItem(QString(str(kind)))]
+        parent.appendRow(row)
+        return item
+
     def mousePressEvent(self, event):
         QTreeView.mousePressEvent(self, event)
         if event.button() == Qt.LeftButton:
@@ -103,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())
@@ -118,23 +150,12 @@ class NodeView(QTreeView):
                     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])
+
+                        self.appendRow(nodeItem, "%s: %s" % (tagname, value), membership=tag_status['add'], kind="attribute")
 
             elif status_data in (node_status['out'], node_status['remove']):
                 QMessageBox.warning(self, "Not selected", "Can only add tags to selected nodes")
@@ -186,44 +207,20 @@ class NodeNameDelegate(QStyledItemDelegate):
             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))
+            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(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))
+            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))
+            for x in tag_status.keys():
+                if (tag_status[x] == status_data) and (x in color_status):
+                    painter.fillPath(path, color_status[x])
 
-            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.setPen(QColor.fromRgb(0, 0, 0))
+            painter.drawText(rect, 0, QString(data))
 
         painter.restore()
 
@@ -300,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)
@@ -355,7 +366,7 @@ class SliceWidget(QWidget):
 
         self.connect(refresh, SIGNAL('clicked()'), self.refresh)
         self.connect(renew, SIGNAL('clicked()'), self.renew)
-        self.connect(submit, SIGNAL('clicked()'), self.submit)
+        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)'),
@@ -364,29 +375,50 @@ class SliceWidget(QWidget):
         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:
             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 refreshFinished(self):
-        self.setStatus("<font color='green'>Slice data refreshed.</font>", timeout=5000)
+    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)
+
+        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 readSliceRSpec(self):
-        rspec_file = config.getSliceRSpecFile()
-        if os.path.exists(rspec_file):
-            xml = open(rspec_file).read()
-            return parse_rspec(xml)
-        return None
-
     def setStatus(self, msg, timeout=None):
         self.parent().setStatus(msg, timeout)
 
@@ -404,14 +436,17 @@ class SliceWidget(QWidget):
 
     def itemStatus(self, item):
         statusItem = item.parent().child(item.row(), MEMBERSHIP_STATUS_COLUMN)
-        return statusItem.data(Qt.DisplayRole).toString()
+        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):
-        change = False
+    def process_subtree(self, rspec, rspec_node_names, resource_node_names, item, depth = 0):
+        changeAdd = 0
+        changeRemove = 0
+        changeAddTag = 0
+        changeRemoveTag = 0
         model = self.nodeModel
 
         if depth in [0, 1]:
@@ -422,58 +457,117 @@ class SliceWidget(QWidget):
             status = self.itemStatus(item)
             if status == node_status['add']:
                 print "Add hostname: %s" % hostname
-                rspec.add_slivers(str(hostname), testbed)
-                change = True
+
+                resource_node = resource_node_names.get(hostname, None)
+
+                if resource_node==None:
+                    print "Error: Failed to find %s in resources rspec" % hostname
+                else:
+                    if not (hostname in rspec_node_names):
+                        network_name = Xrn(resource_node['component_manager_id']).get_hrn()
+                        rspec.version.add_network(network_name)
+                        rspec.version.add_nodes([resource_node])
+                    rspec.version.add_slivers([str(hostname)])
+                    changeAdd += 1
             elif status == node_status['remove']:
                 print "Remove hostname: %s" % hostname
-                rspec.remove_slivers(str(hostname), testbed)
-                change = True
+                rspec.version.remove_slivers([str(hostname)])
+                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, 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():
             return
 
-        rspec = self.readSliceRSpec()
-        change = self.process_subtree(rspec, self.nodeModel.invisibleRootItem())
+        rspec = SfiData().getSliceRSpec()
+        resources = SfiData().getResourcesRSpec()
+
+        resource_node_names = self.nodesByName(resources.version.get_nodes())
+        rspec_node_names = self.nodesByName(rspec.version.get_nodes_with_slivers())
 
-        if not change:
+        (change, changeAdd, changeRemove, changeAddTag, changeRemoveTag) = \
+            self.process_subtree(rspec, rspec_node_names, resource_node_names, self.nodeModel.invisibleRootItem())
+
+        if (change <= 0):
             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)
+        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")
+        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...")
 
+    def submit_pg_compat(self):
+        if self.checkRunningProcess():
+            return
+
+        rspec = SfiData().getSliceRSpec()
+        resources = SfiData().getResourcesRSpec()
+
+        (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
+
+        dlg = ClientSliceManager(self)
+        dlg.submit_pg_compat(rspec)
+        dlg.exec_()
+
+        self.setStatus("<font color='green'>Finished submitting. %d/%d aggs succeeded.</font>" %
+                      (dlg.submit_aggSuccessCount,dlg.submit_aggSuccessCount+dlg.submit_aggFailCount))
+        QTimer.singleShot(2500, self.refresh)
+
     def renew(self):
         dlg = RenewWindow(parent=self)
         dlg.exec_()
@@ -487,11 +581,33 @@ 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.retrieveResources()
+        self.setStatus("Refreshing resources. This will take some time...")
+
+    def nodesByNetwork(self, nodeList):
+        netDict = {}
+        for node in nodeList:
+            network_name = Xrn(node['component_manager_id']).get_hrn()
+            if network_name:
+                net = netDict.get(network_name, [])
+                if net == []:
+                    netDict[network_name] = net
+
+                net.append(node)
+
+        return netDict
+
+    def nodesByName(self, nodeList, nameDict=None):
+        if nameDict==None:
+            nameDict = {}
+        for node in nodeList:
+            hostname = node.get("component_name", None)
+            if hostname and (not hostname in nameDict):
+                nameDict[hostname] = node
 
-        self.process.retrieveRspec()
-        self.setStatus("Refreshing slice data. This will take some time...")
+        return nameDict
 
     def updateView(self):
         global already_in_nodes
@@ -499,69 +615,107 @@ 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()
+
+        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.version.get_networks():
+            network_name = network.get("name", None)
+            if (network_name != None) and (not network_name in networks):
+                networks.append(network_name)
+
+        resources_nodes = self.nodesByNetwork(resources.version.get_nodes())
+        rspec_nodes = self.nodesByNetwork(rspec.version.get_nodes_with_slivers())
+
         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 = rspec.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 ]
+            all_nodes = resources_nodes.get(network, [])
+            sliver_nodes = rspec_nodes.get(network, [])
+
+            sliver_node_names = self.nodesByName(sliver_nodes)
+
+            available_nodes = [ node for node in all_nodes if node["component_name"] not in sliver_node_names ]
 
-            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"))])
+            networkItem = self.nodeView.appendRow(rootItem, network, membership=msg, kind="network")
 
-            already_in_nodes += sliver_nodes
+            already_in_nodes += sliver_node_names.keys()
 
             # 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:
+            nodeItem = self.nodeView.appendRow(networkItem, "%s for %s" % (default_tags, network), kind="defaults")
+            attrs = rspec.version.get_default_sliver_attributes(network)
+            for attr in attrs:
+                    name = attr.get("name", None)
+                    value = attr.get("value", None)
                     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"))])
+                    self.nodeView.appendRow(nodeItem, tagstring, membership=tag_status['in'], kind = "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"))])
-
+                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=nodeStatus,
+                               nodeType=nodeType,
+                               membership=node_status['in'],
+                               kind="node")
+
+                attrs = rspec.version.get_sliver_attributes(node['component_id'], network)
+                for attr in attrs:
+                    name = attr.get("name", None)
+                    value = attr.get("value", None)
+                    self.nodeView.appendRow(nodeItem,
+                                            "%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:
-                nodeItem = QStandardItem(QString(node))
-                statusItem = QStandardItem(QString(node_status['out']))
-                nodeStatus = QStandardItem(QString(rspec.get_node_element(node, network).attrib.get("boot_state","")))
-                networkItem.appendRow([nodeItem, nodeStatus, statusItem, QStandardItem(QString("node"))])
+                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=nodeStatus,
+                               nodeType=nodeType,
+                               membership=node_status['out'],
+                               kind="node")
 
         self.filterModel.setSourceModel(self.nodeModel)
         self.filterModel.setDynamicSortFilter(True)
+        self.filterModel.sort(NAME_COLUMN)
 
-        headers = QStringList() << "Hostname or Tag" << "Node Status" << "Membership Status" << "Kind"
+        headers = QStringList() << "Hostname or Tag" << "Node Type" << "Node Status" << "Membership Status" << "Kind"
         self.nodeModel.setHorizontalHeaderLabels(headers)
 
-        self.nodeView.setItemDelegateForColumn(0, self.nodeNameDelegate)
-        self.nodeView.setItemDelegateForColumn(1, self.nodeStatusDelegate)
+        self.nodeView.setItemDelegateForColumn(NAME_COLUMN, self.nodeNameDelegate)
+        self.nodeView.setItemDelegateForColumn(NODE_STATUS_COLUMN, self.nodeStatusDelegate)
         self.nodeView.setModel(self.filterModel)
         self.nodeView.hideColumn(KIND_COLUMN)
         self.nodeView.expandAll()
@@ -578,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()
@@ -591,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)
+