Restart the veserver if spaces/net changes

[nodemanager-topo.git] / topo.py

diff --git a/topo.py b/topo.py
index b2cabb8..559d417 100755 (executable)
--- a/topo.py
+++ b/topo.py
@@ -135,13 +135,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
 
@@ -167,6 +167,11 @@ def update_links(slice, myid, topospec, key, netns):
             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)
@@ -176,9 +181,10 @@ def update_links(slice, myid, topospec, key, netns):
 
 
 """
-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
@@ -192,11 +198,9 @@ def write_conf_and_restart(slicename, value):
             
         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")
@@ -204,12 +208,10 @@ def write_conf_and_restart(slicename, value):
             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))
 
 
 """
@@ -328,7 +330,6 @@ 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)
@@ -338,8 +339,6 @@ def update_quagga_configs(slicename, hostname, myid, topo, key, netns):
                 myid, key)
     write_ospf(quagga_dir + "ospfd.conf.generated", hostname, ifaces)
 
-    # Start up Quagga if we installed it earlier and netns = 1.
-
     return
 
 
@@ -376,6 +375,7 @@ def write_egre_keys(slicekeys):
 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
 
@@ -387,7 +387,7 @@ an 'egre_key' attribute, and a 'topo_rspec' attribute.
 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()
 
@@ -400,21 +400,24 @@ def GetSlivers(data):
                 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: