X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=topo.py;h=b2cabb8965c98d2ba51fdb02a05e39d1fc0df384;hb=12587297bc7816108884cb3f45b2ab23bbff13a2;hp=a86ea818138e333b26a5f5c9d1a2809971084cd0;hpb=f2f1746fd8e769c03319bed4c22687b5d1e72e3c;p=nodemanager-topo.git

diff --git a/topo.py b/topo.py
index a86ea81..b2cabb8 100755
--- a/topo.py
+++ b/topo.py
@@ -53,7 +53,7 @@ Create a "virtual link" for slice between here and nodeid.
 The key is used to create the EGRE tunnel.
 """
 def setup_virtual_link(slice, key, rate, myid, nodeid, ipaddr, virtip, vnet):
-    logger.log("%s: Set up virtual link to node %d" % (slice, nodeid))
+    logger.log("%s: Set up virtual link to node %s" % (slice, nodeid))
     run(setup_link_cmd + " %s %s %s %s %s %s %s" % (slice, nodeid, ipaddr, 
                                                  key, rate, virtip, vnet))
     return
@@ -286,6 +286,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 +297,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'])