No need to assume integers

[nodemanager-topo.git] / topo.py

diff --git a/topo.py b/topo.py
index 3bda6bb..03c2636 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)
@@ -286,6 +291,7 @@ def write_ospf(filename, myname, ifaces):
     f = open(filename, 'w')
     password = "zebra"
     write_header(f, myname, password)
+    name = None
 
     for name in ifaces:
         f.write ("""!
@@ -296,7 +302,8 @@ def write_ospf(filename, myname, ifaces):
      ip ospf network non-broadcast
 """ % name)
 
-    f.write ("""!
+    if name:
+        f.write ("""!
      router ospf
      ospf router-id %s
 """ % ifaces[name]['local-ip'])
@@ -405,14 +412,16 @@ def GetSlivers(data):
         write_conf_and_restart(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: