import datetime
import os
+import urlparse
from PyQt4.QtCore import *
from PyQt4.QtGui import *
#from sfa.util.rspecHelper import RSpec
-from sfa.rspecs.rspec_parser import parse_rspec
from sface.config import config
from sface.sfirenew import RenewWindow
from sface.sfiprocess import SfiProcess
settable_tags = ['delegations', 'initscript']
NAME_COLUMN = 0
-NODE_STATUS_COLUMN = 1
-MEMBERSHIP_STATUS_COLUMN = 2
-KIND_COLUMN = 3
+NODE_TYPE_COLUMN = 1
+NODE_STATUS_COLUMN = 2
+MEMBERSHIP_STATUS_COLUMN = 3
+KIND_COLUMN = 4
# maximum length of a name to display before clipping
NAME_MAX_LEN = 48
model.emit(SIGNAL("dataChanged(QModelIndex, QModelIndex)"), node_index, node_index)
+ def appendRow(self, parent, name, nodeStatus="", nodeType="", membership="", kind = ""):
+ # row: name nodeStatus nodeType membership kind
+ item = QStandardItem(QString(str(name)))
+ row = [item,
+ QStandardItem(QString(str(nodeType))),
+ QStandardItem(QString(str(nodeStatus))),
+ QStandardItem(QString(str(membership))),
+ QStandardItem(QString(str(kind)))]
+ parent.appendRow(row)
+ return item
+
def mousePressEvent(self, event):
QTreeView.mousePressEvent(self, event)
if event.button() == Qt.LeftButton:
value, ok = QInputDialog.getText(self, "Add tag",
"Value for tag '%s'" % tagname)
if ok:
- # Add a new row to the model for the tag
-
- # For testing with the QStandardItemModel
- #nodeItem = model.itemFromIndex(index)
- #tagstring = QString("%s: %s" % (tagname, value))
- #tagItem = QStandardItem(tagstring)
- #status = QStandardItem(QString(tag_status['add']))
- #nodeItem.appendRow([tagItem, status])
-
# We're using the QSortFilterProxyModel here
src_index = model.mapToSource(index)
src_model = src_index.model()
nodeItem = src_model.itemFromIndex(src_index)
- tagstring = QString("%s: %s" % (tagname, value))
- tagItem = QStandardItem(tagstring)
- status = QStandardItem(QString(tag_status['add']))
- nodeItem.appendRow([tagItem, QStandardItem(QString("")), status])
+
+ self.appendRow(nodeItem, "%s: %s" % (tagname, value), membership=tag_status['add'], kind="attribute")
elif status_data in (node_status['out'], node_status['remove']):
QMessageBox.warning(self, "Not selected", "Can only add tags to selected nodes")
self.connect(refresh, SIGNAL('clicked()'), self.refresh)
self.connect(renew, SIGNAL('clicked()'), self.renew)
- self.connect(submit, SIGNAL('clicked()'), self.submit)
+ 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)'),
else:
self.setStatus("<font color='red'>Slice submit failed: %s</font>" % (faultString))
- # no need to do that anymore
- # QTimer.singleShot(1000, self.refresh)
self.updateView()
self.parent().signalAll("rspecUpdated")
def refreshResourcesFinished(self):
self.disconnect(self.process, SIGNAL('finished()'), self.refreshResourcesFinished)
- self.setStatus("Refreshing slice RSpec.")
- self.connect(self.process, SIGNAL('finished()'), self.refreshRSpecFinished)
- self.process.retrieveRspec()
+ faultString = self.process.getFaultString()
+ if not faultString:
+ self.setStatus("Refreshing slice RSpec.")
+ self.connect(self.process, SIGNAL('finished()'), self.refreshRSpecFinished)
+ self.process.retrieveRspec()
+ else:
+ self.setStatus("<font color='red'>Resources refresh failed: %s</font>" % (faultString))
def refreshRSpecFinished(self):
self.disconnect(self.process, SIGNAL('finished()'), self.refreshRSpecFinished)
- self.setStatus("<font color='green'>Slice data refreshed.</font>", timeout=5000)
+
+ faultString = self.process.getFaultString()
+ if not faultString:
+ self.setStatus("<font color='green'>Slice data refreshed.</font>", timeout=5000)
+ else:
+ self.setStatus("<font color='red'>Slice refresh failed: %s</font>" % (faultString))
+
self.updateView()
self.parent().signalAll("rspecUpdated")
print "Error: Failed to find %s in resources rspec" % hostname
else:
rspec.merge_node(resource_node, testbed)
- rspec.add_slivers(str(hostname), testbed)
+ rspec.add_slivers([{"hostname": str(hostname)}], testbed)
change = True
elif status == node_status['remove']:
print "Remove hostname: %s" % hostname
- rspec.remove_slivers(str(hostname), testbed)
+ rspec.remove_slivers([{"hostname": str(hostname)}], testbed)
change = True
elif depth == 3: # Tag
tag, value = self.itemText(item).split(": ")
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):
+ if node.startswith(default_tags):
rspec.add_default_sliver_attribute(tag, value, testbed)
else:
rspec.add_sliver_attribute(node, 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):
+ if node.startswith(default_tags):
rspec.remove_default_sliver_attribute(tag, value, testbed)
else:
rspec.remove_sliver_attribute(node, tag, value, testbed)
self.setStatus("<font color=red>No change in slice data. Not submitting!</font>", timeout=3000)
return
- self.connect(self.process, SIGNAL('finished()'), self.submitFinished)
+ # Several aggregates have issues with the <statistics> section in the
+ # rspec, so make sure it's not there.
+ stats_elems = rspec.xml.xpath("//statistics")
+ if len(stats_elems)>0:
+ stats_elem = stats_elems[0]
+ parent = stats_elem.xpath("..")[0]
+ parent.remove(stats_elem)
+ self.connect(self.process, SIGNAL('finished()'), self.submitFinished)
self.process.applyRSpec(rspec)
self.setStatus("Sending slice data (RSpec). This will take some time...")
+ # ProtoGENI-compatible submit. Contact each aggregate individually rather
+ # than using the slice manager.
+ # This code will be removed when ProtoGENI slicemanager is patched.
+ def submit_pg_compat(self):
+ if self.checkRunningProcess():
+ return
+
+ rspec = SfiData().getSliceRSpec()
+ resources = SfiData().getResourcesRSpec()
+ change = self.process_subtree(rspec, resources, self.nodeModel.invisibleRootItem())
+
+ if not change:
+ self.setStatus("<font color=red>No change in slice data. Not submitting!</font>", timeout=3000)
+ 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")
+ if len(stats_elems)>0:
+ stats_elem = stats_elems[0]
+ parent = stats_elem.xpath("..")[0]
+ parent.remove(stats_elem)
+
+ self.submit_aggSuccessCount = 0
+ self.submit_aggFailCount = 0
+ self.submit_rspec = rspec
+ self.connect(self.process, SIGNAL('finished()'), self.getVersionFinished)
+ self.process.getSliceMgrVersion()
+ self.setStatus("Getting aggregate directory...")
+
+ def getVersionFinished(self):
+ self.disconnect(self.process, SIGNAL('finished()'), self.getVersionFinished)
+
+ faultString = self.process.getFaultString()
+ if not faultString:
+ peers = SfiData().getSliceMgrVersion()["peers"]
+ self.submit_aggs = [(key, peers[key]) for key in peers.keys()]
+ self.delete_aggs = [(key, peers[key]) for key in peers.keys() if key.startswith("emulab")]
+ str = "<font color='green'>Successfully retrieved agg list.</font> "
+ #self.submitNextAgg(str)
+ self.deleteNextAgg(str)
+ else:
+ self.setStatus("<font color='red'>getSliceMgrVersion failed: %s</font>" % (faultString))
+
+ def deleteNextAgg(self, statusStr=""):
+ if (self.delete_aggs == []):
+ self.submitNextAgg(statusStr)
+ return
+
+ self.delete_agg = self.delete_aggs.pop()
+
+ urlParts = urlparse.urlsplit(self.delete_agg[1])
+ amPort = urlParts.port
+ amAddr = urlParts.hostname+urlParts.path
+
+ self.setStatus(statusStr + "Deleting slivers on %s..." % (self.delete_agg[0]))
+
+ self.connect(self.process, SIGNAL('finished()'), self.deleteNextAggFinished)
+ self.process.deleteSlivers(aggAddr = amAddr, aggPort = amPort)
+
+ def submitNextAgg(self, statusStr=""):
+ if (self.submit_aggs == []):
+ self.setStatus(statusStr + "<font color='green'>Finished submitting. %d/%d aggs succeeded.</font>" %
+ (self.submit_aggSuccessCount,self.submit_aggSuccessCount+self.submit_aggFailCount))
+ QTimer.singleShot(2500, self.refresh)
+ return
+
+ self.submit_agg = self.submit_aggs.pop()
+
+ urlParts = urlparse.urlsplit(self.submit_agg[1])
+ amPort = urlParts.port
+ amAddr = urlParts.hostname+urlParts.path
+
+ self.setStatus(statusStr + "Submitting to %s..." % (self.submit_agg[0]))
+
+ self.connect(self.process, SIGNAL('finished()'), self.submitNextAggFinished)
+ self.process.applyRSpec(self.submit_rspec, aggAddr = amAddr, aggPort = amPort, saveObtained=False)
+
+ def submitNextAggFinished(self):
+ self.disconnect(self.process, SIGNAL('finished()'), self.submitNextAggFinished)
+
+ faultString = self.process.getFaultString()
+ if not faultString:
+ self.submit_aggSuccessCount+=1
+ str = "<font color='green'>Succeeded on %s.</font> " % (self.submit_agg[0])
+ else:
+ self.submit_aggFailCount+=1
+ str = "<font color='red'>Failed on %s.</font> " % (self.submit_agg[0]) # , faultString)
+
+ self.submitNextAgg(str)
+
+ def deleteNextAggFinished(self):
+ self.disconnect(self.process, SIGNAL('finished()'), self.deleteNextAggFinished)
+
+ faultString = self.process.getFaultString()
+ if not faultString:
+ str = "<font color='green'>Succeeded deleteslivers on %s.</font> " % (self.delete_agg[0])
+ else:
+ str = "<font color='red'>Failed deleteslivers on %s.</font> " % (self.delete_agg[0]) # , faultString)
+
+ self.deleteNextAgg(str)
+
def renew(self):
dlg = RenewWindow(parent=self)
dlg.exec_()
available_nodes = [ node for node in all_nodes if node not in sliver_nodes ]
- networkItem = QStandardItem(QString(network))
msg = "%s Nodes\t%s Selected" % (len(all_nodes), len(sliver_nodes))
- rootItem.appendRow([networkItem, QStandardItem(QString("")), QStandardItem(QString(msg)), QStandardItem(QString("network"))])
+ networkItem = self.nodeView.appendRow(rootItem, network, membership=msg, kind="network")
already_in_nodes += sliver_nodes
# Add default slice tags
- nodeItem = QStandardItem(QString("%s for %s" % (default_tags, network)))
- statusItem = QStandardItem(QString(""))
- nodeStatus = QStandardItem(QString(""))
- networkItem.appendRow([nodeItem, nodeStatus, statusItem, QStandardItem(QString("defaults"))])
+ self.nodeView.appendRow(networkItem, "%s for %s" % (default_tags, network), kind="defaults")
attrs = rspec.get_default_sliver_attributes(network)
for (name, value) in attrs:
tagstring = QString("%s: %s" % (name, value))
- tagItem = QStandardItem(tagstring)
- status = QStandardItem(QString(tag_status['in']))
- nodeStatus = QStandardItem(QString(""))
- nodeItem.appendRow([tagItem, nodeStatus, status, QStandardItem(QString("attribute"))])
+ self.nodeView.appendRow(nodeItem, tagstring, membership=tag_status['in'], kind = "attribute")
for node in sliver_nodes:
- nodeItem = QStandardItem(QString(node))
- statusItem = QStandardItem(QString(node_status['in']))
- nodeStatus = QStandardItem(QString(rspec.get_node_element(node, network).attrib.get("boot_state","")))
- networkItem.appendRow([nodeItem, nodeStatus, statusItem, QStandardItem(QString("node"))])
+ 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",""),
+
+ membership=node_status['in'],
+ kind="node")
attrs = rspec.get_sliver_attributes(node, network)
for (name, value) in attrs:
- tagstring = QString("%s: %s" % (name, value))
- tagItem = QStandardItem(tagstring)
- statusItem = QStandardItem(QString(tag_status['in']))
- nodeStatus = QStandardItem(QString(""))
- nodeItem.appendRow([tagItem, nodeStatus, statusItem, QStandardItem(QString("attribute"))])
+ self.nodeView.appendRow(nodeItem,
+ "%s: %s" % (name, value),
+ membership=tag_status['in'],
+ kind="attribute")
for node in available_nodes:
- nodeItem = QStandardItem(QString(node))
- statusItem = QStandardItem(QString(node_status['out']))
- nodeStatus = QStandardItem(QString(resources.get_node_element(node, network).attrib.get("boot_state","")))
- networkItem.appendRow([nodeItem, nodeStatus, statusItem, QStandardItem(QString("node"))])
+ 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),
+ membership=node_status['out'],
+ kind="node")
self.filterModel.setSourceModel(self.nodeModel)
self.filterModel.setDynamicSortFilter(True)
+ self.filterModel.sort(NAME_COLUMN)
- headers = QStringList() << "Hostname or Tag" << "Node Status" << "Membership Status" << "Kind"
+ headers = QStringList() << "Hostname or Tag" << "Node Type" << "Node Status" << "Membership Status" << "Kind"
self.nodeModel.setHorizontalHeaderLabels(headers)
- self.nodeView.setItemDelegateForColumn(0, self.nodeNameDelegate)
- self.nodeView.setItemDelegateForColumn(1, self.nodeStatusDelegate)
+ self.nodeView.setItemDelegateForColumn(NAME_COLUMN, self.nodeNameDelegate)
+ self.nodeView.setItemDelegateForColumn(NODE_STATUS_COLUMN, self.nodeStatusDelegate)
self.nodeView.setModel(self.filterModel)
self.nodeView.hideColumn(KIND_COLUMN)
self.nodeView.expandAll()
git://git.onelab.eu / sface.git / blobdiff