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
"""
-Write /etc/vservers/<slicename>/spaces/net
+Write /etc/vservers/<slicename>/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:
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()
"""
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
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:
sliver['name'])
clean_up_old_virtual_links()
+ write_egre_keys(slicekeys)
return