X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=topo.py;h=be68831b8799d77ceba0c6e5d5e8bb265aeedf3e;hb=ceb5f699fdccf1c56d571a64e16ae9ac606fc2bb;hp=c895741e553a3f85fc2c6ebd7b54bfd5aa6c9b35;hpb=e9a2d77c6236c8f0b21d323bf62e2c3bb3eea6dc;p=nodemanager-topo.git

diff --git a/topo.py b/topo.py
index c895741..be68831 100755
--- 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
 
@@ -392,7 +392,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()