X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=22c321f082d88db942fab8bf36b0b540a4f6a103;hp=52981bf544e364715ab8c72f34fdd162da7fd8f3;hb=021a306d360da13a927d1c1d5811a205b09319b8;hpb=f1a3e03c28781151f333c59a59f0cd0fe068ebd6
diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 52981bf..22c321f 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -10,6 +10,7 @@ from sface.config import config
from sface.sfirenew import RenewWindow
from sface.sfiprocess import SfiProcess
from sface.screens.sfascreen import SfaScreen
+from sface.sfidata import SfiData
already_in_nodes = []
@@ -54,7 +55,16 @@ class NodeView(QTreeView):
self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
self.setToolTip("Double click on a row to change its status. Right click on a host to add a tag.")
+ def keyPressEvent(self, event):
+ if (event.key() == Qt.Key_Space):
+ self.toggleSelection()
+ else:
+ QTreeView.keyPressEvent(self, event)
+
def mouseDoubleClickEvent(self, event):
+ self.toggleSelection()
+
+ def toggleSelection(self):
index = self.currentIndex()
model = index.model()
status_index = model.index(index.row(), MEMBERSHIP_STATUS_COLUMN, index.parent())
@@ -357,6 +367,8 @@ class SliceWidget(QWidget):
self.updateView()
def submitFinished(self):
+ self.disconnect(self.process, SIGNAL('finished()'), self.submitFinished)
+
faultString = self.process.getFaultString()
if not faultString:
self.setStatus("Slice data submitted.")
@@ -368,18 +380,19 @@ class SliceWidget(QWidget):
self.updateView()
self.parent().signalAll("rspecUpdated")
- def refreshFinished(self):
+ 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()
+
+ def refreshRSpecFinished(self):
+ self.disconnect(self.process, SIGNAL('finished()'), self.refreshRSpecFinished)
self.setStatus("Slice data refreshed.", timeout=5000)
self.updateView()
self.parent().signalAll("rspecUpdated")
- def readSliceRSpec(self):
- rspec_file = config.getSliceRSpecFile()
- if os.path.exists(rspec_file):
- xml = open(rspec_file).read()
- return parse_rspec(xml)
- return None
-
def setStatus(self, msg, timeout=None):
self.parent().setStatus(msg, timeout)
@@ -397,13 +410,13 @@ class SliceWidget(QWidget):
def itemStatus(self, item):
statusItem = item.parent().child(item.row(), MEMBERSHIP_STATUS_COLUMN)
- return statusItem.data(Qt.DisplayRole).toString()
+ return str(statusItem.data(Qt.DisplayRole).toString())
def itemText(self, item):
- return item.data(Qt.DisplayRole).toString()
+ return str(item.data(Qt.DisplayRole).toString())
# Recursively walk the tree, making changes to the RSpec
- def process_subtree(self, rspec, item, depth = 0):
+ def process_subtree(self, rspec, resources, item, depth = 0):
change = False
model = self.nodeModel
@@ -415,8 +428,15 @@ class SliceWidget(QWidget):
status = self.itemStatus(item)
if status == node_status['add']:
print "Add hostname: %s" % hostname
- rspec.add_slivers(str(hostname), testbed)
- change = True
+
+ resource_node = resources.get_node_element(hostname)
+
+ if resource_node==None:
+ print "Error: Failed to find %s in resources rspec" % hostname
+ else:
+ rspec.merge_node(resource_node, testbed)
+ rspec.add_slivers(str(hostname), testbed)
+ change = True
elif status == node_status['remove']:
print "Remove hostname: %s" % hostname
rspec.remove_slivers(str(hostname), testbed)
@@ -445,7 +465,7 @@ class SliceWidget(QWidget):
children = item.rowCount()
for row in range(0, children):
- status = self.process_subtree(rspec, item.child(row), depth + 1)
+ status = self.process_subtree(rspec, resources, item.child(row), depth + 1)
change = change or status
return change
@@ -454,14 +474,14 @@ class SliceWidget(QWidget):
if self.checkRunningProcess():
return
- rspec = self.readSliceRSpec()
- change = self.process_subtree(rspec, self.nodeModel.invisibleRootItem())
+ rspec = SfiData().getSliceRSpec()
+ resources = SfiData().getResourcesRSpec()
+ change = self.process_subtree(rspec, resources, self.nodeModel.invisibleRootItem())
if not change:
self.setStatus("No change in slice data. Not submitting!", timeout=3000)
return
- self.disconnect(self.process, SIGNAL('finished()'), self.refreshFinished)
self.connect(self.process, SIGNAL('finished()'), self.submitFinished)
self.process.applyRSpec(rspec)
@@ -480,11 +500,10 @@ class SliceWidget(QWidget):
self.setStatus("There is already a process running. Please wait.")
return
- self.disconnect(self.process, SIGNAL('finished()'), self.submitFinished)
- self.connect(self.process, SIGNAL('finished()'), self.refreshFinished)
+ self.connect(self.process, SIGNAL('finished()'), self.refreshResourcesFinished)
- self.process.retrieveRspec()
- self.setStatus("Refreshing slice data. This will take some time...")
+ self.process.retrieveResources()
+ self.setStatus("Refreshing resources. This will take some time...")
def updateView(self):
global already_in_nodes
@@ -492,20 +511,27 @@ class SliceWidget(QWidget):
self.network_names = []
self.nodeModel.clear()
- rspec = self.readSliceRSpec()
+ rspec = SfiData().getSliceRSpec()
if not rspec:
return None
+ resources = SfiData().getResourcesRSpec()
+ if not resources:
+ return None
+
rootItem = self.nodeModel.invisibleRootItem()
- #networks = sorted(rspec.get_network_list())
networks = rspec.get_networks()
+
+ for network in resources.get_networks():
+ if not network in networks:
+ networks.append(network)
+
for network in networks:
self.network_names.append(network)
- #all_nodes = rspec.get_node_list(network)
- #sliver_nodes = rspec.get_sliver_list(network)
- all_nodes = rspec.get_nodes(network)
+ all_nodes = resources.get_nodes(network)
sliver_nodes = rspec.get_nodes_with_slivers(network)
+
available_nodes = [ node for node in all_nodes if node not in sliver_nodes ]
networkItem = QStandardItem(QString(network))
@@ -544,7 +570,7 @@ class SliceWidget(QWidget):
for node in available_nodes:
nodeItem = QStandardItem(QString(node))
statusItem = QStandardItem(QString(node_status['out']))
- nodeStatus = QStandardItem(QString(rspec.get_node_element(node, network).attrib.get("boot_state","")))
+ nodeStatus = QStandardItem(QString(resources.get_node_element(node, network).attrib.get("boot_state","")))
networkItem.appendRow([nodeItem, nodeStatus, statusItem, QStandardItem(QString("node"))])
self.filterModel.setSourceModel(self.nodeModel)