X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=c2a2118c2a4dacc701596089eb2d0f6570310fa7;hp=96a9b06b4afc419337ab0363f18b7e3680acc99a;hb=dc5a4a16b0819bc27efd1f77d632a76463db82c0;hpb=16876384173c217448f977faac6daa95702aea58

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 96a9b06..c2a2118 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 = []
 
@@ -366,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("<font color='green'>Slice data submitted.</font>")
@@ -377,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("<font color='green'>Slice data refreshed.</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 parse_rspec(xml)
-        return None
-
     def setStatus(self, msg, timeout=None):
         self.parent().setStatus(msg, timeout)
 
@@ -412,7 +416,7 @@ class SliceWidget(QWidget):
         return 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
 
@@ -424,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)
@@ -454,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
@@ -463,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("<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)
@@ -489,11 +500,10 @@ class SliceWidget(QWidget):
             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)
+        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
@@ -501,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))
@@ -553,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)