git://git.onelab.eu
/
sface.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c07803c
)
attribute stuff working
author
smbaker
<smbaker@fc8clean.lan>
Mon, 5 Dec 2011 06:46:58 +0000
(22:46 -0800)
committer
smbaker
<smbaker@fc8clean.lan>
Mon, 5 Dec 2011 06:46:58 +0000
(22:46 -0800)
sface/screens/mainscreen.py
patch
|
blob
|
history
diff --git
a/sface/screens/mainscreen.py
b/sface/screens/mainscreen.py
index
6beaec2
..
b2b8cc8
100644
(file)
--- 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
status = self.itemStatus(item)
tag = "%s" % tag # Prevent weird error from lxml
value = "%s" % value # Prevent weird error from lxml
-
nod
e = self.itemText(item.parent())
+
hostnam
e = self.itemText(item.parent())
testbed = self.itemText(item.parent().parent())
if status == tag_status['add']:
testbed = self.itemText(item.parent().parent())
if status == tag_status['add']:
- print "Add tag to (%s, %s): %s/%s " % (testbed,
nod
e, tag, value)
- if
nod
e.startswith(default_tags):
- rspec.add_default_sliver_attribute(tag, value, testbed)
+ print "Add tag to (%s, %s): %s/%s " % (testbed,
hostnam
e, tag, value)
+ if
hostnam
e.startswith(default_tags):
+ rspec.
version.
add_default_sliver_attribute(tag, value, testbed)
else:
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']:
change = True
elif status == tag_status['remove']:
- print "Remove tag from (%s, %s): %s/%s " % (testbed,
nod
e, tag, value)
- if
nod
e.startswith(default_tags):
- rspec.remove_default_sliver_attribute(tag, value, testbed)
+ print "Remove tag from (%s, %s): %s/%s " % (testbed,
hostnam
e, tag, value)
+ if
hostnam
e.startswith(default_tags):
+ rspec.
version.
remove_default_sliver_attribute(tag, value, testbed)
else:
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()
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(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")
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)
for attr in attrs:
name = attr.get("name", None)
value = attr.get("value", None)