The key is used to create the EGRE tunnel.
"""
def setup_virtual_link(slice, key, rate, myid, nodeid, ipaddr, virtip, vnet):
- logger.log("%s: Set up virtual link to node %d" % (slice, nodeid))
+ 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
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
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):
if netns:
setup_nat(slice, myid, key)
"""
-Write /etc/vservers/<slicename>/spaces/net. If the vserver is running and the spaces/net file is modified, we need to restart it.
+Write /etc/vservers/<slicename>/spaces/net.
+Restart the vserver if there are any changes.
"""
-def write_conf_and_restart(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(FILENAME) != value:
sliver = vserver.VServer(slicename)
- restart = sliver.is_running()
- if (restart):
- sliver.stop()
-
+ sliver.stop()
+
if value:
STATUS="ON"
f = open(FILENAME, "w")
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()
+ sliver.start()
+
+ logger.log("%s: network namespace %s\n" % (slicename, STATUS))
"""
f = open(filename, 'w')
password = "zebra"
write_header(f, myname, password)
+ name = None
for name in ifaces:
f.write ("""!
ip ospf network non-broadcast
""" % name)
- f.write ("""!
+ if name:
+ f.write ("""!
router ospf
ospf router-id %s
""" % ifaces[name]['local-ip'])
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)
myid, key)
write_ospf(quagga_dir + "ospfd.conf.generated", hostname, ifaces)
- # Start up Quagga if we installed it earlier and netns = 1.
-
return
Executed on NM startup
"""
def start(options, config):
+ # Should be taken care of by /etc/sysctl.conf, but it doesn't hurt...
run ("echo 1 > /proc/sys/net/ipv4/ip_forward")
pass
Creating the virtual link depends on the contents of
/etc/vservers/<slice>/spaces/net. Update this first.
"""
-def GetSlivers(data):
+def GetSlivers(data, config = None, plc = None):
global ifaces, old_ifaces
ifaces = old_ifaces = sioc.gifconf()
slicekeys[sliver['name']] = tag['value']
- if 'netns' in attrs:
- netns = int(attrs['netns'])
- else:
- netns = 0
- write_conf_and_restart(sliver['name'], netns)
+ 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: