From 03b467d0bf99663f894553af50265816bd28027e Mon Sep 17 00:00:00 2001 From: smbaker Date: Tue, 18 Oct 2011 19:11:53 -0700 Subject: [PATCH] changes to work with latest rspec versions, try create at aggregates for protogeni compatibility, add mechanisms for getting version info from sfi into sface --- sface/screens/mainscreen.py | 94 ++++++++++++++++++++++++++++++++++--- sface/sfidata.py | 68 +++++++++++++++++++++++++-- sface/sfiprocess.py | 24 ++++++++-- 3 files changed, 172 insertions(+), 14 deletions(-) diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py index 0452161..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)'), @@ -423,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(": ") @@ -438,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) @@ -470,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_() diff --git a/sface/sfidata.py b/sface/sfidata.py index 5de402a..57a6260 100644 --- a/sface/sfidata.py +++ b/sface/sfidata.py @@ -4,10 +4,63 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * from lxml import etree +from sfa.util.xrn import hrn_to_urn, urn_to_hrn from sfa.util.record import SfaRecord, SliceRecord, AuthorityRecord, UserRecord -from sfa.rspecs.rspec_parser import parse_rspec +from sfa.rspecs.rspec import RSpec from sface.config import config +# SfaceRSpec +# temporary, until these references are tracked down and replaced with +# rspec.version + +class SfaceRSpec(RSpec): + def __init__(self, rspec="", version=None, user_options={}): + RSpec.__init__(self, rspec, version, user_options) + + def get_networks(self): + return self.version.get_networks() + + def get_nodes(self, network): + return self.version.get_nodes(network) + + def get_nodes_with_slivers(self, network): + return self.version.get_nodes_with_slivers(network) + + def get_node_element(self, node, network=None): + return self.version.get_node_element(node, network) + + def get_default_sliver_attributes(self, network): + return self.version.get_default_sliver_attributes(network) + + def get_sliver_attributes(self, node, network): + return self.version.get_sliver_attributes(node, network) + + def remove_slivers(self, slivers, network=None, no_dupes=False): + return self.version.remove_slivers(slivers, network, no_dupes) + + #def add_slivers(self, slivers, network=None, sliver_urn=None, no_dupes=False): + # return self.version.add_slivers(slivers, network, sliver_urn, no_dupes) + + def merge_node(self, source_node_tag, network, no_dupes=False): + return self.version.merge_node(source_node_tag, network, no_dupes) + + # sfav1.add_slivers isn't working for us... + def add_slivers(self, slivers, network=None, sliver_urn=None, no_dupes=False): + # add slice name to network tag + network_tags = self.xml.xpath('//network') + if network_tags: + network_tag = network_tags[0] + network_tag.set('slice', urn_to_hrn(sliver_urn)[0]) + + # add slivers + for sliver in slivers: + node_elem = self.get_node_element(sliver['hostname'], network) + if not node_elem: continue + sliver_elem = etree.SubElement(node_elem, 'sliver') + if 'tags' in sliver: + for tag in sliver['tags']: + etree.SubElement(sliver_elem, tag['tagname']).text = value=tag['value'] + class SfiData: def __init__(self): pass @@ -70,7 +123,7 @@ class SfiData: rspec_file = config.getSliceRSpecFile() if os.path.exists(rspec_file): xml = open(rspec_file).read() - rspec = parse_rspec(xml) + rspec = SfaceRSpec(rspec=xml) #rspec = parse_rspec(xml) self.purgeNonSliceResources(rspec) @@ -81,7 +134,8 @@ class SfiData: rspec_file = config.getResourcesRSpecFile() if os.path.exists(rspec_file): xml = open(rspec_file).read() - return parse_rspec(xml) + rspec = SfaceRSpec(rspec=xml) #rspec= parse_rspec(xml) + return rspec return None def getSliverStatus(self, slice=None): @@ -96,4 +150,12 @@ class SfiData: return None + def getSliceMgrVersion(self): + filename = config.fullpath("slicemgr.version") + + if os.path.exists(filename): + data = open(filename).read() + return pickle.loads(data) + + return None diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py index 3c14718..9287acd 100644 --- a/sface/sfiprocess.py +++ b/sface/sfiprocess.py @@ -175,7 +175,7 @@ class SfiProcess(QObject): def getAuthorityRecord(self): self.getRecord(config.getAuthority(), config.getAuthorityRecordFile()) - def applyRSpec(self, rspec): + def applyRSpec(self, rspec, aggAddr=None, aggPort=None, saveObtained=True): # that's what we pass, like in what we'd like to get requested = config.getSliceRSpecFile() + "_new" # that's what we actually receive @@ -183,9 +183,16 @@ class SfiProcess(QObject): obtained = config.getSliceRSpecFile() rspec.save(requested) args = ["-u", config.getUser(), "-a", config.getAuthority(), - "-r", config.getRegistry(), "-s", config.getSlicemgr(), "create", - "-o", obtained, - config.getSlice(), requested] + "-r", config.getRegistry(), "-s", config.getSlicemgr(), "create"] + + if saveObtained: + args = args + ["-o", obtained] + + if aggAddr: + args = args + ["-a", aggAddr, "-p", str(aggPort)] + + args = args + [config.getSlice(), requested] + self.__init_command(args) self.start() @@ -230,6 +237,15 @@ class SfiProcess(QObject): self.__init_command(args) self.start() + def getSliceMgrVersion(self, filename=None): + if not filename: + filename = config.fullpath("slicemgr.version") + + args = ["-u", config.getUser(), "-a", config.getAuthority(), + "-r", config.getRegistry(), "-s", config.getSlicemgr(), "version", + "-o", filename, "-F", "pickled",] + self.__init_command(args) + self.start() def start(self): self.respones = [] -- 2.43.0