make sure default slice tags are sorted above all other lines

[sface.git] / sface / screens / mainscreen.py

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index b2b8cc8..c25403b 100644 (file)
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -287,6 +287,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)
@@ -575,11 +589,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)
@@ -604,7 +618,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)
@@ -619,7 +633,7 @@ class SliceWidget(QWidget):
                                membership=node_status['in'],
                                kind="node")
 
-                attrs = rspec.get_sliver_attributes(node['component_id'], 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)