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.
+Assumes that the vserver was started with a network namespace.
"""
-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()
-
if value:
STATUS="ON"
f = open(FILENAME, "w")
logger.log("%s: network namespace %s\n" % (slicename, STATUS))
- if (restart):
- logger.log("topo: restarting sliver %s\n" % slicename)
- sliver.start()
-
"""
Generate information for each interface in the sliver, in order to configure
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: