From 13839a266d6c7b6d15ed71239841580b672b9681 Mon Sep 17 00:00:00 2001 From: smbaker Date: Sun, 4 Dec 2011 22:46:58 -0800 Subject: [PATCH] attribute stuff working --- sface/screens/mainscreen.py | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py index 6beaec2..b2b8cc8 100644 --- a/sface/screens/mainscreen.py +++ b/sface/screens/mainscreen.py @@ -441,21 +441,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() @@ -608,14 +612,14 @@ class SliceWidget(QWidget): self.nodeView.appendRow(nodeItem, tagstring, membership=tag_status['in'], kind = "attribute") for node in sliver_nodes: - self.nodeView.appendRow(networkItem, + nodeItem = self.nodeView.appendRow(networkItem, node["component_name"], nodeStatus=node.get("boot_state", ""), #nodeType=node.get("rspec.get_node_sliver_type(node, network), membership=node_status['in'], kind="node") - attrs = rspec.get_sliver_attributes(node, network) + attrs = rspec.get_sliver_attributes(node['component_id'], network) for attr in attrs: name = attr.get("name", None) value = attr.get("value", None) -- 2.43.0