from PyQt4.QtGui import *
from sfa.util.rspecHelper import RSpec
-from sface.sfahelper import *
from sface.config import config
from sface.sfiprocess import SfiProcess
from sface.screens.sfascreen import SfaScreen
else: model.setData(status_index, QString(node_status['out']))
model.emit(SIGNAL("dataChanged(QModelIndex, QModelIndex)"), hostname_index, hostname_index)
-
+
+ def currentChanged(self, current, previous):
+ model = current.model()
+ hostname_index = model.index(current.row(), 1, current.parent())
+ hostname_data = hostname_index.data().toString()
+ self.emit(SIGNAL('hostnameClicked(QString)'), hostname_data)
+
class NodeNameDelegate(QStyledItemDelegate):
def __init__(self, parent):
painter.restore()
+
class TreeItem:
def __init__(self, data, parent=None):
self.parentItem = parent
self.__initRoot()
def __initRoot(self):
- self.rootItem = TreeItem([QString("Testbed"), QString("Hostname"), QString("Status")])
+ self.rootItem = TreeItem([QString("Testbed"), QString("Hostname"), QString("Status"), QString("Tags")])
def getItem(self, index):
if index.isValid():
return ret
-
class SliceWidget(QWidget):
def __init__(self, parent):
QWidget.__init__(self, parent)
self.network_names = []
self.process = SfiProcess(self)
- slicename = QLabel ("Slice : %s"%(config.getSlice() or "None"),self)
- slicename.setScaledContents(False)
+ self.slicename = QLabel("", self)
+ self.updateSliceName()
+ self.slicename.setScaledContents(False)
searchlabel = QLabel ("Search: ", self)
searchlabel.setScaledContents(False)
searchbox = QLineEdit(self)
searchbox.setAttribute(Qt.WA_MacShowFocusRect, 0)
toplayout = QHBoxLayout()
- toplayout.addWidget(slicename, 0, Qt.AlignLeft)
+ toplayout.addWidget(self.slicename, 0, Qt.AlignLeft)
toplayout.addStretch()
toplayout.addWidget(searchlabel, 0, Qt.AlignRight)
toplayout.addWidget(searchbox, 0, Qt.AlignRight)
self.connect(refresh, SIGNAL('clicked()'), self.refresh)
self.connect(submit, SIGNAL('clicked()'), self.submit)
self.connect(searchbox, SIGNAL('textChanged(QString)'), self.filter)
- self.connect(self.process, SIGNAL('readyReadStandardOutput()'), self.processOutputReady)
- self.connect(self.process, SIGNAL('readyReadStandardError()'), self.processOutputReady)
+ self.connect(self.nodeView, SIGNAL('hostnameClicked(QString)'),
+ self.nodeSelectionChanged)
self.updateView()
- def processOutputReady(self):
- self.parent().logWindow.setText(self.process.readOutput())
-
def submitFinished(self):
self.setStatus("<font color='green'>Slice data submitted.</font>")
QTimer.singleShot(1000, self.refresh)
def refreshFinished(self):
self.setStatus("<font color='green'>Slice data updated.</font>", 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 xml
+ return RSpec(xml)
return None
def setStatus(self, msg, timeout=None):
if self.checkRunningProcess():
return
- rspec = RSpec(self.readSliceRSpec())
+ rspec = self.readSliceRSpec()
no_change = True
all_child = self.nodeModel.rootItem.allChildItems()
self.connect(self.process, SIGNAL('finished()'), self.submitFinished)
self.process.applyRSpec(rspec)
- self.setStatus("Sending slice data (RSpec). This may take some time...")
+ self.setStatus("Sending slice data (RSpec). This will take some time...")
def refresh(self):
self.disconnect(self.process, SIGNAL('finished()'), self.submitFinished)
self.connect(self.process, SIGNAL('finished()'), self.refreshFinished)
- self.connect(self.process, SIGNAL('finished()'), self.parent().rspecUpdated)
self.process.getRSpecFromSM()
- self.setStatus("Updating slice data. This may take some time...")
+ self.setStatus("Updating slice data. This will take some time...")
def updateView(self):
global already_in_nodes
self.network_names = []
self.nodeModel.clear()
- rspec_string = self.readSliceRSpec()
- if not rspec_string:
+ rspec = self.readSliceRSpec()
+ if not rspec:
return None
- networks = rspec_get_networks(rspec_string)
+ networks = rspec.get_network_list()
for network in networks:
self.network_names.append(network)
- networkItem = TreeItem([QString(network), QString(""), QString("")], self.nodeModel.rootItem)
+ attrs = ""
+ for (name, value) in rspec.get_default_sliver_attributes(network):
+ attrs += "%s/%s " % (name, value)
+ networkItem = TreeItem([QString(network), QString(""), QString(""), QString(attrs)], self.nodeModel.rootItem)
- all_nodes = rspec_get_nodes_from_network(rspec_string, network)
- sliver_nodes = rspec_get_sliver_nodes_from_network(rspec_string, network)
+ all_nodes = rspec.get_node_list(network)
+ sliver_nodes = rspec.get_sliver_list(network)
available_nodes = filter(lambda x:x not in sliver_nodes, all_nodes)
already_in_nodes += sliver_nodes
for node in sliver_nodes:
- nodeItem = TreeItem([QString(""), QString("%s" % node), QString(node_status['in'])], networkItem)
+ attrs = ""
+ for (name, value) in rspec.get_sliver_attributes(node, network):
+ attrs += "%s/%s " % (name, value)
+ nodeItem = TreeItem([QString(""), QString("%s" % node), QString(node_status['in']), QString(attrs)], networkItem)
networkItem.appendChild(nodeItem)
for node in available_nodes:
- nodeItem = TreeItem([QString(""), QString(node), QString(node_status['out'])], networkItem)
+ nodeItem = TreeItem([QString(""), QString(node), QString(node_status['out']), QString("")], networkItem)
networkItem.appendChild(nodeItem)
self.nodeModel.rootItem.appendChild(networkItem)
self.nodeView.expandAll()
self.nodeView.resizeColumnToContents(1)
+ def updateSliceName(self):
+ self.slicename.setText("Slice : %s" % (config.getSlice() or "None"))
+
+ def nodeSelectionChanged(self, hostname):
+ self.parent().nodeSelectionChanged(hostname)
class MainScreen(SfaScreen):
def __init__(self, parent):
slice = SliceWidget(self)
self.init(slice, "Main Window", "OneLab Federation GUI")
+
+ def rspecUpdated(self):
+ self.mainwin.rspecWindow.updateView()
+
+ def configurationChanged(self):
+ self.widget.updateSliceName()
+ self.widget.updateView()
+ self.mainwin.rspecWindow.updateView()
+
+ def nodeSelectionChanged(self, hostname):
+ self.mainwin.nodeSelectionChanged(hostname)