X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=topo.py;h=a86ea818138e333b26a5f5c9d1a2809971084cd0;hb=e7f5d461dc4c2546d7d6aea0c9458d49b77e1de9;hp=f87a2709e333ad0417063c9c16c3e1edf74322e5;hpb=ca47a9756ea2389b8666ad8d6c6c7421083c08b0;p=nodemanager-topo.git diff --git a/topo.py b/topo.py index f87a270..a86ea81 100755 --- a/topo.py +++ b/topo.py @@ -31,6 +31,13 @@ def run(cmd): return subprocess.call(cmd, shell=True); +""" +Subnet used for virtual interfaces by setup-egre-link script +""" +def iias_network(): + return "192.168.0.0 255.255.0.0" + + """ Check for existence of interface dx """ @@ -41,22 +48,14 @@ def virtual_link(key, nodeid): else: return False -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 "virtual link" for slice between here and nodeid. The key is used to create the EGRE tunnel. """ -def setup_virtual_link(slice, key, rate, myid, nodeid, ipaddr): +def setup_virtual_link(slice, key, rate, myid, nodeid, ipaddr, virtip, vnet): logger.log("%s: Set up virtual link to node %d" % (slice, nodeid)) - virtip = get_virt_ip(myid, nodeid) - run(setup_link_cmd + " %s %s %s %s %s %s" % (slice, nodeid, ipaddr, - key, rate, virtip)) + run(setup_link_cmd + " %s %s %s %s %s %s %s" % (slice, nodeid, ipaddr, + key, rate, virtip, vnet)) return @@ -79,6 +78,14 @@ def refresh_virtual_link(nodeid, key): return +""" +IP address of the NAT interface created inside the slice by the +setup-nat script. +""" +def nat_inner_ip(key): + return "10.0.%s.2" % key + + """ Check for existence of interface natx """ @@ -151,27 +158,30 @@ Update virtual links for the slice """ def update_links(slice, myid, topospec, key, netns): topolist = convert_topospec_to_list(topospec) - for (nodeid,ipaddr,rate) in topolist: + for (nodeid, ipaddr, rate, myvirtip, remvirtip, virtnet) in topolist: if not virtual_link(key, nodeid): if netns: - setup_virtual_link(slice, key, rate, myid, nodeid, ipaddr) + setup_virtual_link(slice, key, rate, myid, nodeid, + ipaddr, myvirtip, virtnet) else: logger.log("%s: virtual link to node %s exists" % (slice, nodeid)) refresh_virtual_link(nodeid, key) if not nat_exists(key): - setup_nat(slice, myid, key) + if netns: + setup_nat(slice, myid, key) else: logger.log("%s: NAT exists" % slice) refresh_nat(key) """ -Write /etc/vservers//spaces/net +Write /etc/vservers//spaces/net. If the vserver is running and the spaces/net file is modified, we need to restart it. """ -def writeConf(slicename, value): +def write_conf_and_restart(slicename, value): SLICEDIR="/etc/vservers/%s/" % slicename SPACESDIR="%s/spaces/" % SLICEDIR + FILENAME="%s/net" % SPACESDIR if os.path.exists(SLICEDIR): if not os.path.exists(SPACESDIR): try: @@ -179,13 +189,27 @@ def writeConf(slicename, value): except os.error: logger.log("topo: could not create %s\n" % SPACESDIR) return - f = open("%s/net" % SPACESDIR, "w") - f.write("%s\n" % value) - f.close() - STATUS="OFF" - if value: - STATUS="ON" - logger.log("%s: network namespace %s\n" % (slicename, STATUS)) + + if os.path.exists(FILENAME) != value: + sliver = vserver.VServer(slicename) + restart = sliver.is_running() + + if (restart): + sliver.stop() + + if value: + STATUS="ON" + f = open(FILENAME, "w") + f.close() + else: + STATUS="OFF" + os.remove(FILENAME) + + logger.log("%s: network namespace %s\n" % (slicename, STATUS)) + + if (restart): + logger.log("topo: restarting sliver %s\n" % slicename) + sliver.start() """ @@ -195,11 +219,12 @@ Quagga. def get_ifaces(hostname, myid, topospec, key): ifaces = {} topolist = convert_topospec_to_list(topospec) - for (nodeid, ipaddr, rate) in topolist: + for (nodeid, ipaddr, rate, myvirtip, remvirtip, virtnet) in topolist: name = "a%sx%s" % (key, nodeid) ifaces[name] = {} - ifaces[name]['remote-ip'] = get_virt_ip(nodeid, myid) - ifaces[name]['local-ip'] = get_virt_ip(myid, nodeid) + ifaces[name]['remote-ip'] = remvirtip + ifaces[name]['local-ip'] = myvirtip + ifaces[name]['network'] = virtnet ifaces[name]['short-name'] = hostname.replace('.vini-veritas.net', '') return ifaces @@ -215,29 +240,39 @@ password %s return +""" +IP address of NAT gateway to outside world +""" +def nat_gw(key): + return "10.0.%s.1" % key + +""" +IP address of the NAT interface inside the slice +""" +def nat_inner(key): + return "10.0.%s.2" % key + + """ Write zebra.conf file for Quagga """ -def write_zebra(filename, myname, ifaces): +def write_zebra(filename, myname, ifaces, myid, key): f = open(filename, 'w') password = "zebra" write_header(f, myname, password) - f.write ("""enable password %s -! -""" % password) + f.write ("enable password %s\n" % password) for name in ifaces: f.write ("""! - interface %s - link-detect +interface %s +link-detect """ % name) f.write ("""! +access-list vty permit 127.0.0.1/32 ! - access-list vty permit 127.0.0.1/32 -! - line vty +line vty ! """) f.close() @@ -270,10 +305,11 @@ def write_ospf(filename, myname, ifaces): f.write (" neighbor %s\n" % ifaces[name]['remote-ip']) for name in ifaces: - net = ifaces[name]['local-ip'].rstrip('23')+'0' - f.write (" network %s/24 area 0\n" % net) + net = ifaces[name]['network'] + f.write (" network %s area 0\n" % net) - f.write("""! + f.write(""" redistribute kernel +! access-list vty permit 127.0.0.1/32 ! line vty @@ -296,7 +332,8 @@ def update_quagga_configs(slicename, hostname, myid, topo, key, netns): logger.log("topo: could not create %s\n" % quagga_dir) return - write_zebra(quagga_dir + "zebra.conf.generated", hostname, ifaces) + write_zebra(quagga_dir + "zebra.conf.generated", hostname, ifaces, + myid, key) write_ospf(quagga_dir + "ospfd.conf.generated", hostname, ifaces) # Start up Quagga if we installed it earlier and netns = 1. @@ -314,8 +351,30 @@ def update_hosts(slicename, hosts): f.close() return +""" +Write /etc/vini/egre-keys.txt, used by vsys topo scripts +""" +def write_egre_keys(slicekeys): + vini_dir = "/etc/vini" + if not os.path.exists(vini_dir): + try: + os.mkdir(vini_dir) + except os.error: + logger.log("topo: could not create %s\n" % vini_dir) + return + keys_file = "%s/egre-keys.txt" % vini_dir + f = open(keys_file, 'w') + for slice in slicekeys: + f.write("%s %s\n" % (slice, slicekeys[slice])) + f.close() + return + +""" +Executed on NM startup +""" def start(options, config): + run ("echo 1 > /proc/sys/net/ipv4/ip_forward") pass @@ -330,15 +389,20 @@ def GetSlivers(data): global ifaces, old_ifaces ifaces = old_ifaces = sioc.gifconf() + slicekeys = {} for sliver in data['slivers']: attrs = {} - for attribute in sliver['attributes']: - attrs[attribute['name']] = attribute['value'] + for tag in sliver['attributes']: + attrs[tag['tagname']] = tag['value'] + if tag['tagname'] == 'egre_key': + slicekeys[sliver['name']] = tag['value'] + + if 'netns' in attrs: netns = int(attrs['netns']) - writeConf(sliver['name'], netns) else: netns = 0 + write_conf_and_restart(sliver['name'], netns) if vserver.VServer(sliver['name']).is_running(): if 'egre_key' in attrs and 'topo_rspec' in attrs: @@ -356,6 +420,7 @@ def GetSlivers(data): sliver['name']) clean_up_old_virtual_links() + write_egre_keys(slicekeys) return