X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=92cd687edab0e1accd87d6ab7a5fe67801810453;hp=8316581aa9848f23c21c19e273ee34b028fc2108;hb=842f2526ce06bdfc797917a43f1927e52a05fc67;hpb=223af3cec299c74f5d471a97fbae777e5ecf1fe5

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 8316581..92cd687 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -3,7 +3,8 @@ import os
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from sfa.util.rspecHelper import RSpec
+#from sfa.util.rspecHelper import RSpec
+from sfa.rspecs.rspec_parser import parse_rspec
 from sface.config import config
 from sface.sfiprocess import SfiProcess
 from sface.screens.sfascreen import SfaScreen
@@ -160,7 +161,7 @@ class NodeNameDelegate(QStyledItemDelegate):
 
         if itemType(index) == "node":
             if status_data == node_status['in']: # already in the slice
-                painter.fillPath(path, QColor("cyan"))
+                painter.fillPath(path, QColor.fromRgb(0, 250, 250))
                 painter.setPen(QColor.fromRgb(0, 0, 0))
                 painter.drawText(option.rect, 0, QString(data))
 
@@ -180,7 +181,7 @@ class NodeNameDelegate(QStyledItemDelegate):
 
         else:
             if status_data == tag_status['in']: # already in the slice
-                painter.fillPath(path, QColor("cyan"))
+                painter.fillPath(path, QColor.fromRgb(0, 250, 250))
                 painter.setPen(QColor.fromRgb(0, 0, 0))
                 painter.drawText(option.rect, 0, QString(data))
 
@@ -265,7 +266,7 @@ class SliceWidget(QWidget):
         rspec_file = config.getSliceRSpecFile()
         if os.path.exists(rspec_file):
             xml = open(rspec_file).read()
-            return RSpec(xml)
+            return parse_rspec(xml)
         return None
 
     def setStatus(self, msg, timeout=None):
@@ -306,11 +307,11 @@ class SliceWidget(QWidget):
             status = self.itemStatus(item)
             if status == node_status['add']:
                 print "Add hostname: %s" % hostname
-                rspec.add_sliver(hostname, testbed)
+                rspec.add_slivers(hostname, testbed)
                 change = True
             elif status == node_status['remove']:
                 print "Remove hostname: %s" % hostname
-                rspec.remove_sliver(hostname, testbed)
+                rspec.remove_slivers(hostname, testbed)
                 change = True
         elif depth == 3: # Tag
             tag, value = self.itemText(item).split(": ")
@@ -385,13 +386,16 @@ class SliceWidget(QWidget):
             return None
 
         rootItem = self.nodeModel.invisibleRootItem()
-        networks = sorted(rspec.get_network_list())
+        #networks = sorted(rspec.get_network_list())
+        networks = rspec.get_networks()
         for network in networks:
             self.network_names.append(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)
+            #all_nodes = rspec.get_node_list(network)
+            #sliver_nodes = rspec.get_sliver_list(network)
+            all_nodes = rspec.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))
             msg = "%s Nodes\t%s Selected" % (len(all_nodes), len(sliver_nodes))
@@ -451,7 +455,7 @@ class MainScreen(SfaScreen):
         SfaScreen.__init__(self, parent)
 
         slice = SliceWidget(self)
-        self.init(slice, "Main Window", "OneLab Federation GUI")
+        self.init(slice, "Main Window", "OneLab SFA crawler")
 
     def rspecUpdated(self):
         self.mainwin.rspecWindow.updateView()