X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=74d3abbd711181c1ccb58193ee9a969f761e60fb;hp=985e3154e05b7d6122fefc89c307099dbd4388a8;hb=6952bb5166aeeb4c6e76292bee73267685f28013;hpb=03b467d0bf99663f894553af50265816bd28027e diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py index 985e315..74d3abb 100644 --- a/sface/screens/mainscreen.py +++ b/sface/screens/mainscreen.py @@ -12,6 +12,8 @@ from sface.sfiprocess import SfiProcess from sface.screens.sfascreen import SfaScreen from sface.sfidata import SfiData +from sface.clislicemgr import ClientSliceManager + already_in_nodes = [] node_status = { "in": "Already Selected", @@ -32,9 +34,10 @@ default_tags = "Default tags" 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 @@ -102,6 +105,17 @@ class NodeView(QTreeView): 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: @@ -125,23 +139,12 @@ class NodeView(QTreeView): 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") @@ -482,9 +485,6 @@ class SliceWidget(QWidget): 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 @@ -497,63 +497,13 @@ class SliceWidget(QWidget): self.setStatus("No change in slice data. Not submitting!", timeout=3000) return - # Several aggregates have issues with the 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()] - str = "Successfully retrieved agg list. " - self.submitNextAgg(str) - else: - self.setStatus("getSliceMgrVersion failed: %s" % (faultString)) - - def submitNextAgg(self, statusStr=""): - if (self.submit_aggs == []): - self.setStatus(statusStr + "Finished submitting. %d/%d aggs succeeded." % - (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 = "Succeeded on %s. " % (self.submit_agg[0]) - else: - self.submit_aggFailCount+=1 - str = "Failed on %s. " % (self.submit_agg[0]) # , faultString) + dlg = ClientSliceManager(self) + dlg.submit_pg_compat(rspec) + dlg.exec_() - self.submitNextAgg(str) + self.setStatus("Finished submitting. %d/%d aggs succeeded." % + (dlg.submit_aggSuccessCount,dlg.submit_aggSuccessCount+dlg.submit_aggFailCount)) + QTimer.singleShot(2500, self.refresh) def renew(self): dlg = RenewWindow(parent=self) @@ -602,53 +552,55 @@ class SliceWidget(QWidget): 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()