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 = {}
+ idx = 1
+ 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] = idx
+ topo[nodeB][nodeA] = idx
+ idx += 1
+ return topo
+
+
def get_site(nodeid):
if nodes[nodeid]:
Find the IP address assigned to a virtual interface in the topology
(for creating /etc/hosts)
"""
-def get_virt_ip(myid, nodeid):
- if myid < nodeid:
- virtip = "10.%d.%d.2" % (myid, nodeid)
- else:
- virtip = "10.%d.%d.3" % (nodeid, myid)
- return virtip
+def get_virt_ip(myid, linkid):
+ return "192.168.%d.%d" % (linkid, myid)
+def get_virt_net(linkid):
+ return "192.168.%d.0/24" % linkid
"""
Create a dictionary of site records keyed by site ID
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 attributes
attrs ={}
topo_attr = {}
for attribute in GetSliceAttributes(slice['slice_attribute_ids']):
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']
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:
+ topo = {}
+ for a in slicenodes:
+ for b in adj_matrix[a]:
+ if b in slicenodes:
+ if a not in topo:
+ topo[a] = []
+ link_id = adj_matrix[a][b]
+ my_ip = get_virt_ip(a, link_id)
+ remote_ip = get_virt_ip(b, link_id)
+ net = get_virt_net(link_id)
+ 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)
- #print hosts
- if 'hosts' in attrs:
+ if dryrun:
+ print hosts
+ elif 'hosts' in attrs:
UpdateSliceAttribute(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])
+ 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])
git://git.onelab.eu / nodemanager-topo.git / blobdiff