X-Git-Url: http://git.onelab.eu/?p=nodemanager-topo.git;a=blobdiff_plain;f=topo.py;h=2f7b6dd4b0ad0760e11cdf924a415b0a4a2f8179;hp=f87a2709e333ad0417063c9c16c3e1edf74322e5;hb=HEAD;hpb=ca47a9756ea2389b8666ad8d6c6c7421083c08b0 diff --git a/topo.py b/topo.py index f87a270..2f7b6dd 100755 --- a/topo.py +++ b/topo.py @@ -13,6 +13,7 @@ import re import vserver import os from time import strftime +import socket dryrun = 0 vinidir = "/usr/share/vini/" @@ -30,6 +31,40 @@ def run(cmd): else: return subprocess.call(cmd, shell=True); +""" +From old pyplnet, former semantics needed for VINI +""" +def gifconf(): + try: + interfaces = os.listdir("/sys/class/net") + except: + interfaces = [] + s = None + ret = {} + try: + s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, 0) + for interface in interfaces: + try: + ifreq = fcntl.ioctl(s.fileno(), SIOCGIFADDR, + struct.pack("16sH14x", interface, socket.AF_INET)) + (family, ip) = struct.unpack(SIOCGIFADDR_struct, ifreq) + if family == socket.AF_INET: + ret[interface] = _format_ip(ip) + else: + raise Exception + except: + ret[interface] = "0.0.0.0" + finally: + if s is not None: + s.close() + return ret + +""" +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 +76,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): - 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)) +def setup_virtual_link(slice, key, rate, myid, nodeid, ipaddr, virtip, vnet): + logger.log("%s: Set up virtual link to node %s" % (slice, nodeid)) + run(setup_link_cmd + " %s %s %s %s %s %s %s" % (slice, nodeid, ipaddr, + key, rate, virtip, vnet)) return @@ -79,6 +106,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 """ @@ -128,13 +163,13 @@ def clean_up_old_virtual_links(): for iface in old_ifaces: m = re.match(pattern1, iface) if m: - key = int(m.group(1)) - node = int(m.group(2)) + key = m.group(1) + node = m.group(2) teardown_virtual_link(key, node) m = re.match(pattern2, iface) if m: - key = int(m.group(1)) + key = m.group(1) teardown_nat(key) return @@ -151,27 +186,36 @@ 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) + +""" +Update NAT interface for the slice +""" +def update_nat(slice, myid, key, netns): 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. +Restart the vserver if there are any changes. """ -def writeConf(slicename, value): +def write_spaces_net(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 +223,23 @@ 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) + + sliver.stop() + + if value: + STATUS="ON" + f = open(FILENAME, "w") + f.close() + else: + STATUS="OFF" + os.remove(FILENAME) + + sliver.start() + + logger.log("%s: network namespace %s\n" % (slicename, STATUS)) """ @@ -195,11 +249,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 +270,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() @@ -251,6 +316,7 @@ def write_ospf(filename, myname, ifaces): f = open(filename, 'w') password = "zebra" write_header(f, myname, password) + name = None for name in ifaces: f.write ("""! @@ -261,7 +327,8 @@ def write_ospf(filename, myname, ifaces): ip ospf network non-broadcast """ % name) - f.write ("""! + if name: + f.write ("""! router ospf ospf router-id %s """ % ifaces[name]['local-ip']) @@ -270,10 +337,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 @@ -290,17 +358,15 @@ def update_quagga_configs(slicename, hostname, myid, topo, key, netns): quagga_dir = "/vservers/%s/etc/quagga/" % slicename if not os.path.exists(quagga_dir): try: - # Quagga not installed. Install it here? Chkconfig, sym links. os.mkdir(quagga_dir) except os.error: 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. - return @@ -314,8 +380,31 @@ 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 + -def start(options, config): +""" +Executed on NM startup +""" +def start(): + # Should be taken care of by /etc/sysctl.conf, but it doesn't hurt... + run ("echo 1 > /proc/sys/net/ipv4/ip_forward") pass @@ -326,29 +415,37 @@ an 'egre_key' attribute, and a 'topo_rspec' attribute. Creating the virtual link depends on the contents of /etc/vservers//spaces/net. Update this first. """ -def GetSlivers(data): +def GetSlivers(data, config = None, plc = None): global ifaces, old_ifaces - ifaces = old_ifaces = sioc.gifconf() + ifaces = old_ifaces = gifconf() + slicekeys = {} for sliver in data['slivers']: attrs = {} - for attribute in sliver['attributes']: - attrs[attribute['name']] = attribute['value'] - if 'netns' in attrs: - netns = int(attrs['netns']) - writeConf(sliver['name'], netns) - else: - netns = 0 + for tag in sliver['attributes']: + attrs[tag['tagname']] = tag['value'] + if tag['tagname'] == 'egre_key': + slicekeys[sliver['name']] = tag['value'] + + + if vserver.VServer(sliver['name']).is_running(): + if 'netns' in attrs: + netns = int(attrs['netns']) + else: + netns = 0 + write_spaces_net(sliver['name'], netns) if vserver.VServer(sliver['name']).is_running(): - if 'egre_key' in attrs and 'topo_rspec' in attrs: - logger.log("topo: Update topology for slice %s" % \ - sliver['name']) - update_links(sliver['name'], data['node_id'], - attrs['topo_rspec'], attrs['egre_key'], netns) - update_quagga_configs(sliver['name'], data['hostname'], - data['node_id'], attrs['topo_rspec'], - attrs['egre_key'], netns) + if 'egre_key' in attrs: + logger.log("topo: Update slice %s" % sliver['name']) + update_nat(sliver['name'], data['node_id'], attrs['egre_key'], + netns) + if 'topo_rspec' in attrs: + update_links(sliver['name'], data['node_id'], + attrs['topo_rspec'], attrs['egre_key'], netns) + update_quagga_configs(sliver['name'], data['hostname'], + data['node_id'], attrs['topo_rspec'], + attrs['egre_key'], netns) if 'hosts' in attrs: update_hosts(sliver['name'], attrs['hosts']) else: @@ -356,6 +453,7 @@ def GetSlivers(data): sliver['name']) clean_up_old_virtual_links() + write_egre_keys(slicekeys) return