X-Git-Url: http://git.onelab.eu/?p=nodemanager-topo.git;a=blobdiff_plain;f=topo.py;h=2f7b6dd4b0ad0760e11cdf924a415b0a4a2f8179;hp=03c2636d94cd470aaef0cd002ab6d80c2e2acd8a;hb=HEAD;hpb=4e42a4f26fd3ff1784ebd98159cc5a92ade779d2

diff --git a/topo.py b/topo.py
index 03c2636..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,33 @@ 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
@@ -181,9 +209,10 @@ def update_nat(slice, myid, 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
@@ -197,11 +226,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")
@@ -209,12 +236,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))
 
 
 """
@@ -333,7 +358,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)
@@ -343,8 +367,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
 
 
@@ -380,7 +402,8 @@ def write_egre_keys(slicekeys):
 """
 Executed on NM startup
 """
-def start(options, config):
+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
 
@@ -392,9 +415,9 @@ 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()
+    ifaces = old_ifaces = gifconf()
 
     slicekeys = {}
     for sliver in data['slivers']:
@@ -405,11 +428,12 @@ 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: