Changeset 1da6a23 for fedd/federation/topdl.py

Timestamp:

Sep 4, 2009 5:04:07 PM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-2.00, version-3.01, version-3.02

Children:

5ae3857

Parents:

f5ae004

Message:

cahekpoint: swaps in again!

File:

• fedd/federation/topdl.py (modified) (4 diffs)

fedd/federation/topdl.py

@@ -613 +613 @@
 
 
-def topology_to_ns2(t, filters=[]):
+def topology_to_ns2(t, filters=[], routing="Session"):
     out = """
 set ns [new Simulator]
@@ -668 +668 @@
             for i in s.interfaces:
                 e = i.element
-                ip = e.get_attribute("ip4_address")
+                ip = i.get_attribute("ip4_address")
                 if ip:
-                    out += "tb-set-ip-lan $%s $%s %s\n" % (e.name, name, ip)
+                    out += "tb-set-ip-lan $%s $%s %s\n" % \
+                            (to_tcl(e.name[0]), name, ip)
                 if i.capacity and i.capacity.rate != s.capacity.rate:
                     out += "tb-set-node-lan-bandwidth $%s $%s %fkb\n" % \
@@ -679 +680 @@
                 iloss = i.get_attribute('loss')
                 if loss and iloss != loss :
-                    out += "tb-set-node-lan-loss $%s $%s %f" % \
+                    out += "tb-set-node-lan-loss $%s $%s %f\n" % \
                             (to_tcl_name(e.name[0]), name, float(loss))
             out+= "\n"
@@ -712 +713 @@
                             % (name, to_tcl_name(i.element.name[0]),
                                     delay, cap, loss)
+                ip = i.get_attribute('ip4_address')
+                if ip:
+                    out += "tb-set-ip-link $%s $%s %s\n" % \
+                            (to_tcl_name(i.element.name[0]), name, ip)
             out+= "\n"
         for f in filters:
             out+= f(s)
+    out+="$ns rtproto %s" % routing
     out+="""
 $ns run