X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=a4351855aeb254435702a3c4210a105948a6ed87;hp=74d3abbd711181c1ccb58193ee9a969f761e60fb;hb=ce5e4c9baaac18e6e3afe3de2316c71990c20cca;hpb=6952bb5166aeeb4c6e76292bee73267685f28013 diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py index 74d3abb..a435185 100644 --- a/sface/screens/mainscreen.py +++ b/sface/screens/mainscreen.py @@ -6,6 +6,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * #from sfa.util.rspecHelper import RSpec +from sfa.util.xrn import Xrn from sface.config import config from sface.sfirenew import RenewWindow from sface.sfiprocess import SfiProcess @@ -286,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) @@ -341,7 +356,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_pg_compat) + 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)'), @@ -407,7 +422,7 @@ class SliceWidget(QWidget): 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): + def process_subtree(self, rspec, rspec_node_names, resource_node_names, item, depth = 0): change = False model = self.nodeModel @@ -420,43 +435,50 @@ class SliceWidget(QWidget): if status == node_status['add']: print "Add hostname: %s" % hostname - resource_node = resources.get_node_element(hostname) + resource_node = resource_node_names.get(hostname, None) 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) + 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)]) change = True elif status == node_status['remove']: print "Remove hostname: %s" % hostname - rspec.remove_slivers([{"hostname": str(hostname)}], testbed) + rspec.version.remove_slivers([str(hostname)]) 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()) + 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() for row in range(0, children): - status = self.process_subtree(rspec, resources, item.child(row), depth + 1) + status = self.process_subtree(rspec, rspec_node_names, resource_node_names, item.child(row), depth + 1) change = change or status return change @@ -467,7 +489,11 @@ class SliceWidget(QWidget): rspec = SfiData().getSliceRSpec() resources = SfiData().getResourcesRSpec() - change = self.process_subtree(rspec, resources, self.nodeModel.invisibleRootItem()) + + resource_node_names = self.nodesByName(resources.version.get_nodes()) + rspec_node_names = self.nodesByName(rspec.version.get_nodes_with_slivers()) + + change = self.process_subtree(rspec, rspec_node_names, resource_node_names, self.nodeModel.invisibleRootItem()) if not change: self.setStatus("No change in slice data. Not submitting!", timeout=3000) @@ -523,6 +549,29 @@ class SliceWidget(QWidget): 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 + + return nameDict + def updateView(self): global already_in_nodes already_in_nodes = [] @@ -538,57 +587,74 @@ class SliceWidget(QWidget): return None rootItem = self.nodeModel.invisibleRootItem() - networks = rspec.get_networks() - for network in resources.get_networks(): - if not network in networks: - networks.append(network) + 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 = resources.get_nodes(network) - sliver_nodes = rspec.get_nodes_with_slivers(network) + all_nodes = resources_nodes.get(network, []) + sliver_nodes = rspec_nodes.get(network, []) - available_nodes = [ node for node in all_nodes if node not in sliver_nodes ] + sliver_node_names = self.nodesByName(sliver_nodes) + + available_nodes = [ node for node in all_nodes if node["component_name"] not in sliver_node_names ] msg = "%s Nodes\t%s Selected" % (len(all_nodes), len(sliver_nodes)) 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 - self.nodeView.appendRow(networkItem, "%s for %s" % (default_tags, network), kind="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)) self.nodeView.appendRow(nodeItem, tagstring, membership=tag_status['in'], kind = "attribute") for node in sliver_nodes: - self.nodeView.appendRow(networkItem, - node, - nodeStatus=rspec.get_node_boot_state(node, network), - nodeType=rspec.get_node_sliver_type(node, network), - - #get_node_element(node, network).attrib.get("boot_state",""), - #nodeType=rspec.get_node_element(node, network).attrib.get("sliver_type",""), - + nodeType = None + if ("hardware_types" in node): + hardware_types = [x["name"] for x in node["hardware_types"]] + nodeType = ",".join(hardware_types) + nodeItem = self.nodeView.appendRow(networkItem, + node["component_name"], + nodeStatus=node.get("boot_state", ""), + 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) self.nodeView.appendRow(networkItem, - node, - #nodeStatus=resources.get_node_element(node, network).attrib.get("boot_state",""), - nodeStatus = resources.get_node_boot_state(node, network), - nodeType= resources.get_node_sliver_type(node, network), + node["component_name"], + nodeStatus = node.get("boot_state", ""), + nodeType=nodeType, membership=node_status['out'], kind="node")