X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Faggregates%2Frspec_manager_max.py;h=99b390ae4a5a9af92288747d0adc3be12fdf8955;hb=dbce495b6f2e7d8dccbfb18c5507907d784c143b;hp=6bf1a8c47ad8c241b558d19b601e1e0eae39f8df;hpb=5db2b6c32bb41375e758f6cead25e2d756333435;p=sfa.git diff --git a/sfa/rspecs/aggregates/rspec_manager_max.py b/sfa/rspecs/aggregates/rspec_manager_max.py index 6bf1a8c4..99b390ae 100644 --- a/sfa/rspecs/aggregates/rspec_manager_max.py +++ b/sfa/rspecs/aggregates/rspec_manager_max.py @@ -1,25 +1,87 @@ #!/usr/bin/python -from sfa.util.rspec import Rspec +from sfa.util.rspec import RSpec import sys import pdb +from sfa.util.namespace import get_authority, hrn_to_pl_slicename, +from sfa.util.rspec import * +from sfa.util.specdict import * +from sfa.util.faults import * +from sfa.util.storage import * +from sfa.util.policy import Policy +from sfa.server.aggregate import Aggregates +from sfa.server.registry import Registries +from sfa.util.faults import * + +import xml.dom.minidom SFA_MAX_CONF_FILE = '/etc/sfa/max_allocations' +SFA_MAX_DEFAULT_RSPEC = '/etc/sfa/max_physical.xml' +SFA_MAX_CANNED_RSPEC = '/etc/sfa/max_physical_canned.xml' -# Topology +topology = {} -topology = {'pl23':('planetlab2.dragon.maxgigapop.net','planetlab3.dragon.maxgigapop.net'), - 'pl24':('planetlab2.dragon.maxgigapop.net','planetlab4.dragon.maxgigapop.net'), - 'pl25':('planetlab2.dragon.maxgigapop.net','planetlab5.dragon.maxgigapop.net'), - 'pl34':('planetlab3.dragon.maxgigapop.net','planetlab4.dragon.maxgigapop.net'), - 'pl35':('planetlab3.dragon.maxgigapop.net','planetlab5.dragon.maxgigapop.net'), - 'pl45':('planetlab4.dragon.maxgigapop.net','planetlab5.dragon.maxgigapop.net') - } +class SfaOutOfResource(SfaFault): + def __init__(self, interface): + faultString = "Interface " + interface + " not available" + SfaFault.__init__(self, 100, faultString, '') -def link_endpoints(links): +class SfaNoPairRSpec(SfaFault): + def __init__(self, interface, interface2): + faultString = "Interface " + interface + " should be paired with " + interface2 + SfaFault.__init__(self, 100, faultString, '') + +# Returns a mapping from interfaces to the nodes they lie on and their peer interfaces +# i -> node,i_peer + +def get_interface_map(): + r = RSpec() + r.parseFile(SFA_MAX_DEFAULT_RSPEC) + rspec = r.toDict() + capacity = rspec['rspec']['capacity'] + netspec = capacity[0]['netspec'][0] + linkdefs = {} + for n in netspec['nodespec']: + ifspecs = n['ifspec'] + nodename = n['node'] + for i in ifspecs: + ifname = i['name'] + linkid = i['linkid'] + + if (linkdefs.has_key(linkid)): + linkdefs[linkid].extend([(nodename,ifname)]) + else: + linkdefs[linkid]=[(nodename,ifname)] + + # topology maps interface x interface -> link,node1,node2 + topology={} + + for k in linkdefs.keys(): + (n1,i1) = linkdefs[k][0] + (n2,i2) = linkdefs[k][1] + + topology[i1] = (n1, i2) + topology[i2] = (n2, i1) + + + return topology + + +def allocations_to_rspec(allocations): + rspec = xml.dom.minidom.parse(SFA_MAX_DEFAULT_RSPEC) + req = rspec.firstChild.appendChild(rspec.createElement("request")) + for (iname,ip) in allocations: + ifspec = req.appendChild(rspec.createElement("ifspec")) + ifspec.setAttribute("name","tns:"+iname) + ifspec.setAttribute("ip",ip) + + return rspec.toxml() + + +def if_endpoints(ifs): nodes=[] - for l in links: - nodes.extend(topology[l]) + for l in ifs: + nodes.extend(topology[l][0]) return nodes def lock_state_file(): @@ -35,17 +97,19 @@ def read_alloc_dict(): rows = open(SFA_MAX_CONF_FILE).read().split('\n') for r in rows: columns = r.split(' ') - if (len(columns)>2): + if (len(columns)==2): hrn = columns[0] allocs = columns[1].split(',') - alloc_dict[hrn]=allocs + ipallocs = map(lambda alloc:alloc.split('/'), allocs) + alloc_dict[hrn]=ipallocs return alloc_dict def commit_alloc_dict(d): f = open(SFA_MAX_CONF_FILE, 'w') for hrn in d.keys(): columns = d[hrn] - row = hrn+' '+','.join(columns)+'\n' + ipcolumns = map(lambda x:"/".join(x), columns) + row = hrn+' '+','.join(ipcolumns)+'\n' f.write(row) f.close() @@ -56,21 +120,28 @@ def collapse_alloc_dict(d): return ret -def alloc_links(api, links_to_add, links_to_drop, foo): +def alloc_links(api, hrn, links_to_add, links_to_drop): + slicename=hrn_to_pl_slicename(hrn) + for (iface,ip) in links_to_add: + node = topology[iface][0][0] + try: + api.plshell.AddSliceTag(api.plauth, slicename, "ip_addresses", ip, node) + api.plshell.AddSliceTag(api.plauth, slicename, "vsys", "getvlan", node) + except Exception: + # Probably a duplicate tag. XXX July 21 + pass return True -def alloc_nodes(api,hrn, requested_links, links_to_delete): - - nodes_to_add = link_endpoints(links_to_add) - nodes_to_delete = link_endpoints(links_to_delete) - - pdb.set_trace() - create_slice_max_aggregate(api, hrn, nodes_to_add, nodes_to_delete) +def alloc_nodes(api,hrn, requested_ifs): + requested_nodes = if_endpoints(requested_ifs) + create_slice_max_aggregate(api, hrn, requested_nodes) # Taken from slices.py def create_slice_max_aggregate(api, hrn, nodes): - # Get the slice record from geni + # Get the slice record from SFA + global topology + topology = get_interface_map() slice = {} registries = Registries(api) registry = registries[api.hrn] @@ -176,24 +247,26 @@ def create_slice_max_aggregate(api, hrn, nodes): return 1 -def get_rspec(hrn): +def get_rspec(api, hrn): # Eg. config line: # plc.princeton.sapan vlan23,vlan45 allocations = read_alloc_dict() - if (hrn): - current_allocations = allocations[hrn] + if (hrn and allocations.has_key(hrn)): + ret_rspec = allocations_to_rspec(allocations[hrn]) else: - current_allocations = collapse_alloc_dict(allocations) + ret_rspec = open(SFA_MAX_CANNED_RSPEC).read() - return (allocations_to_rspec_dict(current_allocations)) + return (ret_rspec) def create_slice(api, hrn, rspec_xml): + global topology + topology = get_interface_map() + # Check if everything in rspec is either allocated by hrn # or not allocated at all. - - r = Rspec() + r = RSpec() r.parseString(rspec_xml) rspec = r.toDict() @@ -208,9 +281,15 @@ def create_slice(api, hrn, rspec_xml): current_hrn_allocations=[] # Check request against current allocations - for a in requested_allocations: - if (a not in current_hrn_allocations and a in current_allocations): - return False + requested_interfaces = map(lambda(elt):elt[0], requested_allocations) + current_interfaces = map(lambda(elt):elt[0], current_allocations) + current_hrn_interfaces = map(lambda(elt):elt[0], current_hrn_allocations) + + for a in requested_interfaces: + if (a not in current_hrn_interfaces and a in current_interfaces): + raise SfaOutOfResource(a) + if (topology[a][1] not in requested_interfaces): + raise SfaNoPairRSpec(a,topology[a][1]) # Request OK # Allocations to delete @@ -220,7 +299,7 @@ def create_slice(api, hrn, rspec_xml): allocations_to_delete.extend([a]) # Ok, let's do our thing - alloc_nodes(api, hrn, requested_allocations, allocations_to_delete) + alloc_nodes(api, hrn, requested_interfaces) alloc_links(api, hrn, requested_allocations, allocations_to_delete) allocations[hrn] = requested_allocations commit_alloc_dict(allocations) @@ -230,23 +309,22 @@ def create_slice(api, hrn, rspec_xml): return True def rspec_to_allocations(rspec): - links = [] + ifs = [] try: - linkspecs = rspec['rspec']['request'][0]['netspec'][0]['linkspec'] - for l in linkspecs: - links.extend([l['name'].replace('tns:','')]) - + ifspecs = rspec['rspec']['request'][0]['ifspec'] + for l in ifspecs: + ifs.extend([(l['name'].replace('tns:',''),l['ip'])]) except KeyError: - # Bad Rspec + # Bad RSpec pass - return links + return ifs def main(): - r = Rspec() + t = get_interface_map() + r = RSpec() rspec_xml = open(sys.argv[1]).read() - r.parseString(rspec_xml) - rspec = r.toDict() - create_slice(None,'plc',rspec) + #get_rspec(None,'foo') + create_slice(None, "plc.princeton.sap0", rspec_xml) if __name__ == "__main__": main()