X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2FrspecHelper.py;h=deaa746ae6ee333f1bec134a397127498bbeb554;hb=4bb7dbe3ccaccb337b57ec1da224556b35a218b9;hp=69457b2e9bd2acac6df4cee2aab8d758d56ea8c0;hpb=b625e2bd933f5e2a4faf4513c1be0069d88e7521;p=sfa.git diff --git a/sfa/util/rspecHelper.py b/sfa/util/rspecHelper.py index 69457b2e..deaa746a 100755 --- a/sfa/util/rspecHelper.py +++ b/sfa/util/rspecHelper.py @@ -1,37 +1,133 @@ #! /usr/bin/env python import sys + +from copy import deepcopy from lxml import etree from StringIO import StringIO from optparse import OptionParser +from sfa.util.faults import InvalidRSpec +from sfa.util.sfalogging import logger + +def merge_rspecs(rspecs): + """ + Merge merge a list of RSpecs into 1 RSpec, and return the result. + rspecs must be a valid RSpec string or list of RSpec strings. + """ + if not rspecs or not isinstance(rspecs, list): + return rspecs + + # ugly hack to avoid sending the same info twice, when the call graph has dags + known_networks={} + def register_network (network): + try: + known_networks[network.get('name')]=True + except: + logger.error("merge_rspecs: cannot register network with no name in rspec") + pass + def is_registered_network (network): + try: + return network.get('name') in known_networks + except: + logger.error("merge_rspecs: cannot retrieve network with no name in rspec") + return False + + # the resulting tree + rspec = None + for input_rspec in rspecs: + # ignore empty strings as returned with used call_ids + if not input_rspec: continue + try: + tree = etree.parse(StringIO(input_rspec)) + except etree.XMLSyntaxError: + # consider failing silently here + logger.log_exc("merge_rspecs, parse error") + message = str(sys.exc_info()[1]) + ' with ' + input_rspec + raise InvalidRSpec(message) + + root = tree.getroot() + if not root.get("type") in ["SFA"]: + logger.error("merge_rspecs: unexpected type for rspec root, %s"%root.get('type')) + continue + if rspec == None: + # we scan the first input, register all networks + # in addition we remove duplicates - needed until everyone runs 1.0-10 + rspec = root + for network in root.iterfind("./network"): + if not is_registered_network(network): + register_network(network) + else: + # duplicate in the first input - trash it + root.remove(network) + else: + for network in root.iterfind("./network"): + if not is_registered_network(network): + rspec.append(deepcopy(network)) + register_network(network) + for request in root.iterfind("./request"): + rspec.append(deepcopy(request)) + return etree.tostring(rspec, xml_declaration=True, pretty_print=True) + class RSpec: def __init__(self, xml): parser = etree.XMLParser(remove_blank_text=True) tree = etree.parse(StringIO(xml), parser) self.rspec = tree.getroot() - def get_node_element(self, hostname): - names = self.rspec.iterfind("./network/site/node/hostname") + # If there is only one network in the rspec, make it the default + self.network = None + networks = self.get_network_list() + if len(networks) == 1: + self.network = networks[0] + + # Thierry : need this to locate hostname even if several networks + def get_node_element(self, hostname, network=None): + if network == None and self.network: + network = self.network + if network != None: + names = self.rspec.iterfind("./network[@name='%s']/site/node/hostname" % network) + else: + names = self.rspec.iterfind("./network/site/node/hostname") for name in names: if name.text == hostname: return name.getparent() return None - def get_node_list(self): - result = self.rspec.xpath("./network/site/node/hostname/text()") + # Thierry : need this to return all nodes in all networks + def get_node_list(self, network=None): + if network == None and self.network: + network = self.network + if network != None: + return self.rspec.xpath("./network[@name='%s']/site/node/hostname/text()" % network) + else: + return self.rspec.xpath("./network/site/node/hostname/text()") + + def get_network_list(self): + return self.rspec.xpath("./network[@name]/@name") + + def get_sliver_list(self, network=None): + if network == None: + network = self.network + result = self.rspec.xpath("./network[@name='%s']/site/node[sliver]/hostname/text()" % network) return result - def get_sliver_list(self): - result = self.rspec.xpath("./network/site/node[sliver]/hostname/text()") + def get_available_node_list(self, network=None): + if network == None: + network = self.network + result = self.rspec.xpath("./network[@name='%s']/site/node[not(sliver)]/hostname/text()" % network) return result - def add_sliver(self, hostname): - node = self.get_node_element(hostname) + def add_sliver(self, hostname, network=None): + if network == None: + network = self.network + node = self.get_node_element(hostname, network) etree.SubElement(node, "sliver") - def remove_sliver(self, hostname): - node = self.get_node_element(hostname) + def remove_sliver(self, hostname, network=None): + if network == None: + network = self.network + node = self.get_node_element(hostname, network) node.remove(node.find("sliver")) def attributes_list(self, elem): @@ -41,12 +137,16 @@ class RSpec: opts.append((e.tag, e.text)) return opts - def get_default_sliver_attributes(self): - defaults = self.rspec.find(".//sliver_defaults") + def get_default_sliver_attributes(self, network=None): + if network == None: + network = self.network + defaults = self.rspec.find("./network[@name='%s']/sliver_defaults" % network) return self.attributes_list(defaults) - def get_sliver_attributes(self, hostname): - node = self.get_node_element(hostname) + def get_sliver_attributes(self, hostname, network=None): + if network == None: + network = self.network + node = self.get_node_element(hostname, network) sliver = node.find("sliver") return self.attributes_list(sliver) @@ -54,12 +154,20 @@ class RSpec: opt = etree.SubElement(elem, name) opt.text = value - def add_default_sliver_attribute(self, name, value): - defaults = self.rspec.find(".//sliver_defaults") + def add_default_sliver_attribute(self, name, value, network=None): + if network == None: + network = self.network + defaults = self.rspec.find("./network[@name='%s']/sliver_defaults" % network) + if defaults is None: + defaults = etree.Element("sliver_defaults") + network = self.rspec.find("./network[@name='%s']" % network) + network.insert(0, defaults) self.add_attribute(defaults, name, value) - def add_sliver_attribute(self, hostname, name, value): - node = self.get_node_element(hostname) + def add_sliver_attribute(self, hostname, name, value, network=None): + if network == None: + network = self.network + node = self.get_node_element(hostname, network) sliver = node.find("sliver") self.add_attribute(sliver, name, value) @@ -71,20 +179,99 @@ class RSpec: if opt.text == value: elem.remove(opt) - def remove_default_sliver_attribute(self, name, value): - defaults = self.rspec.find(".//sliver_defaults") + def remove_default_sliver_attribute(self, name, value, network=None): + if network == None: + network = self.network + defaults = self.rspec.find("./network[@name='%s']/sliver_defaults" % network) self.remove_attribute(defaults, name, value) - def remove_sliver_attribute(self, hostname, name, value): - node = self.get_node_element(hostname) + def remove_sliver_attribute(self, hostname, name, value, network=None): + if network == None: + network = self.network + node = self.get_node_element(hostname, network) sliver = node.find("sliver") self.remove_attribute(sliver, name, value) - def add_vlink(self, fromhost, tohost): - pass + def get_site_nodes(self, siteid, network=None): + if network == None: + network = self.network + query = './network[@name="%s"]/site[@id="%s"]/node/hostname/text()' % (network, siteid) + result = self.rspec.xpath(query) + return result + + def get_link_list(self, network=None): + if network == None: + network = self.network + linklist = [] + links = self.rspec.iterfind("./network[@name='%s']/link" % network) + for link in links: + (end1, end2) = link.get("endpoints").split() + name = link.find("description") + linklist.append((name.text, + self.get_site_nodes(end1, network), + self.get_site_nodes(end2, network))) + return linklist + + def get_vlink_list(self, network=None): + if network == None: + network = self.network + vlinklist = [] + vlinks = self.rspec.iterfind("./network[@name='%s']//vlink" % network) + for vlink in vlinks: + endpoints = vlink.get("endpoints") + (end1, end2) = endpoints.split() + query = './network[@name="%s"]//node[@id="%s"]/hostname/text()' % network + node1 = self.rspec.xpath(query % end1)[0] + node2 = self.rspec.xpath(query % end2)[0] + desc = "%s <--> %s" % (node1, node2) + kbps = vlink.find("kbps") + vlinklist.append((endpoints, desc, kbps.text)) + return vlinklist + + def query_links(self, fromnode, tonode, network=None): + if network == None: + network = self.network + fromsite = fromnode.getparent() + tosite = tonode.getparent() + fromid = fromsite.get("id") + toid = tosite.get("id") + + query = "./network[@name='%s']/link[@endpoints = '%s %s']" % (network, fromid, toid) + results = self.rspec.xpath(query) + if results == None: + query = "./network[@name='%s']/link[@endpoints = '%s %s']" % (network, toid, fromid) + results = self.rspec.xpath(query) + return results + + def query_vlinks(self, endpoints, network=None): + if network == None: + network = self.network + query = "./network[@name='%s']//vlink[@endpoints = '%s']" % (network, endpoints) + results = self.rspec.xpath(query) + return results + + + def add_vlink(self, fromhost, tohost, kbps, network=None): + if network == None: + network = self.network + fromnode = self.get_node_element(fromhost, network) + tonode = self.get_node_element(tohost, network) + links = self.query_links(fromnode, tonode, network) + + for link in links: + vlink = etree.SubElement(link, "vlink") + fromid = fromnode.get("id") + toid = tonode.get("id") + vlink.set("endpoints", "%s %s" % (fromid, toid)) + self.add_attribute(vlink, "kbps", kbps) + - def remove_vlink(self, fromhost, tohost): - pass + def remove_vlink(self, endpoints, network=None): + if network == None: + network = self.network + vlinks = self.query_vlinks(endpoints, network) + for vlink in vlinks: + vlink.getparent().remove(vlink) def toxml(self): return etree.tostring(self.rspec, pretty_print=True, @@ -122,87 +309,86 @@ class Commands: help="show sliver attributes") def add_attribute_options(self): - self.parser.add_option("", "--capabilities", + self.parser.add_option("", "--capabilities", action="append", metavar="", help="Vserver bcapabilities") self.parser.add_option("", "--codemux", action="append", metavar="", help="Demux HTTP between slices using " + "localhost ports") - self.parser.add_option("", "--cpu-pct", + self.parser.add_option("", "--cpu-pct", action="append", metavar="", help="Reserved CPU percent (e.g., 25)") - self.parser.add_option("", "--cpu-share", + self.parser.add_option("", "--cpu-share", action="append", metavar="", help="Number of CPU shares (e.g., 5)") self.parser.add_option("", "--delegations", - metavar="", + metavar="", action="append", help="List of slices with delegation authority") self.parser.add_option("", "--disk-max", - metavar="", + metavar="", action="append", help="Disk quota (1k disk blocks)") self.parser.add_option("", "--initscript", - metavar="", + metavar="", action="append", help="Slice initialization script (e.g., stork)") self.parser.add_option("", "--ip-addresses", action="append", metavar="", help="Add an IP address to a sliver") self.parser.add_option("", "--net-i2-max-kbyte", - metavar="", + metavar="", action="append", help="Maximum daily network Tx limit " + "to I2 hosts.") - self.parser.add_option("", "--net-i2-max_rate", - metavar="", + self.parser.add_option("", "--net-i2-max-rate", + metavar="", action="append", help="Maximum bandwidth over I2 routes") self.parser.add_option("", "--net-i2-min-rate", - metavar="", + metavar="", action="append", help="Minimum bandwidth over I2 routes") self.parser.add_option("", "--net-i2-share", - metavar="", + metavar="", action="append", help="Number of bandwidth shares over I2 routes") self.parser.add_option("", "--net-i2-thresh-kbyte", - metavar="", + metavar="", action="append", help="Limit sent to I2 hosts before warning, " + "throttling") self.parser.add_option("", "--net-max-kbyte", - metavar="", + metavar="", action="append", help="Maximum daily network Tx limit " + "to non-I2 hosts.") - self.parser.add_option("", "--net-max_rate", - metavar="", + self.parser.add_option("", "--net-max-rate", + metavar="", action="append", help="Maximum bandwidth over non-I2 routes") self.parser.add_option("", "--net-min-rate", - metavar="", + metavar="", action="append", help="Minimum bandwidth over non-I2 routes") self.parser.add_option("", "--net-share", - metavar="", + metavar="", action="append", help="Number of bandwidth shares over non-I2 " + "routes") self.parser.add_option("", "--net-thresh-kbyte", - metavar="", + metavar="", action="append", help="Limit sent to non-I2 hosts before " + "warning, throttling") - self.parser.add_option("", "--vsys", action="append", - metavar="", + self.parser.add_option("", "--vsys", + metavar="", action="append", help="Vsys script (e.g., fd_fusemount)") self.parser.add_option("", "--vsys-vnet", - metavar="", + metavar="", action="append", help="Allocate a virtual private network") def get_attribute_dict(self): - attrlist = ['capabilities','codemux','cpu-pct','cpu-share', - 'delegations','disk-max','initscript','ip-addresses', - 'net-i2-max-kbyte','net-i2-max-rate','net-i2-min-rate', - 'net-i2-share','net-i2-thresh-kbyte', - 'net-max-kbyte','net-max-rate','net-min-rate', - 'net-share','net-thresh-kbyte', - 'vsys','vsys-vnet'] + attrlist = ['capabilities','codemux','cpu_pct','cpu_share', + 'delegations','disk_max','initscript','ip_addresses', + 'net_i2_max_kbyte','net_i2_max_rate','net_i2_min_rate', + 'net_i2_share','net_i2_thresh_kbyte', + 'net_max_kbyte','net_max_rate','net_min_rate', + 'net_share','net_thresh_kbyte', + 'vsys','vsys_vnet'] attrdict = {} for attr in attrlist: - name = attr value = getattr(self.opts, attr, None) if value is not None: - attrdict[name] = value + attrdict[attr] = value return attrdict def prep(self): @@ -222,7 +408,7 @@ class Commands: self.nodes = self.args if self.opts.outfile: - sys.outfile = open(self.opts.outfile, "w") + sys.stdout = open(self.opts.outfile, "w")