Changeset c7a6a20

Timestamp:

Oct 2, 2012 2:31:32 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

995ad61

Parents:

ab662b6

Message:

Simplify link instantiation and replicate source tcl effects

File:

• fedd/deter/topdl.py (modified) (1 diff)

fedd/deter/topdl.py

@@ -1078 +1078 @@
         name = to_tcl_name(s.name or "sub%d" % idx)
 
-        if len(s.interfaces) > 2:
-            # Lan
-            members = [ to_tcl_name("${%s}") % i.element.name \
-                    for i in s.interfaces]
-            out += 'set %s [$ns make-lan "%s" %fkb %fms ]\n' % \
-                    (name, " ".join([to_tcl_name(m) for m in members]),
-                            rate, delay)
-            if loss:
-                "tb-set-lan-loss ${%s} %f\n" % (name, float(loss))
-
-            for i in s.interfaces:
-                e = i.element
-                ip = i.get_attribute("ip4_address")
-                if ip:
-                    out += "tb-set-ip-lan ${%s} ${%s} %s\n" % \
-                            (to_tcl_name(e.name), name, ip)
-                if i.capacity and i.capacity.rate != rate:
-                    out += "tb-set-node-lan-bandwidth ${%s} ${%s} %fkb\n" % \
-                            (to_tcl_name(e.name), name, i.capacity.rate)
-                if i.latency and i.latency.time != delay:
-                    out += "tb-set-node-lan-delay ${%s} ${%s} %fms\n" % \
-                            (to_tcl_name(e.name), name, i.latency.time)
-                iloss = i.get_attribute('loss')
-                if loss and iloss != loss :
-                    out += "tb-set-node-lan-loss ${%s} ${%s} %f\n" % \
-                            (to_tcl_name(e.name), name, float(loss))
-            out+= "\n"
-        elif len(s.interfaces) == 2:
-            f = s.interfaces[0]
-            t = s.interfaces[1]
-
-            out += "set %s [$ns duplex-link ${%s} ${%s} %fkb %fms DropTail]\n" %\
-                    (name, to_tcl_name(f.element.name), 
-                            to_tcl_name(t.element.name), rate, delay)
-            if loss:
-                out += "tb-set-link-loss ${%s} %f\n" % (name, float(loss))
-
-            for i in s.interfaces:
-                lloss = i.get_attribute("loss")
-                cap_override = i.capacity and \
-                        i.capacity.rate != rate
-                delay_override = i.latency and \
-                        i.latency.time != delay
-                loss_override = lloss and lloss != loss
-                if cap_override or delay_override or loss_override:
-                    if i.capacity: cap = i.capacity.rate
-                    else: cap = rate
-
-                    if i.latency: delay = i.latency.time
-
-                    if lloss: loss = lloss
-                    else: loss = loss or 0.0
-
-                    out += "tb-set-link-simplex-params ${%s} ${%s} %fms %fkb %f\n"\
-                            % (name, to_tcl_name(i.element.name),
-                                    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), name, ip)
-            out+= "\n"
+        # Lan
+        members = [ to_tcl_name("${%s}") % i.element.name \
+                for i in s.interfaces]
+        out += 'set %s [$ns make-lan "%s" %fkb %fms ]\n' % \
+                (name, " ".join([to_tcl_name(m) for m in members]),
+                        rate, 2 * delay)
+        if loss:
+            "tb-set-lan-loss ${%s} %f\n" % (name, float(loss))
+
+        for i in s.interfaces:
+            e = i.element
+            ip = i.get_attribute("ip4_address")
+            if ip:
+                out += "tb-set-ip-lan ${%s} ${%s} %s\n" % \
+                        (to_tcl_name(e.name), name, ip)
+            if i.capacity :
+                out += "tb-set-node-lan-bandwidth ${%s} ${%s} %fkb\n" % \
+                        (to_tcl_name(e.name), name, i.capacity.rate)
+            if i.latency :
+                out += "tb-set-node-lan-delay ${%s} ${%s} %fms\n" % \
+                        (to_tcl_name(e.name), name, i.latency.time)
+            iloss = i.get_attribute('loss')
+            if loss and iloss != loss :
+                out += "tb-set-node-lan-loss ${%s} ${%s} %f\n" % \
+                        (to_tcl_name(e.name), name, float(loss))
+        out+= "\n"
         for f in filters:
             out+= f(s)