X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=985e3154e05b7d6122fefc89c307099dbd4388a8;hp=43e3e31e006c453526067868367e5da88720ffa0;hb=03b467d0bf99663f894553af50265816bd28027e;hpb=c6329bf47bb381a75a23c34c02071e6f7571ba7b
diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 43e3e31..985e315 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -1,11 +1,11 @@
import datetime
import os
+import urlparse
from PyQt4.QtCore import *
from PyQt4.QtGui import *
#from sfa.util.rspecHelper import RSpec
-from sfa.rspecs.rspec_parser import parse_rspec
from sface.config import config
from sface.sfirenew import RenewWindow
from sface.sfiprocess import SfiProcess
@@ -338,7 +338,7 @@ class SliceWidget(QWidget):
self.connect(refresh, SIGNAL('clicked()'), self.refresh)
self.connect(renew, SIGNAL('clicked()'), self.renew)
- self.connect(submit, SIGNAL('clicked()'), self.submit)
+ self.connect(submit, SIGNAL('clicked()'), self.submit_pg_compat)
self.connect(searchbox, SIGNAL('textChanged(QString)'), self.search)
self.connect(filterbox, SIGNAL('currentIndexChanged(QString)'), self.filter)
self.connect(self.nodeView, SIGNAL('hostnameClicked(QString)'),
@@ -355,21 +355,29 @@ class SliceWidget(QWidget):
else:
self.setStatus("Slice submit failed: %s" % (faultString))
- # no need to do that anymore
- # QTimer.singleShot(1000, self.refresh)
self.updateView()
self.parent().signalAll("rspecUpdated")
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()
+ faultString = self.process.getFaultString()
+ if not faultString:
+ self.setStatus("Refreshing slice RSpec.")
+ self.connect(self.process, SIGNAL('finished()'), self.refreshRSpecFinished)
+ self.process.retrieveRspec()
+ else:
+ self.setStatus("Resources refresh failed: %s" % (faultString))
def refreshRSpecFinished(self):
self.disconnect(self.process, SIGNAL('finished()'), self.refreshRSpecFinished)
- self.setStatus("Slice data refreshed.", timeout=5000)
+
+ faultString = self.process.getFaultString()
+ if not faultString:
+ self.setStatus("Slice data refreshed.", timeout=5000)
+ else:
+ self.setStatus("Slice refresh failed: %s" % (faultString))
+
self.updateView()
self.parent().signalAll("rspecUpdated")
@@ -415,11 +423,11 @@ class SliceWidget(QWidget):
print "Error: Failed to find %s in resources rspec" % hostname
else:
rspec.merge_node(resource_node, testbed)
- rspec.add_slivers(str(hostname), testbed)
+ rspec.add_slivers([{"hostname": str(hostname)}], testbed)
change = True
elif status == node_status['remove']:
print "Remove hostname: %s" % hostname
- rspec.remove_slivers(str(hostname), testbed)
+ rspec.remove_slivers([{"hostname": str(hostname)}], testbed)
change = True
elif depth == 3: # Tag
tag, value = self.itemText(item).split(": ")
@@ -430,14 +438,14 @@ class SliceWidget(QWidget):
testbed = self.itemText(item.parent().parent())
if status == tag_status['add']:
print "Add tag to (%s, %s): %s/%s " % (testbed, node, tag, value)
- if node.startsWith(default_tags):
+ if node.startswith(default_tags):
rspec.add_default_sliver_attribute(tag, value, testbed)
else:
rspec.add_sliver_attribute(node, tag, value, testbed)
change = True
elif status == tag_status['remove']:
print "Remove tag from (%s, %s): %s/%s " % (testbed, node, tag, value)
- if node.startsWith(default_tags):
+ if node.startswith(default_tags):
rspec.remove_default_sliver_attribute(tag, value, testbed)
else:
rspec.remove_sliver_attribute(node, tag, value, testbed)
@@ -462,11 +470,91 @@ class SliceWidget(QWidget):
self.setStatus("No change in slice data. Not submitting!", timeout=3000)
return
- self.connect(self.process, SIGNAL('finished()'), self.submitFinished)
+ # Several aggregates have issues with the section in the
+ # rspec, so make sure it's not there.
+ stats_elems = rspec.xml.xpath("//statistics")
+ if len(stats_elems)>0:
+ stats_elem = stats_elems[0]
+ parent = stats_elem.xpath("..")[0]
+ parent.remove(stats_elem)
+ self.connect(self.process, SIGNAL('finished()'), self.submitFinished)
self.process.applyRSpec(rspec)
self.setStatus("Sending slice data (RSpec). This will take some time...")
+ # ProtoGENI-compatible submit. Contact each aggregate individually rather
+ # than using the slice manager.
+ # This code will be removed when ProtoGENI slicemanager is patched.
+ def submit_pg_compat(self):
+ if self.checkRunningProcess():
+ return
+
+ rspec = SfiData().getSliceRSpec()
+ resources = SfiData().getResourcesRSpec()
+ change = self.process_subtree(rspec, resources, self.nodeModel.invisibleRootItem())
+
+ if not change:
+ self.setStatus("No change in slice data. Not submitting!", timeout=3000)
+ return
+
+ # Several aggregates have issues with the section in the
+ # rspec, so make sure it's not there.
+ stats_elems = rspec.xml.xpath("//statistics")
+ if len(stats_elems)>0:
+ stats_elem = stats_elems[0]
+ parent = stats_elem.xpath("..")[0]
+ parent.remove(stats_elem)
+
+ self.submit_aggSuccessCount = 0
+ self.submit_aggFailCount = 0
+ self.submit_rspec = rspec
+ self.connect(self.process, SIGNAL('finished()'), self.getVersionFinished)
+ self.process.getSliceMgrVersion()
+ self.setStatus("Getting aggregate directory...")
+
+ def getVersionFinished(self):
+ self.disconnect(self.process, SIGNAL('finished()'), self.getVersionFinished)
+
+ faultString = self.process.getFaultString()
+ if not faultString:
+ peers = SfiData().getSliceMgrVersion()["peers"]
+ self.submit_aggs = [(key, peers[key]) for key in peers.keys()]
+ str = "Successfully retrieved agg list. "
+ self.submitNextAgg(str)
+ else:
+ self.setStatus("getSliceMgrVersion failed: %s" % (faultString))
+
+ def submitNextAgg(self, statusStr=""):
+ if (self.submit_aggs == []):
+ self.setStatus(statusStr + "Finished submitting. %d/%d aggs succeeded." %
+ (self.submit_aggSuccessCount,self.submit_aggSuccessCount+self.submit_aggFailCount))
+ QTimer.singleShot(2500, self.refresh)
+ return
+
+ self.submit_agg = self.submit_aggs.pop()
+
+ urlParts = urlparse.urlsplit(self.submit_agg[1])
+ amPort = urlParts.port
+ amAddr = urlParts.hostname+urlParts.path
+
+ self.setStatus(statusStr + "Submitting to %s..." % (self.submit_agg[0]))
+
+ self.connect(self.process, SIGNAL('finished()'), self.submitNextAggFinished)
+ self.process.applyRSpec(self.submit_rspec, aggAddr = amAddr, aggPort = amPort, saveObtained=False)
+
+ def submitNextAggFinished(self):
+ self.disconnect(self.process, SIGNAL('finished()'), self.submitNextAggFinished)
+
+ faultString = self.process.getFaultString()
+ if not faultString:
+ self.submit_aggSuccessCount+=1
+ str = "Succeeded on %s. " % (self.submit_agg[0])
+ else:
+ self.submit_aggFailCount+=1
+ str = "Failed on %s. " % (self.submit_agg[0]) # , faultString)
+
+ self.submitNextAgg(str)
+
def renew(self):
dlg = RenewWindow(parent=self)
dlg.exec_()