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())
# 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())
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)
self.updateView()
self.parent().signalAll("rspecUpdated")
+ def deleteSliversFinished(self):
+ self.disconnect(self.process, SIGNAL('finished()'), self.deleteSliversFinished)
+
+ faultString = self.process.getFaultString()
+ if not faultString:
+ self.setStatus("<font color='green'>Slice data submitted.</font>")
+ QTimer.singleShot(2500, self.refresh)
+ else:
+ self.setStatus("<font color='red'>Slice submit failed: %s</font>" % (faultString))
+
def refreshResourcesFinished(self):
self.disconnect(self.process, SIGNAL('finished()'), self.refreshResourcesFinished)
# Recursively walk the tree, making changes to the RSpec
def process_subtree(self, rspec, rspec_node_names, resource_node_names, item, depth = 0):
- change = False
+ changeAdd = 0
+ changeRemove = 0
+ changeAddTag = 0
+ changeRemoveTag = 0
model = self.nodeModel
if depth in [0, 1]:
rspec.version.add_network(network_name)
rspec.version.add_nodes([resource_node])
rspec.version.add_slivers([str(hostname)])
- change = True
+ changeAdd += 1
elif status == node_status['remove']:
print "Remove hostname: %s" % hostname
rspec.version.remove_slivers([str(hostname)])
- change = True
+ changeRemove += 1
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)
- change = True
+ node = rspec_node_names.get(hostname, None)
+ if node:
+ rspec.version.add_sliver_attribute(node['component_id'], tag, value, testbed)
+ changeAddTag += 1
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)
- change = True
+ node = rspec_node_names.get(hostname, None)
+ if node:
+ rspec.version.remove_sliver_attribute(node['component_id'], tag, value, testbed)
+ changeRemoveTag += 1
children = item.rowCount()
for row in range(0, children):
- status = self.process_subtree(rspec, rspec_node_names, resource_node_names, item.child(row), depth + 1)
- change = change or status
+ (c, ca, cr, cat, crt) = self.process_subtree(rspec, rspec_node_names, resource_node_names, item.child(row), depth + 1)
+ changeAdd = changeAdd + ca
+ changeRemove = changeRemove + cr
+ changeAddTag = changeAddTag + cat
+ changeRemoveTag = changeRemoveTag + crt
+
+ change = changeAdd + changeRemove + changeAddTag + changeRemoveTag
- return change
+ return (change, changeAdd, changeRemove, changeAddTag, changeRemoveTag)
def submit(self):
if self.checkRunningProcess():
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())
+ (change, changeAdd, changeRemove, changeAddTag, changeRemoveTag) = \
+ self.process_subtree(rspec, rspec_node_names, resource_node_names, self.nodeModel.invisibleRootItem())
- if not change:
+ if (change <= 0):
self.setStatus("<font color=red>No change in slice data. Not submitting!</font>", timeout=3000)
return
+ if (changeRemove > 0) and (rspec.version.get_nodes_with_slivers() == []):
+ # removing the last sliver in a slice requires us to call deleteSlivers
+ self.connect(self.process, SIGNAL('finished()'), self.deleteSliversFinished)
+ self.process.deleteSlivers()
+ return
+
# Several aggregates have issues with the <statistics> section in the
# rspec, so make sure it's not there.
stats_elems = rspec.xml.xpath("//statistics")
rspec = SfiData().getSliceRSpec()
resources = SfiData().getResourcesRSpec()
- change = self.process_subtree(rspec, resources, self.nodeModel.invisibleRootItem())
- if not change:
+ (change, changeAdd, changeRemove, changeAddTag, changeRemoveTag) = \
+ self.process_subtree(rspec, rspec, resources, self.nodeModel.invisibleRootItem())
+
+ if (change <= 0):
self.setStatus("<font color=red>No change in slice data. Not submitting!</font>", timeout=3000)
return
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)
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,
+ 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")
git://git.onelab.eu / sface.git / blobdiff