X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=df110c64a95554feb25642445b8340626464a466;hp=d66e114a9135ad1e669dbfd0ef64ba160b38ebdd;hb=bc9cce47260c4847c2c613548ca3b2e0eaa6b510;hpb=952ffa80f6c545e58ab4bdf16207f451d509b7bd diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py index d66e114..df110c6 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) @@ -441,21 +465,25 @@ class SliceWidget(QWidget): 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) + node = rspec_node_names.get(hostname, None) + if node: + rspec.version.add_sliver_attribute(node['component_id'], 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) + 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) + node = rspec_node_names.get(hostname, None) + if node: + rspec.version.remove_sliver_attribute(node['component_id'], tag, value, testbed) change = True children = item.rowCount() @@ -571,11 +599,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,31 +628,49 @@ 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) - for (name, value) in attrs: + 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)) 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) - for (name, value) in attrs: + 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") 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")