X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;fp=sface%2Fscreens%2Fmainscreen.py;h=74d3abbd711181c1ccb58193ee9a969f761e60fb;hp=f7171cb1d8723722dddfa47d22d7ccb4652c8f44;hb=6952bb5166aeeb4c6e76292bee73267685f28013;hpb=d7a2606ffd441335cd25b0185cb077c6cb91e795;ds=sidebyside
diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index f7171cb..74d3abb 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -12,6 +12,8 @@ from sface.sfiprocess import SfiProcess
from sface.screens.sfascreen import SfaScreen
from sface.sfidata import SfiData
+from sface.clislicemgr import ClientSliceManager
+
already_in_nodes = []
node_status = { "in": "Already Selected",
@@ -483,9 +485,6 @@ class SliceWidget(QWidget):
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
@@ -498,92 +497,13 @@ class SliceWidget(QWidget):
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()]
- self.delete_aggs = [(key, peers[key]) for key in peers.keys() if key.startswith("emulab")]
- str = "Successfully retrieved agg list. "
- #self.submitNextAgg(str)
- self.deleteNextAgg(str)
- else:
- self.setStatus("getSliceMgrVersion failed: %s" % (faultString))
-
- def deleteNextAgg(self, statusStr=""):
- if (self.delete_aggs == []):
- self.submitNextAgg(statusStr)
- return
-
- self.delete_agg = self.delete_aggs.pop()
-
- urlParts = urlparse.urlsplit(self.delete_agg[1])
- amPort = urlParts.port
- amAddr = urlParts.hostname+urlParts.path
-
- self.setStatus(statusStr + "Deleting slivers on %s..." % (self.delete_agg[0]))
-
- self.connect(self.process, SIGNAL('finished()'), self.deleteNextAggFinished)
- self.process.deleteSlivers(aggAddr = amAddr, aggPort = amPort)
-
- 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 deleteNextAggFinished(self):
- self.disconnect(self.process, SIGNAL('finished()'), self.deleteNextAggFinished)
-
- faultString = self.process.getFaultString()
- if not faultString:
- str = "Succeeded deleteslivers on %s. " % (self.delete_agg[0])
- else:
- str = "Failed deleteslivers on %s. " % (self.delete_agg[0]) # , faultString)
+ dlg = ClientSliceManager(self)
+ dlg.submit_pg_compat(rspec)
+ dlg.exec_()
- self.deleteNextAgg(str)
+ self.setStatus("Finished submitting. %d/%d aggs succeeded." %
+ (dlg.submit_aggSuccessCount,dlg.submit_aggSuccessCount+dlg.submit_aggFailCount))
+ QTimer.singleShot(2500, self.refresh)
def renew(self):
dlg = RenewWindow(parent=self)