X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=create-topo-attributes.py;h=b9536eb659e022ff244fdb9d781f49552858633f;hb=0206b7aa8e458cd414b1adf722b7ef94a8ff9938;hp=05b5aba8c6aadba0fabbf0589b23cdd7a1ef698f;hpb=7fe0b7fe3450fe8c693f6815fd362caa64ae8052;p=nodemanager-topo.git diff --git a/create-topo-attributes.py b/create-topo-attributes.py index 05b5aba..b9536eb 100755 --- a/create-topo-attributes.py +++ b/create-topo-attributes.py @@ -2,7 +2,7 @@ # $URL$ """ -Scan the VINI Central database and create topology "rspec" attributes for +Scan the VINI Central database and create topology "rspec" tags for slices that have an EGRE key. This script to be run from a cron job. """ @@ -10,50 +10,23 @@ import string import socket from topology import links -""" -Generate site adjacency map from list of links -""" -def gen_adjacencies(links): - adj = {} - for (a, b) in links: - if a in adj: - adj[a].append(b) - else: - adj[a] = [a, b] - if b in adj: - adj[b].append(a) - else: - adj[b] = [b, a] - return adj - - -""" -Test whether two sites are adjacent to each other in the adjacency graph. -""" -def is_adjacent(adjacencies, 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(adjacencies): - for site in adjacencies: - for adj in adjacencies[site]: - try: - test = is_adjacent(adjacencies, site, adj) - except Exception, e: - print "Error: ", e, " Fix adjacencies!" - return +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]: @@ -75,15 +48,35 @@ def get_sitenodes(siteid): """ Find the IP address assigned to a virtual interface in the topology -(for creating /etc/hosts) +(for creating /etc/hosts). +Each virtual link is on a /30 subnet. """ -def get_virt_ip(myid, nodeid): - if myid < nodeid: - virtip = "10.%d.%d.2" % (myid, nodeid) +def get_linkid(myid, remoteid): + if myid < remoteid: + linkid = (myid<<7) + remoteid else: - virtip = "10.%d.%d.3" % (nodeid, myid) - return virtip + 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 @@ -106,61 +99,77 @@ def get_nodes(): tmp.append(t) return dict(tmp) -adjacencies = gen_adjacencies(links) -check_adjacencies(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 """ + # Create dictionary of the slice's tags attrs ={} topo_attr = {} - for attribute in GetSliceAttributes(slice['slice_attribute_ids']): - 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'] + for tag in GetSliceTags(slice['slice_tag_ids']): + attrs[tag['tagname']] = tag['slice_tag_id'] + if tag['tagname'] == 'topo_rspec' and tag['node_id']: + topo_attr[tag['node_id']] = tag['slice_tag_id'] + if dryrun and slice['name'] == 'pl_trellis': + attrs['egre_key'] = 101 + if 'egre_key' in attrs: #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) - shortname = nodes[node]['hostname'].replace('.vini-veritas.net', '') - hosts += "%s\t\t%s\n" % (get_virt_ip(node, adj_node), - shortname) - topo_str = "%s" % topo - #print node, topo_str - if node in topo_attr: - UpdateSliceAttribute(topo_attr[node], topo_str) + 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: + UpdateSliceTag(topo_attr[node], topo_str) del topo_attr[node] else: id = slice['slice_id'] - AddSliceAttribute(id, 'topo_rspec', topo_str, node) + AddSliceTag(id, 'topo_rspec', topo_str, node) - #print hosts - if 'hosts' in attrs: - UpdateSliceAttribute(attrs['hosts'], hosts) + if dryrun: + print hosts + elif 'hosts' in attrs: + UpdateSliceTag(attrs['hosts'], hosts) else: id = slice['slice_id'] - AddSliceAttribute(id, 'hosts', hosts) - #else: - #print "No EGRE key for %s" % slice['name'] - - """ Remove old topo_rspec entries """ - for node in topo_attr: - DeleteSliceAttribute(topo_attr[node]) + AddSliceTag(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: + DeleteSliceTag(topo_attr[node])