Display slice tags
[sface.git] / sface / screens / mainscreen.py
index d43bd62..5811617 100644 (file)
@@ -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,8 +45,14 @@ 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):
     def __init__(self, parent):
@@ -99,6 +104,7 @@ class NodeNameDelegate(QStyledItemDelegate):
 
         painter.restore()
 
+
 class TreeItem:
     def __init__(self, data, parent=None):
         self.parentItem = parent
@@ -112,6 +118,15 @@ class TreeItem:
         del self.childItems
         self.childItems = []
 
+    def allChildItems(self):
+        all = []
+        for c in self.childItems:
+            all.append(c)
+            if c.childItems:
+                for cc in c.childItems:
+                    all.append(cc)
+        return all
+
     def appendChild(self, child):
         self.childItems.append(child)
 
@@ -166,7 +181,6 @@ class TreeItem:
         return self.parentItem
 
 
-
 class NodeModel(QAbstractItemModel):
     def __init__(self, parent):
         QAbstractItemModel.__init__(self, parent)
@@ -177,12 +191,13 @@ 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():
             item = index.internalPointer()
-            if item: return item
+            if isinstance(item, TreeItem):
+                return item
         return self.rootItem
 
     def headerData(self, section, orientation, role):
@@ -258,22 +273,23 @@ class NodeModel(QAbstractItemModel):
         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)
@@ -304,8 +320,35 @@ 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.nodeView, SIGNAL('hostnameClicked(QString)'),
+                     self.nodeSelectionChanged)
+
+        self.updateView()
 
+    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 RSpec(xml)
+        return None
+
+    def setStatus(self, msg, timeout=None):
+        self.parent().setStatus(msg, timeout)
+
+    def checkRunningProcess(self):
+        if self.process.isRunning():
+            self.setStatus("<font color='red'>There is already a process running. Please wait.</font>")
+            return True
+        return False
 
     def filter(self, filter_string):
         # for hierarchical models QSortFilterProxyModel applies the
@@ -317,30 +360,50 @@ class SliceWidget(QWidget):
         self.filterModel.setFilterRegExp(QRegExp('|'.join(filters)))
 
     def submit(self):
-        self.parent().setStatus("TODO: Submit not implemented yet!", 3000)
+        if self.checkRunningProcess():
+            return
+
+        rspec = self.readSliceRSpec()
+        
+        no_change = True
+        all_child = self.nodeModel.rootItem.allChildItems()
+        for c in all_child:
+            testbed, hostname, status = c.itemData
+            if isinstance(status, QVariant):
+                status = status.toString()
+
+            if status == node_status['add']:
+                rspec.add_sliver(hostname)
+                no_change = False
+            elif str(status) == node_status['remove']:
+                rspec.remove_sliver(hostname)
+                no_change = False
+
+        if no_change:
+            self.setStatus("<font color=red>No change in slice data. Not submitting!</font>", timeout=3000)
+            return
+
+        self.disconnect(self.process, SIGNAL('finished()'), self.refreshFinished)
+        self.connect(self.process, SIGNAL('finished()'), self.submitFinished)
+
+        self.process.applyRSpec(rspec)
+        self.setStatus("Sending slice data (RSpec). This will take some time...")
         
-    def readSliceRSpec(self):
-        rspec_file = config.getSliceRSpecFile()
-        if os.path.exists(rspec_file):
-            xml = open(rspec_file).read()
-            return xml
-        return None
 
     def refresh(self):
         if not config.getSlice():
-            self.parent().setStatus("<font color='red'>Slice not set yet!</font>", timeout=None)
+            self.setStatus("<font color='red'>Slice not set yet!</font>")
             return
 
-        self.process = SfiProcess()
-        outfile = self.process.getRSpecFromSM()
-        self.parent().setStatus("Updating slice data. This may take some time...", timeout=None)
-        
+        if self.process.isRunning():
+            self.setStatus("<font color='red'>There is already a process running. Please wait.</font>")
+            return
+
+        self.disconnect(self.process, SIGNAL('finished()'), self.submitFinished)
         self.connect(self.process, SIGNAL('finished()'), self.refreshFinished)
 
-    def refreshFinished(self):
-        del self.process
-        self.parent().setStatus("<font color='green'>Slice data updated.</font>", timeout=5000)
-        self.updateView()
+        self.process.getRSpecFromSM()
+        self.setStatus("Updating slice data. This will take some time...")
 
     def updateView(self):
         global already_in_nodes
@@ -348,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)
@@ -382,6 +451,11 @@ class SliceWidget(QWidget):
         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):
@@ -389,3 +463,14 @@ 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)