Display slice tags

[sface.git] / sface / screens / mainscreen.py

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 5507294..5811617 100644 (file)
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -4,7 +4,6 @@ from PyQt4.QtCore import *
 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
@@ -46,6 +45,13 @@ class NodeView(QTreeView):
             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):
@@ -185,7 +191,7 @@ class NodeModel(QAbstractItemModel):
         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():
@@ -314,14 +320,11 @@ class SliceWidget(QWidget):
         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)
@@ -335,7 +338,7 @@ class SliceWidget(QWidget):
         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):
@@ -360,7 +363,7 @@ class SliceWidget(QWidget):
         if self.checkRunningProcess():
             return
 
-        rspec = RSpec(self.readSliceRSpec())
+        rspec = self.readSliceRSpec()
         
         no_change = True
         all_child = self.nodeModel.rootItem.allChildItems()
@@ -384,7 +387,7 @@ class SliceWidget(QWidget):
         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):
@@ -400,7 +403,7 @@ class SliceWidget(QWidget):
         self.connect(self.process, SIGNAL('finished()'), self.refreshFinished)
 
         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
@@ -408,27 +411,33 @@ class SliceWidget(QWidget):
         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)
@@ -445,6 +454,8 @@ class SliceWidget(QWidget):
     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):
@@ -453,7 +464,13 @@ class MainScreen(SfaScreen):
         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)