import string
import socket
+from topology import links
"""
-Map sites to adjacent sites in topology. Generated manually :-(
-A site is adjacent to itself.
+Generate site adjacency map from list of links
"""
-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]
- }
+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(s1, s2):
+def is_adjacent(adjacencies, s1, s2):
set1 = set(adjacencies[s1])
set2 = set(adjacencies[s2])
"""
Check the adjacency graph for discrepancies.
"""
-def check_adjacencies():
+def check_adjacencies(adjacencies):
for site in adjacencies:
for adj in adjacencies[site]:
try:
- test = is_adjacent(site, adj)
+ test = is_adjacent(adjacencies, site, adj)
except Exception, e:
print "Error: ", e, " Fix adjacencies!"
return
raise Exception("Siteid %s not found." % siteid)
+"""
+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
+
+
"""
Create a dictionary of site records keyed by site ID
"""
tmp.append(t)
return dict(tmp)
-
-check_adjacencies()
+adjacencies = gen_adjacencies(links)
+check_adjacencies(adjacencies)
""" Need global topology information """
sites = get_sites()
for slice in GetSlices():
""" Create dictionary of the slice's attributes """
- attrs = []
+ 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 '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
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
+ #print node, topo_str
if node in topo_attr:
UpdateSliceAttribute(topo_attr[node], topo_str)
del topo_attr[node]
id = slice['slice_id']
AddSliceAttribute(id, 'topo_rspec', topo_str, node)
- """ Remove old topo_rspec entries """
- for node in topo_attr:
- DeleteSliceAttribute(topo_attr[node])
+ #print hosts
+ if '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:
- print "No EGRE key for %s" % slice['name']