X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=create-topo-attributes.py;h=ab4680ef0795a1d24f9df039116734f92d7a2685;hb=f9245e44c20a170157d5151083ff70ae1154e34a;hp=816c8196e1c2678b6304d05365cd379317056618;hpb=c5ebfa8eecd71b87e1dbcfe2429cc38f50fc875e;p=nodemanager-topo.git diff --git a/create-topo-attributes.py b/create-topo-attributes.py index 816c819..ab4680e 100755 --- a/create-topo-attributes.py +++ b/create-topo-attributes.py @@ -8,46 +8,25 @@ slices that have an EGRE key. This script to be run from a cron job. import string import socket - -""" -Map sites to adjacent sites in topology. Generated manually :-( -A site is adjacent to itself. -""" -adjacencies = { - 1: [1], 2: [2,12], 3: [3], 4: [4,5,6,7,9,10], 5: [4,5,6,8], - 6: [4,5,6,10], 7: [4,7,8], 8: [5,7,8], 9: [4,9,10], 10: [4,6,9,10], - 11: [11,13,15,16,17], 12: [2,12,13], 13: [11,12,13,15], 14: [14], - 15: [11,13,15,19], 16: [11,16], 17: [11,17,19,22], 18: [18], - 19: [15,17,19,20], 20: [19,20,21,22], 21: [20,21,22], 22: [17,20,21,22] - } - -""" -Test whether two sites are adjacent to each other in the adjacency graph. -""" -def is_adjacent(s1, s2): - set1 = set(adjacencies[s1]) - set2 = set(adjacencies[s2]) - - if s1 in set2 and s2 in set1: - return True - elif not s1 in set2 and not s2 in set1: - return False - else: - raise Exception("Adjacency mismatch, sites %d and %d." % (s1, s2)) - - -""" -Check the adjacency graph for discrepancies. -""" -def check_adjacencies(): - for site in adjacencies: - for adj in adjacencies[site]: - try: - test = is_adjacent(site, adj) - except Exception, e: - print "Error: ", e, " Fix adjacencies!" - return - +from topology import links + + +def get_adjacency_matrix(links): + topo = {} + for (a, b) in links: + aNodes = get_sitenodes(a) + bNodes = get_sitenodes(b) + for nodeA in aNodes: + for nodeB in bNodes: + if nodeA not in topo: + topo[nodeA] = {} + if nodeB not in topo: + topo[nodeB] = {} + topo[nodeA][nodeB] = 1 + topo[nodeB][nodeA] = 1 + return topo + + def get_site(nodeid): if nodes[nodeid]: @@ -67,6 +46,38 @@ def get_sitenodes(siteid): raise Exception("Siteid %s not found." % siteid) +""" +Find the IP address assigned to a virtual interface in the topology +(for creating /etc/hosts). +Each virtual link is on a /30 subnet. +""" +def get_linkid(myid, remoteid): + if myid < remoteid: + linkid = (myid<<7) + remoteid + else: + linkid = (remoteid<<7) + myid + return linkid + +def get_nodeid(myid, remoteid): + if myid < remoteid: + nodeid = 1 + else: + nodeid = 2 + return nodeid + +def get_virt_ip(myid, remoteid): + linkid = get_linkid(myid, remoteid) + nodeid = get_nodeid(myid, remoteid) + first = linkid >> 6 + second = ((linkid & 0x3f)<<2) + nodeid + return "192.168.%d.%d" % (first, second) + +def get_virt_net(myid, remoteid): + linkid = get_linkid(myid, remoteid) + first = linkid >> 6 + second = (linkid & 0x3f)<<2 + return "192.168.%d.%d/30" % (first, second) + """ Create a dictionary of site records keyed by site ID """ @@ -88,49 +99,77 @@ def get_nodes(): tmp.append(t) return dict(tmp) - -check_adjacencies() + +# For debugging +dryrun = 1 """ Need global topology information """ sites = get_sites() nodes = get_nodes() +adj_matrix = get_adjacency_matrix(links) + for slice in GetSlices(): - """ Create dictionary of the slice's attributes """ - attrs = [] + # Create dictionary of the slice's attributes + attrs ={} topo_attr = {} for attribute in GetSliceAttributes(slice['slice_attribute_ids']): - attrs.append(attribute['name']) + attrs[attribute['name']] = attribute['slice_attribute_id'] if attribute['name'] == 'topo_rspec' and attribute['node_id']: topo_attr[attribute['node_id']] = attribute['slice_attribute_id'] + if dryrun and slice['name'] == 'pl_trellis': + attrs['egre_key'] = 101 + if 'egre_key' in attrs: - print "Virtual topology for %s:" % slice['name'] + #print "Virtual topology for %s:" % slice['name'] slicenodes = set(slice['node_ids']) + hosts = "127.0.0.1\t\tlocalhost\n" """ - For each node in the slice, check whether nodes at adjacent sites - are also in the slice's node set. If so, add a virtual link to - the rspec. + For each node in the slice, check whether there are any adjacent + nodes also in the sliceset using the adjacency matrix. + For each pair of adjacent nodes, add to nodes' rspecs. """ - for node in slicenodes: - topo = [] - for adj in adjacencies[get_site(node)]: - for adj_node in get_sitenodes(adj): - if node != adj_node and adj_node in slicenodes: - link = adj_node, get_ipaddr(adj_node), "1Mbit" - topo.append(link) - topo_str = "%s" % topo - print node, topo_str - if node in topo_attr: + topo = {} + for a in slicenodes: + for b in adj_matrix[a]: + if b in slicenodes: + if a not in topo: + topo[a] = [] + my_ip = get_virt_ip(a, b) + remote_ip = get_virt_ip(b, a) + net = get_virt_net(a, b) + link = b, get_ipaddr(b), "1Mbit", my_ip, remote_ip, net + topo[a].append(link) + shortname = nodes[a]['hostname'].replace('.vini-veritas.net', '') + hosts += "%s\t\t%s\n" % (my_ip, shortname) + + for node in topo: + topo_str = "%s" % topo[node] + if dryrun: + print node, topo_str + elif node in topo_attr: UpdateSliceAttribute(topo_attr[node], topo_str) del topo_attr[node] else: id = slice['slice_id'] AddSliceAttribute(id, 'topo_rspec', topo_str, node) - """ Remove old topo_rspec entries """ + if dryrun: + print hosts + elif 'hosts' in attrs: + UpdateSliceAttribute(attrs['hosts'], hosts) + else: + id = slice['slice_id'] + AddSliceAttribute(id, 'hosts', hosts) + else: + if dryrun: + print "No EGRE key for %s" % slice['name'] + + # Remove old topo_rspec entries + + if not dryrun: for node in topo_attr: DeleteSliceAttribute(topo_attr[node]) - else: - print "No EGRE key for %s" % slice['name'] +